Fixing configure.ac patch using ${EGREP} instead of grep, fixing autoreconf issues. Thanks to SpanKY <vapier@gentoo.org> for reporting and solving the issue. Fix bug #147133

Package-Manager: portage-2.1.1

4 files changed, 26 insertions, 19 deletions

diff --git a/dev-libs/popt/ChangeLog b/dev-libs/popt/ChangeLog
index 18d7f8e5b80f..92de3e7595b9 100644
--- a/dev-libs/popt/ChangeLog
+++ b/dev-libs/popt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/popt
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/ChangeLog,v 1.27 2006/09/10 21:52:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/ChangeLog,v 1.28 2006/09/11 18:38:51 sanchan Exp $
+
+  11 Sep 2006; Sandro Bonazzola <sanchan@gentoo.org>
+  files/popt-1.10.4-lib64.patch, popt-1.10.4-r1.ebuild:
+  Fixing configure.ac patch using ${EGREP} instead of grep, fixing autoreconf
+  issues. Thanks to SpanKY <vapier@gentoo.org> for reporting and solving the
+  issue. Fix bug #147133
 
   10 Sep 2006; Diego Pettenò <flameeyes@gentoo.org> popt-1.10.4-r1.ebuild:
   Add ~x86-fbsd keyword as per bug #121862.
diff --git a/dev-libs/popt/Manifest b/dev-libs/popt/Manifest
index c08cab47aab9..f69114014f6a 100644
--- a/dev-libs/popt/Manifest
+++ b/dev-libs/popt/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX popt-1.10.4-lib64.patch 522 RMD160 8e6be9830850714f63216a3f0d316b3e5474320e SHA1 3621d1674767272db5b98cb1bb82aada47207038 SHA256 e3237322e1826410e2db42aae5c86daa1b192ad6bc425aadcaf6b3ae424d297f
-MD5 f188083f2741bb593cfccb7b45eb0d98 files/popt-1.10.4-lib64.patch 522
-RMD160 8e6be9830850714f63216a3f0d316b3e5474320e files/popt-1.10.4-lib64.patch 522
-SHA256 e3237322e1826410e2db42aae5c86daa1b192ad6bc425aadcaf6b3ae424d297f files/popt-1.10.4-lib64.patch 522
+AUX popt-1.10.4-lib64.patch 526 RMD160 a5f389cc3b135696284af8ecb8939f96a398e1ad SHA1 57cad84443554afa912378134e27bec995ef6dd4 SHA256 e91fbc48e1b6de00edd79f7f8d63dc167e497d914b5a4972cd44b7a4a35c5c8a
+MD5 4f8ee5e02483dcd47b3f3df0127b5413 files/popt-1.10.4-lib64.patch 526
+RMD160 a5f389cc3b135696284af8ecb8939f96a398e1ad files/popt-1.10.4-lib64.patch 526
+SHA256 e91fbc48e1b6de00edd79f7f8d63dc167e497d914b5a4972cd44b7a4a35c5c8a files/popt-1.10.4-lib64.patch 526
 AUX popt-1.7-missing-tests.patch 552 RMD160 9e13b505de24b95e03f3b9fb930f01e0c76dad1a SHA1 cc82b360c466a1a19a81cfba09c3f91b88454fbd SHA256 50ab39942289a1ba728d025fab609556315669f6dc2a47161fcaf0c65c0e83d9
 MD5 65e91b3cbc5d3c136d141bae0629fc6a files/popt-1.7-missing-tests.patch 552
 RMD160 9e13b505de24b95e03f3b9fb930f01e0c76dad1a files/popt-1.7-missing-tests.patch 552
@@ -15,18 +15,18 @@ RMD160 0236a24dba80d233f330b304cec659479f525629 files/popt-1.7-nls.patch 374
 SHA256 1fa382ad289cbcd03fb345e7dc09a53b44486cb504aaf764c854dd618e8e6839 files/popt-1.7-nls.patch 374
 DIST popt-1.10.4.tar.gz 1169462 RMD160 c59c383f5e9f53b2fc17294bb2568cc46f204784 SHA1 10e6649c4c37ecfb6fb4296aeca609b5fdd5e34d SHA256 1ce47451c9ac9d81f42b2b7fcb11c2f211b4943e3e5d7d946da53ced7fb04114
 DIST popt-1.7.tar.gz 574549 RMD160 2942c28d82607501d5ae595063da27599b5b93da SHA1 66f3c77b87a160951b180447f4a6dce68ad2f71b SHA256 4e75cb28793f0d44134f71fae53057d5f250805e6268fbd9c9780654b73b0dc1
