Bugfix bump and remove old

13 files changed, 9 insertions, 756 deletions

diff --git a/www-apps/project2/Manifest b/www-apps/project2/Manifest
index f95508b..3812f15 100644
--- a/www-apps/project2/Manifest
+++ b/www-apps/project2/Manifest
@@ -5,18 +5,7 @@ DIST project2-861.tar.bz2 129533 SHA256 8c110894f11f2c683cb87d414016103a3df15468
 DIST project2-892.tar.bz2 131547 SHA256 3de7ba0aea49615aa62da0d3a15b15ce8d53e61ad172049663c0d65a81e03aa9 SHA512 2e9e67f0793ad3bc59b503b2e8d8a7f2c6e0e820506b5a79feb74bde5439567c3844a6d5a45c159542f9c65a88103a1279009f92f825079f5364bf7e95a95e82 WHIRLPOOL c044044a4f88b28dc879c13d773c8b65a3a3d975fc85b6372b8ce6f9208eda21797a1102568ba8ff7ce58fac19cc158cd030fc699ed889d35759dc7299b33ebf
 DIST project2-897.tar.bz2 131860 SHA256 6f326629463351957ab7f61fa6292acf337cf2a0fe8551b42cca416f1d80fd68 SHA512 33c82e03a9dc9c38dde8b4b17fabc8e88b9d0884473e6d186e28d5c6f54e7371edd8b140c67b5c8fa84ddb23925093701c643e6c4bdd8d5cef987da2e4b15cc9 WHIRLPOOL 7a922ed3f3992c957ee40afbe4f0d1f44dcf2e8afa099ebbe49aa8b580ea5314bfff3058c3bb2c1352853fe16046b94b5a0e7e44b8e98551e57955e10720d07d
 DIST project2-906.tar.bz2 132139 SHA256 822e479db93381ec9967daf8271fd57f35a17d3f576574dc6071e80bc24e200e SHA512 1e4b56e082717bda644b904233060de2a28bdebcdd67f20aed8445dc5551bd5ad650d0129be6e95b990f4ade21d305aead63b43288c2abccd999c5edadfd80d3 WHIRLPOOL 3e2acbecae0db9be989e1a92d56f954ae7034713bd3fdb7f02da034276a1b0c270bd38b942e9e3cbbc77ba72b0d2091a6866df806d2adb34f2cf4fa3c2d0e42e
