Bug 182221, guarantee db_includedir is right. Thanks to flameeyes and wiredtek

Package-Manager: portage-2.1.3_rc5

6 files changed, 63 insertions, 32 deletions

diff --git a/dev-perl/BerkeleyDB/BerkeleyDB-0.27.ebuild b/dev-perl/BerkeleyDB/BerkeleyDB-0.27.ebuild
index 7a7245a37e62..cf5a2cbd3d4e 100644
--- a/dev-perl/BerkeleyDB/BerkeleyDB-0.27.ebuild
+++ b/dev-perl/BerkeleyDB/BerkeleyDB-0.27.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/BerkeleyDB/BerkeleyDB-0.27.ebuild,v 1.10 2006/10/21 15:57:36 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/BerkeleyDB/BerkeleyDB-0.27.ebuild,v 1.11 2007/07/09 13:29:34 mcummings Exp $
 
-inherit perl-module eutils
+inherit perl-module eutils db-use
 
 DESCRIPTION="This module provides Berkeley DB interface for Perl."
 HOMEPAGE="http://search.cpan.org/~pmqs/BerkeleyDB-0.27"
@@ -24,4 +24,8 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/Gentoo-config-0.26.diff
+	# on Gentoo/FreeBSD we cannot trust on the symlink /usr/include/db.h
+	# as for Gentoo/Linux, so we need to esplicitely declare the exact berkdb
+	# include path
+	sed -i -e "s:/usr/include:$(db_includedir):" config.in || die "berkdb include directory"
 }
diff --git a/dev-perl/BerkeleyDB/BerkeleyDB-0.29.ebuild b/dev-perl/BerkeleyDB/BerkeleyDB-0.29.ebuild
index 0c0d8bd21ffc..5c1062434f2d 100644
--- a/dev-perl/BerkeleyDB/BerkeleyDB-0.29.ebuild
+++ b/dev-perl/BerkeleyDB/BerkeleyDB-0.29.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/BerkeleyDB/BerkeleyDB-0.29.ebuild,v 1.7 2006/10/21 15:57:36 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/BerkeleyDB/BerkeleyDB-0.29.ebuild,v 1.8 2007/07/09 13:29:34 mcummings Exp $
 
-inherit perl-module eutils
+inherit perl-module eutils db-use
 
 DESCRIPTION="This module provides Berkeley DB interface for Perl."
 HOMEPAGE="http://search.cpan.org/~pmqs/BerkeleyDB-0.27"
@@ -24,4 +24,8 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/Gentoo-config-0.26.diff
+	# on Gentoo/FreeBSD we cannot trust on the symlink /usr/include/db.h
+	# as for Gentoo/Linux, so we need to esplicitely declare the exact berkdb
+	# include path
+	sed -i -e "s:/usr/include:$(db_includedir):" config.in || die "berkdb include directory"
 }
diff --git a/dev-perl/BerkeleyDB/BerkeleyDB-0.30.ebuild b/dev-perl/BerkeleyDB/BerkeleyDB-0.30.ebuild
index 38c1c4a1d1f9..11dcdb7779c3 100644
--- a/dev-perl/BerkeleyDB/BerkeleyDB-0.30.ebuild
+++ b/dev-perl/BerkeleyDB/BerkeleyDB-0.30.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/BerkeleyDB/BerkeleyDB-0.30.ebuild,v 1.6 2006/10/21 15:57:36 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/BerkeleyDB/BerkeleyDB-0.30.ebuild,v 1.7 2007/07/09 13:29:34 mcummings Exp $
 
-inherit perl-module eutils
+inherit perl-module eutils db-use
 
 DESCRIPTION="This module provides Berkeley DB interface for Perl."
 HOMEPAGE="http://search.cpan.org/~pmqs/BerkeleyDB"
@@ -24,4 +24,8 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/Gentoo-config-0.26.diff
+	# on Gentoo/FreeBSD we cannot trust on the symlink /usr/include/db.h
+	# as for Gentoo/Linux, so we need to esplicitely declare the exact berkdb
+	# include path
+	sed -i -e "s:/usr/include:$(db_includedir):" config.in || die "berkdb include directory"
 }
