Added patch to fix some calls to 'tar' when running tests (bug #158386)

Package-Manager: portage-2.1.2_rc3-r6

diff --git a/dev-libs/libxml2/ChangeLog b/dev-libs/libxml2/ChangeLog
index 09351e916380343f7dc7a03ca3748114de902950..e655f866d9662d3d3e212364a48bcd8260058cf8 100644 (file)
--- a/dev-libs/libxml2/ChangeLog
+++ b/dev-libs/libxml2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libxml2
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.171 2006/12/14 01:41:18 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.172 2006/12/18 10:35:41 leonardop Exp $
+
+  18 Dec 2006; Leonardo Boshell <leonardop@gentoo.org>
+  +files/libxml2-2.6.27-tar_in_tests.patch, libxml2-2.6.27.ebuild:
+  Added patch from Ryan Hill to fix some calls to 'tar' when running tests,
+  (bug #158386).
 
 *libxml2-2.6.27 (14 Dec 2006)
 

diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index b1b8bdbd5e748e31dc3292a7d4b2bdbdb152f5e3..e302ea6db7c8b9190be8283157b4ab2c4cbd1cf3 100644 (file)
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,3 +1,7 @@
+AUX libxml2-2.6.27-tar_in_tests.patch 1233 RMD160 155939262d6d7d7533b7f8c1e94ed543c20677e6 SHA1 5f183dff302dc5d6cf0a4714e528afb2e03f5ada SHA256 ea16e680983ccc8d26350d9bfc2ab53c1613f089b70a421ea5a9bc2ad814222d
+MD5 2cabfd1ae865b683d15512b718c6a917 files/libxml2-2.6.27-tar_in_tests.patch 1233
+RMD160 155939262d6d7d7533b7f8c1e94ed543c20677e6 files/libxml2-2.6.27-tar_in_tests.patch 1233
+SHA256 ea16e680983ccc8d26350d9bfc2ab53c1613f089b70a421ea5a9bc2ad814222d files/libxml2-2.6.27-tar_in_tests.patch 1233
 DIST libxml2-2.6.26.tar.bz2 3418273 RMD160 374ad4860cff3bc37e159bf777302f0135be4c08 SHA1 7a3e175253d47c924e285e3b8e344ba59b5f1797 SHA256 bd250980525ba7f786320590fff6d1d7da942ffaf2cffdea5ca1e6019c4d4515
 DIST libxml2-2.6.27.tar.gz 4590835 RMD160 795efee7c91484eb11dd0b275744057d2c82719d SHA1 875ac4d3b5829f2edf0222f6c96b76b46ec72374 SHA256 d7549485c55e55041ad5a5e531b17935d89ebf474ae8bc98a51ea31eeeb876e9
 DIST xsts-2002-01-16.tar.gz 6894439 RMD160 e8905fe1451a1c367b0104af24edca73bad1db08 SHA1 ca6344e6c47f8c28231f5b213d0c8deb0311a409 SHA256 55e5c08db29946a91ea8e70e8f2418d3fd30d8b6777941dfba7f54726ffd9914
@@ -6,14 +10,14 @@ EBUILD libxml2-2.6.26.ebuild 3117 RMD160 54c26fa30f8277e7283741b4c438eb627ad75f1
 MD5 1669c138af1f692e44e4ba68718cc973 libxml2-2.6.26.ebuild 3117
 RMD160 54c26fa30f8277e7283741b4c438eb627ad75f16 libxml2-2.6.26.ebuild 3117
 SHA256 3d2967e2c10ea88585228d550b7bd63d58b33fe59e1330e7626271c24c9e73f8 libxml2-2.6.26.ebuild 3117
-EBUILD libxml2-2.6.27.ebuild 3121 RMD160 5078978b28d627139aefb72bb468daa0bf2e6067 SHA1 4bc624a89fab68f695ccb4471736bdb6c6c660b7 SHA256 74e3410f6ba352aaa098d7d1fe2c40c366d10f147905b7ae52c40ebc3e99fa46
-MD5 75e65c887fb921f7dc959daf9f8fe179 libxml2-2.6.27.ebuild 3121
-RMD160 5078978b28d627139aefb72bb468daa0bf2e6067 libxml2-2.6.27.ebuild 3121
-SHA256 74e3410f6ba352aaa098d7d1fe2c40c366d10f147905b7ae52c40ebc3e99fa46 libxml2-2.6.27.ebuild 3121
-MISC ChangeLog 20366 RMD160 3f04c7533a890b235fa8d3c108f3cc0329f61bd6 SHA1 1b5a2c9110ff91d8ca62fd77155e33e9cc3abce4 SHA256 179e3905025cb84bc73bb879fab26a0c2198b697d9c4173e3a1937b113288ef2
-MD5 e7046bdb29a928ec01e85a6b5e58c4b6 ChangeLog 20366
-RMD160 3f04c7533a890b235fa8d3c108f3cc0329f61bd6 ChangeLog 20366
-SHA256 179e3905025cb84bc73bb879fab26a0c2198b697d9c4173e3a1937b113288ef2 ChangeLog 20366
+EBUILD libxml2-2.6.27.ebuild 3228 RMD160 c0937508215c0477a1cdfe7fbc5c55191344cd83 SHA1 e4617c5687c2d7cd94975a4243589cf0b23a808e SHA256 5d54528fdec188f9b90afa952cd27d82dceffa1166a6601e54721f787669e3d2
+MD5 07b1089cdcfbc6a1436ba712ea98e1f3 libxml2-2.6.27.ebuild 3228
+RMD160 c0937508215c0477a1cdfe7fbc5c55191344cd83 libxml2-2.6.27.ebuild 3228
+SHA256 5d54528fdec188f9b90afa952cd27d82dceffa1166a6601e54721f787669e3d2 libxml2-2.6.27.ebuild 3228
+MISC ChangeLog 20582 RMD160 499a53243d6d782b5a7e8ce45aeeb7e4d6b7dead SHA1 5fa81e815963685500cde02fed4ab5197b181729 SHA256 6f1f3b076a3bea982ad4694a3478bbc1c5795594262683f45961d7a7b802bad4
+MD5 66b753772c649f45d001ba249c1edacb ChangeLog 20582
+RMD160 499a53243d6d782b5a7e8ce45aeeb7e4d6b7dead ChangeLog 20582
+SHA256 6f1f3b076a3bea982ad4694a3478bbc1c5795594262683f45961d7a7b802bad4 ChangeLog 20582
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158

diff --git a/dev-libs/libxml2/files/libxml2-2.6.27-tar_in_tests.patch b/dev-libs/libxml2/files/libxml2-2.6.27-tar_in_tests.patch
new file mode 100644 (file)
index 0000000..271ad19
--- /dev/null
+++ b/dev-libs/libxml2/files/libxml2-2.6.27-tar_in_tests.patch
@@ -0,0 +1,21 @@
+diff -NurdB libxml2-2.6.27/xstc/Makefile.in libxml2-2.6.27-patched/xstc/Makefile.in
+--- libxml2-2.6.27/xstc/Makefile.in    2006-10-25 10:56:47.000000000 -0500
++++ libxml2-2.6.27-patched/xstc/Makefile.in    2006-12-18 02:35:52.000000000 -0500
+@@ -461,7 +461,7 @@
+          else echo "Dont' know how to fetch $(TARBALLURL_2)" ; fi ; fi ; fi)
+       -@(if [ -f $(TARBALL_2) ] ; then \
+          echo -n "extracting test data (NIST)..." ; \
+-         $(TAR) -xzf $(TARBALL_2) '*/Datatypes' '*/Metadata/$(NISTTESTDEF_2)' ; \
++         $(TAR) -xzf $(TARBALL_2) --wildcards '*/Datatypes' '*/Metadata/$(NISTTESTDEF_2)' ; \
+          echo "done" ; \
+          fi)
+       -@(if [ ! -f $(TARBALL) ] ; then \
+@@ -473,7 +473,7 @@
+          else echo "Dont' know how to fetch $(TARBALLURL)" ; fi ; fi ; fi)
+       -@(if [ -f $(TARBALL) ] ; then \
+          echo -n "extracting test data (Sun, Microsoft)..." ; \
+-         $(TAR) -C Tests -xzf $(TARBALL) '*/suntest' '*/msxsdtest' '*/$(MSTESTDEF)' '*/$(SUNTESTDEF)' ; \
++         $(TAR) -C Tests -xzf $(TARBALL) --wildcards '*/suntest' '*/msxsdtest' '*/$(MSTESTDEF)' '*/$(SUNTESTDEF)' ; \
+          if [ -d Tests/suntest ] ; then rm -r Tests/suntest ; fi ; \
+          if [ -d Tests/msxsdtest ] ; then rm -r Tests/msxsdtest ; fi ; \
+          mv Tests/xmlschema2002-01-16/* Tests ; \

diff --git a/dev-libs/libxml2/libxml2-2.6.27.ebuild b/dev-libs/libxml2/libxml2-2.6.27.ebuild
index 50f2b6a7be84b500e612d26be67e13ee1e01fa96..d8923068e7e6f2dc36e437efdcbe3386148b8b56 100644 (file)
--- a/dev-libs/libxml2/libxml2-2.6.27.ebuild
+++ b/dev-libs/libxml2/libxml2-2.6.27.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/libxml2/libxml2-2.6.27.ebuild,v 1.1 2006/12/14 01:41:18 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.6.27.ebuild,v 1.2 2006/12/18 10:35:41 leonardop Exp $
 
 inherit libtool flag-o-matic eutils
 
@@ -42,6 +42,9 @@ src_unpack() {
                        || die "Failed to install test tarballs"
        fi
 
+       # Pass --wildcards option to tar when needed (bug #158386)
+       epatch "${FILESDIR}"/${P}-tar_in_tests.patch
+
        epunt_cxx
 }