diff options
4 files changed, 27 insertions, 3 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/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" \ |