From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B7E0B158091 for ; Sun, 1 May 2022 19:20:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0A8F0E09F4; Sun, 1 May 2022 19:20:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C391CE09F4 for ; Sun, 1 May 2022 19:20:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EE678340FBB for ; Sun, 1 May 2022 19:20:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0B1B0344 for ; Sun, 1 May 2022 19:20:15 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1651432762.d052d624e9ddf9fcfe5ababf0a423e54c779b764.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/batik/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/batik/batik-1.14-r1.ebuild X-VCS-Directories: dev-java/batik/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: d052d624e9ddf9fcfe5ababf0a423e54c779b764 X-VCS-Branch: master Date: Sun, 1 May 2022 19:20:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9f4b2fa2-470e-4edc-a34a-15b2ea0cc969 X-Archives-Hash: de0567af98bdc09cce5dcabadcfb7ad1 commit: d052d624e9ddf9fcfe5ababf0a423e54c779b764 Author: Florian Schmaus gentoo org> AuthorDate: Sun May 1 19:19:22 2022 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Sun May 1 19:19:22 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d052d624 dev-java/batik: minor code style changes Signed-off-by: Florian Schmaus gentoo.org> dev-java/batik/batik-1.14-r1.ebuild | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/dev-java/batik/batik-1.14-r1.ebuild b/dev-java/batik/batik-1.14-r1.ebuild index 4d4b9a29d2be..97c0d8183481 100644 --- a/dev-java/batik/batik-1.14-r1.ebuild +++ b/dev-java/batik/batik-1.14-r1.ebuild @@ -35,7 +35,7 @@ DEPEND="${CP_DEPEND} RDEPEND="${CP_DEPEND} >=virtual/jre-1.8:*" -DOCS=( {CHANGES,NOTICE,README} ) +DOCS=( CHANGES NOTICE README ) S="${WORKDIR}/batik-${PV}" @@ -45,10 +45,8 @@ src_prepare() { } src_compile() { - # We loop over the modules list and compile the jar files. while read module; do - einfo "Compiling $module" JAVA_SRC_DIR="" @@ -82,7 +80,6 @@ src_compile() { JAVA_GENTOO_CLASSPATH_EXTRA+=":$module.jar" rm -fr target || die - # Modules batik-rasterizer-ext and batik-squiggle-ext, upstream puts their jar files in the extensions # directory, see batik-extension/src/main/resources/org/apache/batik/extensions/README.txt # We keep them in the mudules list for later but omit them by 'grep -v'. @@ -91,17 +88,14 @@ src_compile() { done < <(grep -v '\(batik-rasterizer-ext\|batik-squiggle-ext\|batik-test-old\)' "${FILESDIR}"/batik-1.14-modules) if use doc; then - JAVA_SRC_DIR="" JAVA_JAR_FILENAME="ignoreme.jar" while read module; do - # Some modules don't have source code if [[ -d $module/src/main/java/org ]]; then JAVA_SRC_DIR+=( "$module/src/main/java" ) fi - done < "${FILESDIR}"/batik-1.14-modules java-pkg-simple_src_compile @@ -109,11 +103,9 @@ src_compile() { } src_test() { - JAVA_TEST_GENTOO_CLASSPATH="junit-4" while read module; do - einfo "Testing $module" JAVA_TEST_SRC_DIR="" @@ -133,7 +125,6 @@ src_test() { JAVA_TEST_SRC_DIR="$module/src/test/java" java-pkg-simple_src_test fi - done < <(grep -v '\(batik-rasterizer-ext\|batik-squiggle-ext\|batik-test-old\)' "${FILESDIR}"/batik-1.14-modules) } @@ -143,7 +134,6 @@ src_install() { doicon batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/init.svg while read module; do - JAVA_MAIN_CLASS=$( sed -n 's:.*\(.*\):\1:p' $module/pom.xml ) java-pkg_dojar $module.jar @@ -155,13 +145,10 @@ src_install() { # Some modules don't have source code if [[ -d $module/src/main/java/org ]]; then - if use source; then java-pkg_dosrc "$module/src/main/java/*" fi - fi - done < <(grep -v '\(batik-rasterizer-ext\|batik-squiggle-ext\|batik-test-old\)' "${FILESDIR}"/batik-1.14-modules) local java_policy_file="${JAVA_PKG_SHAREPATH}/etc/${PN}.policy"