Made new patch that adds xalan to classpath, since previous patch was removing boot classpath. This one does both. Removed previous ebuild and patch.

Package-Manager: portage-2.1.2_pre2-r6

4 files changed, 12 insertions, 92 deletions

diff --git a/dev-java/jakarta-jstl/Manifest b/dev-java/jakarta-jstl/Manifest
index b0e741e1048a..9499799f56a3 100644
--- a/dev-java/jakarta-jstl/Manifest
+++ b/dev-java/jakarta-jstl/Manifest
@@ -1,27 +1,20 @@
-AUX jakarta-jstl-1.1.2-remove-bootclasspath.patch 585 RMD160 7e2f0439bec451eb4ba614d4e0a6f1ad5a91f0d6 SHA1 9c7c0e56c83bd9301ecc3a0d7e5ee9d15976eeae SHA256 7aaa78dff11710a7737af2194d42d44f245ca3a2edd82f7f9b580d3bec79fb96
-MD5 90e28dc5d90aba8e6d6d573e2a4864ef files/jakarta-jstl-1.1.2-remove-bootclasspath.patch 585
-RMD160 7e2f0439bec451eb4ba614d4e0a6f1ad5a91f0d6 files/jakarta-jstl-1.1.2-remove-bootclasspath.patch 585
-SHA256 7aaa78dff11710a7737af2194d42d44f245ca3a2edd82f7f9b580d3bec79fb96 files/jakarta-jstl-1.1.2-remove-bootclasspath.patch 585
+AUX build-xml.patch 772 RMD160 c56532bc6cddcf23ba48bcd840d92d8ef449312c SHA1 9baa3d372b1baed7fd56fd95436c324cf6fcfeb2 SHA256 3b3b03c03624ed1d800c2f7e614239d1ff2ce598826835260a785aed6504e6b4
+MD5 e2e210c3f3f83243a04b42b3d7893e84 files/build-xml.patch 772
+RMD160 c56532bc6cddcf23ba48bcd840d92d8ef449312c files/build-xml.patch 772
+SHA256 3b3b03c03624ed1d800c2f7e614239d1ff2ce598826835260a785aed6504e6b4 files/build-xml.patch 772
 DIST jakarta-taglibs-standard-1.1.2-src.tar.gz 287031 RMD160 00ac3b34c7aab445f757bf5b6aaef273194bbf94 SHA1 1d24c9e5019b57f298a40a77bac3f863ecf8a033 SHA256 47a0222c426d93dcc9d7493520d52dba85ba256385d351cdc957cf4b6b30fe23
