diff options
| author |   Leonardo Boshell <leonardop@gentoo.org> | 2006-12-18 10:35:41 +0000 |
|---|---|---|
| committer | Leonardo Boshell <leonardop@gentoo.org> | 2006-12-18 10:35:41 +0000 |
| commit | 44441fd990b45810798bf1da7ca3766d9b3428ab (patch) | |
| tree | 93f2a568d9929adc42d69c1064177ba453f851d5 /dev-libs/libxml2 | |
| parent | Removing PATCHES for dodoc (diff) | |
| download | gentoo-2-44441fd990b45810798bf1da7ca3766d9b3428ab.tar.gz gentoo-2-44441fd990b45810798bf1da7ca3766d9b3428ab.tar.bz2 gentoo-2-44441fd990b45810798bf1da7ca3766d9b3428ab.zip | |
Added patch to fix some calls to 'tar' when running tests (bug #158386)
(Portage version: 2.1.2_rc3-r6)
Diffstat (limited to 'dev-libs/libxml2')
| -rw-r--r-- | dev-libs/libxml2/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/libxml2/files/libxml2-2.6.27-tar_in_tests.patch | 21 | ||||
| -rw-r--r-- | dev-libs/libxml2/libxml2-2.6.27.ebuild | 5 |
3 files changed, 31 insertions, 2 deletions
diff --git a/dev-libs/libxml2/ChangeLog b/dev-libs/libxml2/ChangeLog index 09351e916380..e655f866d966 100644 --- 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/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 index 000000000000..271ad199da11 --- /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 50f2b6a7be84..d8923068e7e6 100644 --- 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 } |