Bug #233006, block sys-libs/db:4.7 properly. Patch from Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>.

Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64

7 files changed, 26 insertions, 28 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index 2b78b8930fb3..f374788bd98d 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.330 2008/08/03 20:27:32 keytoaster Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.331 2008/08/13 17:24:27 robbat2 Exp $
+
+  13 Aug 2008; Robin H. Johnson <robbat2@gentoo.org>
+  openldap-2.3.39-r2.ebuild, openldap-2.3.40-r1.ebuild,
+  openldap-2.3.41.ebuild, openldap-2.4.7.ebuild, openldap-2.4.10.ebuild:
+  Bug #233006, block sys-libs/db:4.7 properly. Patch from Arfrever Frehtes
+  Taifersar Arahesis <Arfrever.FTA@GMail.Com>.
 
   03 Aug 2008; Tobias Heinlein <keytoaster@gentoo.org>
   openldap-2.3.43.ebuild:
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index cba2beaba2fd..9a3520b30f06 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX DB_CONFIG.fast.example 746 RMD160 03d179d1c58d695c442eb5e3e69c245f3c2f2358 SHA1 c76a2a9f346a733ed6617d42229b434ce723c59e SHA256 69fc9aa6e4f0b888bc02d3f75642fe1ebf9345c685257a5c1236b2e79ed56e0b
 AUX openldap-2.2.14-perlthreadsfix.patch 614 RMD160 6e868aa5a5cc4e80c0340af25d18d010b342ed15 SHA1 3bb05c7ed511e8464331619ce23064d236a5fe82 SHA256 bb719cc1fed47ff0f111c960f3295781ae6f0d9e98b4266a87751044b4bb3175
 AUX openldap-2.2.6-ntlm.patch 5011 RMD160 317f4b6dc9589826739a14a8ad7200ed287c87be SHA1 29b8e9c4835235c976f026cd5883228b77581083 SHA256 1f7e766bcafb412ec336aad7e07295d6d62d2e2a62b6804b07b06a5056102243
@@ -18,19 +15,12 @@ DIST openldap-2.3.41.tgz 3800142 RMD160 441c7456c9fb5b3cd964c30c246849a9886ab368
 DIST openldap-2.3.43.tgz 3803011 RMD160 3ecb789e5f4d4c939357e2e7220d793eb05402e7 SHA1 796b5db37ae5243b84f7b9c11217bbec44e0da8c SHA256 d7d2dea05362c8ac7e11bb7bf1da4cdeb07225ba8dc16974bff9f51a9f3d37e1
 DIST openldap-2.4.10.tgz 4453204 RMD160 ce070f88eeecdf2418ec74d25526003f5a6fe404 SHA1 7363e50c7b199abc2ce09228d8533a7a16b7bbff SHA256 e460b1ef2a7a50ec8d7bd70c29d5cb3191f091fab50b96a7e10454ee8e4d0902
 DIST openldap-2.4.7.tgz 4217144 RMD160 22942db03c278c941de8f00a99f251d378b34bd8 SHA1 e12d96327980abbe07c9187f3fd238c47098943a SHA256 ee3f22f3e32c3e302a584ab219bf54674e07747b86f14c3a5b696f22d3fd37ab
-EBUILD openldap-2.3.39-r2.ebuild 17583 RMD160 7b6265856a3b93187c734a4749cff2675d1f0819 SHA1 e8b36a5db39d9ceeefd4765b8038f826ee62a54a SHA256 dd11a1d81b6b2556e9d5723ad01eac65a4ade12e9a6cb45ac0b44538f6ca33b7
-EBUILD openldap-2.3.40-r1.ebuild 17593 RMD160 a06539e7cac1de85bb48ebbf9134d42dea94919f SHA1 c4bdb726bd4fd8cfa7514ca81c903fd5a46518aa SHA256 3561a4b84bc003fe5fe3c43c9d48067f272f995f2930781ac040b8e1be462aec
+EBUILD openldap-2.3.39-r2.ebuild 17585 RMD160 ddfd345419a591238c628b03904bb54bd8ddf081 SHA1 25ea90c811128295fe57372576844c44ec91f612 SHA256 0476d2b6815c3a1790049fa4e4b19dabd6c767160a50301e2c8dc5d916eb19df
+EBUILD openldap-2.3.40-r1.ebuild 17595 RMD160 723f7e06a6ab06227cd2ca4502780163516192f9 SHA1 f073d59465a93aaf60d2da85eded5ff98a8a8ad2 SHA256 3980c63c1f55b874313c6726cdaa8c460f67586ea7cd2f76b6123befcdab1d8d
 EBUILD openldap-2.3.41-r1.ebuild 17759 RMD160 d090cc892c2bfed850d84aa61d80683e6d104c6a SHA1 8372fe77cc4eef2827dcf7d2c1563e9e90652026 SHA256 dfc6f8a1a4df8fa74e2a4fdd3c2b1a002d737fc3ed80b6897a0588f8a77e85fe
