Rename with versioning and bump

7 files changed, 22 insertions, 165 deletions

diff --git a/www-apps/project2/Manifest b/www-apps/project2/Manifest
index 70d3a8f..9cd4c18 100644
--- a/www-apps/project2/Manifest
+++ b/www-apps/project2/Manifest
@@ -1,12 +1,8 @@
-DIST project2-1020.tar.bz2 151140 SHA256 45883aba0e8bbc56c8069dfda832cd071b75d4da27ed080007c744eea9d9248c SHA512 e34ab1e0fa05f453f988e056b2d95d002f371b2b7f21e101fa0ff2305013165faa77bc4a367886cf1ad8966645ee9105b59b431f891c6d117f99ad8b672ba21c WHIRLPOOL f785d24a3f465de335f0eef6def30bf9b4ed21fe112d1bed37387c10d7ae82a3d1a3b81cfbf5740a85bf0d1df1c6f883102b95b56eb519f328ade66d9aaa9f26
-DIST project2-1023.tar.bz2 152742 SHA256 fc39be5a86f972ba3e5306864b44f5752b54fd395154e9421477767c477b7a7b SHA512 1d195614de5d6b7cb1613c373ca1e7f79a9a173ef21187ed501357a6b91d07ec4584d0830b7800954103f6f2780192cbb1226c8726104b9922d451299cf5c386 WHIRLPOOL ce3e830554f39d8b9683dd33265f343c67f016df337e70fcc4b6d73dbf2d34ba36f0d076d85029c5baa10f777bfbc07dadaeeee25277c17b6b3c0b0b8807d604
-DIST project2-1027.tar.bz2 150670 SHA256 360d0e69d56b8b008d9cf33653df029cb367159fdce5a2a96b35f505e9cc40ce SHA512 141c7e892bcd4a3ef845ecd3aa2ee1372dbbc16ea5c0d9d7838dff70ee14caf040f8bbfd8e3b3d58f4b38ffd69807336ab314527d5ee7abd2bb3873597508404 WHIRLPOOL 03f3b85ad8d2a19237ee47101dd5067ddd1c17ef7595e76c90af1308c071e7575f347369b9d6055c21da2fa8bf0a84763fe5a73bce81ccb22c205584956cb01d
-DIST project2-922.tar.bz2 139770 SHA256 c82de40313153e31c25c1284a80a75b1fb48baecd322e68360bf9cc2860cde1d SHA512 e6747313c532b748d97bdfd9cb28c7434e976efc8a8307d1e421e3e4842ec98aa21aa470dc5087186475857cef62adbd39db0249196eca455b7d1843e939daeb WHIRLPOOL 796f3a898a51f775763d54e99cea06a9774594a60c604f9c8c621a8c4010be0849fffc9b886d0223dd27613e672fb8289b4f3ddc8279110572ce1574a33bad07
-DIST project2-953.tar.bz2 141783 SHA256 cb57b25b9a71a511a6ed2149951f64b1039539104ade9f8b7219394156184f03 SHA512 f98581b7b70bec00c7d0ed37d8949792c9153a7c5e2771eef2f195d11c8f29655fdb7bfb43cc179733dce7392781a56ada4497819212f0b010bdf135e5abf252 WHIRLPOOL 06b435fef3817d270d1f63c99c2b5370a8ab17d8d3a671f09f89644c0d89a938c07be92f41379c8c532550b43e4e84990c0f6cf8716deb9e1dc57a542b00a4b9
-DIST project2-955.tar.bz2 141883 SHA256 d379eae0c256a4df646371ddc31c06b30c611716d7bb95f851ca967b937fb4c4 SHA512 699ae754e67db4caf1ecf1c7594692fc7ddf75d905e2d175db469f0044b3818a10f3b77d4cf8c13cb864ad5d1d5392d21f8edd0b7ca461b4a6d2497d6f791b24 WHIRLPOOL ba3cb57cc21d3def3c60ddd7af1cfad4564717fc715ae869385d99f4491968f1ddd38810aa4f962a73f09083f3fee55ea6c284d40143e548a0abff08fa72a281
-EBUILD project2-1020.ebuild 2018 SHA256 930d7a58b95376ae53d607327962b306617cdcffb5693707b124fbc8b7fd2fa8 SHA512 45b2224b404bc79853365c2926830e6076a04b56f7fb4fd3c596158264ef95b9018f23f9044d242761f574b6574c15d6df0e88019930ad1c745320940df98c3e WHIRLPOOL 6f068038655a8b12dab2fd5b4e2ce527f3d4d8cd3415a1b61131c84313b49ecae7ecabccb461da4d903ea987e0205b20f6b097552e90ebdcda56bf2a90d9706e
-EBUILD project2-1023.ebuild 2018 SHA256 930d7a58b95376ae53d607327962b306617cdcffb5693707b124fbc8b7fd2fa8 SHA512 45b2224b404bc79853365c2926830e6076a04b56f7fb4fd3c596158264ef95b9018f23f9044d242761f574b6574c15d6df0e88019930ad1c745320940df98c3e WHIRLPOOL 6f068038655a8b12dab2fd5b4e2ce527f3d4d8cd3415a1b61131c84313b49ecae7ecabccb461da4d903ea987e0205b20f6b097552e90ebdcda56bf2a90d9706e
-EBUILD project2-1027.ebuild 2018 SHA256 930d7a58b95376ae53d607327962b306617cdcffb5693707b124fbc8b7fd2fa8 SHA512 45b2224b404bc79853365c2926830e6076a04b56f7fb4fd3c596158264ef95b9018f23f9044d242761f574b6574c15d6df0e88019930ad1c745320940df98c3e WHIRLPOOL 6f068038655a8b12dab2fd5b4e2ce527f3d4d8cd3415a1b61131c84313b49ecae7ecabccb461da4d903ea987e0205b20f6b097552e90ebdcda56bf2a90d9706e
-EBUILD project2-922.ebuild 2103 SHA256 9d3d9d17cd1f2c129b8b2d98638903b06d418cf6d284db1000df23a324cf4e65 SHA512 80fe84df124bdbad1b544f2731b58b5c9827ae2905e1e42756e67db9c0816df8e5d8f4cecd4473ecdbcac0f44449ff45e848d737cf5dd0d7dae2f550f50256a7 WHIRLPOOL 9618005a7ab6f2cc821efbab5e6d686eca75285894dfd51e53c5eefb35c807d4fd4cc18ca95a418498aac8d6ed670cf8fd7337e2fe38f8e2c0bc093e9303e3fd
-EBUILD project2-953.ebuild 2103 SHA256 9d3d9d17cd1f2c129b8b2d98638903b06d418cf6d284db1000df23a324cf4e65 SHA512 80fe84df124bdbad1b544f2731b58b5c9827ae2905e1e42756e67db9c0816df8e5d8f4cecd4473ecdbcac0f44449ff45e848d737cf5dd0d7dae2f550f50256a7 WHIRLPOOL 9618005a7ab6f2cc821efbab5e6d686eca75285894dfd51e53c5eefb35c807d4fd4cc18ca95a418498aac8d6ed670cf8fd7337e2fe38f8e2c0bc093e9303e3fd
-EBUILD project2-955.ebuild 2103 SHA256 9d3d9d17cd1f2c129b8b2d98638903b06d418cf6d284db1000df23a324cf4e65 SHA512 80fe84df124bdbad1b544f2731b58b5c9827ae2905e1e42756e67db9c0816df8e5d8f4cecd4473ecdbcac0f44449ff45e848d737cf5dd0d7dae2f550f50256a7 WHIRLPOOL 9618005a7ab6f2cc821efbab5e6d686eca75285894dfd51e53c5eefb35c807d4fd4cc18ca95a418498aac8d6ed670cf8fd7337e2fe38f8e2c0bc093e9303e3fd
+DIST project2-1.0.1.tar.bz2 150961 SHA256 954235041641cea7d9b68a405a54f45b439df6e144a26927ad15d01b5a15c1fc SHA512 fd8613fa6fe20f3dcaab81aacb4bf51aa7e677e61a8cc7b4e9a75ae2a2434e554a5fdc3ebd30140e99260525ee62410804b2f9cd711fc4c848334acd3f7b0a05 WHIRLPOOL b53369ea1974a82a1d41212d045c9cc313c92def2402703b9b51e772cc64250720029cbc55b39a6ca308b1ef7134e1a3a17c7d31f972456f2e5d26b45347a9d6
+DIST project2-1.0.2.tar.bz2 152746 SHA256 2e3886609e7b21df467c6957fab0febd3b3d4ce73dd32a1a2e5b9093142b6f2c SHA512 10bb247cddc90065921406b0db3260a421a341deeaf3bdb25762ab5bee65ed763659fe5991f644b3b09c3d1f55a301457729b4d75f397a990592e902ad8360e4 WHIRLPOOL 2240a5fa422756c497f193304fa052f923136f30116f25acd043734f1ef3f46a158edc37e5d532364ec4a5101e496e36a7f0585991e6421d17fcd63cad317a5c
+DIST project2-1.0.3.tar.bz2 150663 SHA256 28f5dbb920b0202fc70395044931e87f08dface8bf51b1f3e138522d123cc9eb SHA512 c5533dd430ed0868408de644868957378bb1d02cf471d4232cc5b90c3034af2bb5309f732c980f4bd2bf308fdc8737191103c228ab004efe1af109ddf3ffe716 WHIRLPOOL 73f7a41c286c8d48ed68de0bbd1cff70a4a8ff77f9a6fbf5538ed24089ce6d14a5436298230b59d6612baaa1b72e8cf3e41adbde9f7151b2aa5fc27057bb202f
+DIST project2-1.1.1.tar.bz2 157049 SHA256 086edc59c5fadc91562648ae2e3f05898cc46b0b7b01c64e0926c586e14df61f SHA512 b5f79db95bf6bcff78d24137854366511359b2b2279ad9def8dcc5d913c32944ee8d958b8fcb58cc4e95fee236b63b39e3b2b953c0c6d3430b3500b8b35a4a84 WHIRLPOOL db0c507091893faa6634cc88359f461c3fb89909086802954ef916460109aa027f0fac9122055df2fde1ca07741511ef6161b589a80161d65d587ec170b67705
+EBUILD project2-1.0.1.ebuild 2018 SHA256 930d7a58b95376ae53d607327962b306617cdcffb5693707b124fbc8b7fd2fa8 SHA512 45b2224b404bc79853365c2926830e6076a04b56f7fb4fd3c596158264ef95b9018f23f9044d242761f574b6574c15d6df0e88019930ad1c745320940df98c3e WHIRLPOOL 6f068038655a8b12dab2fd5b4e2ce527f3d4d8cd3415a1b61131c84313b49ecae7ecabccb461da4d903ea987e0205b20f6b097552e90ebdcda56bf2a90d9706e
+EBUILD project2-1.0.2.ebuild 2018 SHA256 930d7a58b95376ae53d607327962b306617cdcffb5693707b124fbc8b7fd2fa8 SHA512 45b2224b404bc79853365c2926830e6076a04b56f7fb4fd3c596158264ef95b9018f23f9044d242761f574b6574c15d6df0e88019930ad1c745320940df98c3e WHIRLPOOL 6f068038655a8b12dab2fd5b4e2ce527f3d4d8cd3415a1b61131c84313b49ecae7ecabccb461da4d903ea987e0205b20f6b097552e90ebdcda56bf2a90d9706e
+EBUILD project2-1.0.3.ebuild 2018 SHA256 930d7a58b95376ae53d607327962b306617cdcffb5693707b124fbc8b7fd2fa8 SHA512 45b2224b404bc79853365c2926830e6076a04b56f7fb4fd3c596158264ef95b9018f23f9044d242761f574b6574c15d6df0e88019930ad1c745320940df98c3e WHIRLPOOL 6f068038655a8b12dab2fd5b4e2ce527f3d4d8cd3415a1b61131c84313b49ecae7ecabccb461da4d903ea987e0205b20f6b097552e90ebdcda56bf2a90d9706e
+EBUILD project2-1.1.1.ebuild 2052 SHA256 d4375605c4424526fddd6ff8d57b5024d9c82db0282cce1c2887b64c49dd8a29 SHA512 c4f2c888a27448ccddb8dcad7ddb6625c03c80c6569b9ef787a84ac2e6ec6d3c9bece4553111e7555233b0b39e73fe28f4fe7abdbde37f91081060a3cc851f15 WHIRLPOOL cc29e5f6cb342ce0e6cdcaebf34b79cbc9739c811b1e910b08afb25b0f5b5dd5c4566af92e9b37da7d620667f55370b0963eb86bbe09a4244fae81ba10648588
diff --git a/www-apps/project2/project2-1020.ebuild b/www-apps/project2/project2-1.0.1.ebuild
index d3d3d16..d3d3d16 100644
--- a/www-apps/project2/project2-1020.ebuild
+++ b/www-apps/project2/project2-1.0.1.ebuild
diff --git a/www-apps/project2/project2-1023.ebuild b/www-apps/project2/project2-1.0.2.ebuild
index d3d3d16..d3d3d16 100644
--- a/www-apps/project2/project2-1023.ebuild
+++ b/www-apps/project2/project2-1.0.2.ebuild
diff --git a/www-apps/project2/project2-1027.ebuild b/www-apps/project2/project2-1.0.3.ebuild
index d3d3d16..d3d3d16 100644
--- a/www-apps/project2/project2-1027.ebuild
+++ b/www-apps/project2/project2-1.0.3.ebuild
diff --git a/www-apps/project2/project2-922.ebuild b/www-apps/project2/project2-1.1.1.ebuild
index 079e3ac..bef6e94 100644
--- a/www-apps/project2/project2-922.ebuild
+++ b/www-apps/project2/project2-1.1.1.ebuild
@@ -1,4 +1,4 @@
-EAPI="3"
+EAPI="5"
 
 DESCRIPTION="User configured application engine"
 HOMEPAGE="http://project2.randomdan.homeip.net"
