Fix bug #133871.

Package-Manager: portage-2.1_rc1-r3

6 files changed, 53 insertions, 72 deletions

diff --git a/dev-libs/apr-util/ChangeLog b/dev-libs/apr-util/ChangeLog
index d252684c30e1..84d1b4ba9f27 100644
--- a/dev-libs/apr-util/ChangeLog
+++ b/dev-libs/apr-util/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/apr-util
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.50 2006/04/27 16:05:46 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.51 2006/06/04 13:23:34 chtekk Exp $
+
+  04 Jun 2006; Luca Longinotti <chtekk@gentoo.org> apr-util-0.9.7.ebuild,
+  apr-util-0.9.12.ebuild, apr-util-1.2.2.ebuild, apr-util-1.2.7.ebuild:
+  Fix bug #133871 for all apr-util versions save the all-stable one.
 
   27 Apr 2006; Marien Zwart <marienz@gentoo.org> Manifest:
   Fixing SHA256 digest, pass four
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index b4afeebcecdd..12097d36deca 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -7,30 +7,30 @@ DIST apr-util-0.9.6.tar.gz 724680 RMD160 db862e3c04a9a701a9322048047ddccec7ccd8c
 DIST apr-util-0.9.7.tar.gz 741891 RMD160 ea11424ae5a99e360b902b0bb203d6781832d690 SHA256 ee2ab06fbfc029dbc6d49f2a37ac0deb319434f264ead26525b2d6152e08feaa size 741891
 DIST apr-util-1.2.2.tar.gz 645311 RMD160 5a507e01d32f79ee9405b3d3698f0fc08ad38acc SHA256 b7170fe39edff9ef044464a321194bbee382065dacd0720abc823adbe47731e1 size 645311
 DIST apr-util-1.2.7.tar.gz 641600 RMD160 339983cbbf4ee66139f14dbb3437d596e5790b2f SHA256 8cd84eb2031a91572e1be2975f4171730a9be72c4cd88718c4c40ac7dc4fd7d3 size 641600
-EBUILD apr-util-0.9.12.ebuild 1961 RMD160 d19181c8bc80c715b11479e7fab3bf56278d598f SHA1 465c87639c132171da8b50fb9509d21573aa87e0 SHA256 8f5e011cbddaee91c69e6ff6ab6ee81be35d0b57dd7923171e25df47f84e5dde size 1961
-MD5 396087e35a5b9013f9cbdd9575359120 apr-util-0.9.12.ebuild 1961
-RMD160 d19181c8bc80c715b11479e7fab3bf56278d598f apr-util-0.9.12.ebuild 1961
-SHA256 8f5e011cbddaee91c69e6ff6ab6ee81be35d0b57dd7923171e25df47f84e5dde apr-util-0.9.12.ebuild 1961
+EBUILD apr-util-0.9.12.ebuild 1770 RMD160 c4382b2c72e7a49b9e0b81539795583af8442a52 SHA1 dcf361cf864ff5f4acf42f671424587487814a02 SHA256 b5645afdfb1d32b6e1ebd1f3d403c14b6092a395c0f7d52efd47b68bf1c6bf1a size 1770
+MD5 bdd724c41b4dc22f2da0047ee086558c apr-util-0.9.12.ebuild 1770
+RMD160 c4382b2c72e7a49b9e0b81539795583af8442a52 apr-util-0.9.12.ebuild 1770
+SHA256 b5645afdfb1d32b6e1ebd1f3d403c14b6092a395c0f7d52efd47b68bf1c6bf1a apr-util-0.9.12.ebuild 1770
 EBUILD apr-util-0.9.6-r2.ebuild 2085 RMD160 dfe8468ec9d468521bcc19fbd0faf3254c6d8c89 SHA1 6043d37a857cc0ec2795f4d951c40ec0dca81845 SHA256 5a965bcb80252b63df02d51f3e0d5db6a5f9c95e94a97eb2fcce2741ccc08625 size 2085
 MD5 c699db0fc6d93043da9b0bbd9cefe38d apr-util-0.9.6-r2.ebuild 2085
 RMD160 dfe8468ec9d468521bcc19fbd0faf3254c6d8c89 apr-util-0.9.6-r2.ebuild 2085
 SHA256 5a965bcb80252b63df02d51f3e0d5db6a5f9c95e94a97eb2fcce2741ccc08625 apr-util-0.9.6-r2.ebuild 2085
