Added patch to remove unnecessary bootclasspath from javac. This allows for the possibility to keywrod on ppc and elsewhere. Provided by Aymeric Nys <aymeric@nnx.com> in bug #134206.

Package-Manager: portage-2.1.1

5 files changed, 44 insertions, 22 deletions

diff --git a/dev-java/jakarta-jstl/ChangeLog b/dev-java/jakarta-jstl/ChangeLog
index 58cfba19bd92..867ebe3c71a3 100644
--- a/dev-java/jakarta-jstl/ChangeLog
+++ b/dev-java/jakarta-jstl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jakarta-jstl
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-jstl/ChangeLog,v 1.4 2006/04/03 23:16:09 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-jstl/ChangeLog,v 1.5 2006/09/13 17:41:31 nichoj Exp $
+
+  13 Sep 2006; Joshua Nichols <nichoj@gentoo.org>
+  +files/jakarta-jstl-1.1.2-remove-bootclasspath.patch,
+  jakarta-jstl-1.1.2.ebuild:
+  Added patch to remove unnecessary bootclasspath from javac. This allows for
+  the possibility to keywrod on ppc and elsewhere. Provided by Aymeric Nys
+  <aymeric@nnx.com> in bug #134206.
 
   03 Apr 2006; Joshua Nichols <nichoj@gentoo.org> jakarta-jstl-1.1.2.ebuild:
   Removed unecessary tomcat dependency.
diff --git a/dev-java/jakarta-jstl/Manifest b/dev-java/jakarta-jstl/Manifest
index 84279a65973f..1399df879365 100644
--- a/dev-java/jakarta-jstl/Manifest
+++ b/dev-java/jakarta-jstl/Manifest
@@ -1,22 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 15349889f30dad573b58fa56e075679c ChangeLog 752
-RMD160 010c637a78133e549644f911dc14c1124e8ed120 ChangeLog 752
-SHA256 e9bcb4a9809c2f9adeeaadc8303bfc06b91a2574f6cd87b4398be0925be9c635 ChangeLog 752
-MD5 8c701edd23836a70f273903ebfa44382 files/digest-jakarta-jstl-1.1.2 86
-RMD160 cd69f2ab4d31efbeb5e46b4c767f7dc9ee4a1375 files/digest-jakarta-jstl-1.1.2 86
-SHA256 eadb1fa17335a8517d7f0e92eb551b60e4a6d8e992d80bbde604b4c595d9f87d files/digest-jakarta-jstl-1.1.2 86
-MD5 082f3a6b48d0d6283b3a345a80a567cf jakarta-jstl-1.1.2.ebuild 1691
-RMD160 4a21ea2c2416ac2d3453eeaea3c9da6508100d45 jakarta-jstl-1.1.2.ebuild 1691
-SHA256 5309cfd95b4928d21a00649d28ae526f9bd6551317eb2da7fae0df03f48bcf1f jakarta-jstl-1.1.2.ebuild 1691
+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
+DIST jakarta-taglibs-standard-1.1.2-src.tar.gz 287031 RMD160 00ac3b34c7aab445f757bf5b6aaef273194bbf94 SHA1 1d24c9e5019b57f298a40a77bac3f863ecf8a033 SHA256 47a0222c426d93dcc9d7493520d52dba85ba256385d351cdc957cf4b6b30fe23
+EBUILD jakarta-jstl-1.1.2.ebuild 1891 RMD160 696880675c2771d295929babd68b68c750167569 SHA1 48e385962b26509828919cbd700fa6a5a07bf43c SHA256 f79103585d94abcfd97fb25b76e1b189e73db2470ebdc0457f77e01356c12bf7
+MD5 6eb54f3387370084090a77f1a690b4ce jakarta-jstl-1.1.2.ebuild 1891
+RMD160 696880675c2771d295929babd68b68c750167569 jakarta-jstl-1.1.2.ebuild 1891
+SHA256 f79103585d94abcfd97fb25b76e1b189e73db2470ebdc0457f77e01356c12bf7 jakarta-jstl-1.1.2.ebuild 1891
+MISC ChangeLog 1077 RMD160 78aa7b4f8f83d4cc67c8a25a07e1638e758e0388 SHA1 aeaef78dc566c2dcc9a7bfa32e042cc9e3646aac SHA256 b8cd262a9b47e5270869138391128d95c24a7d6029d01b86463a9a8de77a8c4e
+MD5 10a0337798f5d6bfe378a130cead42f6 ChangeLog 1077
+RMD160 78aa7b4f8f83d4cc67c8a25a07e1638e758e0388 ChangeLog 1077
+SHA256 b8cd262a9b47e5270869138391128d95c24a7d6029d01b86463a9a8de77a8c4e ChangeLog 1077
+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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEMazZndWRXhKOboURAkn1AKC664TS9RdPUgz0fzhMuG96clYpeACg1Za2
-EutsR2VIbKgtEYdDVpxYZZI=
-=Sq/0
------END PGP SIGNATURE-----
+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
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
index 4909fdd92716..5f4c5e1ac1ac 100644
--- a/dev-java/jakarta-jstl/files/digest-jakarta-jstl-1.1.2
+++ b/dev-java/jakarta-jstl/files/digest-jakarta-jstl-1.1.2
@@ -1 +1,3 @@
 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
new file mode 100644
index 000000000000..a1003026b67e
--- /dev/null
+++ b/dev-java/jakarta-jstl/files/jakarta-jstl-1.1.2-remove-bootclasspath.patch
@@ -0,0 +1,10 @@
+--- 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
index 4710dc1bec84..89c6b4efd193 100644
--- a/dev-java/jakarta-jstl/jakarta-jstl-1.1.2.ebuild
+++ b/dev-java/jakarta-jstl/jakarta-jstl-1.1.2.ebuild
@@ -1,8 +1,8 @@
 # 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.5 2006/04/03 23:16:09 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-jstl/jakarta-jstl-1.1.2.ebuild,v 1.6 2006/09/13 17:41:31 nichoj Exp $
 
-inherit java-pkg
+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"
@@ -26,6 +26,11 @@ 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" \