[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

[Patrice Clement]

commit:     95cbaa87f0b70702ab7829ae642c3fa223e6683a
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 28 17:53:38 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Oct 28 17:57:13 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95cbaa87

dev-java/batik: make a bunch of variables local.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-java/batik/batik-1.9.ebuild | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/dev-java/batik/batik-1.9.ebuild b/dev-java/batik/batik-1.9.ebuild
index a223d4116d9..ab95a4c9432 100644
--- a/dev-java/batik/batik-1.9.ebuild
+++ b/dev-java/batik/batik-1.9.ebuild
@@ -26,24 +26,26 @@ CDEPEND="
        dev-java/xml-commons-external:1.3"
 
 DEPEND="
-       >=virtual/jdk-1.6
-       ${CDEPEND}"
+       ${CDEPEND}
+       >=virtual/jdk-1.6"
 
 RDEPEND="
-       >=virtual/jre-1.6
-       ${CDEPEND}"
+       ${CDEPEND}
+       >=virtual/jre-1.6"
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
 
 EANT_GENTOO_CLASSPATH="
        xml-commons-external-1.3
        xmlgraphics-commons-2
-       xalan
        rhino-1.6
-"
+       xalan"
 
-java_prepare() {
-       # bug #318323
+src_prepare() {
+       default
+
+       # See bug 318323.
+       local file
        for file in build.xml contrib/rasterizertask/build.xml; do
                java-ant_xml-rewrite -f ${file} -c -e javadoc -a failonerror -v 
no -a maxmemory -v 512m
        done
@@ -69,6 +71,7 @@ src_compile() {
 
 src_install() {
        batik_unversion_jars() {
+               local jar
                for jar in batik-*.jar; do
                        newj="${jar%-*}.jar"
                        java-pkg_newjar ${jar} ${newj}
@@ -88,11 +91,13 @@ src_install() {
        dodoc README CHANGES
        use doc && java-pkg_dojavadoc "${P}/docs/javadoc"
 
-       # pwd fixes bug #116976
-       java-pkg_dolauncher batik-${SLOT} --pwd 
"${EPREFIX}/usr/share/${PN}-${SLOT}/" \
+       # See bug #116976.
+       java-pkg_dolauncher "batik-${SLOT}" \
+               --pwd "${EPREFIX}/usr/share/${PN}-${SLOT}/" \
                --main org.apache.batik.apps.svgbrowser.Main
 
        # To find these lsjar batik-${SLOT} | grep Main.class
+       local launcher
        for launcher in ttf2svg slideshow svgpp rasterizer; do
                java-pkg_dolauncher batik-${launcher}-${SLOT} \
                        --main org.apache.batik.apps.${launcher}.Main