5 files changed, 83 insertions, 78 deletions
diff --git a/www-apps/project2/Manifest b/www-apps/project2/Manifest
index bb8c335..dd26c2d 100644
--- a/www-apps/project2/Manifest
+++ b/www-apps/project2/Manifest
@@ -1,3 +1,2 @@
-EBUILD project2-0.1.ebuild 593 RMD160 14c820a79e8bc9f19428e4f8850d90caea043602 SHA1 f674e6b78969d92698a38079f817fbe04954b035 SHA256 30f3d2a6e74b7d6ae849950ca7599db4cec19bed5db5036ef5837d2056334aab
-EBUILD project2-0.2.ebuild 616 RMD160 2fb1c49e7cfa2879fdbb1290c40f7fb798bdbcd4 SHA1 ebbb82f0ab81dcdb9562552a7ed252865e4aeb76 SHA256 0e36e57bc4196fdf5d66a0c3c076e842b3aa4018ad934f272d3019b16fce0795
-EBUILD project2-9999.ebuild 1084 RMD160 5d6542d25cfcb9923a59fd9d3424e16e1d3c3016 SHA1 788f0811defd3bfbfb7e5082bd6c02b62c2da185 SHA256 3196ae48f7c98cfa83031244c58d489d8ab30dacfc5a1c56ddb770bc8c6b1656
+EBUILD project2-510.ebuild 1524 RMD160 d0836642f0e86f8b482562292058081716b1021e SHA1 11eefe81d42e1fe458e7aa3602e123f91ba40cf3 SHA256 50f4fe97e9022ac80d69eddd6e87eda48dc1f2481108b0789822d5d9f4e68675
+EBUILD project2-9999.ebuild 1504 RMD160 7bf5500642fc05dbde8f53c00209d022d3c0253e SHA1 43f01b2ae7aebc375bc1012cba3e45f8388bad85 SHA256 9606e87888e20863ce67c4d28d26ebf2ede2d542fc1d8d3bac5f2f70463ad638
diff --git a/www-apps/project2/project2-0.1.ebuild b/www-apps/project2/project2-0.1.ebuild
deleted file mode 100644
index 30c59a3..0000000
--- a/www-apps/project2/project2-0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-inherit subversion
-
-DESCRIPTION="User configured application engine"
-HOMEPAGE="http://project2.randomdan.homeip.net"
-
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="dev-db/unixODBC
-	dev-cpp/libxmlpp
-	dev-cpp/glibmm
-	dev-libs/boost
-	=dev-util/boost-build-1.42*
-	virtual/httpd-fastcgi
-	dev-libs/fcgi
-	www-apache/mod_transform"
-RDEPEND="${DEPEND}"
-ESVN_REPO_URI="svn+ssh://svn.random.lan/var/svn/src/tags/${PF}"
-
-src_compile() {
-	cd ${S}/project2 || die
-	bjam-1_42 variant=release || die
-}
-
-src_install() {
-	exeinto /usr/share/webapps/project2
-	doexe ${S}/project2/bin/*/release/p2web
-}
diff --git a/www-apps/project2/project2-0.2.ebuild b/www-apps/project2/project2-0.2.ebuild
deleted file mode 100644
index 485966b..0000000
--- a/www-apps/project2/project2-0.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-inherit subversion
-
-DESCRIPTION="User configured application engine"
-HOMEPAGE="http://project2.randomdan.homeip.net"
-
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="dev-db/unixODBC
-	dev-cpp/libxmlpp
-	dev-cpp/glibmm
-	>=dev-libs/boost-1.42
-	dev-libs/cgicc
-	=dev-util/boost-build-1.42*
-	virtual/httpd-fastcgi
-	dev-libs/fcgi
-	www-apache/mod_transform"
-RDEPEND="${DEPEND}"
-ESVN_REPO_URI="svn+ssh://svn.random.lan/var/svn/src/tags/${PF}"
-
-src_compile() {
-	cd ${S}/project2 || die
-	bjam-1_42 variant=release || die
-}
-
-src_install() {
-	exeinto /usr/share/webapps/project2
-	doexe ${S}/project2/bin/*/release/p2web
-}
diff --git a/www-apps/project2/project2-510.ebuild b/www-apps/project2/project2-510.ebuild
new file mode 100644
index 0000000..0a20724
--- /dev/null
+++ b/www-apps/project2/project2-510.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[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-9999.ebuild b/www-apps/project2/project2-9999.ebuild
index 76ce8a6..17e2497 100644
--- a/www-apps/project2/project2-9999.ebuild
+++ b/www-apps/project2/project2-9999.ebuild
@@ -6,34 +6,46 @@ HOMEPAGE="http://project2.randomdan.homeip.net"
 EAPI="3"
 LICENSE="GPL"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE="debug +docs"
+KEYWORDS="~x86 ~amd64"
+IUSE="debug +docs odbc postgres +console +web +fastcgi"
 
-DEPEND="dev-db/unixODBC
+DEPEND="
+	dev-util/boost-build
+	net-libs/libesmtp
 	www-client/lynx
 	dev-cpp/libxmlpp
 	dev-cpp/glibmm
-	>=dev-libs/boost-1.42
-	dev-libs/cgicc
-	dev-util/boost-build
-	virtual/httpd-fastcgi
-	dev-libs/fcgi
-	net-libs/libesmtp
-	docs? ( app-doc/doxygen )
-	www-apache/mod_transform"
+	>=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="svn+ssh://svn.random.lan/var/svn/src/trunk"
+ESVN_REPO_URI="http://svn.randomdan.homeip.net/src/trunk"
 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} -q cflags="${CFLAGS}" linkflags="${LDFLAGS}" || die "Compile failed"
+	${BJAM} ${var} ${odbc} ${pq} ${bt} -q cflags="${CFLAGS}" linkflags="${LDFLAGS}" || die "Compile failed"
 }
 
 src_install() {
 	cd ${S}/project2 || die
-	${BJAM} ${var} install -q --bindir=${D}/usr/share/webapps/project2 --libdir=${D}/usr/lib \
+	${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