old

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 0 insertions, 262 deletions

diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index bc28da8e025e..265577ac3ee4 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -1,11 +1,7 @@
 AUX libxslt-1.1.23-parallel-install.patch 578 RMD160 b944d9886516e676ec60f7657011d524bff5bba5 SHA1 716cfb859d93acf7b6e5c411e65a7842f396066a SHA256 9b2fa23d7a4fef60c8acec7e8003bc42f4a4c9c1dbd5e035aa54af3e8ccecd5a
-AUX libxslt-1.1.24-exslt_crypt.patch 4906 RMD160 fbdbea30ec2180b3093cf71f9119ad0287fa8be4 SHA1 018183759b431aaabe094ecadbdb30df80613dd8 SHA256 d21b61608d4bd05e99270bbfaa46238157ae72e6869cac519bb11653d508f0dd
 AUX libxslt-1.1.26-undefined.patch 616 RMD160 571771b9fd262df841442b4d8b0db1922529a7d3 SHA1 fcc3730b2466e08ac443ea05e0fff5877f9e2624 SHA256 bcd05d121d9857181037ec5d9740fff51640ee2e4a7c5933c9d65f7ee6011062
 AUX libxslt.m4-libxslt-1.1.26.patch 1421 RMD160 f54116e3871afaa97daf5bbb832f2147d395077b SHA1 cdf3aa89083371b45e88c67cc53b9303cd13f2f8 SHA256 c02cd8437064db0921c08e63245c403dad12410d2997715aa7aa36600bfaa895
-AUX libxslt.m4-libxslt-1.1.8.patch 1292 RMD160 0dcd21978aa0102784df670f2c9835da227f42c8 SHA1 ffa3c5ff84b0636ec4238167e324d377305c4d34 SHA256 0da59fb6cb50bf30e8ac79644df90394707ac07e60337aa3c0e53986781e9e0d
-DIST libxslt-1.1.24.tar.gz 3363961 RMD160 41e7721eeed722c45310877d045422b47ab32973 SHA1 b5402e24abff5545ed76f6a55049cbebc664bd58 SHA256 c0c10944841e9a79f29d409c6f8da0d1b1af0403eb3819c82c788dfa6a180b3e
 DIST libxslt-1.1.26.tar.gz 3401513 RMD160 fc7630352ae5772d25fc8132a373d477fb8d8d5f SHA1 69f74df8228b504a87e2b257c2d5238281c65154 SHA256 55dd52b42861f8a02989d701ef716d6280bfa02971e967c285016f99c66e3db1
