Update 4.4 and 4.5 to use econf instead of gnuconfig_update per bug #160192

Package-Manager: portage-2.1.2-r12

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index e80dea072d2ab2b74de77042849e43a981163428..56eaee273170531410a4af2fec538cfeae7853b6 100644 (file)
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/db
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.198 2007/02/27 21:05:37 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.199 2007/02/28 13:22:15 caleb Exp $
+
+  28 Feb 2007; Caleb Tennis <caleb@gentoo.org> db-4.4.20_p4.ebuild,
+  db-4.5.20_p2.ebuild:
+  Update 4.4 and 4.5 to use econf instead of gnuconfig_update per bug #160192
 
   27 Feb 2007; Caleb Tennis <caleb@gentoo.org> db-4.5.20_p2.ebuild:
   Paul asked to turn uniquename off, since it causes too many issues

diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 2c596def12d1507d80bee3ab50922c6241d809ac..d7faaa14cb4ade688c3022a1d1b974e09b3a271d 100644 (file)
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -173,18 +173,18 @@ EBUILD db-4.3.29-r2.ebuild 3714 RMD160 1a121970edb3fd0a61fd2960ce99a67990bd416d
 MD5 452e5a4cb5096dd014e24f2b2477d383 db-4.3.29-r2.ebuild 3714
 RMD160 1a121970edb3fd0a61fd2960ce99a67990bd416d db-4.3.29-r2.ebuild 3714
 SHA256 dbfdb1889a13f59facb11a0be2dcbec415bb6f156babd602e09e8e315395e7a5 db-4.3.29-r2.ebuild 3714
-EBUILD db-4.4.20_p4.ebuild 3698 RMD160 856483e9e66e5b17c8f757b87edcf04cd45c21f3 SHA1 2fba8fcc551a4b815590322a9115556684a42ec8 SHA256 abf10573f98109ef72c81d8d1cb43fb6a8e858113a31ec52443f00043be6d3fc
-MD5 488f509e85be6f682f273d97e672f049 db-4.4.20_p4.ebuild 3698
-RMD160 856483e9e66e5b17c8f757b87edcf04cd45c21f3 db-4.4.20_p4.ebuild 3698
-SHA256 abf10573f98109ef72c81d8d1cb43fb6a8e858113a31ec52443f00043be6d3fc db-4.4.20_p4.ebuild 3698
-EBUILD db-4.5.20_p2.ebuild 3691 RMD160 105503ece344c4721c6a67748fa904a4e676d01c SHA1 1d78c589eb3937b4c19ed62fb4b01846363d3ef0 SHA256 6638416633cbb1aea6c590d06dfd74ce910bbddaa79bcf34787bb2a3ae40b2a5
-MD5 f33a3441e71a70dad76a24b8592c4c96 db-4.5.20_p2.ebuild 3691
-RMD160 105503ece344c4721c6a67748fa904a4e676d01c db-4.5.20_p2.ebuild 3691
-SHA256 6638416633cbb1aea6c590d06dfd74ce910bbddaa79bcf34787bb2a3ae40b2a5 db-4.5.20_p2.ebuild 3691
-MISC ChangeLog 30801 RMD160 96b4735e6585286bb6af6b22cada177b43ea503f SHA1 b15170330bc31384d88f6c1a25ff2c026481d937 SHA256 25cb04f0aea4bd33df7b596efcd18aef805634ccffb4703bba4b1ce8745fe3d7
-MD5 3b8e110478d9b185a066732a03a11c6b ChangeLog 30801
-RMD160 96b4735e6585286bb6af6b22cada177b43ea503f ChangeLog 30801
-SHA256 25cb04f0aea4bd33df7b596efcd18aef805634ccffb4703bba4b1ce8745fe3d7 ChangeLog 30801
+EBUILD db-4.4.20_p4.ebuild 3681 RMD160 b57e0c08b4e574648de6e90754faf0566174ce01 SHA1 d3f484239a006f1a2f4bb637c63a410bbafeab62 SHA256 f25a3cf4b1c40076c5c7857b265378e485d0c4a6c69e934f0e4be193523a85db
+MD5 e1ad588b8d4734440c68fc1d8d6dba4b db-4.4.20_p4.ebuild 3681
+RMD160 b57e0c08b4e574648de6e90754faf0566174ce01 db-4.4.20_p4.ebuild 3681
+SHA256 f25a3cf4b1c40076c5c7857b265378e485d0c4a6c69e934f0e4be193523a85db db-4.4.20_p4.ebuild 3681
+EBUILD db-4.5.20_p2.ebuild 3674 RMD160 4af5c68c23c2e6c1f050328fd955c7898f800acb SHA1 fec8e063d7b0c84039c870f9fa8fc9ec5c02e097 SHA256 39063bea3aac0a9a169e90a9510dc7b38e160edbf80f2a9cbee680e4cf6f3ce7
+MD5 b3b7ceba0a74409aa926f4510b9b28fc db-4.5.20_p2.ebuild 3674
+RMD160 4af5c68c23c2e6c1f050328fd955c7898f800acb db-4.5.20_p2.ebuild 3674
+SHA256 39063bea3aac0a9a169e90a9510dc7b38e160edbf80f2a9cbee680e4cf6f3ce7 db-4.5.20_p2.ebuild 3674
+MISC ChangeLog 30971 RMD160 a1e0ad90c3a0d87a0ddeddda36a2171e2a61ca27 SHA1 31fcbff7538354c9e89d7528efc71132f1da12f3 SHA256 ec7e7a1c9926583158520b0bde94c0fa2f02b8ae9e9ab840ee4a9b169f46eaa5
+MD5 b43bfa99fb6408159d47de5c7c6d7b7e ChangeLog 30971
+RMD160 a1e0ad90c3a0d87a0ddeddda36a2171e2a61ca27 ChangeLog 30971
+SHA256 ec7e7a1c9926583158520b0bde94c0fa2f02b8ae9e9ab840ee4a9b169f46eaa5 ChangeLog 30971
 MISC metadata.xml 1460 RMD160 6f73dd6370c976b947d939633aa6f67d078e4fc7 SHA1 a29a6ed2d9dfbe3b686a9281a1909d9fc7bd61e9 SHA256 ad820b0fe2d8ec2aac1eb181f2e3e2769392e1ae6c5f6afb7e1603bdd0bb7405
 MD5 e1753ef0eb3e9614fadff321ecd1b082 metadata.xml 1460
 RMD160 6f73dd6370c976b947d939633aa6f67d078e4fc7 metadata.xml 1460

