From 8ec580403d434695f43300f0aa87e8a7e9827e95 Mon Sep 17 00:00:00 2001
From: randomdan <randomdan@localhost>
Date: Thu, 9 Jun 2011 20:26:20 +0000
Subject: Fix install and doxygen deps
---
www-apps/project2/Manifest | 4 +--
www-apps/project2/project2-510.ebuild | 55 ----------------------------------
www-apps/project2/project2-511.ebuild | 55 ++++++++++++++++++++++++++++++++++
www-apps/project2/project2-9999.ebuild | 8 ++---
4 files changed, 61 insertions(+), 61 deletions(-)
delete mode 100644 www-apps/project2/project2-510.ebuild
create mode 100644 www-apps/project2/project2-511.ebuild
diff --git a/www-apps/project2/Manifest b/www-apps/project2/Manifest
index dd26c2d..e7358de 100644
--- a/www-apps/project2/Manifest
+++ b/www-apps/project2/Manifest
@@ -1,2 +1,2 @@
-EBUILD project2-510.ebuild 1524 RMD160 d0836642f0e86f8b482562292058081716b1021e SHA1 11eefe81d42e1fe458e7aa3602e123f91ba40cf3 SHA256 50f4fe97e9022ac80d69eddd6e87eda48dc1f2481108b0789822d5d9f4e68675
-EBUILD project2-9999.ebuild 1504 RMD160 7bf5500642fc05dbde8f53c00209d022d3c0253e SHA1 43f01b2ae7aebc375bc1012cba3e45f8388bad85 SHA256 9606e87888e20863ce67c4d28d26ebf2ede2d542fc1d8d3bac5f2f70463ad638
+EBUILD project2-511.ebuild 1509 RMD160 18fab5d458245d361376e7f681cb95207045a13c SHA1 0b9a4ff3368d94d58e1b2524c71bf2df6d5e2d2f SHA256 32143415b632db5df147567f1ea42188effa61fa39d6c86994d8c4a6f4b7a73d
+EBUILD project2-9999.ebuild 1489 RMD160 68b15f9e763a1ce7a4ad3b90de535c96973d8eb7 SHA1 8a8defe826bcdd24614ff4e046f94a9b2cbef214 SHA256 4409d75225b5f80e9db7d98319abe856ba49f5aaee66174b21ecd0d97743a92c
diff --git a/www-apps/project2/project2-510.ebuild b/www-apps/project2/project2-510.ebuild
deleted file mode 100644
index 0a20724..0000000
--- a/www-apps/project2/project2-510.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-inherit subversion
-
-DESCRIPTION="User configured application engine"
-HOMEPAGE="http://project2.randomdan.homeip.net"
-
-EAPI="3"
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="debug +docs odbc postgres +console +web +fastcgi"
-
-DEPEND="
- dev-util/boost-build
- net-libs/libesmtp
- www-client/lynx
- dev-cpp/libxmlpp
- dev-cpp/glibmm
- >=dev-libs/boost-1.45
- odbc? ( dev-db/unixODBC )
- postgres? ( dev-db/postgresql-base )
- web? (
- www-apache/mod_transform
- fastcgi? (
- dev-libs/cgicc
- virtual/httpd-fastcgi
- dev-libs/fcgi
- )
- )
- docs? ( app-doc/doxygen[cairo] )
- "
-RDEPEND="${DEPEND}"
-ESVN_REPO_URI="http://svn.randomdan.homeip.net/src/trunk"
-ESVN_REVISION="${PV}"
-BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-use !debug && var="variant=release"
-use !odbc && odbc="odbc=no"
-use !postgres && pq="pq=no"
-use console && ( bt="$bt p2console" ; it="$it installp2con" )
-use web && ( bt="$bt p2cgi" ; it="$it installp2cgi" )
-use web && use fastcgi && ( bt="$bt p2fcgi" ; it="$it installp2fci" )
-
-src_compile() {
- cd ${S}/project2 || die
- ${BJAM} ${var} ${odbc} ${pq} ${bt} -q cflags="${CFLAGS}" linkflags="${LDFLAGS}" || die "Compile failed"
-}
-
-src_install() {
- cd ${S}/project2 || die
- ${BJAM} ${var} ${odbc} ${pq} ${it} -q --bindir=${D}/usr/share/webapps/project2 --libdir=${D}/usr/lib \
- cflags="${CFLAGS}" linkflags="${LDFLAGS}" || die "Installed failed"
- mkdir -p ${D}/usr/share/doc/${P}
- if use docs ; then
- (cat Doxyfile ; echo OUTPUT_DIRECTORY=${D}/usr/share/doc/${P}) | doxygen - || die "Build docs failed"
- fi
-}
diff --git a/www-apps/project2/project2-511.ebuild b/www-apps/project2/project2-511.ebuild
new file mode 100644
index 0000000..c4c52dc
--- /dev/null
+++ b/www-apps/project2/project2-511.ebuild
@@ -0,0 +1,55 @@
+inherit subversion
+
+DESCRIPTION="User configured application engine"
+HOMEPAGE="http://project2.randomdan.homeip.net"
+
+EAPI="3"
+LICENSE="GPL"
+SLOT="0"
+KEYWORDS="x86 amd64"
+IUSE="debug +docs odbc postgres +console +web +fastcgi"
+
+DEPEND="
+ dev-util/boost-build
+ net-libs/libesmtp
+ www-client/lynx
+ dev-cpp/libxmlpp
+ dev-cpp/glibmm
+ >=dev-libs/boost-1.45
+ odbc? ( dev-db/unixODBC )
+ postgres? ( dev-db/postgresql-base )
+ web? (
+ www-apache/mod_transform
+ fastcgi? (
+ dev-libs/cgicc
+ virtual/httpd-fastcgi
+ dev-libs/fcgi
+ )
+ )
+ docs? ( app-doc/doxygen )
+ "
+RDEPEND="${DEPEND}"
+ESVN_REPO_URI="http://svn.randomdan.homeip.net/src/trunk"
+ESVN_REVISION="${PV}"
+BJAM=`ls -1 /usr/bin/bjam* | tail -1`
+use !debug && var="variant=release"
+use !odbc && odbc="odbc=no"
+use !postgres && pq="pq=no"
+use console && bt="$bt p2console" && it="$it installp2con"
+use web && bt="$bt p2cgi" && it="$it installp2cgi"
+use web && use fastcgi && bt="$bt p2fcgi" && it="$it installp2fcgi"
+
+src_compile() {
+ cd ${S}/project2 || die
+ ${BJAM} ${var} ${odbc} ${pq} ${bt} -q cflags="${CFLAGS}" linkflags="${LDFLAGS}" || die "Compile failed"
+}
+
+src_install() {
+ cd ${S}/project2 || die
+ ${BJAM} ${var} ${odbc} ${pq} ${it} -q --bindir=${D}/usr/share/webapps/project2 --libdir=${D}/usr/lib \
+ cflags="${CFLAGS}" linkflags="${LDFLAGS}" || die "Installed failed"
+ mkdir -p ${D}/usr/share/doc/${P}
+ if use docs ; then
+ (cat Doxyfile ; echo OUTPUT_DIRECTORY=${D}/usr/share/doc/${P}) | doxygen - || die "Build docs failed"
+ fi
+}
diff --git a/www-apps/project2/project2-9999.ebuild b/www-apps/project2/project2-9999.ebuild
index 17e2497..b60c31e 100644
--- a/www-apps/project2/project2-9999.ebuild
+++ b/www-apps/project2/project2-9999.ebuild
@@ -26,7 +26,7 @@ DEPEND="
dev-libs/fcgi
)
)
- docs? ( app-doc/doxygen[cairo] )
+ docs? ( app-doc/doxygen )
"
RDEPEND="${DEPEND}"
ESVN_REPO_URI="http://svn.randomdan.homeip.net/src/trunk"
@@ -34,9 +34,9 @@ BJAM=`ls -1 /usr/bin/bjam* | tail -1`
use !debug && var="variant=release"
use !odbc && odbc="odbc=no"
use !postgres && pq="pq=no"
-use console && ( bt="$bt p2console" ; it="$it installp2con" )
-use web && ( bt="$bt p2cgi" ; it="$it installp2cgi" )
-use web && use fastcgi && ( bt="$bt p2fcgi" ; it="$it installp2fci" )
+use console && bt="$bt p2console" && it="$it installp2con"
+use web && bt="$bt p2cgi" && it="$it installp2cgi"
+use web && use fastcgi && bt="$bt p2fcgi" && it="$it installp2fcgi"
src_compile() {
cd ${S}/project2 || die
--
cgit v1.2.3