-EBUILD apr-util-0.9.7.ebuild 1892 RMD160 13268b2bc04523725b59209980c1f7575cda112a SHA1 fcc2c1caa5ad46a837c92c46623ef0446aad834a SHA256 23b394930923ded09159925b4bae114e17c5bd0c15bd924edaf9d95744867085 size 1892
-MD5 d2500e7c92a7e0d7860dc4fc94c8906c apr-util-0.9.7.ebuild 1892
-RMD160 13268b2bc04523725b59209980c1f7575cda112a apr-util-0.9.7.ebuild 1892
-SHA256 23b394930923ded09159925b4bae114e17c5bd0c15bd924edaf9d95744867085 apr-util-0.9.7.ebuild 1892
-EBUILD apr-util-1.2.2.ebuild 1941 RMD160 1554bd5ceef4b7c0652c0aa7717a8c9d39df96d3 SHA1 a104787db2ef87f66d8c710408b81af88b99a40f SHA256 df53f68bf50a318a90fbb751c83b478d36e8ada06d8d1df1bb4ec7770445ed60 size 1941
-MD5 aa32d71effe3082cbde3edd46c5aef2d apr-util-1.2.2.ebuild 1941
-RMD160 1554bd5ceef4b7c0652c0aa7717a8c9d39df96d3 apr-util-1.2.2.ebuild 1941
-SHA256 df53f68bf50a318a90fbb751c83b478d36e8ada06d8d1df1bb4ec7770445ed60 apr-util-1.2.2.ebuild 1941
-EBUILD apr-util-1.2.7.ebuild 2142 RMD160 b854ea9163535e214954f5b1b83eab305e8bf918 SHA1 71f1b8c0d8f640ac7aa0c564c29ff0a3c68a5425 SHA256 490f377709e013567d482eec90145911dc87912e4abf20c346b42472f1250c6d size 2142
-MD5 36bb308f8fa3a9e58107b1a92a251cb8 apr-util-1.2.7.ebuild 2142
-RMD160 b854ea9163535e214954f5b1b83eab305e8bf918 apr-util-1.2.7.ebuild 2142
-SHA256 490f377709e013567d482eec90145911dc87912e4abf20c346b42472f1250c6d apr-util-1.2.7.ebuild 2142
-MISC ChangeLog 6380 RMD160 c5277f403155a0c540d52ee2cddba5a71515d4be SHA1 26bedfc6fe5c01360a304fc4719857959af4c414 SHA256 5c9c0e299296a88449743fb84d7931f60258fedb0510facf4f3d81102bf9513b size 6380
-MD5 cd609a62d580d757b852d3563aaa2978 ChangeLog 6380
-RMD160 c5277f403155a0c540d52ee2cddba5a71515d4be ChangeLog 6380
-SHA256 5c9c0e299296a88449743fb84d7931f60258fedb0510facf4f3d81102bf9513b ChangeLog 6380
+EBUILD apr-util-0.9.7.ebuild 1701 RMD160 d3ed5dd24b7ca8062825eedfd1a0153afee75eaa SHA1 a966ac8221e2c29544c3d76c1f4d6c996979958d SHA256 e10082f9e80886529350d125e632436f5bbb05aae3030d2588d2fb3f0ad8af75 size 1701
+MD5 31bf69cc6c2223512dab3f7b40be38be apr-util-0.9.7.ebuild 1701
+RMD160 d3ed5dd24b7ca8062825eedfd1a0153afee75eaa apr-util-0.9.7.ebuild 1701
+SHA256 e10082f9e80886529350d125e632436f5bbb05aae3030d2588d2fb3f0ad8af75 apr-util-0.9.7.ebuild 1701
+EBUILD apr-util-1.2.2.ebuild 1750 RMD160 7ae4d3b9a47e3c645dac756e6cc77157606999c4 SHA1 40916753b0a23195b946b1c52e47c7eacb51d86a SHA256 d1cc8f6ed1aaeec53e33149ad73a18948149cf3b146b3504d6d26ff7fb2fb01e size 1750
+MD5 7d74f7e2ac8b57aabd8409c6c50d508c apr-util-1.2.2.ebuild 1750
+RMD160 7ae4d3b9a47e3c645dac756e6cc77157606999c4 apr-util-1.2.2.ebuild 1750
+SHA256 d1cc8f6ed1aaeec53e33149ad73a18948149cf3b146b3504d6d26ff7fb2fb01e apr-util-1.2.2.ebuild 1750
+EBUILD apr-util-1.2.7.ebuild 1808 RMD160 29a665b525576bd1e9d1a24005d7c6ad9e4a2d29 SHA1 5ac9584c5e764488f803bb6263dc775ade32f478 SHA256 4e8aedf9190a7e3b42fc532ad2fd963b3858e26b325852068ed06289eb5c2645 size 1808
+MD5 e410ac9311610bde0ea45b6fccc6b79c apr-util-1.2.7.ebuild 1808
+RMD160 29a665b525576bd1e9d1a24005d7c6ad9e4a2d29 apr-util-1.2.7.ebuild 1808
+SHA256 4e8aedf9190a7e3b42fc532ad2fd963b3858e26b325852068ed06289eb5c2645 apr-util-1.2.7.ebuild 1808
+MISC ChangeLog 6595 RMD160 02d6f0b2be728df7317c37024a4352c0474caafc SHA1 a9eb30dd9408d4ee7594b2f7c1efbb738dfc6eb1 SHA256 0469cd20d86642c9485e5c0d2af69c43c17d471090735661bcb15749fede492c size 6595
+MD5 e92828d36c488d1444bb405d08c502cc ChangeLog 6595
+RMD160 02d6f0b2be728df7317c37024a4352c0474caafc ChangeLog 6595
+SHA256 0469cd20d86642c9485e5c0d2af69c43c17d471090735661bcb15749fede492c ChangeLog 6595
 MISC metadata.xml 226 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e SHA1 fe9f7ce6f2281683065abb3255c8b731665c82ac SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8 size 226
 MD5 7272d8b6d09e3e301b6a08aa9c912eb0 metadata.xml 226
 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e metadata.xml 226