-EBUILD openldap-2.3.41.ebuild 17657 RMD160 4f6bf0ab9f19b017e2c5dcdd01504b2e9ae0a859 SHA1 b54284f5a371a7f6aeaa4be3fef1b7b05b846013 SHA256 a95c3556e5ae562f8e559f2ba4adf062c3d9acae419b7cc6d04f1b37da18486e
+EBUILD openldap-2.3.41.ebuild 17656 RMD160 01abbed03acbbc3574c8ab533eefb3e22d5616ff SHA1 63a845b4ac83c058ac8d2e548ef3d25ab153c9f3 SHA256 f65fc3912368b1628cbfd47d929fdfe4327b146f13de6fb56e388489e43ca82b
 EBUILD openldap-2.3.43.ebuild 17750 RMD160 d413e98956f47b8b12e58d05f1fe7dc8635ee265 SHA1 591851f81fc3e25feb6646dfd27cd0e8d69aec11 SHA256 6068c190e12d339f976cc96a9d48baf987f6544ef9e688637740c93200e78c8c
-EBUILD openldap-2.4.10.ebuild 13838 RMD160 162f56d0945e210615e4e52b8e8b1b40d74f148c SHA1 8f93aebcbbbb6ab428677e96cc3fea80abcd87b0 SHA256 66a6100df311b3c1b4645dfaf2d821bdc0e07831df5f842b6b9c71c1dfde14bc
-EBUILD openldap-2.4.7.ebuild 11057 RMD160 7b88fd524a0cd1a60c1fb895c0030e5e9280cdf0 SHA1 cddb1c72f38dec173c3db5e5b780b780aae33159 SHA256 33b4b473ffb73aab3afdb7620860816d6eebff03510832355a93d80b5fbac8cb
-MISC ChangeLog 55586 RMD160 95ccc328522e1e2043bafbc530fd5f12e2205558 SHA1 fc1f60e79e4bec67c8f2bba8bbb419fd10ed4467 SHA256 be174e31eb325dec3815dc38ae7418dde3da06248590e5cbd57b475c41341a16
+EBUILD openldap-2.4.10.ebuild 13887 RMD160 3a63c3a7270fdc0236922570b2b9b0bd233b75cb SHA1 6ad2722d0a1d11265e733d117d166589b18f5a6d SHA256 291ab646b54ac7f286f5c33dc9087921cd6a39957442540b4ed4f88d5e757aa3
+EBUILD openldap-2.4.7.ebuild 11106 RMD160 093948db1357a06b60826d76dbb870d49985409a SHA1 a8fc14a97e6b8a78ad9b11b69ac8408b8351c0bd SHA256 01b233c023499c7c423c838106b73ff9f620ba70d0b50dd954c843f6799f5305
+MISC ChangeLog 55888 RMD160 a68d5bb2af562b2d6342f0e174eb9e20adc83eaf SHA1 8c59f7937ee56d52298563c2ae16186465f6d7e8 SHA256 e9621114741100f380710f417ab3f01c24f7bf555dba0e4ab52be9d74da92c6a
 MISC metadata.xml 240 RMD160 3dfef965b1bac3faa4abfec78fb98b0ed5a9ddaf SHA1 21c64f9ef102b6649bccfca61f06d7b328ef1727 SHA256 fecb6db825d33099fa9f18392db0b7a5ab89a4895ac6ca0f8a2313f348dfaaa6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkiWFMcACgkQt3UOBHx+2m+QgACeLXVxe9GPZD3n1PTGO209NdE1
-M8sAoIkmQGlEJ2e755y3YLp+uz0syK0R
-=Nd8B
------END PGP SIGNATURE-----
diff --git a/net-nds/openldap/openldap-2.3.39-r2.ebuild b/net-nds/openldap/openldap-2.3.39-r2.ebuild
index 021dc3dea5eb..57249b13e4e1 100644
--- a/net-nds/openldap/openldap-2.3.39-r2.ebuild
+++ b/net-nds/openldap/openldap-2.3.39-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.39-r2.ebuild,v 1.12 2008/01/13 22:22:25 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.39-r2.ebuild,v 1.13 2008/08/13 17:24:27 robbat2 Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -31,10 +31,10 @@ RDEPEND="sys-libs/ncurses
 		perl? ( dev-lang/perl )
 		samba? ( dev-libs/openssl )
 		kerberos? ( virtual/krb5 )
