gentoo resync : 29.12.2022

2 files changed, 45 insertions, 74 deletions

diff --git a/dev-java/pdfbox/Manifest b/dev-java/pdfbox/Manifest
index d43750b24130..81b55e2d089a 100644
--- a/dev-java/pdfbox/Manifest
+++ b/dev-java/pdfbox/Manifest
@@ -33,11 +33,12 @@ DIST PDFBOX-4423-000746.pdf 574613 BLAKE2B 01f139d1c9b9e60d5e3be184b6289a4c50f03
 DIST PDFBOX-4490.pdf 283351 BLAKE2B 4abac1974e9fc7ca0ede73d5c388125794760a32b24fbb245799f92bebf3cc37a6f0fb8e38fa282d39d0aa00093b829e924d90560b90562033958c270d07dec2 SHA512 5ae7f232c47c13ed31997eb2c368e7deb1013c1321d70bf79369f8d709b33406191d94c21a5d27b4c4bb48241bafd9328a0a6d2d093d4e540d5044e9503bd099
 DIST PDFBOX-4517-cryptfilter.pdf 2157 BLAKE2B 69fea4396c05d977dcb7bc5c29143ad3a64fc45331dd8ddd660e3d557d222d56a548b3b24bb0141e8c8e8b6a5dfee2a3f83fa48a2b39fd448b9209204b3e4d9f SHA512 ed55a65bad6f91104846d28e9e7dcb18b11efbf980a74781350551428bbaecba375d9e22af02edf0f91263c7f668e93ec7c52d397898b7640c2d60e7dd3ae940
 DIST PDFBOX-4750.pdf 333223 BLAKE2B 86e9191142b725a338c750d2f1cd25e3b65957160638e64ecdedc1a26f343709765b99fc15381e6a5045a60aa3d59cf6ff427599b89c03a6aface38e356a36da SHA512 add66ca86b5eb3bfd44fd8c273a81695586d76f6e630b714d4b8db6db5aee5b80e7a6d47b9863a42506773c2c0ee2181469d5cd717dba185b70ef5db7ffb80b9
+DIST PDFBOX-4831.pdf 708821 BLAKE2B b4b31a0c5685222b7dc4e9c3e1fbe5c72c6ee3b7ea4ac74727c10e04cc10a8c96ae82c7163d82a3003d69105d5990cefbb481d3c42be3bc69ca0a9c15db4d8b2 SHA512 cb13ce2ca64fa446b9d840444f6d363f0d826a55e4dae1c2de094aaee4dd92df192ec375ff6ca0ee50c5cdd52b634b9b838431d7aa6b852de02504c3fd95531a
 DIST PDFBOX-5196-lotus.jpg 48292 BLAKE2B 9f9a02acb481349acc65266ab6529d40e9493fa0c6f5181aa46757ca2a3d29d519e7de2ea95c8288cd3f25f362a3fe7695e81fe0b653984ee267d2b5cc112e51 SHA512 37c73b41d1e00d66717c3715e6c45724c3f163d3d5b045c67e90c3713746d39eef96b4f0e6f368d0679d4c73d02ca01cfe5141d8a526e46ea15a4579ea1e75a2
 DIST genko_oc_shiryo1.pdf 124896 BLAKE2B c3a9921afb052ee4fe5080a1f1e66d991e3041ff90bd26d42bf3a9116f05e81fb5bb51449411527c3c3193072854482cf4616bf57cad1ac7d774044fce26f13d SHA512 71888e06a0323ac6196c5942c5961f76f8a4d8c6913114aaa9e215f43112cfa5f1b741b7c801e794dc44e62c2d34bfaafe89267a4c7de753e4da1481b35820f3
 DIST ipag00303.zip 4295310 BLAKE2B b68dd7dd7a7320894d782350c4598572c31d6ef492f9572adc2aac20ca98b5c5027995c0169bf815bc1e3a64d635b0e2d4e378b749e034f2fe718bcb7901d40a SHA512 59535137c649a2f8bdbb463cd716426811a6003a65883ca6e45bb0af1d526b3889af0fba3a353e90bc8d373cd32b90a27ff9ff6916ecbccb42e922c09e9b046a
 DIST ipagp00303.zip 4295877 BLAKE2B e096303106029daaedae9befb003f70c2c7d00b858f89f5f8fffb9fc73679e63ec0dde8e0304cad2c611aa74d3cf1bfea56b9ac35e6838953d38b028654f5434 SHA512 26d0a9bfba7f5457a98b0bf45a4a6b081bca4140047a0886625691231459f8c81a6cdbe523e9abcbd45fd7caed21d78f1baf3a2cf9167320f6b79be3d697cb5b
 DIST n019003l.pfb 79155 BLAKE2B 2995cd6e35de2d49cc6d4a5f6c7461396b23e14c6403cd7aecedbd5cec904fd0c42a114c4c5f5079fd1fad306dd8ddba649a13424ec5183395fb0fc1cbe2abb9 SHA512 8eafe21ffa6f3d7d0a50e9f4e5bcdeb727e804b552d74e65b709e778c9ed4605e5aa63743be285f0bc17ad162768583fec4196e1d1146d98f8703359247f22d0