-EBUILD popt-1.10.4-r1.ebuild 859 RMD160 1cb299a1a7e69b3885d51c676a8255cbd19c4c39 SHA1 1c4fd350bb01a7a98b3c4724971e49068a6e0068 SHA256 40655a3cdec61cd4990e7643b5d17548280e0736d48734795fd7abb4435b28f6
-MD5 ba3206ce1751b04537c6bca28b8dc7f3 popt-1.10.4-r1.ebuild 859
-RMD160 1cb299a1a7e69b3885d51c676a8255cbd19c4c39 popt-1.10.4-r1.ebuild 859
-SHA256 40655a3cdec61cd4990e7643b5d17548280e0736d48734795fd7abb4435b28f6 popt-1.10.4-r1.ebuild 859
+EBUILD popt-1.10.4-r1.ebuild 880 RMD160 d5623ca7c9370c0c8fd8e08ec30d00bf0e032f03 SHA1 46e44fa4f88c111071d56e2f2d7c6c1ada5dead1 SHA256 c3ee062c889f016d09ef3e637376dc9ceb0a5e5c8abcc554581fdfce904b9ad8
+MD5 2469077da8b7111005179897f428bda0 popt-1.10.4-r1.ebuild 880
+RMD160 d5623ca7c9370c0c8fd8e08ec30d00bf0e032f03 popt-1.10.4-r1.ebuild 880
+SHA256 c3ee062c889f016d09ef3e637376dc9ceb0a5e5c8abcc554581fdfce904b9ad8 popt-1.10.4-r1.ebuild 880
 EBUILD popt-1.7-r1.ebuild 1008 RMD160 d970fc925da944a688ccc1ffed6ca787546a1e0b SHA1 46dec90ae80e900c50f331d369d02cf9480a33f9 SHA256 97374bf771012dbe44ce91feaddfc37f7c3b07c9c121e131c542b76b95c7cea9
 MD5 3583b8fb9d1b93cd3328d556f44906a0 popt-1.7-r1.ebuild 1008
 RMD160 d970fc925da944a688ccc1ffed6ca787546a1e0b popt-1.7-r1.ebuild 1008
 SHA256 97374bf771012dbe44ce91feaddfc37f7c3b07c9c121e131c542b76b95c7cea9 popt-1.7-r1.ebuild 1008
-MISC ChangeLog 3607 RMD160 a558edc79f3a322518e76de3b94e772858da7bba SHA1 e17d342a1f0e78a114e36f8a3174a75ca1e6e76c SHA256 43e6a6a1f214af27fae499126e1076c5de2b674e7c721e980367b7e1941394d4
-MD5 97516c53f717a6dfcc502fe13a63f680 ChangeLog 3607
-RMD160 a558edc79f3a322518e76de3b94e772858da7bba ChangeLog 3607
-SHA256 43e6a6a1f214af27fae499126e1076c5de2b674e7c721e980367b7e1941394d4 ChangeLog 3607
+MISC ChangeLog 3895 RMD160 6bc938194b34d280322bd274810d5c9a369156f0 SHA1 37eb40b0ea8b5d90f2192f63a72a274f4569b96a SHA256 47c12043006dab78ae5a4aab260f7fe4d69322e058d65fcb0d5c14ef491968ae
+MD5 fb87713e7cf5e5823734d5b881dcf339 ChangeLog 3895
+RMD160 6bc938194b34d280322bd274810d5c9a369156f0 ChangeLog 3895
+SHA256 47c12043006dab78ae5a4aab260f7fe4d69322e058d65fcb0d5c14ef491968ae ChangeLog 3895
 MISC metadata.xml 201 RMD160 84f5c130041f4ed38aa2d689e6c5faa4048e4124 SHA1 fc8b97ba1f227aef406eee81975083451a66704b SHA256 07c89cd922e9d70aed17db9b28f90676f57137cfadc39f18b082634557b89de6
 MD5 a55db6e9a92a8c7dacc74eee4e08d5dc metadata.xml 201
 RMD160 84f5c130041f4ed38aa2d689e6c5faa4048e4124 metadata.xml 201
@@ -40,7 +40,7 @@ SHA256 ca02fb4b04a3255cf323e653dc5f48866f12ecd3f72c1fe40b1cbf8b52d2e62b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFBIksAiZjviIA2XgRAnWuAJ0a06F66usc3HrZaADyjxBNppC1igCdF4v1
-DmU8cZPr28GrqTq8rrCHnIg=
-=ycsB
+iD8DBQFFBaxvwmS/YhfgUiURAhnWAKCIHCOOK0KHNc9S9HMXNWr4aPDONACdFIKR
+61s9+KBcnXOowKJJ0hLElEI=
+=3eCO
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/popt/files/popt-1.10.4-lib64.patch b/dev-libs/popt/files/popt-1.10.4-lib64.patch
index 8f8b33b16678..d4711640f9d2 100644
--- a/dev-libs/popt/files/popt-1.10.4-lib64.patch
+++ b/dev-libs/popt/files/popt-1.10.4-lib64.patch
@@ -7,7 +7,7 @@
 -case "${target_cpu}" in
 -x86_64*|powerpc64*|ppc64*|sparc64*|s390x*)        MARK64=64 ;;
 -esac
-+if ! echo "${libdir}" | grep -q '64$' ; then
++if ! echo "${libdir}" | ${EGREP} -q '64$' ; then
 +	case "${target_cpu}" in
 +	x86_64*|powerpc64*|ppc64*|sparc64*|s390x*) MARK64=64 ;;
 +	esac
diff --git a/dev-libs/popt/popt-1.10.4-r1.ebuild b/dev-libs/popt/popt-1.10.4-r1.ebuild
index ed207ec4bda4..a0a179bcc58b 100644
--- a/dev-libs/popt/popt-1.10.4-r1.ebuild
+++ b/dev-libs/popt/popt-1.10.4-r1.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/popt/popt-1.10.4-r1.ebuild,v 1.2 2006/09/10 21:52:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.10.4-r1.ebuild,v 1.3 2006/09/11 18:38:51 sanchan Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic autotools
 
 DESCRIPTION="Parse Options - Command line parser"
 HOMEPAGE="http://www.rpm.org/"
@@ -23,6 +23,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-lib64.patch
+	eautoreconf
 }
 
 src_compile() {