-EBUILD libxslt-1.1.24-r1.ebuild 1989 RMD160 60766cedca2cb4a2f6ed98b8225ecdb199e5357e SHA1 e07a57823fc3cfb5e98c9bfee4e0cb539b8800f4 SHA256 e7e64141c382574141e3015664dcd67cc827353460e495c5c158ac40d612b148
 EBUILD libxslt-1.1.26.ebuild 1459 RMD160 034fe3e9b825d264c2764c2eab0726769a261e1b SHA1 117e7e2001b52a1bae43e3a2b629d2870feea6e2 SHA256 8da9d1c86e91cf522b70a1b2959a5d64203ac63d0826167f048e6ff2ae82339c
 MISC ChangeLog 24101 RMD160 f62f3d92948fec90abb40cf3f0f0176a297e4e32 SHA1 d7156e64549ff895465929f92603c8dc200ba8f8 SHA256 59ea480e7d66c11fd18e93ff431f0d497c88b1c77900afffa827d9e7a43204d0
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
diff --git a/dev-libs/libxslt/files/libxslt-1.1.24-exslt_crypt.patch b/dev-libs/libxslt/files/libxslt-1.1.24-exslt_crypt.patch
deleted file mode 100644
index c9ab232dd4b9..000000000000
--- a/dev-libs/libxslt/files/libxslt-1.1.24-exslt_crypt.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-Index: libexslt/crypto.c
-===================================================================
---- libexslt/crypto.c	(revision 1479)
-+++ libexslt/crypto.c	(working copy)
-@@ -595,11 +595,13 @@ exsltCryptoRc4EncryptFunction (xmlXPathP
-     int str_len = 0, bin_len = 0, hex_len = 0;
-     xmlChar *key = NULL, *str = NULL, *padkey = NULL;
-     xmlChar *bin = NULL, *hex = NULL;
-+    xsltTransformContextPtr tctxt = NULL;
- 
--    if ((nargs < 1) || (nargs > 3)) {
-+    if (nargs != 2) {
- 	xmlXPathSetArityError (ctxt);
- 	return;
-     }
-+    tctxt = xsltXPathGetTransformContext(ctxt);
- 
-     str = xmlXPathPopString (ctxt);
-     str_len = xmlUTF8Strlen (str);
-@@ -611,7 +613,7 @@ exsltCryptoRc4EncryptFunction (xmlXPathP
-     }
- 
-     key = xmlXPathPopString (ctxt);
--    key_len = xmlUTF8Strlen (str);
-+    key_len = xmlUTF8Strlen (key);
- 
-     if (key_len == 0) {
- 	xmlXPathReturnEmptyString (ctxt);
-@@ -620,15 +622,33 @@ exsltCryptoRc4EncryptFunction (xmlXPathP
- 	return;
-     }
- 
--    padkey = xmlMallocAtomic (RC4_KEY_LENGTH);
-+    padkey = xmlMallocAtomic (RC4_KEY_LENGTH + 1);
-+    if (padkey == NULL) {
-+	xsltTransformError(tctxt, NULL, tctxt->inst,
-+	    "exsltCryptoRc4EncryptFunction: Failed to allocate padkey\n");
-+	tctxt->state = XSLT_STATE_STOPPED;
-+	xmlXPathReturnEmptyString (ctxt);
-+	goto done;
-+    }
-+    memset(padkey, 0, RC4_KEY_LENGTH + 1);
-+
-     key_size = xmlUTF8Strsize (key, key_len);
-+    if ((key_size > RC4_KEY_LENGTH) || (key_size < 0)) {
-+	xsltTransformError(tctxt, NULL, tctxt->inst,
-+	    "exsltCryptoRc4EncryptFunction: key size too long or key broken\n");
-+	tctxt->state = XSLT_STATE_STOPPED;
-+	xmlXPathReturnEmptyString (ctxt);
-+	goto done;
-+    }
-     memcpy (padkey, key, key_size);
--    memset (padkey + key_size, '\0', sizeof (padkey));
- 
- /* encrypt it */
-     bin_len = str_len;
-     bin = xmlStrdup (str);
-     if (bin == NULL) {
-+	xsltTransformError(tctxt, NULL, tctxt->inst,
-+	    "exsltCryptoRc4EncryptFunction: Failed to allocate string\n");
-+	tctxt->state = XSLT_STATE_STOPPED;
- 	xmlXPathReturnEmptyString (ctxt);
- 	goto done;
-     }
-@@ -638,6 +658,9 @@ exsltCryptoRc4EncryptFunction (xmlXPathP
-     hex_len = str_len * 2 + 1;
-     hex = xmlMallocAtomic (hex_len);
-     if (hex == NULL) {
-+	xsltTransformError(tctxt, NULL, tctxt->inst,
-+	    "exsltCryptoRc4EncryptFunction: Failed to allocate result\n");
-+	tctxt->state = XSLT_STATE_STOPPED;
- 	xmlXPathReturnEmptyString (ctxt);
- 	goto done;
-     }
-@@ -670,11 +693,13 @@ exsltCryptoRc4DecryptFunction (xmlXPathP
-     int str_len = 0, bin_len = 0, ret_len = 0;
-     xmlChar *key = NULL, *str = NULL, *padkey = NULL, *bin =
- 	NULL, *ret = NULL;
-+    xsltTransformContextPtr tctxt = NULL;
- 
--    if ((nargs < 1) || (nargs > 3)) {
-+    if (nargs != 2) {
- 	xmlXPathSetArityError (ctxt);
- 	return;
-     }
-+    tctxt = xsltXPathGetTransformContext(ctxt);
- 
-     str = xmlXPathPopString (ctxt);
-     str_len = xmlUTF8Strlen (str);
-@@ -686,7 +711,7 @@ exsltCryptoRc4DecryptFunction (xmlXPathP
-     }
- 
-     key = xmlXPathPopString (ctxt);
--    key_len = xmlUTF8Strlen (str);
-+    key_len = xmlUTF8Strlen (key);
- 
-     if (key_len == 0) {
- 	xmlXPathReturnEmptyString (ctxt);
-@@ -695,22 +720,51 @@ exsltCryptoRc4DecryptFunction (xmlXPathP
- 	return;
-     }
- 
--    padkey = xmlMallocAtomic (RC4_KEY_LENGTH);
-+    padkey = xmlMallocAtomic (RC4_KEY_LENGTH + 1);
-+    if (padkey == NULL) {
-+	xsltTransformError(tctxt, NULL, tctxt->inst,
-+	    "exsltCryptoRc4EncryptFunction: Failed to allocate padkey\n");
-+	tctxt->state = XSLT_STATE_STOPPED;
-+	xmlXPathReturnEmptyString (ctxt);
-+	goto done;
-+    }
-+    memset(padkey, 0, RC4_KEY_LENGTH + 1);
-     key_size = xmlUTF8Strsize (key, key_len);
-+    if ((key_size > RC4_KEY_LENGTH) || (key_size < 0)) {
-+	xsltTransformError(tctxt, NULL, tctxt->inst,
-+	    "exsltCryptoRc4EncryptFunction: key size too long or key broken\n");
-+	tctxt->state = XSLT_STATE_STOPPED;
-+	xmlXPathReturnEmptyString (ctxt);
-+	goto done;
-+    }
-     memcpy (padkey, key, key_size);
--    memset (padkey + key_size, '\0', sizeof (padkey));
- 
- /* decode hex to binary */
-     bin_len = str_len;
-     bin = xmlMallocAtomic (bin_len);
-+    if (bin == NULL) {
-+	xsltTransformError(tctxt, NULL, tctxt->inst,
-+	    "exsltCryptoRc4EncryptFunction: Failed to allocate string\n");
-+	tctxt->state = XSLT_STATE_STOPPED;
-+	xmlXPathReturnEmptyString (ctxt);
-+	goto done;
-+    }
-     ret_len = exsltCryptoHex2Bin (str, str_len, bin, bin_len);
- 
- /* decrypt the binary blob */
-     ret = xmlMallocAtomic (ret_len);
-+    if (ret == NULL) {
-+	xsltTransformError(tctxt, NULL, tctxt->inst,
-+	    "exsltCryptoRc4EncryptFunction: Failed to allocate result\n");
-+	tctxt->state = XSLT_STATE_STOPPED;
-+	xmlXPathReturnEmptyString (ctxt);
-+	goto done;
-+    }
-     PLATFORM_RC4_DECRYPT (ctxt, padkey, bin, ret_len, ret, ret_len);
- 
-     xmlXPathReturnString (ctxt, ret);
- 
-+done:
-     if (key != NULL)
- 	xmlFree (key);
-     if (str != NULL)
diff --git a/dev-libs/libxslt/files/libxslt.m4-libxslt-1.1.8.patch b/dev-libs/libxslt/files/libxslt.m4-libxslt-1.1.8.patch
deleted file mode 100644
index 82db848d954e..000000000000
--- a/dev-libs/libxslt/files/libxslt.m4-libxslt-1.1.8.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- libxslt.m4	2004-05-17 05:25:26.000000000 +0200
-+++ libxslt.m4.patched	2004-07-26 06:05:36.000000000 +0200
-@@ -52,8 +52,10 @@
-            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-     if test "x$enable_xslttest" = "xyes" ; then
-       ac_save_CFLAGS="$CFLAGS"
-+      ac_save_CXXFLAGS="$CXXFLAGS"
-       ac_save_LIBS="$LIBS"
-       CFLAGS="$CFLAGS $XSLT_CFLAGS"
-+      CXXFLAGS="$CFLAGS"
-       LIBS="$XSLT_LIBS $LIBS"
- dnl
- dnl Now check if the installed libxslt is sufficiently new.
-@@ -138,6 +140,7 @@
- }
- ],, no_xslt=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-        CFLAGS="$ac_save_CFLAGS"
-+       CXXFLAGS="$ac_save_CXXFLAGS"
-        LIBS="$ac_save_LIBS"
-      fi
-   fi
-@@ -158,6 +161,7 @@
-        else
-           echo "*** Could not run libxslt test program, checking why..."
-           CFLAGS="$CFLAGS $XSLT_CFLAGS"
-+          CXXFLAGS="$CFLAGS"
-           LIBS="$LIBS $XSLT_LIBS"
-           AC_TRY_LINK([
- #include <libxslt/xslt.h>
-@@ -177,6 +181,7 @@
-           echo "*** or that you have moved LIBXSLT since it was installed. In the latter case, you"
-           echo "*** may want to edit the xslt-config script: $XSLT_CONFIG" ])
-           CFLAGS="$ac_save_CFLAGS"
-+		  CXXFLAGS="$ac_save_CXXFLAGS"
-           LIBS="$ac_save_LIBS"
-        fi
-      fi
diff --git a/dev-libs/libxslt/libxslt-1.1.24-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.24-r1.ebuild
deleted file mode 100644
index 441faa1917db..000000000000
--- a/dev-libs/libxslt/libxslt-1.1.24-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.24-r1.ebuild,v 1.3 2009/05/31 23:10:10 eva Exp $
-
-inherit libtool eutils python autotools
-
-DESCRIPTION="XSLT libraries and tools"
-HOMEPAGE="http://www.xmlsoft.org/"
-SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="crypt debug examples python"
-
-RDEPEND=">=dev-libs/libxml2-2.6.27
-	crypt?  ( >=dev-libs/libgcrypt-1.1.92 )
-	python? ( dev-lang/python )"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# we still require the 1.1.8 patch for the .m4 file, to add
-	# the CXXFLAGS defines <obz@gentoo.org>
-	epatch "${FILESDIR}/libxslt.m4-${PN}-1.1.8.patch"
-
-	# fix parallel install, bug #212784.
-	epatch "${FILESDIR}/${PN}-1.1.23-parallel-install.patch"
-
-	# Patch Makefile to fix bug #99382 so that html gets installed in ${PF}
-	sed -i -e "s:libxslt-\$(VERSION):${PF}:" doc/Makefile.am
-
-	# Fix broken <python-2.5 site-packages detection
-	# see bug #86756 and bug #218643
-	python_version
-	sed -i "s:^\(AC_SUBST(PYTHON_SITE_PACKAGES)\):PYTHON_SITE_PACKAGES=\"/usr/$(get_libdir)/python${PYVER}/site-packages\"\n\1:" configure.in
-
-	# Fix broken rc4 encrypt.  bug #232172
-	epatch "${FILESDIR}/${P}-exslt_crypt.patch"
-
-	eautoreconf
-	epunt_cxx
-	elibtoolize
-}
-
-src_compile() {
-	local myconf="$(use_with python) \
-		$(use_with crypt crypto) \
-		$(use_with debug)        \
-		$(use_with debug mem-debug)"
-
-	econf ${myconf}
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		DOCS_DIR=/usr/share/doc/${PF}/python \
-		install || die "Installation failed"
-
-	dodoc AUTHORS ChangeLog Copyright FEATURES NEWS README TODO || die "dodoc failed"
-	rm -rf "${D}/usr/share/doc/${PN}-python-${PV}"
-
-	if ! use examples; then
-		rm -rf "${D}/usr/share/doc/${PF}/python/examples"
-	fi
-}