# HG changeset patch # User Binki # Date 2009-03-10 13:49:13 # Node ID ebbe0b2176677164e203f4eb7d50ec456f2e0d51 # Parent a0f41d9138d93312dbf8bad305dd5a29abe621dc dev-libs/libxml: added fix for --as-needed diff --git a/dev-libs/libxml/ChangeLog b/dev-libs/libxml/ChangeLog --- a/dev-libs/libxml/ChangeLog +++ b/dev-libs/libxml/ChangeLog @@ -2,6 +2,10 @@ # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml/ChangeLog,v 1.23 2009/02/03 23:53:09 patrick Exp $ + 10 Mar 2009; Nathan Phillip Brink + -libxml-1.8.17-r2.ebuild, libxml-1.8.17-r3.ebuild + added elibtoolize, added patch for --as-needed + *libxml-1.8.17-r3 (03 Feb 2009) 03 Feb 2009; Patrick Lauer diff --git a/dev-libs/libxml/Manifest b/dev-libs/libxml/Manifest --- a/dev-libs/libxml/Manifest +++ b/dev-libs/libxml/Manifest @@ -1,7 +1,7 @@ +AUX as-needed.patch 472 RMD160 4804c7df08db6ce0f7bd96536644b2d5d1466a01 SHA1 788b603df4935d902133c274388c0d1b1c860ec4 SHA256 f0e801206d508cc9f032b440d444161323ddfeefbff22a0d835282146baa5adc AUX configure-LANG.patch 1686 RMD160 4ff8355af81705058fd411910dfae94887bcd884 SHA1 67ae0deff73689cb39cd6e7451262bdda9c25a39 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea AUX open_call_fix.patch 363 RMD160 d504ae87018452fb4f4908c7b8f63df33520de8e SHA1 8b5bd7aba70b055c1588dd2f69633e6942c225b2 SHA256 7a9aec42a5e3fe2278eac4273e4315518136888089de1a2a17874e1935154995 DIST libxml-1.8.17.tar.gz 996351 RMD160 3d01879e6e5a38f4453d009ea8bd2d2fc9e86bcc SHA1 ebe7b76bb2b62c882000c1a846a6f8f8346e3bb4 SHA256 bffd3178dec8d75e2cfe05f4a4c36319c8fd3206209e32ef84e1a7c5173a86ed -EBUILD libxml-1.8.17-r2.ebuild 1244 RMD160 4c44af3c260da701a8973e72ba24a5e2bb0d370b SHA1 5129f8ece342d3ab32fdf36f5454a3cc51331dd9 SHA256 89d296a2c6d1a33b3d34e9c3f127f82a7dbfceb425fe2ae82dd3f9b741e17d95 -EBUILD libxml-1.8.17-r3.ebuild 1296 RMD160 b954bde1e522234eded6556a442b0cde0250b9dd SHA1 35c6436f9729c380ec81faefc52f8113edb72f14 SHA256 00d19f5b27ef70d1380348a74d291eec75fa19b2ec18bb86e8ea61961e373113 -MISC ChangeLog 3037 RMD160 cc860089735260e410869be60fe09b0fc59ebdde SHA1 a44d0fa200e3643f8343b8eebc4d233fe3c6636e SHA256 b1d6c07af0ec4bdef22e87368f21298565dd14a259956f14a4b25491a80d62b8 +EBUILD libxml-1.8.17-r3.ebuild 1378 RMD160 c28de1b4f2631b66fe68253a0144ce47654a0a9d SHA1 c57940ec5bdcffc2454db80e3b7fbb1944a043a7 SHA256 642aa11a15c1be2290f309258d32f55816598b2842f68e43d2a20acbc32adc26 +MISC ChangeLog 3206 RMD160 5c318163c3c03a21e2573a0b61841f5b7db0820b SHA1 23ed18e7174a12430ba2efa7369106b3eda2114d SHA256 f7a337b19f7f96a92c9981737ea64f349db42613702a84daa44a58435894ebac MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a diff --git a/dev-libs/libxml/files/as-needed.patch b/dev-libs/libxml/files/as-needed.patch new file mode 100644 --- /dev/null +++ b/dev-libs/libxml/files/as-needed.patch @@ -0,0 +1,14 @@ +diff -u /var/tmp/portage/dev-libs/libxml-1.8.17-r3/work/libxml-1.8.17/Makefile.am /tmp/buffer-content-286183qp +--- Makefile.am 2001-06-28 10:53:53.000000000 -0400 ++++ Makefile.am 2009-03-10 12:52:07.000000000 -0400 +@@ -62,7 +62,7 @@ + tester_SOURCES=tester.c + tester_LDFLAGS = + tester_DEPENDENCIES = $(DEPS) +-tester_LDADD= @RDL_LIBS@ $(LDADDS) ++tester_LDADD= $(LDADDS) @RDL_LIBS@ + + testSAX_SOURCES=testSAX.c + testSAX_LDFLAGS = + +Diff finished. Tue Mar 10 12:52:07 2009 diff --git a/dev-libs/libxml/libxml-1.8.17-r2.ebuild b/dev-libs/libxml/libxml-1.8.17-r2.ebuild deleted file mode 100644 --- a/dev-libs/libxml/libxml-1.8.17-r2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml/libxml-1.8.17-r2.ebuild,v 1.30 2008/10/14 09:24:33 robbat2 Exp $ - -inherit eutils flag-o-matic - -DESCRIPTION="Version 1 of the library to manipulate XML files" -HOMEPAGE="http://www.xmlsoft.org/" -SRC_URI="ftp://xmlsoft.org/old/${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2" -SLOT="1" -KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86" -IUSE="doc" - -RDEPEND=">=sys-libs/ncurses-5.2" -DEPEND="${RDEPEND} - >=sys-libs/readline-4.1 - doc? ( >=dev-util/gtk-doc-1 )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/configure-LANG.patch -} - -src_compile() { - LIBS="-lncurses" econf || die - emake -j1 || die # Doesn't work with -j 4 (hallski) -} - -src_install() { - make DESTDIR="${D}" \ - BASE_DIR=/usr/share/doc \ - DOC_MODULE=${PF} \ - TARGET_DIR=/usr/share/doc/${PF}/html \ - install || die - - # This link must be fixed - rm "${D}"/usr/include/gnome-xml/libxml - dosym /usr/include/gnome-xml /usr/include/gnome-xml/libxml - - dodoc AUTHORS ChangeLog NEWS README -} - -pkg_preinst() { - if [[ -e ${ROOT}/usr/include/gnome-xml/libxml ]] ; then - rm -f "${ROOT}"/usr/include/gnome-xml/libxml - fi -} diff --git a/dev-libs/libxml/libxml-1.8.17-r3.ebuild b/dev-libs/libxml/libxml-1.8.17-r3.ebuild --- a/dev-libs/libxml/libxml-1.8.17-r3.ebuild +++ b/dev-libs/libxml/libxml-1.8.17-r3.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml/libxml-1.8.17-r3.ebuild,v 1.1 2009/02/03 23:53:09 patrick Exp $ -inherit eutils flag-o-matic +inherit eutils flag-o-matic libtool autotools DESCRIPTION="Version 1 of the library to manipulate XML files" HOMEPAGE="http://www.xmlsoft.org/" @@ -23,6 +23,9 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/configure-LANG.patch epatch "${FILESDIR}"/open_call_fix.patch + epatch "${FILESDIR}"/as-needed.patch + elibtoolize + eautoreconf } src_compile() {