Fix bug #150543. Patch provided by opensolaris.org, ported from popt-1.7 and adapted...

Package-Manager: portage-2.1.2_pre2-r5

diff --git a/dev-libs/popt/ChangeLog b/dev-libs/popt/ChangeLog
index d84999d9d7bb288be6e090aa82080dac96ab9734..daf561f5402a10c2662f81d40a330be70ac89c72 100644 (file)
--- 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.34 2006/10/01 15:40:04 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/ChangeLog,v 1.35 2006/10/09 18:46:52 sanchan Exp $
+
+  09 Oct 2006; Sandro Bonazzola <sanchan@gentoo.org>
+  +files/popt-1.10.4-nls.patch, popt-1.10.4-r1.ebuild:
+  Fix bug #150543. Patch provided by opensolaris.org, ported from popt-1.7 and
+  adapted for gentoo. Original patch available here:
+  http://cvs.opensolaris.org/source/xref/jds/Solaris/patches/popt-01-xgettext.diff
 
   01 Oct 2006; Guy Martin <gmsoft@gentoo.org> popt-1.10.4-r1.ebuild:
   Stable on hppa.

diff --git a/dev-libs/popt/Manifest b/dev-libs/popt/Manifest
index 8098af420a9a8a0135812a2cfbb7a604649aa394..6ad7dae26543778646f877fbae02bdffd438f504 100644 (file)
--- a/dev-libs/popt/Manifest
+++ b/dev-libs/popt/Manifest
@@ -1,7 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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.10.4-nls.patch 423 RMD160 e66ce45eba6dc0d6e3650bbbd31adaba8b5a85a7 SHA1 5e3c674a5b9e17d72264e0fcc73c4e59f8077765 SHA256 113c5c2e80be9833efb406c0ef2ff5e450eb4404f80461c1a8ad61e1796ebbab
+MD5 6e66bd4229d24d3f5f8d4eddc561cc10 files/popt-1.10.4-nls.patch 423
+RMD160 e66ce45eba6dc0d6e3650bbbd31adaba8b5a85a7 files/popt-1.10.4-nls.patch 423
+SHA256 113c5c2e80be9833efb406c0ef2ff5e450eb4404f80461c1a8ad61e1796ebbab files/popt-1.10.4-nls.patch 423
 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
@@ -12,18 +19,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 855 RMD160 03ed94c94850c3de1b34bacee6a01a756b5f6a8c SHA1 7baa65184c33cee0f27d4c35671703fe883ecac2 SHA256 1c9f691b2533eec4f4ee61e5b0c19e278802c025e6e60489287b84b7db9d09e3
-MD5 264f93af18d20c39def7eee3403c464f popt-1.10.4-r1.ebuild 855
-RMD160 03ed94c94850c3de1b34bacee6a01a756b5f6a8c popt-1.10.4-r1.ebuild 855
-SHA256 1c9f691b2533eec4f4ee61e5b0c19e278802c025e6e60489287b84b7db9d09e3 popt-1.10.4-r1.ebuild 855
+EBUILD popt-1.10.4-r1.ebuild 904 RMD160 a1d51a58c5cb4d7fe3dc3f923161544af64b0f1a SHA1 ce7a546adcf9e9f7fb66382680849c0f5c08c383 SHA256 fc4329bc561b217111c5f2a8e824d7fe6a8b46ecbc3ab40bf57800ccf25e7a8a
+MD5 048945eb593d14d558bb666fc9f0ab40 popt-1.10.4-r1.ebuild 904
+RMD160 a1d51a58c5cb4d7fe3dc3f923161544af64b0f1a popt-1.10.4-r1.ebuild 904
+SHA256 fc4329bc561b217111c5f2a8e824d7fe6a8b46ecbc3ab40bf57800ccf25e7a8a popt-1.10.4-r1.ebuild 904
 EBUILD popt-1.7-r1.ebuild 1032 RMD160 eb62701b3bb2bf276355fa1a8f7652172e27162f SHA1 af3b0da1637d986e2156c1ff2e6d5af3d059899c SHA256 3d753a65d735ef2cbee9109606ea046567bcdd8b90ee1bd24a22d2be07506d65
 MD5 dedd3cb67ab8f57acbf9f1dafd78ee93 popt-1.7-r1.ebuild 1032
 RMD160 eb62701b3bb2bf276355fa1a8f7652172e27162f popt-1.7-r1.ebuild 1032
 SHA256 3d753a65d735ef2cbee9109606ea046567bcdd8b90ee1bd24a22d2be07506d65 popt-1.7-r1.ebuild 1032