diff --git a/sys-libs/db/db-4.4.20_p4.ebuild b/sys-libs/db/db-4.4.20_p4.ebuild
index 30c36b18ed01328bd66dbeaec6ef855ddcd1d13e..52dbfc7ca2c5eadbd304dc7c01dd40b02a784010 100644 (file)
--- a/sys-libs/db/db-4.4.20_p4.ebuild
+++ b/sys-libs/db/db-4.4.20_p4.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/sys-libs/db/db-4.4.20_p4.ebuild,v 1.1 2007/02/27 20:28:23 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.4.20_p4.ebuild,v 1.2 2007/02/28 13:22:15 caleb Exp $
 
-inherit eutils gnuconfig db flag-o-matic java-pkg-opt-2
+inherit eutils db flag-o-matic java-pkg-opt-2
 
 #Number of official patches
 #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
@@ -48,8 +48,6 @@ src_unpack() {
        epatch "${FILESDIR}"/"${PN}"-4.3-jni-check-prefix-first.patch
        epatch "${FILESDIR}"/"${PN}"-4.3-listen-to-java-options.patch
 
-       gnuconfig_update "${S}"/../dist
-
        sed -i \
                -e "s,\(ac_compiler\|\${MAKEFILE_CC}\|\${MAKEFILE_CXX}\|\$CC\)\( *--version\),\1 -dumpversion,g" \
                "${S}"/../dist/configure
@@ -91,7 +89,7 @@ src_compile() {
                append-ldflags -Wl,--default-symver
        fi
 
-       ../dist/configure \
+       cd ${S} && ECONF_SOURCE="${S}"/../dist econf \
                --prefix=/usr \
                --mandir=/usr/share/man \
                --infodir=/usr/share/info \

diff --git a/sys-libs/db/db-4.5.20_p2.ebuild b/sys-libs/db/db-4.5.20_p2.ebuild
index 88a1be385c03c29e8f1557aaf9b3aff365789f6e..6637ddac49da872fd909665cd74425f8ba77d195 100644 (file)
--- a/sys-libs/db/db-4.5.20_p2.ebuild
+++ b/sys-libs/db/db-4.5.20_p2.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/sys-libs/db/db-4.5.20_p2.ebuild,v 1.3 2007/02/27 21:05:37 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.5.20_p2.ebuild,v 1.4 2007/02/28 13:22:15 caleb Exp $
 
-inherit eutils gnuconfig db flag-o-matic java-pkg-opt-2
+inherit eutils db flag-o-matic java-pkg-opt-2
 
 #Number of official patches
 #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
@@ -48,8 +48,6 @@ src_unpack() {
        epatch "${FILESDIR}"/"${PN}"-4.3-jni-check-prefix-first.patch
        epatch "${FILESDIR}"/"${PN}"-4.3-listen-to-java-options.patch
 
-       gnuconfig_update "${S}"/../dist
-
        sed -i \
                -e "s,\(ac_compiler\|\${MAKEFILE_CC}\|\${MAKEFILE_CXX}\|\$CC\)\( *--version\),\1 -dumpversion,g" \
                "${S}"/../dist/configure
@@ -91,7 +89,7 @@ src_compile() {
                append-ldflags -Wl,--default-symver
        fi
 
-       ../dist/configure \
+       cd ${S} && ECONF_SOURCE="${S}"/../dist econf \
                --prefix=/usr \
                --mandir=/usr/share/man \
                --infodir=/usr/share/info \