-EBUILD project2-740.ebuild 1821 SHA256 97a5d702ba997ce531d49fec37ea47d839e2a280a77da95016b27def75702888 SHA512 7bde5499cf03e8e9c5107c3efacded816a8548d9e1a98ed2bef50a44e3fd705f8ad2133168f704197a4bab27016b13e903243e6a7ed13f3ce6717bf3d6d1dac1 WHIRLPOOL 6fbe43e6e623ca681f10ccd068ac74cd746f9b088b143e04ed90ef9233f375f21806532481af3a8732b3a7d5adee1cc22dbcb355c50ddfbbf52412aee91d8389
-EBUILD project2-742.ebuild 1821 SHA256 97a5d702ba997ce531d49fec37ea47d839e2a280a77da95016b27def75702888 SHA512 7bde5499cf03e8e9c5107c3efacded816a8548d9e1a98ed2bef50a44e3fd705f8ad2133168f704197a4bab27016b13e903243e6a7ed13f3ce6717bf3d6d1dac1 WHIRLPOOL 6fbe43e6e623ca681f10ccd068ac74cd746f9b088b143e04ed90ef9233f375f21806532481af3a8732b3a7d5adee1cc22dbcb355c50ddfbbf52412aee91d8389
-EBUILD project2-759.ebuild 1793 SHA256 f8a89467425a43a4900d661660b5f6089bb3daee10fc8855558c14e946ebfe84 SHA512 3aa11f5ae40d521aec012b777efb3ad36ba91fb3069068432d2a987d93c599f7b872b28562b8d8fc2038b3d0dd68a745db97c25ab52627915831296fbcbd94b7 WHIRLPOOL 941f02cc735aff60c8c39faeda13d43918df421ab17070ba6b78b91fed83f34f8e604e5db21c9e9205efcd7fdf7e8be6e61aa16d454de23f12a52fc5a5b59eda
-EBUILD project2-760.ebuild 1793 SHA256 f8a89467425a43a4900d661660b5f6089bb3daee10fc8855558c14e946ebfe84 SHA512 3aa11f5ae40d521aec012b777efb3ad36ba91fb3069068432d2a987d93c599f7b872b28562b8d8fc2038b3d0dd68a745db97c25ab52627915831296fbcbd94b7 WHIRLPOOL 941f02cc735aff60c8c39faeda13d43918df421ab17070ba6b78b91fed83f34f8e604e5db21c9e9205efcd7fdf7e8be6e61aa16d454de23f12a52fc5a5b59eda
-EBUILD project2-762.ebuild 1793 SHA256 f8a89467425a43a4900d661660b5f6089bb3daee10fc8855558c14e946ebfe84 SHA512 3aa11f5ae40d521aec012b777efb3ad36ba91fb3069068432d2a987d93c599f7b872b28562b8d8fc2038b3d0dd68a745db97c25ab52627915831296fbcbd94b7 WHIRLPOOL 941f02cc735aff60c8c39faeda13d43918df421ab17070ba6b78b91fed83f34f8e604e5db21c9e9205efcd7fdf7e8be6e61aa16d454de23f12a52fc5a5b59eda
-EBUILD project2-763.ebuild 1793 SHA256 f8a89467425a43a4900d661660b5f6089bb3daee10fc8855558c14e946ebfe84 SHA512 3aa11f5ae40d521aec012b777efb3ad36ba91fb3069068432d2a987d93c599f7b872b28562b8d8fc2038b3d0dd68a745db97c25ab52627915831296fbcbd94b7 WHIRLPOOL 941f02cc735aff60c8c39faeda13d43918df421ab17070ba6b78b91fed83f34f8e604e5db21c9e9205efcd7fdf7e8be6e61aa16d454de23f12a52fc5a5b59eda
-EBUILD project2-769.ebuild 1793 SHA256 f8a89467425a43a4900d661660b5f6089bb3daee10fc8855558c14e946ebfe84 SHA512 3aa11f5ae40d521aec012b777efb3ad36ba91fb3069068432d2a987d93c599f7b872b28562b8d8fc2038b3d0dd68a745db97c25ab52627915831296fbcbd94b7 WHIRLPOOL 941f02cc735aff60c8c39faeda13d43918df421ab17070ba6b78b91fed83f34f8e604e5db21c9e9205efcd7fdf7e8be6e61aa16d454de23f12a52fc5a5b59eda
-EBUILD project2-775.ebuild 1793 SHA256 f8a89467425a43a4900d661660b5f6089bb3daee10fc8855558c14e946ebfe84 SHA512 3aa11f5ae40d521aec012b777efb3ad36ba91fb3069068432d2a987d93c599f7b872b28562b8d8fc2038b3d0dd68a745db97c25ab52627915831296fbcbd94b7 WHIRLPOOL 941f02cc735aff60c8c39faeda13d43918df421ab17070ba6b78b91fed83f34f8e604e5db21c9e9205efcd7fdf7e8be6e61aa16d454de23f12a52fc5a5b59eda
-EBUILD project2-779.ebuild 1800 SHA256 ffb6d03a4b1c815fb21ee7bcfd47dcfee0c42ec13f4cccce4d6be598958eebfc SHA512 32eb9a309dd78cc6134ccdc1aa49d2dcfddbd3f2f6286957732a828455c13fe06d4ce13e19c99c778d7dfb79d990947de32eda52c4813544f442d2cfea0fea85 WHIRLPOOL 09ef35c02ddf4c751095f71bb004b1e838a5590a2291a5b6af39cc5cca95b8c5c04c6e980bf1147b0ef41af7b6a15335754e01f9a60a93c5357560c58c693c1b
-EBUILD project2-781.ebuild 1800 SHA256 ffb6d03a4b1c815fb21ee7bcfd47dcfee0c42ec13f4cccce4d6be598958eebfc SHA512 32eb9a309dd78cc6134ccdc1aa49d2dcfddbd3f2f6286957732a828455c13fe06d4ce13e19c99c778d7dfb79d990947de32eda52c4813544f442d2cfea0fea85 WHIRLPOOL 09ef35c02ddf4c751095f71bb004b1e838a5590a2291a5b6af39cc5cca95b8c5c04c6e980bf1147b0ef41af7b6a15335754e01f9a60a93c5357560c58c693c1b
-EBUILD project2-783.ebuild 1800 SHA256 ffb6d03a4b1c815fb21ee7bcfd47dcfee0c42ec13f4cccce4d6be598958eebfc SHA512 32eb9a309dd78cc6134ccdc1aa49d2dcfddbd3f2f6286957732a828455c13fe06d4ce13e19c99c778d7dfb79d990947de32eda52c4813544f442d2cfea0fea85 WHIRLPOOL 09ef35c02ddf4c751095f71bb004b1e838a5590a2291a5b6af39cc5cca95b8c5c04c6e980bf1147b0ef41af7b6a15335754e01f9a60a93c5357560c58c693c1b
-EBUILD project2-796.ebuild 1800 SHA256 ffb6d03a4b1c815fb21ee7bcfd47dcfee0c42ec13f4cccce4d6be598958eebfc SHA512 32eb9a309dd78cc6134ccdc1aa49d2dcfddbd3f2f6286957732a828455c13fe06d4ce13e19c99c778d7dfb79d990947de32eda52c4813544f442d2cfea0fea85 WHIRLPOOL 09ef35c02ddf4c751095f71bb004b1e838a5590a2291a5b6af39cc5cca95b8c5c04c6e980bf1147b0ef41af7b6a15335754e01f9a60a93c5357560c58c693c1b
+DIST project2-914.tar.bz2 132101 SHA256 5da4780e26486a39925bce089759fd2ef300c2632464ef70363b89b72485c5c3 SHA512 e2c09e60428b672c2edc86191e9f6280ea31f22162fd1ff90af3648852d1ea31b3bc4d8e0c9af30211da72daf77ea5ff91519f1b169e878e5109e382812b7cfd WHIRLPOOL ebbf2799558c5d17ff42d8b8534a3e0144d8243478345189f5d0ad1280423fd24ef30735dd5f89f1cfd4f4bfcf01c946c159f0cc6df47e227a2f3295b79ceae3
 EBUILD project2-814.ebuild 1800 SHA256 ffb6d03a4b1c815fb21ee7bcfd47dcfee0c42ec13f4cccce4d6be598958eebfc SHA512 32eb9a309dd78cc6134ccdc1aa49d2dcfddbd3f2f6286957732a828455c13fe06d4ce13e19c99c778d7dfb79d990947de32eda52c4813544f442d2cfea0fea85 WHIRLPOOL 09ef35c02ddf4c751095f71bb004b1e838a5590a2291a5b6af39cc5cca95b8c5c04c6e980bf1147b0ef41af7b6a15335754e01f9a60a93c5357560c58c693c1b
 EBUILD project2-826.ebuild 1770 SHA256 5ecd0734bdb152c67b6a54b0ef650dedb000ca8120beb766c3503f9cabff615f SHA512 2ec15f78d0d2cd2008982901c470e8e921a4ed606923521091293280e7544dda622e76a5e3bd26b9349b3ea48655046d88649ae80fa10d0e4196c28e067a51d3 WHIRLPOOL 4325f89e65ee4e2e638067a3c6e062f2043be8b94172cb63eaa3fc0c15474ffd37196d1734b4c73cf79ff09cff1d285b77fab3ae05ce73c19deca8c636a9d4d8
 EBUILD project2-838.ebuild 1838 SHA256 e6067cf6ab831d046aa1f46aa4f66c9667ef4f972a818cc1de5d2e4813545b86 SHA512 2c89daf712e4e7b0b36596abda4a2bb12e929ec91e6089cf65977acda5013b7fabc64e7e589c4dbf8d963e01431c90baad7b7129ac102280c6ad689ddb0cd262 WHIRLPOOL c623f076fdfce097e30b0b22cd45a60c359e31e5b00d9a95c10d30307e77937801fe12d8dd1bd509bdbd02e2d7cdfb130fc4e6417eff899671ac5390077ec3ce
