Remove pointless gettext check #161988 by Christian Heim.

Package-Manager: portage-2.1.2_rc4-r9

diff --git a/dev-libs/popt/ChangeLog b/dev-libs/popt/ChangeLog
index c109e0f8ed849ce0340645e23b5b85073a2add27..c6232261109055b8af0f7a7ecae3158d42c89169 100644 (file)
--- a/dev-libs/popt/ChangeLog
+++ b/dev-libs/popt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/popt
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/ChangeLog,v 1.53 2007/01/13 23:34:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/ChangeLog,v 1.54 2007/01/15 16:26:55 vapier Exp $
+
+  15 Jan 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/popt-1.10.7-scrub-lame-gettext.patch, popt-1.10.7.ebuild:
+  Remove pointless gettext check #161988 by Christian Heim.
 
   13 Jan 2007; Mike Frysinger <vapier@gentoo.org> popt-1.10.7.ebuild:
   Cleanup patches and drop requirement for autotools.

diff --git a/dev-libs/popt/Manifest b/dev-libs/popt/Manifest
index 9d23b388da3a8dab823f85aed84342825952da1a..4e4a1904c40b4cdf122c8b02c44db8aeb1175e07 100644 (file)
--- a/dev-libs/popt/Manifest
+++ b/dev-libs/popt/Manifest
@@ -13,6 +13,10 @@ AUX popt-1.10.4-regression.patch 432 RMD160 7d2748d5b4a0269527291a98fd15e387adcf
 MD5 fcde5ce8c66077ba90838f9eee193b77 files/popt-1.10.4-regression.patch 432
 RMD160 7d2748d5b4a0269527291a98fd15e387adcfb644 files/popt-1.10.4-regression.patch 432
 SHA256 aea460ab83c99a9f3284f78857a34eeeabdc75f5a62f74b7a41e8f6696913915 files/popt-1.10.4-regression.patch 432
+AUX popt-1.10.7-scrub-lame-gettext.patch 851 RMD160 5181528e3c593280e6d96b8d511eefd07b052417 SHA1 6ff0d7e07009033143125b498c73d1da5c5f0d7c SHA256 1208a409b3e9586feda797b0f0cf3a682601f3a17eaa7eb4340a256f0f6a8ae5
+MD5 30840eadff9bfdee49a72936149a5fc3 files/popt-1.10.7-scrub-lame-gettext.patch 851
+RMD160 5181528e3c593280e6d96b8d511eefd07b052417 files/popt-1.10.7-scrub-lame-gettext.patch 851
+SHA256 1208a409b3e9586feda797b0f0cf3a682601f3a17eaa7eb4340a256f0f6a8ae5 files/popt-1.10.7-scrub-lame-gettext.patch 851
 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
@@ -28,18 +32,18 @@ EBUILD popt-1.10.4-r3.ebuild 972 RMD160 cbefa290d48dd521ba79f1c474d4e32ecb68feb0
 MD5 8c4104013256fb7d1db10e9d98df9418 popt-1.10.4-r3.ebuild 972
 RMD160 cbefa290d48dd521ba79f1c474d4e32ecb68feb0 popt-1.10.4-r3.ebuild 972
 SHA256 17cabd232215ea36613613a2a01531c7a66c5933ea7d8185d3a4f9d5eaa226f5 popt-1.10.4-r3.ebuild 972
-EBUILD popt-1.10.7.ebuild 898 RMD160 c37dfdd4d9cdde943f245f1dfc8ce82e48fa8ea7 SHA1 f8015b1cafde43765594cfe4fdd62ba1f6cafbcf SHA256 b03505c03ae57bb4a1c299a099bd21bdc7b4cd92e563c11a87e47f6efa47b2ec
-MD5 0670d89749dfbbdc40061ca7b1bbcafb popt-1.10.7.ebuild 898
-RMD160 c37dfdd4d9cdde943f245f1dfc8ce82e48fa8ea7 popt-1.10.7.ebuild 898
-SHA256 b03505c03ae57bb4a1c299a099bd21bdc7b4cd92e563c11a87e47f6efa47b2ec popt-1.10.7.ebuild 898
+EBUILD popt-1.10.7.ebuild 958 RMD160 9e7a7d4a75067bee3552a2df501f99df370cf9f1 SHA1 3c0b0e9cf604f725a451006748c6f95d99294544 SHA256 68ba455b8ee5c2cac357335dfd8e6ddcb36835477ffcb7543994b70df7a80265
+MD5 e79a4dbdc07d376489549069c17399aa popt-1.10.7.ebuild 958
+RMD160 9e7a7d4a75067bee3552a2df501f99df370cf9f1 popt-1.10.7.ebuild 958
+SHA256 68ba455b8ee5c2cac357335dfd8e6ddcb36835477ffcb7543994b70df7a80265 popt-1.10.7.ebuild 958
 EBUILD popt-1.7-r1.ebuild 981 RMD160 27a1d5715bee8e326e352343437cc2a2fa9014f9 SHA1 2bca91c8d2e2d28adb450f4d63972df671525944 SHA256 6d785f5f5d8c3eac8d15b33529d142921569e96833d00efc460f947452711d32
 MD5 4920f54afc86850739bf07b583811d5b popt-1.7-r1.ebuild 981
 RMD160 27a1d5715bee8e326e352343437cc2a2fa9014f9 popt-1.7-r1.ebuild 981
 SHA256 6d785f5f5d8c3eac8d15b33529d142921569e96833d00efc460f947452711d32 popt-1.7-r1.ebuild 981