-MISC ChangeLog 4549 RMD160 95076e75ce7dcb50fba939ec7424f68c992be162 SHA1 ad38b934ae517fc5ebc18f65a302e9d73c472fc4 SHA256 745c69f4020fd574089d8b45255bbf6f4ccca10d980cc70aca254b8bd1d2df7f
-MD5 a370b24a66ee23ada26f58da25438432 ChangeLog 4549
-RMD160 95076e75ce7dcb50fba939ec7424f68c992be162 ChangeLog 4549
-SHA256 745c69f4020fd574089d8b45255bbf6f4ccca10d980cc70aca254b8bd1d2df7f ChangeLog 4549
+MISC ChangeLog 4874 RMD160 a05d32243f5dc849d5028ef58edd5ad31ff67fe0 SHA1 5d9421d10a17c7736fff03a3aa61a2069a000cfc SHA256 e2d02b7ed334a0aedd48cbbc3b831015b72d7ce6ef184c08bd9a56a5212009b6
+MD5 dd457ebdda79a472811d5ebcf96441a7 ChangeLog 4874
+RMD160 a05d32243f5dc849d5028ef58edd5ad31ff67fe0 ChangeLog 4874
+SHA256 e2d02b7ed334a0aedd48cbbc3b831015b72d7ce6ef184c08bd9a56a5212009b6 ChangeLog 4874
 MISC metadata.xml 201 RMD160 84f5c130041f4ed38aa2d689e6c5faa4048e4124 SHA1 fc8b97ba1f227aef406eee81975083451a66704b SHA256 07c89cd922e9d70aed17db9b28f90676f57137cfadc39f18b082634557b89de6
 MD5 a55db6e9a92a8c7dacc74eee4e08d5dc metadata.xml 201
 RMD160 84f5c130041f4ed38aa2d689e6c5faa4048e4124 metadata.xml 201
@@ -34,3 +41,10 @@ SHA256 7105ccdb425cc4574413c5068a97947bd1fdb6127a19809dfe56ad190f0a5d61 files/di
 MD5 c4150da38b9b4dfabecb9734ccc6a538 files/digest-popt-1.7-r1 226
 RMD160 8d8f96da5bebaa712af0f571e912024d5e4c3c84 files/digest-popt-1.7-r1 226
 SHA256 ca02fb4b04a3255cf323e653dc5f48866f12ecd3f72c1fe40b1cbf8b52d2e62b files/digest-popt-1.7-r1 226
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFKpgZwmS/YhfgUiURAr4cAJkBmB1HHO6PpZ085MQpaU2cU3gZCwCglohk
+xVHcsVKnBET9P+4XYptEPk8=
+=j979
+-----END PGP SIGNATURE-----

diff --git a/dev-libs/popt/files/popt-1.10.4-nls.patch b/dev-libs/popt/files/popt-1.10.4-nls.patch
new file mode 100644 (file)
index 0000000..a1f59d3
--- /dev/null
+++ b/dev-libs/popt/files/popt-1.10.4-nls.patch
@@ -0,0 +1,11 @@
+--- popt-1.10.4.orig/configure.ac      2006-10-09 20:27:18.326914000 +0200
++++ popt-1.10.4/configure.ac   2006-10-09 20:28:14.826914000 +0200
+@@ -101,7 +101,7 @@
+               [ : ] )
+ AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
+ 
+-if test ! -f ../rpm.c
++if /bin/false
+ then
+   AC_MSG_CHECKING(for GNU xgettext)
+   xgettext --version 2>&1 | grep 'GNU gettext' >/dev/null 2>&1 || AC_MSG_ERROR([

diff --git a/dev-libs/popt/popt-1.10.4-r1.ebuild b/dev-libs/popt/popt-1.10.4-r1.ebuild
index 7ba8729f9a30ac801bff086dc7dac8c3158b8be9..cd76be887fb39d53d53ea1870e0fb963e125e732 100644 (file)
--- a/dev-libs/popt/popt-1.10.4-r1.ebuild
+++ b/dev-libs/popt/popt-1.10.4-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.8 2006/10/01 15:40:04 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.10.4-r1.ebuild,v 1.9 2006/10/09 18:46:52 sanchan Exp $
 
 inherit flag-o-matic autotools
 
@@ -23,6 +23,7 @@ src_unpack() {
        unpack ${A}
        cd "${S}"
        epatch "${FILESDIR}"/${P}-lib64.patch
+       use nls || epatch "${FILESDIR}"/${P}-nls.patch
        eautoreconf
 }