@@ -25,3 +14,4 @@ EBUILD project2-861.ebuild 2092 SHA256 1700e3c2da8739b04008ac8fe0a8b7464503efd07
 EBUILD project2-892.ebuild 2092 SHA256 1700e3c2da8739b04008ac8fe0a8b7464503efd0707de132b7c7ef74c7276b58 SHA512 742b617e9f4421c3d18b59be2ea6a7b3819483035e92997144fafe86ef25d666fbb79a86e963890bc3787e7548860c1dd4787b8cd9fc24d461f0453c7ddce19e WHIRLPOOL 762edc062cf7b5071595035d9329fa4e33004309ab105b879ab936c2156e7f6b9b22ee5b869947886748ab4c9b457ef0a8ad0e188970b09f66aea30ca9641b0f
 EBUILD project2-897.ebuild 2092 SHA256 1700e3c2da8739b04008ac8fe0a8b7464503efd0707de132b7c7ef74c7276b58 SHA512 742b617e9f4421c3d18b59be2ea6a7b3819483035e92997144fafe86ef25d666fbb79a86e963890bc3787e7548860c1dd4787b8cd9fc24d461f0453c7ddce19e WHIRLPOOL 762edc062cf7b5071595035d9329fa4e33004309ab105b879ab936c2156e7f6b9b22ee5b869947886748ab4c9b457ef0a8ad0e188970b09f66aea30ca9641b0f
 EBUILD project2-906.ebuild 2092 SHA256 1700e3c2da8739b04008ac8fe0a8b7464503efd0707de132b7c7ef74c7276b58 SHA512 742b617e9f4421c3d18b59be2ea6a7b3819483035e92997144fafe86ef25d666fbb79a86e963890bc3787e7548860c1dd4787b8cd9fc24d461f0453c7ddce19e WHIRLPOOL 762edc062cf7b5071595035d9329fa4e33004309ab105b879ab936c2156e7f6b9b22ee5b869947886748ab4c9b457ef0a8ad0e188970b09f66aea30ca9641b0f