-EBUILD jakarta-jstl-1.1.2-r1.ebuild 1905 RMD160 2b567de6d36767d09f6b7b423a78fc766050a8e7 SHA1 6cfb193d2611bcc334a26d3d1c969b769a21046b SHA256 0db4f18e7f13f460ba20f0ee57100ea7201b8aafe0cd910239751effcb6ceeeb
-MD5 d295990f39e805b5249fe348fa40f6fd jakarta-jstl-1.1.2-r1.ebuild 1905
-RMD160 2b567de6d36767d09f6b7b423a78fc766050a8e7 jakarta-jstl-1.1.2-r1.ebuild 1905
-SHA256 0db4f18e7f13f460ba20f0ee57100ea7201b8aafe0cd910239751effcb6ceeeb jakarta-jstl-1.1.2-r1.ebuild 1905
-EBUILD jakarta-jstl-1.1.2.ebuild 1890 RMD160 b33b1d90e28c84057f076a5bc2c161e9a866bce5 SHA1 5c1c123c8346d2d34cb3482ecbab403a312c71e1 SHA256 21bec4ff88156a41136b03d1a5c2c654a533e7f98f63c9a6c0db48f2f5585cbf
-MD5 741e0d08691f7116f24110042b583095 jakarta-jstl-1.1.2.ebuild 1890
-RMD160 b33b1d90e28c84057f076a5bc2c161e9a866bce5 jakarta-jstl-1.1.2.ebuild 1890
-SHA256 21bec4ff88156a41136b03d1a5c2c654a533e7f98f63c9a6c0db48f2f5585cbf jakarta-jstl-1.1.2.ebuild 1890
-MISC ChangeLog 1582 RMD160 dd3e63c222c4b6bf236aae9b11b94742e52f5d31 SHA1 83bfc2ff3f9177f0363ca2cba69fb1331bfa92d9 SHA256 e93d242307d654c0603e053abcd90d6fbd9f0292d908f33e0c9e16d2b71a4320
-MD5 0aba4f16a1722799b4987bd122ee90dd ChangeLog 1582
-RMD160 dd3e63c222c4b6bf236aae9b11b94742e52f5d31 ChangeLog 1582
-SHA256 e93d242307d654c0603e053abcd90d6fbd9f0292d908f33e0c9e16d2b71a4320 ChangeLog 1582
+EBUILD jakarta-jstl-1.1.2-r1.ebuild 1888 RMD160 6dad11325ebdd1cec7eb123bbf748378541d7c67 SHA1 224740b3d8ccc660a30263ef15bd56253e13567d SHA256 6ecd6b58ffd40859d0e8a875589d8c86a31568aa67bafb750154c728f9e2a8e6
+MD5 df3f34afeec1f4812f3a03e7050d2df5 jakarta-jstl-1.1.2-r1.ebuild 1888
+RMD160 6dad11325ebdd1cec7eb123bbf748378541d7c67 jakarta-jstl-1.1.2-r1.ebuild 1888
+SHA256 6ecd6b58ffd40859d0e8a875589d8c86a31568aa67bafb750154c728f9e2a8e6 jakarta-jstl-1.1.2-r1.ebuild 1888
+MISC ChangeLog 1937 RMD160 a3a607e7e4dde3037fc99be4546fcc6347356352 SHA1 89b5fd8c44ec5e9cc6eecf7fdff7eeadec316b44 SHA256 16bfdc66acdbd4ac964e3feb2628c8e27ad97b42c0f27a683899feaf7428570b
+MD5 9d7607dd502ac43d5605371bc87d1b85 ChangeLog 1937
+RMD160 a3a607e7e4dde3037fc99be4546fcc6347356352 ChangeLog 1937
+SHA256 16bfdc66acdbd4ac964e3feb2628c8e27ad97b42c0f27a683899feaf7428570b ChangeLog 1937
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata.xml 158
-MD5 e933c1ba30900ac5716147f05cbeac56 files/digest-jakarta-jstl-1.1.2 304
-RMD160 81a6d4f25ecbd6f0947e204edf51325cbdfe4db2 files/digest-jakarta-jstl-1.1.2 304
-SHA256 33fc8ada033d3dc1f70d75887f84d8b7c70396410495e5ca152d8b2a22bf4363 files/digest-jakarta-jstl-1.1.2 304
 MD5 e933c1ba30900ac5716147f05cbeac56 files/digest-jakarta-jstl-1.1.2-r1 304
 RMD160 81a6d4f25ecbd6f0947e204edf51325cbdfe4db2 files/digest-jakarta-jstl-1.1.2-r1 304
 SHA256 33fc8ada033d3dc1f70d75887f84d8b7c70396410495e5ca152d8b2a22bf4363 files/digest-jakarta-jstl-1.1.2-r1 304
