Big update with v1.0 series libdbpp

3 files changed, 54 insertions, 8 deletions

diff --git a/dev-libs/libdbpp/Manifest b/dev-libs/libdbpp/Manifest
index a958b5d..97127ee 100644
--- a/dev-libs/libdbpp/Manifest
+++ b/dev-libs/libdbpp/Manifest
@@ -1,15 +1,14 @@
 DIST libdbpp-0.10.1.tar.bz2 14113 SHA256 0b196cb71fc8162fb45cb40a584e95e77f850b0977ca5582deac1ec5973a49b3 SHA512 3c1b5e2dbf5284bd73325b12814cd6034a9cdc0a4b1acfe945345c1b8fa94b19d2968a1925f3599090149ac8780ced674648b5a6b5c73226f6194bfad88013ed WHIRLPOOL 868bde241fa618d943f61074b50f4d4dfadae60160534193c5d6b0f6c2f6dfe16b8206756fb942099a2629b5046696d125f0c77b4feeee5172a7615c050f0f02
 DIST libdbpp-0.10.2.tar.bz2 14143 SHA256 f986a606ff7c4b477679bf36a34001f624b10787672c1269fae11a724c47b059 SHA512 ffb7bfa5d78eb955daf149f26c06032c3a42bfc4fdd1d880eb33f63732807a8bc7fc40248298c10bccfb0be782acfc19840e510c218b23f638f3ab32bce71ed3 WHIRLPOOL 6db8ed8d3b58668258dc1bc22aeb45095c08b3cf75f7d270f8eec419d17aca0e7afe8b4c43a9afef1fb50a30b707b90318e059cd791320700bcc9500466b3ca3
-DIST libdbpp-0.10.3_beta1.tar.bz2 16991 SHA256 0e5155ca812cbe4773422b84b0573bb7f1d370cb20366bc1ccd7dc81a3729a03 SHA512 b5093a614d58f68e82e5d81028a24ea951afc5585040c195b5c12a8909e6d8228cf1b27486b173824bf6a7fc0e1f0138d245c929a09f3c6f4fdbabd40b4586dd WHIRLPOOL 9d57f9037978783af9cdcaf097f2494c82b3814fe84058bb08930cd5838f7c06df94f36760a73a2aaed68b54b87d5d1359deec91c07431a3a7b18188f1744db5
 DIST libdbpp-0.10.tar.bz2 14114 SHA256 68d6a241c694e48ec38b867bd81662f55533c55dc45da40d77d456cd04e65a68 SHA512 3abdeab2e1cec071390e2fb5e028c043c0479724517120fcd328a666cf94d8cec8348f7c70d87354c12d48e5dd65967513267c2fbd7306dadf46dd51091552ef WHIRLPOOL facdb97999e43568bdcb475758b5b3f1dede80aac0eb453f4216018af9c74cc1a47cb5ae74cd924e1ea21113c7db26f5b7ad24b52a27b1906560bf9af91f8bfe
 DIST libdbpp-0.9.1.tar.bz2 11171 SHA256 cadecca3d753f77d5681bfb30b8e3783054d35201242d431a36037f87a4e79a3 SHA512 9b3882a5a9752bec0c216c6f804da9e14e89244247a87822634667f2e054e01b4c2beaa2f92db9f6d85694127f552090189977db8474de3662732fa991113c49 WHIRLPOOL 9d9f00b79dfdddd3c5647ad696accece371ea5bcd55e544b3b3c55b5953495982cce1676802c322cb973f0d29e09426dde6b3afee6fb5b19d4bb784ee0206003
 DIST libdbpp-0.9.tar.bz2 10980 SHA256 cae5d67c98fa60b27002037f59357c2f7b6b46c9e7ed756743ed9510c6e67ad9 SHA512 2577720c48ada6ed6a133c39eac5dd5bffb650ee9e1db15669406a34008ee66f069d9f593d0a403af3d152b8a7a252deba883b5c57f3797e7cf597e1b726719f WHIRLPOOL 0cad53aeeead3f3a23e255f594c88146769835993c804ed1343c0ec5eb933f54e17e0dc729924ede97b86645797a443fa75eaf88e5ea760b9df3f4b9965ba919