+EBUILD project2-914.ebuild 2092 SHA256 1700e3c2da8739b04008ac8fe0a8b7464503efd0707de132b7c7ef74c7276b58 SHA512 742b617e9f4421c3d18b59be2ea6a7b3819483035e92997144fafe86ef25d666fbb79a86e963890bc3787e7548860c1dd4787b8cd9fc24d461f0453c7ddce19e WHIRLPOOL 762edc062cf7b5071595035d9329fa4e33004309ab105b879ab936c2156e7f6b9b22ee5b869947886748ab4c9b457ef0a8ad0e188970b09f66aea30ca9641b0f
diff --git a/www-apps/project2/project2-740.ebuild b/www-apps/project2/project2-740.ebuild
deleted file mode 100644
index 0836a74..0000000
--- a/www-apps/project2/project2-740.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-EAPI="3"
-inherit subversion
-
-DESCRIPTION="User configured application engine"
-HOMEPAGE="http://project2.randomdan.homeip.net"
-
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="debug +docs mysql odbc postgres +console +web +fastcgi"
-
-DEPEND="
-	dev-util/boost-build
-	net-libs/libesmtp
-	www-client/lynx
-	dev-cpp/libxmlpp
-	sys-libs/zlib
-	>=sys-devel/gcc-4.5
-	>=dev-cpp/glibmm-2.28
-	>=dev-libs/boost-1.45
-	mysql? ( dev-db/mysql )
-	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}"
-use !debug && var="variant=release"
-use !odbc && odbc="odbc=no"
-use !mysql && mysql="mysql=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_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${bt} -q \
-			|| die "Compile failed"
-}
-
-src_install() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${it} -q \
-			--bindir=${D}/usr/share/webapps/project2 --libdir=${D}/usr/lib \
-			|| die "Installed failed"
-	if use docs ; then
-		mkdir -p ${D}/usr/share/doc/${PN}
-		(cat Doxyfile ; echo OUTPUT_DIRECTORY=${D}/usr/share/doc/${PN}) | doxygen - || die "Build docs failed"
-	fi
-}
diff --git a/www-apps/project2/project2-742.ebuild b/www-apps/project2/project2-742.ebuild
deleted file mode 100644
index 0836a74..0000000
--- a/www-apps/project2/project2-742.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-EAPI="3"
-inherit subversion
-
-DESCRIPTION="User configured application engine"
-HOMEPAGE="http://project2.randomdan.homeip.net"
-
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="debug +docs mysql odbc postgres +console +web +fastcgi"
-
-DEPEND="
-	dev-util/boost-build
-	net-libs/libesmtp
-	www-client/lynx
-	dev-cpp/libxmlpp
-	sys-libs/zlib
-	>=sys-devel/gcc-4.5
-	>=dev-cpp/glibmm-2.28
-	>=dev-libs/boost-1.45
-	mysql? ( dev-db/mysql )
-	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}"
-use !debug && var="variant=release"
-use !odbc && odbc="odbc=no"
-use !mysql && mysql="mysql=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_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${bt} -q \
-			|| die "Compile failed"
-}
-
-src_install() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${it} -q \
-			--bindir=${D}/usr/share/webapps/project2 --libdir=${D}/usr/lib \
-			|| die "Installed failed"
-	if use docs ; then
-		mkdir -p ${D}/usr/share/doc/${PN}
-		(cat Doxyfile ; echo OUTPUT_DIRECTORY=${D}/usr/share/doc/${PN}) | doxygen - || die "Build docs failed"
-	fi
-}
diff --git a/www-apps/project2/project2-759.ebuild b/www-apps/project2/project2-759.ebuild
deleted file mode 100644
index e364506..0000000
--- a/www-apps/project2/project2-759.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-EAPI="3"
-inherit subversion
-
-DESCRIPTION="User configured application engine"
-HOMEPAGE="http://project2.randomdan.homeip.net"
-
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="debug +docs mysql odbc postgres +console +web +fastcgi"
-
-DEPEND="
-	dev-util/boost-build
-	net-libs/libesmtp
-	www-client/lynx
-	dev-cpp/libxmlpp
-	sys-libs/zlib
-	>=sys-devel/gcc-4.5
-	>=dev-cpp/glibmm-2.28
-	>=dev-libs/boost-1.45
-	mysql? ( dev-db/mysql )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql-base )
-	web? (
-			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}"
-use !debug && var="variant=release"
-use !odbc && odbc="odbc=no"
-use !mysql && mysql="mysql=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_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${bt} -q \
-			|| die "Compile failed"
-}
-
-src_install() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${it} -q \
-			--bindir=${D}/usr/share/webapps/project2 --libdir=${D}/usr/lib \
-			|| die "Installed failed"
-	if use docs ; then
-		mkdir -p ${D}/usr/share/doc/${PN}
-		(cat Doxyfile ; echo OUTPUT_DIRECTORY=${D}/usr/share/doc/${PN}) | doxygen - || die "Build docs failed"
-	fi
-}
diff --git a/www-apps/project2/project2-760.ebuild b/www-apps/project2/project2-760.ebuild
deleted file mode 100644
index e364506..0000000
--- a/www-apps/project2/project2-760.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-EAPI="3"
-inherit subversion
-
-DESCRIPTION="User configured application engine"
-HOMEPAGE="http://project2.randomdan.homeip.net"
-
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="debug +docs mysql odbc postgres +console +web +fastcgi"
-
-DEPEND="
-	dev-util/boost-build
-	net-libs/libesmtp
-	www-client/lynx
-	dev-cpp/libxmlpp
-	sys-libs/zlib
-	>=sys-devel/gcc-4.5
-	>=dev-cpp/glibmm-2.28
-	>=dev-libs/boost-1.45
-	mysql? ( dev-db/mysql )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql-base )
-	web? (
-			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}"
-use !debug && var="variant=release"
-use !odbc && odbc="odbc=no"
-use !mysql && mysql="mysql=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_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${bt} -q \
-			|| die "Compile failed"
-}
-
-src_install() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${it} -q \
-			--bindir=${D}/usr/share/webapps/project2 --libdir=${D}/usr/lib \
-			|| die "Installed failed"
-	if use docs ; then
-		mkdir -p ${D}/usr/share/doc/${PN}
-		(cat Doxyfile ; echo OUTPUT_DIRECTORY=${D}/usr/share/doc/${PN}) | doxygen - || die "Build docs failed"
-	fi
-}
diff --git a/www-apps/project2/project2-762.ebuild b/www-apps/project2/project2-762.ebuild
deleted file mode 100644
index e364506..0000000
--- a/www-apps/project2/project2-762.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-EAPI="3"
-inherit subversion
-
-DESCRIPTION="User configured application engine"
-HOMEPAGE="http://project2.randomdan.homeip.net"
-
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="debug +docs mysql odbc postgres +console +web +fastcgi"
-
-DEPEND="
-	dev-util/boost-build
-	net-libs/libesmtp
-	www-client/lynx
-	dev-cpp/libxmlpp
-	sys-libs/zlib
-	>=sys-devel/gcc-4.5
-	>=dev-cpp/glibmm-2.28
-	>=dev-libs/boost-1.45
-	mysql? ( dev-db/mysql )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql-base )
-	web? (
-			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}"
-use !debug && var="variant=release"
-use !odbc && odbc="odbc=no"
-use !mysql && mysql="mysql=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_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${bt} -q \
-			|| die "Compile failed"
-}
-
-src_install() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${it} -q \
-			--bindir=${D}/usr/share/webapps/project2 --libdir=${D}/usr/lib \
-			|| die "Installed failed"
-	if use docs ; then
-		mkdir -p ${D}/usr/share/doc/${PN}
-		(cat Doxyfile ; echo OUTPUT_DIRECTORY=${D}/usr/share/doc/${PN}) | doxygen - || die "Build docs failed"
-	fi
-}
diff --git a/www-apps/project2/project2-763.ebuild b/www-apps/project2/project2-763.ebuild
deleted file mode 100644
index e364506..0000000
--- a/www-apps/project2/project2-763.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-EAPI="3"
-inherit subversion
-
-DESCRIPTION="User configured application engine"
-HOMEPAGE="http://project2.randomdan.homeip.net"
-
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="debug +docs mysql odbc postgres +console +web +fastcgi"
-
-DEPEND="
-	dev-util/boost-build
-	net-libs/libesmtp
-	www-client/lynx
-	dev-cpp/libxmlpp
-	sys-libs/zlib
-	>=sys-devel/gcc-4.5
-	>=dev-cpp/glibmm-2.28
-	>=dev-libs/boost-1.45
-	mysql? ( dev-db/mysql )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql-base )
-	web? (
-			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}"
-use !debug && var="variant=release"
-use !odbc && odbc="odbc=no"
-use !mysql && mysql="mysql=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_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${bt} -q \
-			|| die "Compile failed"
-}
-
-src_install() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${it} -q \
-			--bindir=${D}/usr/share/webapps/project2 --libdir=${D}/usr/lib \
-			|| die "Installed failed"
-	if use docs ; then
-		mkdir -p ${D}/usr/share/doc/${PN}
-		(cat Doxyfile ; echo OUTPUT_DIRECTORY=${D}/usr/share/doc/${PN}) | doxygen - || die "Build docs failed"
-	fi
-}
diff --git a/www-apps/project2/project2-769.ebuild b/www-apps/project2/project2-769.ebuild
deleted file mode 100644
index e364506..0000000
--- a/www-apps/project2/project2-769.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-EAPI="3"
-inherit subversion
-
-DESCRIPTION="User configured application engine"
-HOMEPAGE="http://project2.randomdan.homeip.net"
-
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="debug +docs mysql odbc postgres +console +web +fastcgi"
-
-DEPEND="
-	dev-util/boost-build
-	net-libs/libesmtp
-	www-client/lynx
-	dev-cpp/libxmlpp
-	sys-libs/zlib
-	>=sys-devel/gcc-4.5
-	>=dev-cpp/glibmm-2.28
-	>=dev-libs/boost-1.45
-	mysql? ( dev-db/mysql )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql-base )
-	web? (
-			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}"
-use !debug && var="variant=release"
-use !odbc && odbc="odbc=no"
-use !mysql && mysql="mysql=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_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${bt} -q \
-			|| die "Compile failed"
-}
-
-src_install() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${it} -q \
-			--bindir=${D}/usr/share/webapps/project2 --libdir=${D}/usr/lib \
-			|| die "Installed failed"
-	if use docs ; then
-		mkdir -p ${D}/usr/share/doc/${PN}
-		(cat Doxyfile ; echo OUTPUT_DIRECTORY=${D}/usr/share/doc/${PN}) | doxygen - || die "Build docs failed"
-	fi
-}
diff --git a/www-apps/project2/project2-775.ebuild b/www-apps/project2/project2-775.ebuild
deleted file mode 100644
index e364506..0000000
--- a/www-apps/project2/project2-775.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-EAPI="3"
-inherit subversion
-
-DESCRIPTION="User configured application engine"
-HOMEPAGE="http://project2.randomdan.homeip.net"
-
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="debug +docs mysql odbc postgres +console +web +fastcgi"
-
-DEPEND="
-	dev-util/boost-build
-	net-libs/libesmtp
-	www-client/lynx
-	dev-cpp/libxmlpp
-	sys-libs/zlib
-	>=sys-devel/gcc-4.5
-	>=dev-cpp/glibmm-2.28
-	>=dev-libs/boost-1.45
-	mysql? ( dev-db/mysql )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql-base )
-	web? (
-			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}"
-use !debug && var="variant=release"
-use !odbc && odbc="odbc=no"
-use !mysql && mysql="mysql=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_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${bt} -q \
-			|| die "Compile failed"
-}
-
-src_install() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${it} -q \
-			--bindir=${D}/usr/share/webapps/project2 --libdir=${D}/usr/lib \
-			|| die "Installed failed"
-	if use docs ; then
-		mkdir -p ${D}/usr/share/doc/${PN}
-		(cat Doxyfile ; echo OUTPUT_DIRECTORY=${D}/usr/share/doc/${PN}) | doxygen - || die "Build docs failed"
-	fi
-}
diff --git a/www-apps/project2/project2-781.ebuild b/www-apps/project2/project2-781.ebuild
deleted file mode 100644
index 11ddaa5..0000000
--- a/www-apps/project2/project2-781.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-EAPI="3"
-inherit subversion
-
-DESCRIPTION="User configured application engine"
-HOMEPAGE="http://project2.randomdan.homeip.net"
-
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="debug +docs mysql odbc postgres +console +web +fastcgi"
-
-DEPEND="
-	dev-util/boost-build
-	net-libs/libesmtp
-	www-client/lynx
-	>=dev-cpp/libxmlpp-2.36
-	sys-libs/zlib
-	>=sys-devel/gcc-4.5
-	>=dev-cpp/glibmm-2.28
-	>=dev-libs/boost-1.45
-	mysql? ( dev-db/mysql )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql-base )
-	web? (
-			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}"
-use !debug && var="variant=release"
-use !odbc && odbc="odbc=no"
-use !mysql && mysql="mysql=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_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${bt} -q \
-			|| die "Compile failed"
-}
-
-src_install() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${it} -q \
-			--bindir=${D}/usr/share/webapps/project2 --libdir=${D}/usr/lib \
-			|| die "Installed failed"
-	if use docs ; then
-		mkdir -p ${D}/usr/share/doc/${PN}
-		(cat Doxyfile ; echo OUTPUT_DIRECTORY=${D}/usr/share/doc/${PN}) | doxygen - || die "Build docs failed"
-	fi
-}
diff --git a/www-apps/project2/project2-783.ebuild b/www-apps/project2/project2-783.ebuild
deleted file mode 100644
index 11ddaa5..0000000
--- a/www-apps/project2/project2-783.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-EAPI="3"
-inherit subversion
-
-DESCRIPTION="User configured application engine"
-HOMEPAGE="http://project2.randomdan.homeip.net"
-
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="debug +docs mysql odbc postgres +console +web +fastcgi"
-
-DEPEND="
-	dev-util/boost-build
-	net-libs/libesmtp
-	www-client/lynx
-	>=dev-cpp/libxmlpp-2.36
-	sys-libs/zlib
-	>=sys-devel/gcc-4.5
-	>=dev-cpp/glibmm-2.28
-	>=dev-libs/boost-1.45
-	mysql? ( dev-db/mysql )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql-base )
-	web? (
-			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}"
-use !debug && var="variant=release"
-use !odbc && odbc="odbc=no"
-use !mysql && mysql="mysql=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_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${bt} -q \
-			|| die "Compile failed"
-}
-
-src_install() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${it} -q \
-			--bindir=${D}/usr/share/webapps/project2 --libdir=${D}/usr/lib \
-			|| die "Installed failed"
-	if use docs ; then
-		mkdir -p ${D}/usr/share/doc/${PN}
-		(cat Doxyfile ; echo OUTPUT_DIRECTORY=${D}/usr/share/doc/${PN}) | doxygen - || die "Build docs failed"
-	fi
-}
diff --git a/www-apps/project2/project2-796.ebuild b/www-apps/project2/project2-796.ebuild
deleted file mode 100644
index 11ddaa5..0000000
--- a/www-apps/project2/project2-796.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-EAPI="3"
-inherit subversion
-
-DESCRIPTION="User configured application engine"
-HOMEPAGE="http://project2.randomdan.homeip.net"
-
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="debug +docs mysql odbc postgres +console +web +fastcgi"
-
-DEPEND="
-	dev-util/boost-build
-	net-libs/libesmtp
-	www-client/lynx
-	>=dev-cpp/libxmlpp-2.36
-	sys-libs/zlib
-	>=sys-devel/gcc-4.5
-	>=dev-cpp/glibmm-2.28
-	>=dev-libs/boost-1.45
-	mysql? ( dev-db/mysql )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql-base )
-	web? (
-			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}"
-use !debug && var="variant=release"
-use !odbc && odbc="odbc=no"
-use !mysql && mysql="mysql=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_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${bt} -q \
-			|| die "Compile failed"
-}
-
-src_install() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${it} -q \
-			--bindir=${D}/usr/share/webapps/project2 --libdir=${D}/usr/lib \
-			|| die "Installed failed"
-	if use docs ; then
-		mkdir -p ${D}/usr/share/doc/${PN}
-		(cat Doxyfile ; echo OUTPUT_DIRECTORY=${D}/usr/share/doc/${PN}) | doxygen - || die "Build docs failed"
-	fi
-}
diff --git a/www-apps/project2/project2-779.ebuild b/www-apps/project2/project2-914.ebuild
index 11ddaa5..b15375f 100644
--- a/www-apps/project2/project2-779.ebuild
+++ b/www-apps/project2/project2-914.ebuild
@@ -1,13 +1,13 @@
 EAPI="3"