diff --git a/dev-java/jakarta-jstl/files/digest-jakarta-jstl-1.1.2 b/dev-java/jakarta-jstl/files/digest-jakarta-jstl-1.1.2
deleted file mode 100644
index 5f4c5e1ac1ac..000000000000
--- a/dev-java/jakarta-jstl/files/digest-jakarta-jstl-1.1.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 42a65b8bd2dede333e4fdfa029f557c2 jakarta-taglibs-standard-1.1.2-src.tar.gz 287031
-RMD160 00ac3b34c7aab445f757bf5b6aaef273194bbf94 jakarta-taglibs-standard-1.1.2-src.tar.gz 287031
-SHA256 47a0222c426d93dcc9d7493520d52dba85ba256385d351cdc957cf4b6b30fe23 jakarta-taglibs-standard-1.1.2-src.tar.gz 287031
diff --git a/dev-java/jakarta-jstl/files/jakarta-jstl-1.1.2-remove-bootclasspath.patch b/dev-java/jakarta-jstl/files/jakarta-jstl-1.1.2-remove-bootclasspath.patch
deleted file mode 100644
index a1003026b67e..000000000000
--- a/dev-java/jakarta-jstl/files/jakarta-jstl-1.1.2-remove-bootclasspath.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- standard.orig/build.xml	2006-05-25 13:27:01.000000000 -0500
-+++ standard/build.xml	2006-05-25 13:27:26.000000000 -0500
-@@ -170,7 +170,6 @@
-     <javac 
-       srcdir="${library.src}" 
-       destdir="${build.library}/classes"
--      bootclasspath="${xalan.jar}:${java.home}/lib/rt.jar"
-       classpath="${servlet24.jar}:${jsp20.jar}:${jdbc2_0-stdext.jar}:${jaxp-api.jar}:${dom.jar}:${sax.jar}"
-       excludes="org/apache/taglibs/standard/lang/jstl/parser/jsp20/* org/apache/taglibs/standard/lang/jpath/** org/apache/taglibs/standard/lang/spel/**"
-       debug="${compile.debug}"
diff --git a/dev-java/jakarta-jstl/jakarta-jstl-1.1.2.ebuild b/dev-java/jakarta-jstl/jakarta-jstl-1.1.2.ebuild
deleted file mode 100644
index fbea0e1e0509..000000000000
--- a/dev-java/jakarta-jstl/jakarta-jstl-1.1.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-jstl/jakarta-jstl-1.1.2.ebuild,v 1.8 2006/09/14 03:06:39 nichoj Exp $
-
-inherit java-pkg eutils
-
-DESCRIPTION="An implementation of the JSP Standard Tag Library (JSTL)"
-HOMEPAGE="http://jakarta.apache.org/taglibs/doc/standard-doc/intro.html"
-SRC_URI="mirror://apache/jakarta/taglibs/standard/source/jakarta-taglibs-standard-${PV}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="doc jikes examples source"
-
-RDEPEND=">=virtual/jre-1.4.2
-	=dev-java/servletapi-2.4*"
-DEPEND=">=virtual/jdk-1.4.2
-	${RDEPEND}
-	dev-java/ant-core
-	jikes? ( dev-java/jikes )
-	source? ( app-arch/zip )"
-
-S=${WORKDIR}/jakarta-taglibs-standard-${PV}-src/standard
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# Remove unnecessary bootclasspath from javac calls.
-	# This allows compilation with  non-Sun JDKs
-	# See bug #134206
-	# TODO file upstream
-	epatch ${FILESDIR}/${P}-remove-bootclasspath.patch
-
-	echo -e "base.dir=..\n" \
-		"build.dir = \${base.dir}/build\n" \
-		"build.classes=\${build.dir}/standard/standard/classes\n" \
-		"dist.dir = \${base.dir}/dist\n" \
-		"servlet24.jar=$(java-pkg_getjar servletapi-2.4 servlet-api.jar)\n" \
-		"jsp20.jar=$(java-pkg_getjar servletapi-2.4 jsp-api.jar)\n" \
-		> build.properties
-}
-
-src_compile() {
-	local antflags="build"
-	use doc && antflags="${antflags} javadoc-dist"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} || die "compilation failed"
-}
-
-src_install() {
-	java-pkg_dojar ${S}/../build/standard/standard/lib/*.jar
-
-	use doc && java-pkg_dohtml -r ${S}/doc/web/* ${S}/../dist/standard/javadoc/
-	if use examples; then
-		dodir /usr/share/doc/${PF}/examples
-		cp -r ${S}/examples/* ${D}/usr/share/doc/${PF}/examples
-	fi
-	use source && java-pkg_dosrc ${S}/src/*
-}