-MISC ChangeLog 7683 RMD160 4b437747226db89c2d0a934a59caf225f53f8868 SHA1 95344f5c5d894c458b1ebed08a62141c10f72c13 SHA256 5bf3ac955b8fb0a50072f4c274e84a63f4cf2550f687e8d48362df9b97cabcd9
-MD5 4edc201b5b3634e00e65aae2cac9dbf7 ChangeLog 7683
-RMD160 4b437747226db89c2d0a934a59caf225f53f8868 ChangeLog 7683
-SHA256 5bf3ac955b8fb0a50072f4c274e84a63f4cf2550f687e8d48362df9b97cabcd9 ChangeLog 7683
+MISC ChangeLog 7861 RMD160 1e6e13f742a79d570f02d682cfeeb1bb193d7998 SHA1 29f3aba020628f4df77121b31873bbb4b3c466a2 SHA256 7e00a3ad677ba71be7750b98ab47f6585c4d268ee522ffdb174b2054ff2a59b2
+MD5 a4c6e15ee568e0da764ec1219d089263 ChangeLog 7861
+RMD160 1e6e13f742a79d570f02d682cfeeb1bb193d7998 ChangeLog 7861
+SHA256 7e00a3ad677ba71be7750b98ab47f6585c4d268ee522ffdb174b2054ff2a59b2 ChangeLog 7861
 MISC metadata.xml 200 RMD160 331ec44f62309eb45aea8c9eab75e00969431e6d SHA1 38bcf7483ccd7147602ab1a4a684f670a8b2b5d0 SHA256 c230e59ad2ffb0572f140ddeb37a4ca49a99d74b8bc61558bdae47b1d087478d
 MD5 12d99f523f4f80f436a421930e3cc4d8 metadata.xml 200
 RMD160 331ec44f62309eb45aea8c9eab75e00969431e6d metadata.xml 200
@@ -56,7 +60,7 @@ SHA256 ca02fb4b04a3255cf323e653dc5f48866f12ecd3f72c1fe40b1cbf8b52d2e62b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFqWyk8bi6rjpTunYRAltMAKDeOAa5qDPwvvhV0Sk24R0Z4QxhJACg2k+n
-C/79njnTuPe7rGHA3jjoXsk=
-=UjJ0
+iD8DBQFFq6tv8bi6rjpTunYRAsVOAKCZVVrCgMwp0wchkdqncBDY22Cy5gCgpP4g
+FrBfblp5XZQOX5JGcHDAPoE=
+=4G2N
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/popt/files/popt-1.10.7-scrub-lame-gettext.patch b/dev-libs/popt/files/popt-1.10.7-scrub-lame-gettext.patch
new file mode 100644 (file)
index 0000000..80c8245
--- /dev/null
+++ b/dev-libs/popt/files/popt-1.10.7-scrub-lame-gettext.patch
@@ -0,0 +1,26 @@
+this serves no real purpose
+
+--- configure
++++ configure
+@@ -20471,21 +20471,6 @@
+ fi
+ 
+ 
+-if test ! -f ../rpm.c
+-then
+-  echo "$as_me:$LINENO: checking for GNU xgettext" >&5
+-echo $ECHO_N "checking for GNU xgettext... $ECHO_C" >&6
+-  xgettext --version 2>&1 | grep 'GNU gettext' >/dev/null 2>&1 || { { echo "$as_me:$LINENO: error:
+-  *** GNU gettext is required. The latest version
+-  *** is always available from ftp://ftp.gnu.org/gnu/gettext/." >&5
+-echo "$as_me: error:
+-  *** GNU gettext is required. The latest version
+-  *** is always available from ftp://ftp.gnu.org/gnu/gettext/." >&2;}
+-   { (exit 1); exit 1; }; }
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-fi
+-
+ echo "$as_me:$LINENO: checking for setreuid" >&5
+ echo $ECHO_N "checking for setreuid... $ECHO_C" >&6
+ if test "${ac_cv_func_setreuid+set}" = set; then

diff --git a/dev-libs/popt/popt-1.10.7.ebuild b/dev-libs/popt/popt-1.10.7.ebuild
index 0c9ecb7fbb5a3787d7a97aa3e91d39f82899a6bd..7f011ccb8350010a28ab84658edf7a824ea75c56 100644 (file)
--- a/dev-libs/popt/popt-1.10.7.ebuild
+++ b/dev-libs/popt/popt-1.10.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.10.7.ebuild,v 1.7 2007/01/13 23:34:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.10.7.ebuild,v 1.8 2007/01/15 16:26:55 vapier Exp $
 
 inherit eutils
 
@@ -21,6 +21,7 @@ src_unpack() {
        cd "${S}"
        epatch "${FILESDIR}"/${PN}-1.10.4-regression.patch
        epatch "${FILESDIR}"/${PN}-1.10.4-lib64.patch
+       epatch "${FILESDIR}"/${PN}-1.10.7-scrub-lame-gettext.patch
 }
 
 src_compile() {