5 files changed, 3 insertions, 171 deletions
diff --git a/www-apps/project2/Manifest b/www-apps/project2/Manifest
index 545d64b..272d4d1 100644
--- a/www-apps/project2/Manifest
+++ b/www-apps/project2/Manifest
@@ -1,7 +1,4 @@
-EBUILD project2-511.ebuild 1509 RMD160 18fab5d458245d361376e7f681cb95207045a13c SHA1 0b9a4ff3368d94d58e1b2524c71bf2df6d5e2d2f SHA256 32143415b632db5df147567f1ea42188effa61fa39d6c86994d8c4a6f4b7a73d
-EBUILD project2-524.ebuild 1509 RMD160 18fab5d458245d361376e7f681cb95207045a13c SHA1 0b9a4ff3368d94d58e1b2524c71bf2df6d5e2d2f SHA256 32143415b632db5df147567f1ea42188effa61fa39d6c86994d8c4a6f4b7a73d
-EBUILD project2-546.ebuild 1516 RMD160 19e9e0b19190d53d435a7b1751c507dba06f44a8 SHA1 a3206e5608e48a71ce14471639942a0e55d1f115 SHA256 d69c18e93b028debf4f33f537cb953c98ee407da5b173f396f8903f25f1969f1
-EBUILD project2-586.ebuild 1648 RMD160 0b8c6bc4e8564b544654365d0150b657fcd60282 SHA1 81f3e8501887f1e647b07f6903bc53a047cde473 SHA256 a6033b73096ac829c51dc98dc19ba084758ae008adcb50a2a063bd9b9126cbcf
 EBUILD project2-592.ebuild 1648 RMD160 0b8c6bc4e8564b544654365d0150b657fcd60282 SHA1 81f3e8501887f1e647b07f6903bc53a047cde473 SHA256 a6033b73096ac829c51dc98dc19ba084758ae008adcb50a2a063bd9b9126cbcf
 EBUILD project2-597.ebuild 1648 RMD160 0b8c6bc4e8564b544654365d0150b657fcd60282 SHA1 81f3e8501887f1e647b07f6903bc53a047cde473 SHA256 a6033b73096ac829c51dc98dc19ba084758ae008adcb50a2a063bd9b9126cbcf
+EBUILD project2-602.ebuild 1651 RMD160 84298e22e58fd87b4966f6cd3f704a39807ca941 SHA1 131d85985247d9f3854e70cb3bcc0a81ebbd2281 SHA256 146635bdf0d631a6c74f2395a6452e73c5a904433c655320d80d1fd3093f18f8
 EBUILD project2-9999.ebuild 1621 RMD160 2a922298c20b4b559309cc45d8bd7bddf649528d SHA1 c5e062b4a6c14f651f5b08eef5f768866bb2e03e SHA256 3819ecbde99a5068ff35b18086ca13344e80763c00c0f312ff8a1e830827e48e
diff --git a/www-apps/project2/project2-511.ebuild b/www-apps/project2/project2-511.ebuild
deleted file mode 100644
index c4c52dc..0000000
--- a/www-apps/project2/project2-511.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 )
-	"
-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-524.ebuild b/www-apps/project2/project2-524.ebuild
deleted file mode 100644
index c4c52dc..0000000
--- a/www-apps/project2/project2-524.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 )
-	"
-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-546.ebuild b/www-apps/project2/project2-546.ebuild
deleted file mode 100644
index 192dae9..0000000
--- a/www-apps/project2/project2-546.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-2.28
-	>=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-586.ebuild b/www-apps/project2/project2-602.ebuild
index b169afd..5913fc5 100644
--- a/www-apps/project2/project2-586.ebuild
+++ b/www-apps/project2/project2-602.ebuild
@@ -53,8 +53,8 @@ src_install() {
 			${BJAM} ${BJAMOPTS} ${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"
+		mkdir -p ${D}/usr/share/doc/${PN}
+		(cat Doxyfile ; echo OUTPUT_DIRECTORY=${D}/usr/share/doc/${PN}) | doxygen - || die "Build docs failed"
 	fi
 }