gentoo resync : 06.04.2022

5 files changed, 242 insertions, 1 deletions

diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index d1d905460443..e7c783a415a3 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1,4 +1,8 @@
+AUX batik-1.14-modules 461 BLAKE2B a22123561682c3990ad289ca888453b876bb1a4de03b435445758386297cb8e1058db777d4c79941a407c4b95ad8623a6450dc8ba0acf71f66b25a666ab7695c SHA512 19ec52318a76f16122e0740bb8f744e6b669537ad75f44931c1cf64c407a1d11b6eba4ea4b0e0e37ec5402e9ff99b76e8ae0e5b65f529f6ad56e30625cb7b77e
 AUX batik-1.9-ImportInfo.patch 439 BLAKE2B 2d1c13f8ffa944c9f303932818b4df5b2c9c10f2903b67500971413e9e3460340b4c6d9bb3e84875ce06845f6646d0ce566a295a5982e88209bf692266dabbb8 SHA512 ff390670537fd631dbd0041a4496e0a33daa1bbd9390867285d2a817ee7794d19c0d634dbfcf4a1e777db072a0f1b6bc2b68e475bbe590bce825aa7b7d76f643
+AUX batik-squiggle.desktop 177 BLAKE2B 7f4fbc31f31f6ddbdb7802ad4ea6b87c21b39b83cec2caf5f8b68634693b05c66e3f7da6d2cf69f5da6defa2d44fa4c5a0eba4af13308b8f18fb666be86b1d40 SHA512 7e7be90a0a779752cf04bbb1e702f5f3ca773129f7dfebcc3352e55f81cad2d65f6067e07c075f730b7f11235529804856fc226703b5e213216bc110dd978d8e
+DIST batik-src-1.14.tar.gz 17647867 BLAKE2B 9385e77e739ece921012310a53953a6e258a5d748987e85dd20783ca248ae55619db6472b7590a45fe40a1b51c693478a37a7dbe1a958b42392c525e5f228815 SHA512 689c52f58f8f0456c89bd18745d2d92e7590b9054bea71b96be87d44977057d583e78504cbf14afc3e0c585d2383dac3009c7c421de868c847db045e921da8fb
 DIST batik-src-1.9.tar.gz 16748072 BLAKE2B 4e23c0de3d56ba130c5bc9ef80a01549e8c11ab4db3b1ac5dae8525cf0a3a8b7f4df3161c12f1f0df9c74229aaf2034fb6c9c2f91b7fc7407a0af580d144e606 SHA512 96a5c16bd3d61ea33ed5013fd0b00f1724470d9b667f0f84ef4a29dcaaa19b1cc8ffcc92dc49767f4e29d77a47f99df5afca479336ac5619778b51a6fb6cd952
+EBUILD batik-1.14.ebuild 5251 BLAKE2B 64d22677065376d04600941259211d017babf26c612a83b6af5fc8286d1ce63ddf1673bdc2870c345e2a23a210a84892618e6c0983ab850f7d72677d6a8ac2dd SHA512 80171f8ece1e3eaeb17849d4088ae84e0236a1a291062bbb6250b966c03e4a295902e45d228386de4f0718332ac8a14f279025c5b0450226a31f6b5aaf42615e
 EBUILD batik-1.9.ebuild 2594 BLAKE2B a7aa8ebb48b3819cc4fb088cabc6dc858dd5c3f20b2779c910e8f631d2be3920c133ae38caf4048991f1d6a1108a2b16a14a3f8e3d6cdfcea1256bebfcdb1724 SHA512 bf2eee253a058dfe08714e3a533e37a034af1477534a00b425105d9d2330798c37ea9ed3a00dc79f56a7558effa5a44473c74260d0fd2fffe9b621679a120e46
