gentoo resync : 06.04.2022

5 files changed, 167 insertions, 5 deletions

diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index e9a911fdc4a0..a637501f4cbd 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -1,4 +1,8 @@
+AUX fop-2.7-core-event-models.jar 8835 BLAKE2B d9bebf4dec77e79a5adf202929840b7333b6ce3c9b66654b2d14b229c08a092d7286c948a2a758ec52a3ab829badb4cc6c614bd111b741344281d87f5d215b92 SHA512 f2ceee4d98043084fbe0c4c1ef3a72513d782964e56acab2b9eadf10da707d951f13ad1fa60f8ad112f3a55d5c007a326b711e0a28d46c20194acf976687249b
+AUX fop-2.7-test-event-model.jar 428 BLAKE2B 434f8bfa73b1702f14102c9bf10e435edc216b6ba643ed0ffb2097654532acb57c05697e142140a594dc8892f5c6973f617efc32f6e63fcc06c0573aa9caa333 SHA512 f7bfa500b37c902acfca46399fe86d7fa5e51701b3a568ad0081b2e33c0190de5c8b5e652ef08156119622833de63d2ca9f24fec871be8c61e425935e542bb69
 AUX headless-launcher.bash 67 BLAKE2B 29ea0750d057e9a914ce26a14f1d6d1c4d49967aa553d6f55b115df0ebf1b77d693e01a7a06dbe92de4a589ff5847b176ccb820c23acde06b336e302a763d089 SHA512 d3a6635105ea62a62f1ff690a457bfbdebe3d15f8fd220f5508a4ec20b8a5c46e66bf9189562661d5053c6ac31a6998d1f4a117e0ac6087b336a0475635d7d3a
 DIST fop-2.0-src.zip 26381859 BLAKE2B 8500de6a23e93c14fdb4f27c59bafba27a64e6aaffb7a761f16de5bd523e2fdb83593ab53a66de79bf7b7d6c2b887ab97a34accb18be416b26448753babe2395 SHA512 428793303fcf143cffaecadc22cfdb8a065bad0108cceebcabc479d92dbe9834b4f81fd27f3e0314546d848e1960b2fe1a9d443999d8f336f7e87fce771beb7a
+DIST fop-2.7-src.tar.gz 26799877 BLAKE2B 00bcbd4cc915aad67c0dac54e85b7c5d10576115a0a8a16517846af249137c73b10c8b0ff161c9957f7c49686eefbf9777dc452b038573c996e29cbad951176a SHA512 bffbc0a97db8bbc826cf9af89fbf4a7e6f705585ea4915c0954df57c6d7af50d323387bb4bb9e2d13047826352d9eb7cbf4f23d5146ce246965b4c531e015633
 EBUILD fop-2.0-r3.ebuild 3050 BLAKE2B 99e24888912fda8f6d9d2ca37ad03d6af2b4631e8bbf6d3fd3f2398c92636612afba50127fa1c627401b4a41b7f8c03632aea486e92c3c3c493a083a0b9d15b2 SHA512 debaeea4df79a274fe79c531e808e331f1995deb23c981224fe3f8dde57dd62c911494c86a578d314d373289d286d0475c96ad8bbeedf9227f87a4679c21ea45
-MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
+EBUILD fop-2.7.ebuild 4101 BLAKE2B 8c2fd3cf9077539fd68beda97cdb19dbd7a3a528c7516712739c7372be57009313008e8a0edf19ee84f9a4df8671e08baaa8bc00fd124069596ca42d1979f0ba SHA512 89776b3f7bc2d4b5e54f7679f9a98c3656bb7dfa0fc64eb86d96f9340438128f88df033e0920a0c63766665a951d48c04b6ac4267412258d0f9b439c725a3751
+MISC metadata.xml 449 BLAKE2B 91dd2fd3b50581a408755aade7aa37406c527e9298bd0156cb18d363fef88cf60eb85f259ba443022fbd6c5377be0e0fc990cb2826d418347dc92bf7b6ff5ca9 SHA512 cf49f03d1ed992a7df7deebb7c00721895be45ff144da8c4b1777aecba5e17d86a7353a83ad8df8b356f70afda5fadcdc53350b2c5732a0f0469b18f501959d4
diff --git a/dev-java/fop/files/fop-2.7-core-event-models.jar b/dev-java/fop/files/fop-2.7-core-event-models.jar
new file mode 100644
index 000000000000..49bece365d93
--- /dev/null
+++ b/dev-java/fop/files/fop-2.7-core-event-models.jar
diff --git a/dev-java/fop/files/fop-2.7-test-event-model.jar b/dev-java/fop/files/fop-2.7-test-event-model.jar
new file mode 100644
index 000000000000..7c2fff6a088d
--- /dev/null
+++ b/dev-java/fop/files/fop-2.7-test-event-model.jar
diff --git a/dev-java/fop/fop-2.7.ebuild b/dev-java/fop/fop-2.7.ebuild
new file mode 100644
index 000000000000..b6bc2ad9ebca
--- /dev/null
+++ b/dev-java/fop/fop-2.7.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.xmlgraphics:fop:2.7"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="XML Graphics Format Object Processor All-In-One"
+HOMEPAGE="https://xmlgraphics.apache.org/fop/"
+SRC_URI="mirror://apache/xmlgraphics/fop/source/fop-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.7"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+CP_DEPEND="
+	dev-java/batik:1.14
+	dev-java/commons-io:1
+	dev-java/fontbox:0
+	dev-java/qdox:1.12
+	dev-java/sun-jai-bin:0
+	dev-java/xmlgraphics-commons:2
+"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	dev-java/ant-core:0
+	dev-java/sun-jai-bin:0
+	test? (
+		dev-java/mockito:0
+		dev-java/pdfbox:0
+		dev-java/xmlunit:1
+	)
+"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( NOTICE README )
+
+S="${WORKDIR}/fop-${PV}"
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_compile() {
+	JAVA_SRC_DIR="fop-util/src/main/java"
+	JAVA_JAR_FILENAME="fop-util.jar"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-util.jar"
+	rm -r target || die
+
+	JAVA_SRC_DIR="fop-events/src/main/java"
+	JAVA_RESOURCE_DIRS="fop-events/src/main/resources"
+	JAVA_JAR_FILENAME="fop-events.jar"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-events.jar"
+	rm -r target || die
+
+	JAVA_SRC_DIR="fop-core/src/main/java"
+	JAVA_RESOURCE_DIRS="fop-core/src/main/resources"
+	JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' fop-core/pom.xml )
+	JAVA_JAR_FILENAME="fop-core.jar"
+	# Code generation according to
+	# https://github.com/apache/xmlgraphics-fop/blob/fop-2_7/fop-core/pom.xml#L150-L219
+	pushd fop-core/src/main/codegen/fonts >/dev/null || die
+		local fonts=$(find . -name "Courier*.xml" \
+			-o -name "Helvetica*.xml" \
+			-o -name "Times*.xml" \
+			-o -name "Symbol.xml" \
+			-o -name "ZapfDingbats.xml"
+			)
+		for font in ${fonts}; do \
+			xalan -XSLTC \
+				-IN $font \
+				-XSL font-file.xsl \
+				-OUT ../../java/org/apache/fop/fonts/base14/${font//.xml}.java || die
+		done
+		xalan -XSLTC \
+			-IN encodings.xml \
+			-XSL code-point-mapping.xsl \
+			-OUT ../../java/org/apache/fop/fonts/base14/CodePointMapping.java || die
+	popd
+	java-pkg-simple_src_compile
+	rm -r target || die
+
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-core.jar"
+
+	# Update "fop-core.jar" with "event-mode.xml" files produced manually
+	# by running "mvn package".
+	mkdir event-model && pushd $_ >/dev/null || die
+		jar -xf "${FILESDIR}/fop-2.7-core-event-models.jar"
+	popd
+	jar -uf "fop-core.jar" -C event-model . || die
+	# Upstream does this with maven-antrun-plugin:
+	# https://github.com/apache/xmlgraphics-fop/blob/fop-2_7/fop-core/pom.xml#L263-L284
+
+	# public class EventProducerCollectorTask extends Task {
+	#
+	#     private List<FileSet> filesets = new java.util.ArrayList<FileSet>();
+	#     private File destDir;
+	#     private File translationFile;
+
+	if use doc; then \
+		JAVA_SRC_DIR=(
+			"fop-util/src/main/java"
+			"fop-events/src/main/java"
+			"fop-core/src/main/java"
+		)
+		JAVA_JAR_FILENAME="ignoreme.jar"
+		java-pkg-simple_src_compile
+	fi
+}
+
+src_test() {
+	JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito,pdfbox,xmlunit-1"
+
+	JAVA_TEST_SRC_DIR="fop-events/src/test/java"
+	JAVA_TEST_RUN_ONLY="org.apache.fop.events.BasicEventTestCase"
+
+	# This jar file was created manually from the output of "mvn test".
+	# Upstream does this with maven-antrun-plugin
+	jar -xf ${FILESDIR}/fop-2.7-test-event-model.jar || die
+
+	java-pkg-simple_src_test
+
+	JAVA_TEST_SRC_DIR="fop-core/src/test/java"
+	JAVA_TEST_RESOURCE_DIRS="fop-core/src/test/resources"
+
+	# Testing fop-core seems to want a newer mockito:
+	# error: cannot find symbol
+	# import static org.mockito.ArgumentMatchers.anyInt;
+#	java-pkg-simple_src_test
+}
+
+src_install() {
+	for module in fop-util fop-events fop-core ; do
+		java-pkg_dojar $module.jar
+		if use source; then
+			java-pkg_dosrc "$module/src/main/java/*"
+		fi
+	done
+	if use doc; then
+		java-pkg_dojavadoc target/api
+	fi
+	java-pkg_dolauncher "fop-${SLOT}" --main "org.apache.fop.cli.Main"
+	einstalldocs
+}
diff --git a/dev-java/fop/metadata.xml b/dev-java/fop/metadata.xml
index 6ef2d50cf07e..3f00c936434b 100644
--- a/dev-java/fop/metadata.xml
+++ b/dev-java/fop/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://issues.apache.org/jira/projects/FOP/issues</bugs-to>
+		<changelog>https://xmlgraphics.apache.org/fop/changes.html</changelog>
+		<remote-id type="github">apache/xmlgraphics-fop</remote-id>
+	</upstream>
 </pkgmetadata>