-		berkdb? ( >=sys-libs/db-4.2.52_p2-r1 !=sys-libs/db-4.6* )
+		berkdb? ( >=sys-libs/db-4.2.52_p2-r1 !>=sys-libs/db-4.6 )
 		!berkdb? (
 			gdbm? ( sys-libs/gdbm )
-			!gdbm? ( >=sys-libs/db-4.2.52_p2-r1 !=sys-libs/db-4.6* )
+			!gdbm? ( >=sys-libs/db-4.2.52_p2-r1 !>=sys-libs/db-4.6 )
 		)
 		smbkrb5passwd? (
 			dev-libs/openssl
diff --git a/net-nds/openldap/openldap-2.3.40-r1.ebuild b/net-nds/openldap/openldap-2.3.40-r1.ebuild
index 5032f2de7d69..b5b29b6a1c79 100644
--- a/net-nds/openldap/openldap-2.3.40-r1.ebuild
+++ b/net-nds/openldap/openldap-2.3.40-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.40-r1.ebuild,v 1.4 2008/01/13 22:22:25 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.40-r1.ebuild,v 1.5 2008/08/13 17:24:27 robbat2 Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -31,10 +31,10 @@ RDEPEND="sys-libs/ncurses
 		perl? ( dev-lang/perl )
 		samba? ( dev-libs/openssl )
 		kerberos? ( virtual/krb5 )
-		berkdb? ( >=sys-libs/db-4.2.52_p2-r1 !=sys-libs/db-4.6* )
+		berkdb? ( >=sys-libs/db-4.2.52_p2-r1 !>=sys-libs/db-4.6 )
 		!berkdb? (
 			gdbm? ( sys-libs/gdbm )
-			!gdbm? ( >=sys-libs/db-4.2.52_p2-r1 !=sys-libs/db-4.6* )
+			!gdbm? ( >=sys-libs/db-4.2.52_p2-r1 !>=sys-libs/db-4.6 )
 		)
 		smbkrb5passwd? (
 			dev-libs/openssl
diff --git a/net-nds/openldap/openldap-2.3.41.ebuild b/net-nds/openldap/openldap-2.3.41.ebuild
index 122732e1668d..799b7021862a 100644
--- a/net-nds/openldap/openldap-2.3.41.ebuild
+++ b/net-nds/openldap/openldap-2.3.41.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.41.ebuild,v 1.8 2008/07/20 10:19:10 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.41.ebuild,v 1.9 2008/08/13 17:24:27 robbat2 Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -31,10 +31,10 @@ RDEPEND="sys-libs/ncurses
 		perl? ( dev-lang/perl )
 		samba? ( dev-libs/openssl )
 		kerberos? ( virtual/krb5 )
-		berkdb? ( >=sys-libs/db-4.2.52_p2-r1 !=sys-libs/db-4.6* )
+		berkdb? ( >=sys-libs/db-4.2.52_p2-r1 !>=sys-libs/db-4.6 )
 		!berkdb? (
 			gdbm? ( sys-libs/gdbm )
-			!gdbm? ( >=sys-libs/db-4.2.52_p2-r1 !=sys-libs/db-4.6* )
+			!gdbm? ( >=sys-libs/db-4.2.52_p2-r1 !>=sys-libs/db-4.6 )
 		)
 		smbkrb5passwd? (
 			dev-libs/openssl
diff --git a/net-nds/openldap/openldap-2.4.10.ebuild b/net-nds/openldap/openldap-2.4.10.ebuild
index 651338ade30b..9af378ab8283 100644
--- a/net-nds/openldap/openldap-2.4.10.ebuild
+++ b/net-nds/openldap/openldap-2.4.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.10.ebuild,v 1.3 2008/07/20 10:19:10 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.10.ebuild,v 1.4 2008/08/13 17:24:27 robbat2 Exp $
 
 EAPI="1"
 inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
@@ -213,6 +213,7 @@ src_compile() {
 			ewarn "Note: if you disable berkdb, you can only use remote-backends!"
 			ewarn
 			ebeep 5
+			myconf="${myconf} --disable-bdb --disable-hdb"
 		fi
 		for backend in dnssrv ldap meta monitor null passwd relay shell sock; do
 			myconf="${myconf} --enable-${backend}=mod"
diff --git a/net-nds/openldap/openldap-2.4.7.ebuild b/net-nds/openldap/openldap-2.4.7.ebuild
index 2fa9147f505a..2cc27cf2b16b 100644
--- a/net-nds/openldap/openldap-2.4.7.ebuild
+++ b/net-nds/openldap/openldap-2.4.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.7.ebuild,v 1.6 2008/07/20 10:19:10 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.7.ebuild,v 1.7 2008/08/13 17:24:27 robbat2 Exp $
 
 EAPI="1"
 inherit db-use eutils flag-o-matic multilib ssl-cert versionator
@@ -199,6 +199,7 @@ src_compile() {
 			ewarn "Note: if you disable berkdb, you can only use remote-backends!"
 			ewarn
 			ebeep 5
+			myconf="${myconf} --disable-bdb --disable-hdb"
 		fi
 		for backend in dnssrv ldap meta monitor null passwd relay shell; do
 			myconf="${myconf} --enable-${backend}=mod"