From 783452bdc85bcb37ae3f1330bc22b5779350071e Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <daniel.goodliffe@pressassociation.com>
Date: Wed, 16 Aug 2017 15:26:47 +0100
Subject: Purge old, fix install paths libdbpp and connectors

---
 dev-libs/libdbpp-odbc/Manifest                  |  6 ++--
 dev-libs/libdbpp-odbc/libdbpp-odbc-1.0.1.ebuild | 38 -------------------------
 dev-libs/libdbpp-odbc/libdbpp-odbc-1.1.0.ebuild | 17 ++++-------
 3 files changed, 7 insertions(+), 54 deletions(-)
 delete mode 100644 dev-libs/libdbpp-odbc/libdbpp-odbc-1.0.1.ebuild

(limited to 'dev-libs/libdbpp-odbc')

diff --git a/dev-libs/libdbpp-odbc/Manifest b/dev-libs/libdbpp-odbc/Manifest
index 0717ec3..703746b 100644
--- a/dev-libs/libdbpp-odbc/Manifest
+++ b/dev-libs/libdbpp-odbc/Manifest
@@ -1,4 +1,2 @@
-DIST libdbpp-odbc-1.0.1.tar.bz2 31317 SHA256 2de7e7f74455c77e990232ec58d7610d5944ab39bfa430604ce609bddf698911 SHA512 4bd79f8516a10ad0790675b94cc52106f5646eec5bcd69bd6583a98fcecedce1088db5b1141930608e063a291f9253f62766e663223579099026c3d7cb4be284 WHIRLPOOL 078fd57a05dd31e1d9bf0f44b0cf9e2f6638548ec61b6a338c2ec45229dcdce2bc81d9822b5086748827d65ad6b5a6b8f61b0403e4ca0ac6105be6356396ba85
-DIST libdbpp-odbc-1.1.0.tar.bz2 14650 SHA256 9a8df979ef279fba8ce0aff657f84531d54b274949d9befaf931fe133563bf8e SHA512 9f559833af0901bf6deb1ae4301708cc466264852e0d06d713d1708bf0264b211e3e55797fda91409e845460afb8406f88b7fda3dbfeca7294164e398fd553a4 WHIRLPOOL dec363bc443a2799ce3a643c9fb6b55c426bf7036a20476446d997a4c26c7652c98b0421ce0798ad5ce1c5300c62d3f57222880ac8ba4df79f0999dcb34a18e5
-EBUILD libdbpp-odbc-1.0.1.ebuild 825 SHA256 d156a8f550c41fa90e35d5e2b9d668580d4b63c6e9847cd5ec85d8367cd4b0a3 SHA512 aa1b98739121620114d8489332fcbca5df40685f8970f02a0011221f07777621b542f51f6716c9809d979809ce1eea75df493f4bb883eb9c1e4751cc70afaea2 WHIRLPOOL 8f76036e2009372e96f0b29fa283b616d765bf1bb317b10e72dd2af1fa85be3b54964ab46ba7730df7840e3f14a3d9e6501de45ed370773822f63d1b88b1e909
-EBUILD libdbpp-odbc-1.1.0.ebuild 833 SHA256 1181d56fff2ca11843b174956d8cf46add509bb6bfc77c50db75db521575ca58 SHA512 e8097c4882d48e1f6f5af507f27803f39122021c786dffe0b375758c6a68644cb71e341abd4241005c37a86a418fcef5c23f3c03698291294fbc6c4c1fe2eba6 WHIRLPOOL 126423f783439c3d2b50008e766e38c558bddbfcd401c9f1f23cb4f317ff4e83895ed4b1c500b7c0a9d5aec9fe14619ac4b5680ed6df375e704c6397eabaad9c
+DIST libdbpp-odbc-1.1.0.tar.xz 14432 SHA256 b0ecf66dbd83d74e9e5b6330c984e04e92001cb10041e5cd65eb14bed0802054 SHA512 832fc9671dd24d14b21f9d6bd8a60eb88b4b85e77bf1ffce8237bc20dd19ddb6bdf809c9de5a6b022e2e77222a8b3a62bb33c73c48380eb0a646c396f18a573b WHIRLPOOL 19c344e7d50a7d80a56d23e5ea12957a2ab03934d9bba9f5d6f466dbcf7cf3ca3a7bde1086d11f3a93a95862cc80367c082ad10630b10433e22824404e39d267
+EBUILD libdbpp-odbc-1.1.0.ebuild 522 SHA256 237a6c7d335794b377112c1074f4b25f521eff5d35c984301d6608b954192878 SHA512 8ad38a9c5e9e708a70e4d9c88cced196feb3f31b27cc55b592fed6f097926b23b532bceab5c5dbf8f5ca2f3afe060cb168b0e9d1c46d22ec1f471b96cd69127e WHIRLPOOL 1229ab5d0c0542ccfa59d3087a54c94b84c76194caff0a39c43d16728a0cbcc21aed9fce05b81cd527cb2166f259443a677d13c768c83e9da6f195bc1d5f85ac
diff --git a/dev-libs/libdbpp-odbc/libdbpp-odbc-1.0.1.ebuild b/dev-libs/libdbpp-odbc/libdbpp-odbc-1.0.1.ebuild
deleted file mode 100644
index 31deb0a..0000000
--- a/dev-libs/libdbpp-odbc/libdbpp-odbc-1.0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-EAPI="5"
-
-DESCRIPTION="C++ database connectivity ODBC components"
-HOMEPAGE="http://libdbpp.randomdan.homeip.net/odbc"
-
-SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-RDEPEND="
-	dev-libs/boost
-	=dev-libs/libdbpp-1.0*:=
-	dev-db/unixODBC
-	dev-libs/libadhocutil:=
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/boost-build
-"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	cd ${S}/libodbcpp || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release dbpp-odbc -q || die
-}
-
-src_install() {
-	cd ${S}/libodbcpp || die
-
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release install -q \
-		--libdir=${D}/usr/lib \
-		--includedir=${D}/usr/include/dbpp-odbc || die
-}
-
diff --git a/dev-libs/libdbpp-odbc/libdbpp-odbc-1.1.0.ebuild b/dev-libs/libdbpp-odbc/libdbpp-odbc-1.1.0.ebuild
index 77ac38f..50f6db3 100644
--- a/dev-libs/libdbpp-odbc/libdbpp-odbc-1.1.0.ebuild
+++ b/dev-libs/libdbpp-odbc/libdbpp-odbc-1.1.0.ebuild
@@ -1,9 +1,10 @@
 EAPI="5"
+inherit bjam
 
 DESCRIPTION="C++ database connectivity ODBC components"
 HOMEPAGE="http://libdbpp.randomdan.homeip.net/odbc"
 
-SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
+SRC_URI="http://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz"
 LICENSE="GPL"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
@@ -19,20 +20,12 @@ DEPEND="
 	dev-util/boost-build
 "
 
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
 src_compile() {
-	cd ${S}/libodbcpp || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release dbpp-odbc -q || die
+	bjambuild libodbcpp//dbpp-odbc
 }
 
 src_install() {
-	cd ${S}/libodbcpp || die
-
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release install -q \
-		--libdir=${D}/usr/lib \
-		--includedir=${D}/usr/include/dbpp-odbc || die
+	bjaminstall libodbcpp//install \
+		-i dbpp-odbc
 }
 
-- 
cgit v1.2.3