Add backport from upstream to skip over localisation test (#37) when German locale is unavailable; this also fixes the other test failure (#73) since that was just a recursion over the rest of the tests. Solves the blocking issues from bug #257399.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 28 insertions, 7 deletions

diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog
index 46ce8ebe96fb..8ce66d1ac866 100644
--- a/sys-devel/libtool/ChangeLog
+++ b/sys-devel/libtool/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/libtool
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.144 2009/09/13 14:46:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.145 2009/09/13 15:41:49 flameeyes Exp $
+
+  13 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  libtool-2.2.6a.ebuild, +files/2.2.6a/libtool-2.2.6a-tests-locale.patch:
+  Add backport from upstream to skip over localisation test (#37) when
+  German locale is unavailable; this also fixes the other test failure (#73)
+  since that was just a recursion over the rest of the tests. Solves the
+  blocking issues from bug #257399.
 
   13 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org> libtool-9999.ebuild:
   Fix dependencies from current GIT.
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index 9a64f1650f0b..baeb3c258819 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -7,6 +7,7 @@ AUX 1.5.20/libtool-1.5.20-use-linux-version-in-fbsd.patch 1185 RMD160 ed02facdc5
 AUX 1.5.20/libtool-1.5.20-version-checking.patch 1857 RMD160 25b981402a038a2c4c5ad64066c5f8a5b1416b36 SHA1 c5000fa6da0ffec1d7c48d871db94d8237c949ca SHA256 0d1af5e7024949dcf95bef0d5a47387d0b04b7905d0a55d3349576733783bb6d
 AUX 1.5.6/libtool-1.5-filter-host-tags.patch 1608 RMD160 af10d3d3459d07f77ccbdef6080e931e3387af38 SHA1 5d27c058f803cdc1953e82b71f747c2028b78ea0 SHA256 a50cba1c4b799717b21355cc908993c5cdf913b66881992b74b79001f8feb891
 AUX 2.2.6a/libtool-2.2.6a-gnuinfo.patch 1454 RMD160 1342700e864e985559dd55f9d49a7d81c9d2a5ee SHA1 9c5410b857551ec202159dd570ca8a81f40d507e SHA256 a06eee9bbbbb617c6b8014bb67ba1442b0b0a618079998d1f629a6043c97083a
+AUX 2.2.6a/libtool-2.2.6a-tests-locale.patch 599 RMD160 be9e1d21e56a36c5d4d959135afa5928298a66b0 SHA1 a4ae6a4df7b0d43d4d09d07f4aed5edccddf6e55 SHA256 3832137bfb2e4cbf00467ec78ab7041bb7f0fc95d91cdee25717d19b8436c1a0
 DIST libtool-1.3.5.tar.gz 538884 RMD160 0bb20b6802bc790dcbdaecde4058ed06ec77b429 SHA1 0e0a57bcdd4942a872d6b24ff666cfa0dd721452 SHA256 02e287ba621aa01ee581b0f88854deb222fa61e7e0fc55ed7685038354f0259f
 DIST libtool-1.5.26.tar.gz 2961939 RMD160 4d1d7dd0308b98e8f590723ae5daddb8da49ac11 SHA1 4c1738351736562a951a345e24f233d00953ec0a SHA256 1c35ae34fe85aa167bd7ab4bc9f477fe019138e1af62678d952fc43c0b7e2f09
 DIST libtool-2.2.4.tar.bz2 1919208 RMD160 3bafc6c02ee34bd80d3bd2c4164aa71a94347b14 SHA1 bc485fd07c8b12820234240e9ef41dba693af2b7 SHA256 c4e63399b12f5858d11c44cea8e92f21cd564f8548e488dadc84046b424c80fc
@@ -14,14 +15,14 @@ DIST libtool-2.2.6a.tar.lzma 733923 RMD160 1f1d4d8a86615fb455b76d5edcc92fe1a8ebf
 EBUILD libtool-1.3.5.ebuild 800 RMD160 6c4fea1ab669d1a1926f176476fcba1f1fc84483 SHA1 a0fafa46ce16604a62bd56efdc65196730bb9397 SHA256 1d937d795219f49d8231ec0e11963043e4586da182603425f5b475d24600f49f
 EBUILD libtool-1.5.26.ebuild 2767 RMD160 4925000b25774e4e53dda375dc6fff7038f6944c SHA1 c6faa58ee70d0712f2c3179ee74dd7d9189422bc SHA256 9fc50159f1d7828a16d159c643ac2b012a92be181aa96656d799b2a450125e1d
 EBUILD libtool-2.2.4.ebuild 1255 RMD160 ea8ee469a76064a717e49091576a598520fdfef0 SHA1 6970bc4cc405d28a5238da70bfde7771dd4c91dc SHA256 1edbbd94403641a68c0f6cc7a891921e8b2a1f265679c0d2c54e4da296068b54
-EBUILD libtool-2.2.6a.ebuild 1749 RMD160 66f167698780af4f0cf7c9dfb6305f529fa0a3e8 SHA1 66d5cd2a476010bb6236fc04bb4b9b72698ae2d4 SHA256 efdd1ffae8b94cf5562e8171c894be3f70c9254c5ee95d5180f0eb3c1ec6809b
+EBUILD libtool-2.2.6a.ebuild 1809 RMD160 e56d79a3d00aceb955828aa1824361b9d5ba52e5 SHA1 1758e2d8f36b2b5301bc902baece68af4842b2c6 SHA256 a20b8444b205d3ee58884724e8ad02ad57a4d6c5482715ea778d81b9850ad6a1
 EBUILD libtool-9999.ebuild 1327 RMD160 f9a217315d38dfda00e8d8c6877040dac63dbb66 SHA1 38aeec4338c6d1e58c69ec6ab639f8ee55f34f7f SHA256 b7c9be504e756544411db0d163237834e146de5e9c7e8302b0a1d8b89d124f02
-MISC ChangeLog 21985 RMD160 fcb78d6cbd28d9090b7a340be5d33778b0be84f7 SHA1 7fcaab093f8a3941b2918f93cc71ad769eabf764 SHA256 2efae013e52357c520ba9228e83b4b50cf1eec2a02fc63d9d8242c021f585fb3
+MISC ChangeLog 22373 RMD160 2db165bb22de52174309d756ca5e880f13d43831 SHA1 a380ec130805d3ea36a8976362bddd615d075728 SHA256 252dbcd42cf91b48f749d2914520ebed05b1302663ae7dfca8a566731eecb582
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqtBeIACgkQAiZjviIA2XhgRQCcCzsiAprsoJ/Os/z3ZJPODMJ4
-0cgAmwVJPbmzKN3ijKW71vswmDyiFhVy
-=yhin
+iEYEARECAAYFAkqtEsMACgkQAiZjviIA2Xhd6QCgz5QGSuwOkqdDChXGwf6C+SJ7
+6IIAoPSSmpztz8svxxQUyJcp5VKR9om7
+=+kYD
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/libtool/files/2.2.6a/libtool-2.2.6a-tests-locale.patch b/sys-devel/libtool/files/2.2.6a/libtool-2.2.6a-tests-locale.patch
new file mode 100644
index 000000000000..15730d911076
--- /dev/null
+++ b/sys-devel/libtool/files/2.2.6a/libtool-2.2.6a-tests-locale.patch
@@ -0,0 +1,12 @@
+Index: libtool-2.2.6/tests/localization.at
+===================================================================
+--- libtool-2.2.6.orig/tests/localization.at
++++ libtool-2.2.6/tests/localization.at
+@@ -47,6 +47,7 @@ mv -f stdout expected-stdout
+ mv -f stderr expected-stderr
+ AT_CHECK([$LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c a.c || exit 1],
+ 	 [1], [stdout], [stderr])
++AT_CHECK([grep LC_ALL stdout stderr && exit 77], [1])
+ AT_CHECK([diff expected-stderr stderr])
+ LTBASE=`$ECHO "$LIBTOOL" | sed 's,^.*/,,'`
+ AT_CHECK([grep -v "^$LTBASE: compile" stdout | diff expected-stdout -])
diff --git a/sys-devel/libtool/libtool-2.2.6a.ebuild b/sys-devel/libtool/libtool-2.2.6a.ebuild
index 9e7449c7ecf8..d67cad7a92e2 100644
--- a/sys-devel/libtool/libtool-2.2.6a.ebuild
+++ b/sys-devel/libtool/libtool-2.2.6a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.2.6a.ebuild,v 1.6 2009/09/13 14:38:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.2.6a.ebuild,v 1.7 2009/09/13 15:41:49 flameeyes Exp $
 
 LIBTOOLIZE="true" #225559
 inherit eutils autotools
@@ -27,6 +27,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PV}/${P}-gnuinfo.patch #249168
+	epatch "${FILESDIR}"/${PV}/${P}-tests-locale.patch #249168
 
 	if ! use vanilla ; then
 		epunt_cxx