-DIST pdfbox-2.0.24-src.zip 15651754 BLAKE2B 5d0220c28c2be18a66aa66c2540d3e1d85ecc6826f632e6c9a0193f2f02dca645909b0a54c707d856bb2886d52b0b5fb706503b4f89f0eb7aede8e612bebfa8e SHA512 5d55b3cadbbae266d90c47f5b10c9b09b6dc16f53b77a0cf15c78e62fc69afc7b6eab5a4329608ecdf25de9194b38db1f7d23e7d71af473cc1bf7b09b0028642
-EBUILD pdfbox-2.0.24.ebuild 13576 BLAKE2B 3e6bf956546262a8dc4b379b8951e88d562d56285c639d7a542ab18691645d9b10305f3d72a6f42193779f83aa0b409475a8dc9414bd41894d992d758291f4da SHA512 f28c63fb29b6ec5195d85493ba57e1e4cc08ebb9d0a8ce617c1adfb65e8dafe7f20d480174fcc2402cd6f1ac15288d280c22982c60de1bac084f2cd98c278e6f
+DIST pdfbox-2.0.26-src.zip 15766524 BLAKE2B eafedf1db5a54d36cb42111b736ad79adfcc106630fa4b2bc57873dcfbdbbb7bd0e9408611b0d8771909e719813e388430944ae0fbaf800bdc859595de2b101b SHA512 e14c57e28d10324dbcb6ad239bad5751a2dab0035bbd80427afd03f65467ec1376ddd7d08e7cefd4d950b149f85d8f505f6f50cc3093fd65bb8a2cbb2b8c7c1e
+EBUILD pdfbox-2.0.26.ebuild 10950 BLAKE2B f1bd5fb508bfecf592c84b9e2a4c089d13985c7bad2e28741c13e87ce4867adddecc943452c9b37bff22e1b89793a71af6dc3c29d0005df2643673ef536ecb64 SHA512 5e70a5ef5e6eccd9d75732aee6a143760eccede1dc3810059257175d1c986e10e196d2659d07220ae680a7e24ad1baeb1e99bb66fb624990793fdce297b27fb9
 MISC metadata.xml 782 BLAKE2B 96e76863aeaf1791f4a7a44aeb49df8b5a9bf91ac0d8d69e5642128df590456a2d38c64c84e8b50c917d3361bbaeb880a1b7744b994db9eee5ca8d250d765d6a SHA512 d7d47cc9eb182780424161f2a136cdec74bbe0cf4d63f52bfc77df8ad4fadc2bb9f3bd7b1ccff667d25928b4e0bc4a979b725ce77f1dff244585713ca40f88cc
diff --git a/dev-java/pdfbox/pdfbox-2.0.24.ebuild b/dev-java/pdfbox/pdfbox-2.0.26.ebuild
index c2ae65ec701b..97b9ade34c7d 100644
--- a/dev-java/pdfbox/pdfbox-2.0.24.ebuild
+++ b/dev-java/pdfbox/pdfbox-2.0.26.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pdfbox-2.0.24/pdfbox/pom.xml --download-uri https://downloads.apache.org/pdfbox/2.0.24/pdfbox-2.0.24-src.zip --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild pdfbox-2.0.24.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/pdfbox/2.0.26/pdfbox-2.0.26-src.zip --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild pdfbox-2.0.26.ebuild
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.pdfbox:pdfbox:2.0.24"
+MAVEN_ID="org.apache.pdfbox:pdfbox:2.0.26"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
@@ -55,6 +55,7 @@ SRC_URI="mirror://apache/${PN}/${PV}/${P}-src.zip
 		https://issues.apache.org/jira/secure/attachment/12911053/n019003l.pfb
 		https://issues.apache.org/jira/secure/attachment/12949710/032163.jpg -> PDFBOX-4184-032163.jpg
 		https://issues.apache.org/jira/secure/attachment/13025718/lotus.jpg -> PDFBOX-5196-lotus.jpg
+		https://issues.apache.org/jira/secure/attachment/13002695/13._Korona_szallo_vegzes_13.09.26.eredeti.pdf -> PDFBOX-4831.pdf
 	)"
 
 LICENSE="Apache-2.0"