-MISC metadata.xml 450 BLAKE2B a8c857eac8c35c8d2e7f09496db63d086fbfd269d91fb1ca8fa592570545d11ec499053b93c6fe15e35b1db981920f657d2c500b98485bdb86179216b8b5e632 SHA512 303289add9c060eb698462203c35a2eef3332c4ff24c390011a91bd2c0ec05669483a1069a9abb1d6ba97a760565ac34a28b1a7d12eb8d1078bb81a05dbeae68
+MISC metadata.xml 610 BLAKE2B c589c175b595deb71eae6b8fccd46f4d6b82331f636cff28b6074300b6495efb780d157bb1b5b1359070cca7405138fcff719d72f1038023357fc7ab05c52b87 SHA512 73a6bb61c87645d1600ab90ca954599208c8599e967f6e999d973fa80e9693435db8a75ace95c8881486c8e2929d5a201a51e821e5f58763c273b21b5a32c229
diff --git a/dev-java/batik/batik-1.14.ebuild b/dev-java/batik/batik-1.14.ebuild
new file mode 100644
index 000000000000..f4be7b642036
--- /dev/null
+++ b/dev-java/batik/batik-1.14.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/xmlgraphics/batik/source/batik-src-1.14.tar.gz --slot 1.14 --keywords "~amd64 ~ppc64 ~x86" --ebuild batik-1.14.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.xmlgraphics:batik:1.14"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit desktop java-pkg-2 java-pkg-simple xdg-utils
+
+DESCRIPTION="XML Graphics Batik"
+HOMEPAGE="https://xmlgraphics.apache.org/batik/"
+SRC_URI="mirror://apache/xmlgraphics/batik/source/batik-src-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1.14"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+CP_DEPEND="
+	dev-java/jacl:0
+	dev-java/jython:2.7
+	dev-java/rhino:1.6
+	dev-java/xalan:0
+	dev-java/xml-commons-external:1.3
+	dev-java/xmlgraphics-commons:2
+"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( {CHANGES,NOTICE,README} )
+
+S="${WORKDIR}/batik-${PV}"
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_compile() {
+
+	# We loop over the modules list and compile the jar files.
+	while read module ; do \
+
+		echo "compiling $module"
+
+		JAVA_SRC_DIR=""
+		JAVA_RESOURCE_DIRS=""
+		JAVA_JAR_FILENAME="$module.jar"
+		JAVA_MAIN_CLASS=""
+
+		# Not all of the modules have resources.
+		if [[ -d $module/src/main/resources ]]; then \
+			JAVA_RESOURCE_DIRS="$module/src/main/resources"
+		fi
+
+		# Don't let sed die on modules without MainClass.
+		JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' $module/pom.xml )
+
+		# Some modules don't have source code.
+		if [[ -d $module/src/main/java/org ]]; then \
+			JAVA_SRC_DIR="$module/src/main/java"
+			java-pkg-simple_src_compile
+		else
+			# This case applies to batik-rasterizer.
+			if [[ -d $module/src/main/resources/org ]]; then \
+				jar -cfe $module.jar "${JAVA_MAIN_CLASS}" -C "$module/src/main/resources" . || die
+			# Else for batik-rasterizer-ext, batik-squiggle and batik-squiggle-ext
+			else
+				jar -cfe $module.jar "${JAVA_MAIN_CLASS}" -C . README || die
+				zip -d $module.jar "README"
+			fi
+		fi
+
+		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'.
+	# The same for batik-test-old which depends on fop-transcoder-allinone which itself depends on batik.
+	# batik-1.14-modules is the "Reactor Build Order" extracted from the output of "mvn dependency:tree".
+	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
+	fi
+}
+
+src_test() {
+
+	JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+
+	while read module ; do \
+
+		echo "testing $module"
+
+		JAVA_TEST_SRC_DIR=""
+		JAVA_TEST_RESOURCE_DIRS=""
+		JAVA_TEST_RUN_ONLY=""
+
+		if [[ -d $module/src/test/resources ]]; then \
+			JAVA_TEST_RESOURCE_DIRS="$module/src/test/resources"
+		fi
+
+		# https://github.com/apache/xmlgraphics-batik/blob/refs/tags/batik-1_14/batik-util/pom.xml#L74-L75
+		if [[ $module == batik-util ]]; then \
+			JAVA_TEST_RUN_ONLY="org.apache.batik.util.Base64TestCases"
+		fi
+
+		if [[ -d $module/src/test/java/org ]]; then \
+			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)
+}
+
+src_install() {
+	einstalldocs
+	domenu "${FILESDIR}"/batik-squiggle.desktop
+	doicon batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/init.svg
+
+	while read module ; do \
+
+		JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' $module/pom.xml )
+
+		java-pkg_dojar $module.jar
+
+		# Add a launcher if the module has a MainClass.
+		if [[ -n "${JAVA_MAIN_CLASS}" ]]; then \
+			java-pkg_dolauncher "$module-${SLOT}" --main "${JAVA_MAIN_CLASS}"
+		fi
+
+		# 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"
+	insinto "$(dirname "${java_policy_file}")"
+	newins - "$(basename "${java_policy_file}")" <<- _EOF_
+		grant codeBase "file:${EPREFIX}${JAVA_PKG_JARDEST}/-" {
+			permission java.security.AllPermission;
+		};
+	_EOF_
+	java-pkg_register-environment-variable \
+		gjl_java_args \
+		"-Djava.security.policy=file:${EPREFIX}${java_policy_file}"
+
+	if use doc; then
+		java-pkg_dojavadoc target/api
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/dev-java/batik/files/batik-1.14-modules b/dev-java/batik/files/batik-1.14-modules
new file mode 100644
index 000000000000..d9c964870901
--- /dev/null
+++ b/dev-java/batik/files/batik-1.14-modules
@@ -0,0 +1,33 @@
+batik-constants
+batik-i18n
+batik-test
+batik-util
+batik-awt-util
+batik-css
+batik-ext
+batik-xml
+batik-dom
+batik-parser
+batik-svg-dom
+batik-anim
+batik-gvt
+batik-script
+batik-bridge
+batik-svggen
+batik-transcoder
+batik-codec
+batik-extension
+batik-gui-util
+batik-svgrasterizer
+batik-rasterizer-ext
+batik-rasterizer
+batik-slideshow
+batik-swing
+batik-svgbrowser
+batik-squiggle-ext
+batik-squiggle
+batik-svgpp
+batik-ttf2svg
+batik-test-swing
+batik-test-svg
+batik-test-old
diff --git a/dev-java/batik/files/batik-squiggle.desktop b/dev-java/batik/files/batik-squiggle.desktop
new file mode 100644
index 000000000000..95bb990177c7
--- /dev/null
+++ b/dev-java/batik/files/batik-squiggle.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Squiggle
+Comment=SVG browser
+Exec=batik-squiggle-1.14
+Icon=init
+Terminal=false
+Type=Application
+Categories=Graphics;VectorGraphics;
+MimeType=image/svg+xml;
diff --git a/dev-java/batik/metadata.xml b/dev-java/batik/metadata.xml
index 2841917ad49d..a9b2477896cb 100644
--- a/dev-java/batik/metadata.xml
+++ b/dev-java/batik/metadata.xml
@@ -5,6 +5,10 @@
 	<email>java@gentoo.org</email>
 	<name>Java</name>
 </maintainer>
+<upstream>
+	<bugs-to>https://issues.apache.org/jira/projects/BATIK/issues/</bugs-to>
+	<remote-id type="github">apache/xmlgraphics-batik</remote-id>
+</upstream>
 <longdescription>
 	Java toolkit for applications or applets that want to use
 	images in the Scalable Vector Graphics (SVG) format for various