@@ -7,7 +7,7 @@ SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
 LICENSE="GPL"
 SLOT="0"
 KEYWORDS="x86 amd64"
-IUSE="debug +docs mysql odbc postgres +console +web +fastcgi +daemon"
+IUSE="debug +docs mysql odbc postgres sqlite +console +web +fastcgi +daemon"
 
 DEPEND="
 	dev-util/boost-build
@@ -22,6 +22,7 @@ DEPEND="
 	mysql? ( virtual/mysql )
 	odbc? ( dev-db/unixODBC )
 	postgres? ( dev-db/postgresql )
+	sqlite? ( dev-db/sqlite )
 	web? (
 			fastcgi? (
 				dev-libs/cgicc
@@ -30,12 +31,14 @@ DEPEND="
 				)
 		 )
 	docs? ( app-doc/doxygen )
+	dev-cpp/slicer:=
 	"
 RDEPEND="${DEPEND}"
-use !debug && var="variant=release"
-use !odbc && odbc="odbc=no"
-use !mysql && mysql="mysql=no"
-use !postgres && pq="pq=no"
+use !debug && opts+=" variant=release"
+use !odbc && opts+=" odbc=no"
+use !mysql && opts+=" mysql=no"
+use !postgres && opts+=" pq=no"
+use !sqlite && opts+=" sqlite=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"
@@ -46,23 +49,21 @@ src_prepare() {
 }
 
 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 \