@@ -72,16 +73,12 @@ RESTRICT="test"
 # org.bouncycastle:bcmail-jdk15on:1.64 -> >=dev-java/bcmail-1.68:0
 # org.bouncycastle:bcprov-jdk15on:1.64 -> >=dev-java/bcprov-1.68:0
 
-CDEPEND="
+CP_DEPEND="
 	dev-java/bcmail:0
 	dev-java/bcprov:0
 	dev-java/commons-logging:0
 	~dev-java/fontbox-${PV}:0
-	tools? (
-		dev-java/java-diff-utils:0
-		dev-java/junit:4
-		dev-java/mockito:0
-	)"
+"
 
 # Compile dependencies
 # POM: ${P}/${PN}/pom.xml
@@ -92,22 +89,22 @@ CDEPEND="
 # test? org.apache.pdfbox:jbig2-imageio:3.0.3 -> >=dev-java/jbig2-imageio-3.0.3:0
 # test? org.mockito:mockito-core:3.10.0 -> !!!suitble-mavenVersion-not-found!!!
 
-DEPEND="${CDEPEND}
+DEPEND="${CP_DEPEND}
 	>=virtual/jdk-1.8:*
 	test? (
 		dev-java/jai-imageio-core:0
 		dev-java/jai-imageio-jpeg2000:0
 		dev-java/java-diff-utils:0
 		dev-java/jbig2-imageio:0
-		dev-java/mockito:0
+		dev-java/mockito:4
 	)"
 
-RDEPEND="${CDEPEND}
+RDEPEND="${CP_DEPEND}
 	>=virtual/jre-1.8:*"
 
 BDEPEND="app-arch/unzip"
 
