summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Faulhammer <opfer@gentoo.org>2007-11-13 11:21:01 +0000
committerChristian Faulhammer <opfer@gentoo.org>2007-11-13 11:21:01 +0000
commit2bffe0c3e941b59de1c6829cbe06e21e600cf82c (patch)
tree58939b798b7424790a6d22c2e96539c494e5ce06 /dev-java/jakarta-jstl
parentx86 stable, security bug #198196 (diff)
downloadgentoo-2-2bffe0c3e941b59de1c6829cbe06e21e600cf82c.tar.gz
gentoo-2-2bffe0c3e941b59de1c6829cbe06e21e600cf82c.tar.bz2
gentoo-2-2bffe0c3e941b59de1c6829cbe06e21e600cf82c.zip
filtered jikes and quoted some variables
(Portage version: 2.1.3.19)
Diffstat (limited to 'dev-java/jakarta-jstl')
-rw-r--r--dev-java/jakarta-jstl/ChangeLog6
-rw-r--r--dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r1.ebuild15
2 files changed, 13 insertions, 8 deletions
diff --git a/dev-java/jakarta-jstl/ChangeLog b/dev-java/jakarta-jstl/ChangeLog
index 2acf6112f4f1..1262b30bcf95 100644
--- a/dev-java/jakarta-jstl/ChangeLog
+++ b/dev-java/jakarta-jstl/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/jakarta-jstl
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-jstl/ChangeLog,v 1.17 2007/09/09 18:47:51 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-jstl/ChangeLog,v 1.18 2007/11/13 11:21:01 opfer Exp $
+
+ 13 Nov 2007; Christian Faulhammer <opfer@gentoo.org>
+ jakarta-jstl-1.1.2-r1.ebuild:
+ filtered jikes and quoted some variables
09 Sep 2007; Miroslav Šulc <fordfrog@gentoo.org>
jakarta-jstl-1.1.2-r1.ebuild:
diff --git a/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r1.ebuild b/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r1.ebuild
index 0586f7b00e6b..e909425fb23c 100644
--- a/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r1.ebuild
+++ b/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 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-r1.ebuild,v 1.10 2007/09/09 18:47:51 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r1.ebuild,v 1.11 2007/11/13 11:21:01 opfer Exp $
inherit java-pkg-2 java-ant-2 eutils
@@ -29,12 +29,12 @@ S="${WORKDIR}/${MY_P}-src/standard"
src_unpack() {
unpack ${A}
- cd ${S}
+ cd "${S}"
# Remove unnecessary bootclasspath from javac calls.
# This allows compilation with non-Sun JDKs
# See bug #134206
# TODO file upstream
- epatch ${FILESDIR}/build-xml.patch
+ epatch "${FILESDIR}/build-xml.patch"
echo -e "base.dir=..\n" \
"build.dir = \${base.dir}/build\n" \
@@ -44,6 +44,7 @@ src_unpack() {
"jsp20.jar=$(java-pkg_getjar servletapi-2.4 jsp-api.jar)\n" \
"xalan.jar=$(java-pkg_getjar xalan xalan.jar)" \
> build.properties
+ java-pkg_filter-compiler jikes
}
src_compile() {
@@ -51,12 +52,12 @@ src_compile() {
}
src_install() {
- java-pkg_dojar ${S}/../build/standard/standard/lib/*.jar
+ java-pkg_dojar "${S}"/../build/standard/standard/lib/*.jar
- use doc && java-pkg_dohtml -r ${S}/doc/web/* ${S}/../dist/standard/javadoc/
+ 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
+ cp -r "${S}"/examples/* "${D}"/usr/share/doc/${PF}/examples
fi
- use source && java-pkg_dosrc ${S}/src/*
+ use source && java-pkg_dosrc "${S}"/src/*
}