diff --git a/dev-perl/BerkeleyDB/BerkeleyDB-0.31.ebuild b/dev-perl/BerkeleyDB/BerkeleyDB-0.31.ebuild
index cb604bb08beb..0c1ff573a5be 100644
--- a/dev-perl/BerkeleyDB/BerkeleyDB-0.31.ebuild
+++ b/dev-perl/BerkeleyDB/BerkeleyDB-0.31.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/BerkeleyDB/BerkeleyDB-0.31.ebuild,v 1.6 2007/04/15 20:28:13 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/BerkeleyDB/BerkeleyDB-0.31.ebuild,v 1.7 2007/07/09 13:29:34 mcummings Exp $
 
-inherit perl-module eutils
+inherit perl-module eutils db-use
 
 DESCRIPTION="This module provides Berkeley DB interface for Perl."
 HOMEPAGE="http://search.cpan.org/~pmqs/BerkeleyDB"
@@ -24,4 +24,8 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/Gentoo-config-0.26.diff
+	# on Gentoo/FreeBSD we cannot trust on the symlink /usr/include/db.h
+	# as for Gentoo/Linux, so we need to esplicitely declare the exact berkdb
+	# include path
+	sed -i -e "s:/usr/include:$(db_includedir):" config.in || die "berkdb include directory"
 }
diff --git a/dev-perl/BerkeleyDB/ChangeLog b/dev-perl/BerkeleyDB/ChangeLog
index 65720c7070b9..05d9131b3115 100644
--- a/dev-perl/BerkeleyDB/ChangeLog
+++ b/dev-perl/BerkeleyDB/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-perl/BerkeleyDB
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/BerkeleyDB/ChangeLog,v 1.46 2007/04/15 20:28:13 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/BerkeleyDB/ChangeLog,v 1.47 2007/07/09 13:29:34 mcummings Exp $
+
+  09 Jul 2007; Michael Cummings <mcummings@gentoo.org>
+  BerkeleyDB-0.27.ebuild, BerkeleyDB-0.29.ebuild, BerkeleyDB-0.30.ebuild,
+  BerkeleyDB-0.31.ebuild:
+  Bug 182221, guarantee db_includedir is right. Thanks to flameeyes and wiredtek
 
   15 Apr 2007; Markus Rothe <corsair@gentoo.org> BerkeleyDB-0.31.ebuild:
   Stable on ppc64
diff --git a/dev-perl/BerkeleyDB/Manifest b/dev-perl/BerkeleyDB/Manifest
index f62e8238119b..f07e97335a28 100644
--- a/dev-perl/BerkeleyDB/Manifest
+++ b/dev-perl/BerkeleyDB/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX Gentoo-config-0.26.diff 568 RMD160 6d37d88c7511cb3d6c4d548e4c10c123f2814f52 SHA1 170efa4d42da48ac1109256a329c02a4a4bd9e72 SHA256 6ed6506872c7fa74a9e3f236c7220909e0e7741f27152f9504e8c286743a6854
 MD5 7087d023559a2843c354a731a21c2ddf files/Gentoo-config-0.26.diff 568
 RMD160 6d37d88c7511cb3d6c4d548e4c10c123f2814f52 files/Gentoo-config-0.26.diff 568
@@ -10,26 +13,26 @@ DIST BerkeleyDB-0.27.tar.gz 155551 RMD160 d4a259c492c126655b95d9f356cddcd764bdd0
 DIST BerkeleyDB-0.29.tar.gz 159937 RMD160 8f9bb503bf38b929dfa9b7dfdaa88e2b62387381 SHA1 688f1cd026cd95789b69f7eee7401846db654ee7 SHA256 74d8e8f3da79463f5be501f228126ffedf6c32a46720a32fad06a89dc656b7ff
 DIST BerkeleyDB-0.30.tar.gz 160374 RMD160 e865e216a84f4709006cbc2b7c41edc213f6b72c SHA1 e06bdbe72114e8ea50933c1419bedf75fc2ea122 SHA256 6577222972c51d8f5c6d924e7818f3dfb3513b4ac5ff0ea1b38b737c41ebbde3
 DIST BerkeleyDB-0.31.tar.gz 160822 RMD160 b3078e847c79a0809806b001933407a0acca15ba SHA1 17a221e4e9e36dd76bc0ba3053044d73b516088c SHA256 af162f89626fef037a99bc346c10dc2bdf645102fea9c6ac2af7a3b7e24da12b