+DIST libdbpp-1.0.0.tar.bz2 18213 SHA256 3b2d4d39fc7ca08e473083b971436e468d3b3a69441446154aba520ce47ad300 SHA512 5bc379e752c9206de06555f9e5345c2274fdf89355f71bf103e7031d2834b825681cf49e3c18643d4c6cf7837bf65ca4abd60588c9fe784c0beaa709053df336 WHIRLPOOL 99ffa1de3d10cbdde7d6f5937816e8069927944122ead8e6bd8026f5c65314fe664e6f6f9ed8fa1a134ff2bc1fc24c54921347305b61c24c1518ceefa57943a2
+DIST libdbpp-1.0.1.tar.bz2 18214 SHA256 c2ba7cff25b9fa0de58dae0fe914bd01db319339600cdbf575825c0f464c5eaa SHA512 a79f7d66d98130bcaeb3c798adb61d5a7e498fd938282a17dfd90fa2e2ed2cd0d74e667e5e4f6e04b1b2e723c0ab41a00ab6aeb7f23bdd23a5ca3205b3681858 WHIRLPOOL 64acaa060906a02e13b556f98b93b41c3a84a5f5734ccaae51fe0f23811a66b162e400c443fc2f4dc4378b866c007b6e44df7b23e74c7c6266eeabddce8c58d5
 EBUILD libdbpp-0.10-r1.ebuild 1097 SHA256 26b7ebe4b50e7569720bcd1d1058261c8518b29cade1e5e86c20264e616c6138 SHA512 9f361beaf528fd4b3bd2fe7876d14263ff98d188fe2ed32b354d609c6992b43555a265e87e2b39e114b7ab135a37fc0ccdc859e48b892c890b83bf17174933bc WHIRLPOOL cccdca55754739a7f34f64355aeb803fdc1f85e9d8a10c08def3ca20142f682dbce4c3fed618d44d609e8c638d9bd0b5e86588c5ca1fb050aab209e12a7a707c
 EBUILD libdbpp-0.10.1-r1.ebuild 1097 SHA256 26b7ebe4b50e7569720bcd1d1058261c8518b29cade1e5e86c20264e616c6138 SHA512 9f361beaf528fd4b3bd2fe7876d14263ff98d188fe2ed32b354d609c6992b43555a265e87e2b39e114b7ab135a37fc0ccdc859e48b892c890b83bf17174933bc WHIRLPOOL cccdca55754739a7f34f64355aeb803fdc1f85e9d8a10c08def3ca20142f682dbce4c3fed618d44d609e8c638d9bd0b5e86588c5ca1fb050aab209e12a7a707c
 EBUILD libdbpp-0.10.2-r1.ebuild 1097 SHA256 26b7ebe4b50e7569720bcd1d1058261c8518b29cade1e5e86c20264e616c6138 SHA512 9f361beaf528fd4b3bd2fe7876d14263ff98d188fe2ed32b354d609c6992b43555a265e87e2b39e114b7ab135a37fc0ccdc859e48b892c890b83bf17174933bc WHIRLPOOL cccdca55754739a7f34f64355aeb803fdc1f85e9d8a10c08def3ca20142f682dbce4c3fed618d44d609e8c638d9bd0b5e86588c5ca1fb050aab209e12a7a707c
-<<<<<<< Updated upstream
-=======
-EBUILD libdbpp-0.10.3_beta1.ebuild 1097 SHA256 8de0bad5fbdd3a25d0a53034921f65d32f0891c0f3d9778a908ec0f38b12bb03 SHA512 ba581b2a0a55f679b79f8dd73ad1328f21a0efcc84a197041e0538fac2b5e195efcbb976a0aee1bca79e03fca8074200a056e0610620a68cf114f082f3ed84fd WHIRLPOOL 5b56c8d834e29ce5587a6970ab2b1a17ade295a6e1804464ddea2c2e734218c5e62e6d35fd4444283bcd290a5db8835e4a02dd10bc9fdf9fc3c281a09c2c2149
->>>>>>> Stashed changes
 EBUILD libdbpp-0.9-r1.ebuild 1097 SHA256 d8461cb212624b4f139b9484e7eebe29e2851ee1c4275049c370c03fce9ed72a SHA512 4b7eb8c59c3386f38c195308d4baa5cac67a86b01c5241ff847281abdf5d6ae73180d36e78503fc56ac9ee9664a802906c0b72f062ee2443cb5bb7d6798a13ff WHIRLPOOL a834604dad84c8595f184f2be301683e9c266ea883b0dc5fe4e8329114b2c75b76857af69dcd3a49c6d53161c09012286bcc7d8f86f60cbdaeb4d90f657aa31a
 EBUILD libdbpp-0.9.1-r1.ebuild 1097 SHA256 d8461cb212624b4f139b9484e7eebe29e2851ee1c4275049c370c03fce9ed72a SHA512 4b7eb8c59c3386f38c195308d4baa5cac67a86b01c5241ff847281abdf5d6ae73180d36e78503fc56ac9ee9664a802906c0b72f062ee2443cb5bb7d6798a13ff WHIRLPOOL a834604dad84c8595f184f2be301683e9c266ea883b0dc5fe4e8329114b2c75b76857af69dcd3a49c6d53161c09012286bcc7d8f86f60cbdaeb4d90f657aa31a
