From a326fc5c63578cbd3feb85452790cb3a90f3bd88 Mon Sep 17 00:00:00 2001 From: Leonardo Boshell Date: Tue, 6 Sep 2005 21:02:51 +0000 Subject: [PATCH] New release: 1.1.15. Removing old ebuild/patch. Package-Manager: portage-2.0.51.22-r2 --- dev-libs/libxslt/ChangeLog | 8 +++++- dev-libs/libxslt/Manifest | 17 +++--------- dev-libs/libxslt/files/digest-libxslt-1.1.14 | 1 - dev-libs/libxslt/files/digest-libxslt-1.1.15 | 1 + .../libxslt/files/libxslt-1.1.13-xslt.patch | 25 ----------------- ...lt-1.1.14.ebuild => libxslt-1.1.15.ebuild} | 27 ++++++++++++------- 6 files changed, 29 insertions(+), 50 deletions(-) delete mode 100644 dev-libs/libxslt/files/digest-libxslt-1.1.14 create mode 100644 dev-libs/libxslt/files/digest-libxslt-1.1.15 delete mode 100644 dev-libs/libxslt/files/libxslt-1.1.13-xslt.patch rename dev-libs/libxslt/{libxslt-1.1.14.ebuild => libxslt-1.1.15.ebuild} (62%) diff --git a/dev-libs/libxslt/ChangeLog b/dev-libs/libxslt/ChangeLog index e761872ab9fc..16310d41eb91 100644 --- a/dev-libs/libxslt/ChangeLog +++ b/dev-libs/libxslt/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/libxslt # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/ChangeLog,v 1.120 2005/08/31 22:35:23 herbs Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/ChangeLog,v 1.121 2005/09/06 21:02:51 leonardop Exp $ + +*libxslt-1.1.15 (06 Sep 2005) + + 06 Sep 2005; Leonardo Boshell + -libxslt-1.1.14.ebuild, +libxslt-1.1.15.ebuild: + New version. 31 Aug 2005; Herbie Hopkins libxslt-1.1.14-r2.ebuild: Stable on amd64. diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest index 5f53d122cb2f..b3d941965aca 100644 --- a/dev-libs/libxslt/Manifest +++ b/dev-libs/libxslt/Manifest @@ -1,20 +1,9 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +MD5 9290686506d841dc4d21f960b9279aab ChangeLog 14445 MD5 37cd3ccd92224c10394167fcbfdafe51 libxslt-1.1.12.ebuild 1004 -MD5 8b9206d4f1da894ef4184655d2bb3318 libxslt-1.1.14.ebuild 1481 +MD5 580db9fd3f473276df1b4d5363f72769 libxslt-1.1.15.ebuild 1771 MD5 a3fa0ca7bbebe0eee3d3b16adb8cba78 libxslt-1.1.14-r2.ebuild 1692 -MD5 18218388e21672d22ee67d4c738b4b35 ChangeLog 14289 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 -MD5 ba955ecf3fb1912956c89db250c6e233 files/libxslt-1.1.13-xslt.patch 819 MD5 0036be4a6749d5a3fc499f2732f59031 files/digest-libxslt-1.1.12 68 -MD5 0c18eda60de8886c97c58c7a17596c3d files/digest-libxslt-1.1.14 68 +MD5 3f759d81e688060d55a76a9529dd41d7 files/digest-libxslt-1.1.15 68 MD5 0c18eda60de8886c97c58c7a17596c3d files/digest-libxslt-1.1.14-r2 68 MD5 a772cd7aafe8f9e0fd59de02b2ea2e85 files/libxslt.m4-libxslt-1.1.8.patch 1292 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDFjC62G5bA0cA/ScRAqc4AJkBkd82ZmSlcafyEtC53zb7+FFRlgCePCh+ -RwIIDXdM0/692rA2oNwuHlQ= -=IH/b ------END PGP SIGNATURE----- diff --git a/dev-libs/libxslt/files/digest-libxslt-1.1.14 b/dev-libs/libxslt/files/digest-libxslt-1.1.14 deleted file mode 100644 index 5f700fc79e0a..000000000000 --- a/dev-libs/libxslt/files/digest-libxslt-1.1.14 +++ /dev/null @@ -1 +0,0 @@ -MD5 1fe60d57b8fcff7462fb1d9fac6c2ae8 libxslt-1.1.14.tar.bz2 1819250 diff --git a/dev-libs/libxslt/files/digest-libxslt-1.1.15 b/dev-libs/libxslt/files/digest-libxslt-1.1.15 new file mode 100644 index 000000000000..db80a14b5700 --- /dev/null +++ b/dev-libs/libxslt/files/digest-libxslt-1.1.15 @@ -0,0 +1 @@ +MD5 0a48d1a723d5338b246702ab1769e7bf libxslt-1.1.15.tar.bz2 1822862 diff --git a/dev-libs/libxslt/files/libxslt-1.1.13-xslt.patch b/dev-libs/libxslt/files/libxslt-1.1.13-xslt.patch deleted file mode 100644 index 65a8682526b6..000000000000 --- a/dev-libs/libxslt/files/libxslt-1.1.13-xslt.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -ur libxslt-1.1.13/libxslt/xslt.c libxslt-1.1.13-patched/libxslt/xslt.c ---- libxslt-1.1.13/libxslt/xslt.c 2005-01-23 04:58:02.000000000 +0800 -+++ libxslt-1.1.13-patched/libxslt/xslt.c 2005-03-25 09:48:03.705023480 +0800 -@@ -1534,14 +1534,17 @@ - while (text != NULL) { - if ((text->content != NULL) && - (!xmlDictOwns(style->dict, text->content))) { -- xmlChar *old = (xmlChar *) text->content; - - /* - * internalize the text string - */ -- text->content = (xmlChar *) -- xmlDictLookup(style->dict, old, -1); -- xmlFree(old); -+ if (text->doc->dict != NULL) { -+ xmlChar *old = (xmlChar *) text->content; -+ text->content = -+ (xmlChar *) xmlDictLookup( -+ text->doc->dict, old, -1); -+ xmlFree(old); -+ } - } - - next = text->next; diff --git a/dev-libs/libxslt/libxslt-1.1.14.ebuild b/dev-libs/libxslt/libxslt-1.1.15.ebuild similarity index 62% rename from dev-libs/libxslt/libxslt-1.1.14.ebuild rename to dev-libs/libxslt/libxslt-1.1.15.ebuild index 26a9b506d6f2..e084b0c1341f 100644 --- a/dev-libs/libxslt/libxslt-1.1.14.ebuild +++ b/dev-libs/libxslt/libxslt-1.1.15.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.14.ebuild,v 1.6 2005/08/02 17:32:24 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.15.ebuild,v 1.1 2005/09/06 21:02:51 leonardop Exp $ inherit libtool gnome.org eutils python @@ -9,7 +9,7 @@ HOMEPAGE="http://www.xmlsoft.org/" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" IUSE="crypt debug python static" DEPEND=">=dev-libs/libxml2-2.6.17 @@ -17,21 +17,29 @@ DEPEND=">=dev-libs/libxml2-2.6.17 python? ( dev-lang/python )" src_unpack() { - unpack ${A} - cd ${S} + unpack "${A}" + cd "${S}" # we still require the 1.1.8 patch for the .m4 file, to add # the CXXFLAGS defines epatch "${FILESDIR}"/libxslt.m4-${PN}-1.1.8.patch + # Patch Makefile to fix bug #99382 so that html gets installed in ${PF} + sed -i -e 's:libxslt-$(VERSION):${PF}:' doc/Makefile.in + epunt_cxx elibtoolize } src_compile() { - local myconf="$(use_with python) $(use_with crypt crypto) \ - $(use_enable static) $(use_with debug) $(use_with debug mem-debug) \ - $(use_with debug debugger)" + # Always pass --with-debugger. It is required by third parties (see + # e.g. bug #98345) + local myconf="--with-debugger \ + $(use_with python) \ + $(use_with crypt crypto) \ + $(use_with debug) \ + $(use_with debug mem-debug) \ + $(use_enable static)" econf ${myconf} || die "configure failed" @@ -45,10 +53,11 @@ src_compile() { || die "sed failed" done - emake || die "make failed" + emake || die "Compilation failed" } src_install() { - make DESTDIR="${D}" install || die + make DESTDIR="${D}" install || die "Installation failed" + dodoc AUTHORS ChangeLog Copyright FEATURES NEWS README TODO } -- 2.26.2