-EBUILD BerkeleyDB-0.27.ebuild 752 RMD160 2b7e183981760ff512a2d6b75beb066a7e48b23e SHA1 ed1dfc23d26bf580427b2e6ba8a0d6f3b299ee33 SHA256 cccb28695957ada58b430543d43d84291ba740a564d4d4d1746c50851c9ea1a9
-MD5 16fb2fffcc198bd96a5452f421600953 BerkeleyDB-0.27.ebuild 752
-RMD160 2b7e183981760ff512a2d6b75beb066a7e48b23e BerkeleyDB-0.27.ebuild 752
-SHA256 cccb28695957ada58b430543d43d84291ba740a564d4d4d1746c50851c9ea1a9 BerkeleyDB-0.27.ebuild 752
-EBUILD BerkeleyDB-0.29.ebuild 753 RMD160 d6c6a1e08fcaae80bb62bd88c4cb248f7a5c9fc3 SHA1 64f034c7d92b6127e554551eed5f7827fd7eda3d SHA256 0a352257aacc951927527ba7db4dc1375352d293d2089ee92030eba76ec72eed
-MD5 222e8cc88a61a0aec048535491fd5f68 BerkeleyDB-0.29.ebuild 753
-RMD160 d6c6a1e08fcaae80bb62bd88c4cb248f7a5c9fc3 BerkeleyDB-0.29.ebuild 753
-SHA256 0a352257aacc951927527ba7db4dc1375352d293d2089ee92030eba76ec72eed BerkeleyDB-0.29.ebuild 753
-EBUILD BerkeleyDB-0.30.ebuild 749 RMD160 79d6659f8ae6091037e426483c748d2f020a981e SHA1 7b8bc80d970eb70da0839e992decf591763e3f47 SHA256 68f1bc30f5f063f085ea0b327fe4aa217609cd3dece9e14a6f73d32adcdd7fbd
-MD5 843bb3dddbc1d88a2103c6801ec79d4d BerkeleyDB-0.30.ebuild 749
-RMD160 79d6659f8ae6091037e426483c748d2f020a981e BerkeleyDB-0.30.ebuild 749
-SHA256 68f1bc30f5f063f085ea0b327fe4aa217609cd3dece9e14a6f73d32adcdd7fbd BerkeleyDB-0.30.ebuild 749
-EBUILD BerkeleyDB-0.31.ebuild 744 RMD160 c30b453bbd9c215dd1d1c082366babf09b1885e7 SHA1 5f490699133810fbf5d97c6de6a0b44266044bf6 SHA256 6fa81386dbe77341dd54ed0ef24deb6d574ff4a56de6520388ef506638650fff
-MD5 124e9f66f33bede19672a873d527ef39 BerkeleyDB-0.31.ebuild 744
-RMD160 c30b453bbd9c215dd1d1c082366babf09b1885e7 BerkeleyDB-0.31.ebuild 744
-SHA256 6fa81386dbe77341dd54ed0ef24deb6d574ff4a56de6520388ef506638650fff BerkeleyDB-0.31.ebuild 744
-MISC ChangeLog 5176 RMD160 7892d57ecb13a579ea9c47ee67fba4f98361434d SHA1 62e97cdad59953067c7dbda0898ec2602946a62d SHA256 5d8724e97bd3a3420fe1122c9087293acb1f8defb0bc2c12bc1154c420754854
-MD5 833f398b890a6ff608fb8119dec1359f ChangeLog 5176
-RMD160 7892d57ecb13a579ea9c47ee67fba4f98361434d ChangeLog 5176
-SHA256 5d8724e97bd3a3420fe1122c9087293acb1f8defb0bc2c12bc1154c420754854 ChangeLog 5176
+EBUILD BerkeleyDB-0.27.ebuild 1010 RMD160 99b353018d5f66d1a50d4043690b9f3cfafff2ce SHA1 6d9e39f9c2943eecafa5b7814ca9947367ffdd79 SHA256 0d9aa71d52f7d28ae4c20efc3f9d452f9dfc548685c4bf619059bcb232be5415
+MD5 7d2b8a421967a46bbdcf3e25c9d2bb7b BerkeleyDB-0.27.ebuild 1010
+RMD160 99b353018d5f66d1a50d4043690b9f3cfafff2ce BerkeleyDB-0.27.ebuild 1010
+SHA256 0d9aa71d52f7d28ae4c20efc3f9d452f9dfc548685c4bf619059bcb232be5415 BerkeleyDB-0.27.ebuild 1010
+EBUILD BerkeleyDB-0.29.ebuild 1011 RMD160 63cb75ecea074fbc59db3e7a6314655203508afe SHA1 b444730cccd1bdb96a50bd2afc4517a054becd37 SHA256 8aeda0e4994428afc344b5e21b49c47880cda2018f9c6010f23641e286c84145
+MD5 63925aefa373345e886964537116acfe BerkeleyDB-0.29.ebuild 1011
+RMD160 63cb75ecea074fbc59db3e7a6314655203508afe BerkeleyDB-0.29.ebuild 1011
+SHA256 8aeda0e4994428afc344b5e21b49c47880cda2018f9c6010f23641e286c84145 BerkeleyDB-0.29.ebuild 1011
+EBUILD BerkeleyDB-0.30.ebuild 1007 RMD160 e9a801e49561c99bc64a3dfcc95324b213b2eefd SHA1 627aca2985d2fbb86ff673d470bfc1a598a61137 SHA256 08296f12e298d1db68c4efc25b72f9b34de916ab28631fd504f7ae50cb36d196
+MD5 746114a58261189ccafaf27c30950db4 BerkeleyDB-0.30.ebuild 1007
+RMD160 e9a801e49561c99bc64a3dfcc95324b213b2eefd BerkeleyDB-0.30.ebuild 1007
+SHA256 08296f12e298d1db68c4efc25b72f9b34de916ab28631fd504f7ae50cb36d196 BerkeleyDB-0.30.ebuild 1007
+EBUILD BerkeleyDB-0.31.ebuild 1004 RMD160 5898a8a4d2ec9fac2c672ef01982ea5f1b38168f SHA1 c65fc8808a9407c9255ac049c04deb67b36b4916 SHA256 2171925e94b09c04bd631c518445095dbcbe4d55b41a9456079d0ec039d0a40b
+MD5 ab464040e899e2d68158dffa80c97179 BerkeleyDB-0.31.ebuild 1004
+RMD160 5898a8a4d2ec9fac2c672ef01982ea5f1b38168f BerkeleyDB-0.31.ebuild 1004
+SHA256 2171925e94b09c04bd631c518445095dbcbe4d55b41a9456079d0ec039d0a40b BerkeleyDB-0.31.ebuild 1004
+MISC ChangeLog 5415 RMD160 faac3906e206c7e730864703d6b62f700265844c SHA1 570fd1675c2f4a90e4e8f0041ad8b392d6f76d63 SHA256 58de7d8cc4e44fd9a7cf81a1920afb70679a9a739bc8501b1ebb791000f69b9d
+MD5 fa269cd953c282a4ac951f168a4f918b ChangeLog 5415
+RMD160 faac3906e206c7e730864703d6b62f700265844c ChangeLog 5415
+SHA256 58de7d8cc4e44fd9a7cf81a1920afb70679a9a739bc8501b1ebb791000f69b9d ChangeLog 5415
 MISC metadata.xml 307 RMD160 c19fc2bb085e673d93304ca0edaf2ef82a23d8bc SHA1 fe5b56ade6829464607eda58f73cda670890c617 SHA256 c1bfe293579fdff72c39aac7115d76f6d43f9cfe3a1fdc344e47954945f17873
 MD5 fd8d51928290f49c981e4842df519774 metadata.xml 307
 RMD160 c19fc2bb085e673d93304ca0edaf2ef82a23d8bc metadata.xml 307
@@ -46,3 +49,10 @@ SHA256 36b8b5d65460c5af1bca9ac10496b234745f314436fb9c10fa678e78ab284dae files/di
 MD5 8d073d8c1f0ebdf9e551618c53341e26 files/digest-BerkeleyDB-0.31 247
 RMD160 f65bbcb63c4c92a9c6f17f3a368cfdb8e15a17ad files/digest-BerkeleyDB-0.31 247
 SHA256 dd1eede25d0faef0cea50a8a3ee60466b1c146f40348a992cbda8eea5a2e1601 files/digest-BerkeleyDB-0.31 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGkjhFtG5z4I8BtQoRAhYQAJ9nQ19i5MrAFY7BRziOscoK20aKxwCglHwm
+bt2nN8xWoflBjfwoofS6uRU=
+=bsKu
+-----END PGP SIGNATURE-----