+			b2 ${BJAMOPTS} ${opts} ${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 \
+			b2 ${BJAMOPTS} ${opts} ${it} -q \
 			--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"
+	b2 installheaders --includedir=${D}/usr/include/project2 || die "Install headers failed"
+	b2 installheadersmisc --includedir=${D}/usr/include/project2/lib || die "Install headers failed"
+	b2 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"
diff --git a/www-apps/project2/project2-953.ebuild b/www-apps/project2/project2-953.ebuild
deleted file mode 100644
index 079e3ac..0000000
--- a/www-apps/project2/project2-953.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-EAPI="3"
-
-DESCRIPTION="User configured application engine"
-HOMEPAGE="http://project2.randomdan.homeip.net"
-
-SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="debug +docs mysql odbc postgres +console +web +fastcgi +daemon"
-
-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
-	>=dev-libs/Ice-3.5
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql )
-	web? (
-			fastcgi? (
-				dev-libs/cgicc
-				virtual/httpd-fastcgi
-				dev-libs/fcgi
-				)
-		 )
-	docs? ( app-doc/doxygen )
-	"
-RDEPEND="${DEPEND}"
-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"
-use daemon && bt="$bt p2daemon" && it="$it installp2daemon"
-
-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 \
-			--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"
-	fi
-}
diff --git a/www-apps/project2/project2-955.ebuild b/www-apps/project2/project2-955.ebuild
deleted file mode 100644
index 079e3ac..0000000
--- a/www-apps/project2/project2-955.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-EAPI="3"
-
-DESCRIPTION="User configured application engine"
-HOMEPAGE="http://project2.randomdan.homeip.net"
-
-SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="debug +docs mysql odbc postgres +console +web +fastcgi +daemon"
-
-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
-	>=dev-libs/Ice-3.5
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql )
-	web? (
-			fastcgi? (
-				dev-libs/cgicc
-				virtual/httpd-fastcgi
-				dev-libs/fcgi
-				)
-		 )
-	docs? ( app-doc/doxygen )
-	"
-RDEPEND="${DEPEND}"
-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"
-use daemon && bt="$bt p2daemon" && it="$it installp2daemon"
-
-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 \
-			--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"
-	fi
-}