| 1 |
commit: d052d624e9ddf9fcfe5ababf0a423e54c779b764 |
| 2 |
Author: Florian Schmaus <flow <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 1 19:19:22 2022 +0000 |
| 4 |
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 1 19:19:22 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d052d624 |
| 7 |
|
| 8 |
dev-java/batik: minor code style changes |
| 9 |
|
| 10 |
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-java/batik/batik-1.14-r1.ebuild | 15 +-------------- |
| 13 |
1 file changed, 1 insertion(+), 14 deletions(-) |
| 14 |
|
| 15 |
diff --git a/dev-java/batik/batik-1.14-r1.ebuild b/dev-java/batik/batik-1.14-r1.ebuild |
| 16 |
index 4d4b9a29d2be..97c0d8183481 100644 |
| 17 |
--- a/dev-java/batik/batik-1.14-r1.ebuild |
| 18 |
+++ b/dev-java/batik/batik-1.14-r1.ebuild |
| 19 |
@@ -35,7 +35,7 @@ DEPEND="${CP_DEPEND} |
| 20 |
RDEPEND="${CP_DEPEND} |
| 21 |
>=virtual/jre-1.8:*" |
| 22 |
|
| 23 |
-DOCS=( {CHANGES,NOTICE,README} ) |
| 24 |
+DOCS=( CHANGES NOTICE README ) |
| 25 |
|
| 26 |
S="${WORKDIR}/batik-${PV}" |
| 27 |
|
| 28 |
@@ -45,10 +45,8 @@ src_prepare() { |
| 29 |
} |
| 30 |
|
| 31 |
src_compile() { |
| 32 |
- |
| 33 |
# We loop over the modules list and compile the jar files. |
| 34 |
while read module; do |
| 35 |
- |
| 36 |
einfo "Compiling $module" |
| 37 |
|
| 38 |
JAVA_SRC_DIR="" |
| 39 |
@@ -82,7 +80,6 @@ src_compile() { |
| 40 |
JAVA_GENTOO_CLASSPATH_EXTRA+=":$module.jar" |
| 41 |
|
| 42 |
rm -fr target || die |
| 43 |
- |
| 44 |
# Modules batik-rasterizer-ext and batik-squiggle-ext, upstream puts their jar files in the extensions |
| 45 |
# directory, see batik-extension/src/main/resources/org/apache/batik/extensions/README.txt |
| 46 |
# We keep them in the mudules list for later but omit them by 'grep -v'. |
| 47 |
@@ -91,17 +88,14 @@ src_compile() { |
| 48 |
done < <(grep -v '\(batik-rasterizer-ext\|batik-squiggle-ext\|batik-test-old\)' "${FILESDIR}"/batik-1.14-modules) |
| 49 |
|
| 50 |
if use doc; then |
| 51 |
- |
| 52 |
JAVA_SRC_DIR="" |
| 53 |
JAVA_JAR_FILENAME="ignoreme.jar" |
| 54 |
|
| 55 |
while read module; do |
| 56 |
- |
| 57 |
# Some modules don't have source code |
| 58 |
if [[ -d $module/src/main/java/org ]]; then |
| 59 |
JAVA_SRC_DIR+=( "$module/src/main/java" ) |
| 60 |
fi |
| 61 |
- |
| 62 |
done < "${FILESDIR}"/batik-1.14-modules |
| 63 |
|
| 64 |
java-pkg-simple_src_compile |
| 65 |
@@ -109,11 +103,9 @@ src_compile() { |
| 66 |
} |
| 67 |
|
| 68 |
src_test() { |
| 69 |
- |
| 70 |
JAVA_TEST_GENTOO_CLASSPATH="junit-4" |
| 71 |
|
| 72 |
while read module; do |
| 73 |
- |
| 74 |
einfo "Testing $module" |
| 75 |
|
| 76 |
JAVA_TEST_SRC_DIR="" |
| 77 |
@@ -133,7 +125,6 @@ src_test() { |
| 78 |
JAVA_TEST_SRC_DIR="$module/src/test/java" |
| 79 |
java-pkg-simple_src_test |
| 80 |
fi |
| 81 |
- |
| 82 |
done < <(grep -v '\(batik-rasterizer-ext\|batik-squiggle-ext\|batik-test-old\)' "${FILESDIR}"/batik-1.14-modules) |
| 83 |
} |
| 84 |
|
| 85 |
@@ -143,7 +134,6 @@ src_install() { |
| 86 |
doicon batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/init.svg |
| 87 |
|
| 88 |
while read module; do |
| 89 |
- |
| 90 |
JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' $module/pom.xml ) |
| 91 |
|
| 92 |
java-pkg_dojar $module.jar |
| 93 |
@@ -155,13 +145,10 @@ src_install() { |
| 94 |
|
| 95 |
# Some modules don't have source code |
| 96 |
if [[ -d $module/src/main/java/org ]]; then |
| 97 |
- |
| 98 |
if use source; then |
| 99 |
java-pkg_dosrc "$module/src/main/java/*" |
| 100 |
fi |
| 101 |
- |
| 102 |
fi |
| 103 |
- |
| 104 |
done < <(grep -v '\(batik-rasterizer-ext\|batik-squiggle-ext\|batik-test-old\)' "${FILESDIR}"/batik-1.14-modules) |
| 105 |
|
| 106 |
local java_policy_file="${JAVA_PKG_SHAREPATH}/etc/${PN}.policy" |
Archives