-DOCS=( {README.md,{LICENSE,NOTICE,RELEASE-NOTES}.txt} )
+DOCS=( README.md {NOTICE,RELEASE-NOTES}.txt )
 
 PATCHES=(
 	# adds @Ignore annotation to
@@ -119,43 +116,16 @@ PATCHES=(
 S="${WORKDIR}/${P}"
 
 JAVA_GENTOO_CLASSPATH_EXTRA="pdfbox.jar:pdfbox-debugger.jar"
-JAVA_GENTOO_CLASSPATH="commons-logging,fontbox,bcmail,bcprov"
-JAVA_TEST_GENTOO_CLASSPATH="jai-imageio-core,jai-imageio-jpeg2000,java-diff-utils,jbig2-imageio,junit-4,mockito"
+JAVA_TEST_GENTOO_CLASSPATH="jai-imageio-core,jai-imageio-jpeg2000,java-diff-utils,jbig2-imageio,junit-4,mockito-4"
 
 JAVA_TEST_EXCLUDES=(
 	# excluded upstream according to
-	# https://github.com/apache/pdfbox/blob/8876e8e1a0adbf619cef4638cc3cea073e3ca484/pdfbox/pom.xml#L123
+	# https://github.com/apache/pdfbox/blob/2.0.26/pdfbox/pom.xml#L123
 	"org.apache.pdfbox.rendering.TestPDFToImage"
 
-	# 1) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testIsSetDirect (java.lang.InstantiationException
-	# 2) warning(junit.framework.TestSuite$1
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testAccept (java.lang.InstantiationException
-	# 3) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testGetCOSObject (java.lang.InstantiationException
+	# Causing test failures. Upstream does not run these tests.
 	"org.apache.pdfbox.cos.TestCOSBase"
-
-	# 4) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testFloatValue (java.lang.InstantiationException
-	# 5) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testGet (java.lang.InstantiationException
-	# 6) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testInvalidNumber (java.lang.InstantiationException
-	# 7) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testLongValue (java.lang.InstantiationException
-	# 8) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testIntValue (java.lang.InstantiationException
-	# 9) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testLargeNumber (java.lang.InstantiationException
-	# 10) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testDoubleValue (java.lang.InstantiationException
-	# 11) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testIsSetDirect (java.lang.InstantiationException
-	# 12) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testAccept (java.lang.InstantiationException
-	# 13) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testGetCOSObject (java.lang.InstantiationException
-	"org.apache.pdfbox.cos.TestCOSNumber"	# Tests run: 10,  Failures: 10
+	"org.apache.pdfbox.cos.TestCOSNumber"
 )
 
 src_prepare() {
@@ -163,50 +133,45 @@ src_prepare() {
 }
 
 src_compile() {
+	einfo "Compiling pdfbox"
 	JAVA_SRC_DIR="pdfbox/src/main/java"
 	JAVA_RESOURCE_DIRS="pdfbox/src/main/resources"
 	JAVA_JAR_FILENAME="pdfbox.jar"
 	java-pkg-simple_src_compile
 
-	JAVA_SRC_DIR="debugger/src/main/java"
-	JAVA_RESOURCE_DIRS="debugger/src/main/resources"
-	JAVA_JAR_FILENAME="pdfbox-debugger.jar"
-	java-pkg-simple_src_compile
-
 	if use tools; then
-		JAVA_GENTOO_CLASSPATH+=" java-diff-utils,junit-4,mockito"
+		einfo "Compiling debugger"
+		JAVA_SRC_DIR="debugger/src/main/java"
+		JAVA_RESOURCE_DIRS="debugger/src/main/resources"
+		JAVA_JAR_FILENAME="pdfbox-debugger.jar"
+		java-pkg-simple_src_compile
+
+		einfo "Compiling pdfbox-tools"
 		JAVA_SRC_DIR="tools/src/main/java"
 		JAVA_RESOURCE_DIRS=""
 		JAVA_JAR_FILENAME="pdfbox-tools.jar"
 		java-pkg-simple_src_compile
 	fi
 
-	JAVA_SRC_DIR=(
-		"${S}/pdfbox/src/main/java"
-		"${S}/debugger/src/main/java"
-	)
-	if use tools; then
-		JAVA_SRC_DIR+=( "${S}/tools" )
+	if use doc; then
+		einfo "Compiling javadocs"
+		JAVA_SRC_DIR=(
+			"${S}/pdfbox/src/main/java"
+			"${S}/debugger/src/main/java"
+		)
+		if use tools; then
+			JAVA_SRC_DIR+=( "${S}/tools/src/main/java" )
+		fi
+		JAVA_JAR_FILENAME="ignoreme.jar"
+		java-pkg-simple_src_compile
 	fi
-	JAVA_JAR_FILENAME="ignoreme.jar"
-	java-pkg-simple_src_compile
 }
 
 src_test() {
+	einfo "Testing pdfbox"
 	JAVA_TEST_SRC_DIR="pdfbox/src/test/java"
 	JAVA_TEST_RESOURCE_DIRS="pdfbox/src/test/resources"
 
-	# There was 1 failure
-	# 1) testIsEmbeddingPermittedMultipleVersions(org.apache.pdfbox.pdmodel.font.TestFontEmbedding)
-	# java.lang.ExceptionInInitializerError
-	# Caused by: java.lang.reflect.InaccessibleObjectException: Unable to make protected final java.lang.Class java.lang.ClassLoader.defineClass(java.lang.String,byte[],int,int,java.security.ProtectionDomain) throws java.lang.ClassFormatError accessible: module java.base does not "opens java.lang" to unnamed module @4dc690f9
-	# FAILURES!!!
-	# Tests run: 586,  Failures: 1
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if [[ "${vm_version}" == "17" ]] ; then
-		JAVA_TEST_EXCLUDES+=( "org.apache.pdfbox.pdmodel.font.TestFontEmbedding" )
-	fi
-
 	# tests failed with S="${WORKDIR}/${P}"
 	find pdfbox/src/test/ -type f -exec sed -i 's:src/test/resources:pdfbox/src/test/resources:' {} + || die
 
@@ -245,6 +210,7 @@ src_test() {
 		"${DISTDIR}"/PDFBOX-4338.pdf \
 		"${DISTDIR}"/PDFBOX-4339.pdf \
 		"${DISTDIR}"/genko_oc_shiryo1.pdf \
+		"${DISTDIR}"/PDFBOX-4831.pdf \
 		"target/pdfs" || die
 
 	mkdir target/fonts || die
@@ -263,6 +229,7 @@ src_test() {
 	rm -r target/test-classes || die # avoid to run previous tests again
 
 	if use tools; then
+		einfo "Testing pdfbox-tools"
 		find tools/src/test/ -type f -exec sed -i 's:src/test/resources:tools/src/test/resources:' {} + || die
 		JAVA_TEST_SRC_DIR="tools/src/test/java"
 		JAVA_TEST_RESOURCE_DIRS="tools/src/test/resources"
@@ -275,8 +242,8 @@ src_install() {
 	default
 
 	java-pkg_dojar "pdfbox.jar"
-	java-pkg_dojar "pdfbox-debugger.jar"
 	if use tools; then
+		java-pkg_dojar "pdfbox-debugger.jar"
 		java-pkg_dojar "pdfbox-tools.jar"
 		java-pkg_dolauncher ${PN} --main org.apache.pdfbox.tools.PDFBox
 	fi
@@ -286,6 +253,9 @@ src_install() {
 	fi
 
 	if use source; then
-		java-pkg_dosrc "${S}/pdfbox" "${S}/debugger" "${S}/tools"
+		java-pkg_dosrc \
+			"${S}/pdfbox/src/main/java/*" \
+			"${S}/debugger/src/main/java/*" \
+			"${S}/tools/src/main/java/*"
 	fi
 }