+EBUILD libdbpp-1.0.0.ebuild 1101 SHA256 9b501631b580f9145923c0b83a324637aa37fba1c2dc4f31e94bb2584f147944 SHA512 7ef8ef39696e5bd32f63e99ff93b71678e9192030a0d4a773818a6d7bec85b239a498672a11b367491c7d57e7a3b35c0f5223172b87c836d639a681b5ae6e264 WHIRLPOOL f66f44ff567f761febcfcb0108fa8c6eb43b299bb362be6cbe83db8d9842ded0d84213f82d2f2b2f9fa3c4854b2844ce28e950d37469d4af1cc53f29875fa65f
+EBUILD libdbpp-1.0.1.ebuild 1101 SHA256 9b501631b580f9145923c0b83a324637aa37fba1c2dc4f31e94bb2584f147944 SHA512 7ef8ef39696e5bd32f63e99ff93b71678e9192030a0d4a773818a6d7bec85b239a498672a11b367491c7d57e7a3b35c0f5223172b87c836d639a681b5ae6e264 WHIRLPOOL f66f44ff567f761febcfcb0108fa8c6eb43b299bb362be6cbe83db8d9842ded0d84213f82d2f2b2f9fa3c4854b2844ce28e950d37469d4af1cc53f29875fa65f
diff --git a/dev-libs/libdbpp/libdbpp-0.10.3_beta1.ebuild b/dev-libs/libdbpp/libdbpp-1.0.0.ebuild
index f50c419..041c32e 100644
--- a/dev-libs/libdbpp/libdbpp-0.10.3_beta1.ebuild
+++ b/dev-libs/libdbpp/libdbpp-1.0.0.ebuild
@@ -5,13 +5,13 @@ HOMEPAGE="http://libdbpp.randomdan.homeip.net/"
 
 SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
 LICENSE="GPL"
-SLOT="0/1"
-KEYWORDS="x86 amd64"
+SLOT="0/2"
+KEYWORDS="~x86 ~amd64"
 IUSE="man ut"
 
 RDEPEND="
 	dev-libs/boost
-	>=dev-libs/libadhocutil-0.3:=
+	>=dev-libs/libadhocutil-0.3.2:=
 "
 DEPEND="
 	${RDEPEND}
diff --git a/dev-libs/libdbpp/libdbpp-1.0.1.ebuild b/dev-libs/libdbpp/libdbpp-1.0.1.ebuild
new file mode 100644
index 0000000..041c32e
--- /dev/null
+++ b/dev-libs/libdbpp/libdbpp-1.0.1.ebuild
@@ -0,0 +1,47 @@
+EAPI="5"
+
+DESCRIPTION="C++ database connectivity common components"
+HOMEPAGE="http://libdbpp.randomdan.homeip.net/"
+
+SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
+LICENSE="GPL"
+SLOT="0/2"
+KEYWORDS="~x86 ~amd64"
+IUSE="man ut"
+
+RDEPEND="
+	dev-libs/boost
+	>=dev-libs/libadhocutil-0.3.2:=
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/flex
+	dev-util/boost-build
+	man? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
+}
+
+src_compile() {
+	cd ${S}/libdbpp || die
+	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release dbppcore $(use ut && echo dbpptestcore) -q || die
+}
+
+src_install() {
+	cd ${S}/libdbpp || die
+
+	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release install $(use ut && echo installtest) -q \
+		--libdir=${D}/usr/lib \
+		--includedir=${D}/usr/include/dbpp || die
+
+	if use man ; then
+		mkdir -p ${D}/usr/share/man
+		(cat Doxyfile ;
+			echo OUTPUT_DIRECTORY=${D}/usr/share
+			echo PROJECT_NUMBER=${PV}
+		) | tee /var/tmp/doxy | doxygen - || die "Build docs failed"
+	fi
+}
+