-inherit subversion
 
 DESCRIPTION="User configured application engine"
 HOMEPAGE="http://project2.randomdan.homeip.net"
 
+SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
 LICENSE="GPL"
 SLOT="0"
 KEYWORDS="x86 amd64"
-IUSE="debug +docs mysql odbc postgres +console +web +fastcgi"
+IUSE="debug +docs mysql odbc postgres +console +web +fastcgi +daemon"
 
 DEPEND="
 	dev-util/boost-build
@@ -31,8 +31,6 @@ DEPEND="
 	docs? ( app-doc/doxygen )
 	"
 RDEPEND="${DEPEND}"
-ESVN_REPO_URI="http://svn.randomdan.homeip.net/src/trunk"
-ESVN_REVISION="${PV}"
 use !debug && var="variant=release"
 use !odbc && odbc="odbc=no"
 use !mysql && mysql="mysql=no"
@@ -40,6 +38,7 @@ 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"
+use daemon && bt="$bt p2daemon" && it="$it installp2daemon"
 
 src_prepare() {
 	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
@@ -58,8 +57,11 @@ src_install() {
 	cd ${S}/project2 || die
 	setarch $(uname -m) -RL \
 			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${it} -q \
-			--bindir=${D}/usr/share/webapps/project2 --libdir=${D}/usr/lib \
+			--prefix=${D}/usr \
 			|| die "Installed failed"
+	${BJAM} installheaders --includedir=${D}/usr/include/project2 || die "Install headers failed"
+	${BJAM} installheadersmisc --includedir=${D}/usr/include/project2/lib || die "Install headers failed"
+	${BJAM} installheadersdb --includedir=${D}/usr/include/project2/sql || die "Install headers failed"
 	if use docs ; then
 		mkdir -p ${D}/usr/share/doc/${PN}
 		(cat Doxyfile ; echo OUTPUT_DIRECTORY=${D}/usr/share/doc/${PN}) | doxygen - || die "Build docs failed"