diff --git a/dev-libs/apr-util/apr-util-0.9.12.ebuild b/dev-libs/apr-util/apr-util-0.9.12.ebuild
index 6387dd0a9169..dc1e09984c8c 100644
--- a/dev-libs/apr-util/apr-util-0.9.12.ebuild
+++ b/dev-libs/apr-util/apr-util-0.9.12.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-0.9.12.ebuild,v 1.4 2006/05/18 18:19:19 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-0.9.12.ebuild,v 1.5 2006/06/04 13:23:34 chtekk Exp $
 
-inherit eutils flag-o-matic libtool
+inherit eutils flag-o-matic libtool db-use
 
 DESCRIPTION="Apache Portable Runtime Library"
 HOMEPAGE="http://apr.apache.org/"
@@ -31,16 +31,11 @@ src_compile() {
 	myconf="${myconf} $(use_with gdbm)"
 
 	if use berkdb; then
-		if has_version '=sys-libs/db-4.3*'; then
-			myconf="${myconf} --with-dbm=db43
-			--with-berkeley-db=/usr/include/db4.3:/usr/$(get_libdir)"
-		elif has_version '=sys-libs/db-4.2*'; then
-			myconf="${myconf} --with-dbm=db42
-			--with-berkeley-db=/usr/include/db4.2:/usr/$(get_libdir)"
-		elif has_version '=sys-libs/db-4*'; then
-			myconf="${myconf} --with-dbm=db4
-			--with-berkeley-db=/usr/include/db4:/usr/$(get_libdir)"
-		fi
+		dbver="$(db_findver sys-libs/db)" || die "Unable to find db version"
+		dbver="$(db_ver_to_slot "$dbver")"
+		dbver="${dbver/\./}"
+		myconf="${myconf} --with-dbm=db${dbver}
+		--with-berkeley-db=$(db_includedir):/usr/$(get_libdir)"
 	else
 		myconf="${myconf} --without-berkeley-db"
 	fi
diff --git a/dev-libs/apr-util/apr-util-0.9.7.ebuild b/dev-libs/apr-util/apr-util-0.9.7.ebuild
index cde278836acb..cbc7f601b393 100644
--- a/dev-libs/apr-util/apr-util-0.9.7.ebuild
+++ b/dev-libs/apr-util/apr-util-0.9.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-0.9.7.ebuild,v 1.11 2006/04/19 01:00:25 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-0.9.7.ebuild,v 1.12 2006/06/04 13:23:34 chtekk Exp $
 
-inherit eutils libtool
+inherit eutils libtool db-use
 
 DESCRIPTION="Apache Portable Runtime Library"
 HOMEPAGE="http://apr.apache.org/"
@@ -29,16 +29,11 @@ src_compile() {
 	myconf="${myconf} $(use_with gdbm)"
 
 	if use berkdb; then
-		if has_version '=sys-libs/db-4.3*'; then
-			myconf="${myconf} --with-dbm=db43
-			--with-berkeley-db=/usr/include/db4.3:/usr/$(get_libdir)"
-		elif has_version '=sys-libs/db-4.2*'; then
-			myconf="${myconf} --with-dbm=db42
-			--with-berkeley-db=/usr/include/db4.2:/usr/$(get_libdir)"
-		elif has_version '=sys-libs/db-4*'; then
-			myconf="${myconf} --with-dbm=db4
-			--with-berkeley-db=/usr/include/db4:/usr/$(get_libdir)"
-		fi
+		dbver="$(db_findver sys-libs/db)" || die "Unable to find db version"
+		dbver="$(db_ver_to_slot "$dbver")"
+		dbver="${dbver/\./}"
+		myconf="${myconf} --with-dbm=db${dbver}
+		--with-berkeley-db=$(db_includedir):/usr/$(get_libdir)"
 	else
 		myconf="${myconf} --without-berkeley-db"
 	fi
diff --git a/dev-libs/apr-util/apr-util-1.2.2.ebuild b/dev-libs/apr-util/apr-util-1.2.2.ebuild
index 0993009efef3..af03584c5f11 100644
--- a/dev-libs/apr-util/apr-util-1.2.2.ebuild
+++ b/dev-libs/apr-util/apr-util-1.2.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.2.2.ebuild,v 1.5 2006/04/19 01:00:25 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.2.2.ebuild,v 1.6 2006/06/04 13:23:34 chtekk Exp $
 
-inherit eutils libtool
+inherit eutils libtool db-use
 
 DESCRIPTION="Apache Portable Runtime Library"
 HOMEPAGE="http://apr.apache.org/"
@@ -38,16 +38,11 @@ src_compile() {
 	myconf="${myconf} $(use_with sqlite3)"
 
 	if use berkdb; then
-		if has_version '=sys-libs/db-4.3*'; then
-			myconf="${myconf} --with-dbm=db43
-			--with-berkeley-db=/usr/include/db4.3:/usr/$(get_libdir)"
-		elif has_version '=sys-libs/db-4.2*'; then
-			myconf="${myconf} --with-dbm=db42
-			--with-berkeley-db=/usr/include/db4.2:/usr/$(get_libdir)"
-		elif has_version '=sys-libs/db-4*'; then
-			myconf="${myconf} --with-dbm=db4
-			--with-berkeley-db=/usr/include/db4:/usr/$(get_libdir)"
-		fi
+		dbver="$(db_findver sys-libs/db)" || die "Unable to find db version"
+		dbver="$(db_ver_to_slot "$dbver")"
+		dbver="${dbver/\./}"
+		myconf="${myconf} --with-dbm=db${dbver}
+		--with-berkeley-db=$(db_includedir):/usr/$(get_libdir)"
 	else
 		myconf="${myconf} --without-berkeley-db"
 	fi
diff --git a/dev-libs/apr-util/apr-util-1.2.7.ebuild b/dev-libs/apr-util/apr-util-1.2.7.ebuild
index 6755e926dd29..a5179ff50dac 100644
--- a/dev-libs/apr-util/apr-util-1.2.7.ebuild
+++ b/dev-libs/apr-util/apr-util-1.2.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.2.7.ebuild,v 1.3 2006/05/18 18:19:19 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.2.7.ebuild,v 1.4 2006/06/04 13:23:34 chtekk Exp $
 
-inherit eutils flag-o-matic libtool
+inherit eutils flag-o-matic libtool db-use
 
 DESCRIPTION="Apache Portable Runtime Library"
 HOMEPAGE="http://apr.apache.org/"
@@ -40,19 +40,11 @@ src_compile() {
 	myconf="${myconf} $(use_with sqlite3)"
 
 	if use berkdb; then
-		if has_version '=sys-libs/db-4.4*'; then
-			myconf="${myconf} --with-dbm=db44
-			--with-berkeley-db=/usr/include/db4.4:/usr/$(get_libdir)"
-		elif has_version '=sys-libs/db-4.3*'; then
-			myconf="${myconf} --with-dbm=db43
-			--with-berkeley-db=/usr/include/db4.3:/usr/$(get_libdir)"
-		elif has_version '=sys-libs/db-4.2*'; then
-			myconf="${myconf} --with-dbm=db42
-			--with-berkeley-db=/usr/include/db4.2:/usr/$(get_libdir)"
-		elif has_version '=sys-libs/db-4*'; then
-			myconf="${myconf} --with-dbm=db4
-			--with-berkeley-db=/usr/include/db4:/usr/$(get_libdir)"
-		fi
+		dbver="$(db_findver sys-libs/db)" || die "Unable to find db version"
+		dbver="$(db_ver_to_slot "$dbver")"
+		dbver="${dbver/\./}"
+		myconf="${myconf} --with-dbm=db${dbver}
+		--with-berkeley-db=$(db_includedir):/usr/$(get_libdir)"
 	else
 		myconf="${myconf} --without-berkeley-db"
 	fi