gentoo auto-resync : 16:05:2023 - 16:07:12

3 files changed, 68 insertions, 22 deletions

diff --git a/app-text/pdftk/Manifest b/app-text/pdftk/Manifest
index 784670700a9f..3dab3cf4259a 100644
--- a/app-text/pdftk/Manifest
+++ b/app-text/pdftk/Manifest
@@ -1,4 +1,4 @@
-DIST pdftk-v3.3.3.tar.gz 2380289 BLAKE2B b370777f5b87706ed811e424214db23b5622ef4e2420fe00c7e5e7d03fb51314589e7a1588d911c0734c075612adab9af17a1ad4ddcaac7a5dfc407c1aa28392 SHA512 2fd8dce8787856955984d6396ccb9a57d4e7a255cd74f10b31a7d87c84fac80143c0067d76bf6d8c0ec1a55dfb7d1e90f4898706e8ae26ccdf657b38d88e6cd6
-EBUILD pdftk-3.3.3.ebuild 1926 BLAKE2B 6ba722118bc28b42436039d270844002fa75aad0bb927b22fefa683818a35b7dffc0c55d31fe23cb442cdf06085576d2ab743a0180f0d41e289c00a8dae41369 SHA512 4abc5b436f94a182b8a5d5c14377fe3fc314ec6c04845030b367596fa92328104543128c58134ca8baf6552e514f3e7676296f1786fc4cf96a2a924c0dd576c3
-EBUILD pdftk-9999.ebuild 906 BLAKE2B bbc5a168431ff4f4f8a51ee581c1dde06c3044212be071360168a7f192cf7f257fa3b0bf966cc66532763b3cbe5ac74fca56de276f8afbf17cfe49fa7a837a5a SHA512 312c2f2bfb40abc41c2b67f96ecb54b1cdaeeb083dffb2d395e5fb757e56b7b1d128850f64c6427a4066734a2cf33d29ebbf3841497cbc8a106edb1c305de55a
+DIST pdftk-v3.3.3.tar.bz2 2205902 BLAKE2B 7802554cef4389670392ca2fda3dc4c041943ad21ecf47cfcd333dc1f0899796fabf9538388586f4e64a8a1fa5d7278a93f9e88c19a1ec510b24b85027888ad4 SHA512 48173d0c4698bc984221b56dff3e6434df7cf144dddfdbf684f8fa28b9eacfd0ebf9ebca0b87df3f9534a1ed13caa4c0866bd3e7a8cd06a21b46dfaedda9ea21
+EBUILD pdftk-3.3.3.ebuild 1927 BLAKE2B 706c5b3a723275644ab5d76382af3b6d0471573bfb46c168df064aff8c51754be9c4ff12b88fa996937b4c993473a00e6cf1b4826b39d7c46816baa21d5c459e SHA512 0775f3238877b793b5a0493cc422c965ac562b127c360054139ab3eef628a8c768f3c6e747f422422cb5f41199e66192074f9fc99f7422c6b0885c462c1f5e00
+EBUILD pdftk-9999.ebuild 2084 BLAKE2B 1a727c8774c124498648034a1f5efc2e68c95d654d89ebb96efeb8d3201227f682a6488e630d6ce2e1ca2ce04ec4a5f4446f31e7bfb16ef2bba7f88f6274950d SHA512 b27e4035779c8199160a92263d1855d616210d8a769c8ffb6ef12983848ad15400e7ce2ff8e324e8e4e7f769b8b04acfd995abf16bf650dac6e59bddcc0b5ac4
 MISC metadata.xml 427 BLAKE2B d839579ab02144cd303ff7094601b4db0473bfd39479cd24183e4012469fb2ccd4320c1c0d6bf36e1ed08a6ea51469eaabe19712a3d3a1e21c45a2b066cd3e79 SHA512 a015f4405e987d543783d3fcf36876b6d8d0bc986570f47baaf2ab12eb08be77024ad75450b98867d9e9a625168af51542ffe90214fd4f997dbb6c25b1f9324b
diff --git a/app-text/pdftk/pdftk-3.3.3.ebuild b/app-text/pdftk/pdftk-3.3.3.ebuild
index 842fda08ceb1..27913e759f19 100644
--- a/app-text/pdftk/pdftk-3.3.3.ebuild
+++ b/app-text/pdftk/pdftk-3.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A port of pdftk into java"
 HOMEPAGE="https://gitlab.com/pdftk-java/pdftk"
-SRC_URI="https://gitlab.com/pdftk-java/pdftk/-/archive/v${PV}/pdftk-v${PV}.tar.gz"
+SRC_URI="https://gitlab.com/pdftk-java/pdftk/-/archive/v${PV}/pdftk-v${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-text/pdftk/pdftk-9999.ebuild b/app-text/pdftk/pdftk-9999.ebuild
index 01bda985c416..f76cb2d086b7 100644
--- a/app-text/pdftk/pdftk-9999.ebuild
+++ b/app-text/pdftk/pdftk-9999.ebuild
@@ -1,9 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit java-pkg-2 java-ant-2
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.gitlab.pdftk-java:pdftk-java:3.3.3"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="gcj-free version of pdftk written in Java"
 HOMEPAGE="https://gitlab.com/pdftk-java/pdftk"
@@ -11,6 +15,7 @@ HOMEPAGE="https://gitlab.com/pdftk-java/pdftk"
 if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/pdftk-java/pdftk/"
+	S="${WORKDIR}/pdftk-${PV}"
 else
 	SRC_URI="https://gitlab.com/pdftk-java/pdftk/-/archive/v${PV}/pdftk-v${PV}.tar.bz2"
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
@@ -20,23 +25,64 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 
-JAVA_PKG_STRICT="yes"
-EANT_GENTOO_CLASSPATH="bcprov,commons-lang-3.6"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-CDEPEND="
+CP_DEPEND="
 	dev-java/bcprov:0
-	dev-java/commons-lang:3.6"
+	dev-java/commons-lang:3.6
+"
 
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
+# Compile dependencies
+# POM: pom.xml
+# test? com.github.stefanbirkner:system-rules:1.19.0 -> !!!groupId-not-found!!!
+# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
 
 DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8:*"
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+	test? (
+		app-text/poppler[cairo]
+		dev-java/system-rules:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+JAVA_LAUNCHER_FILENAME="${PN}"
+JAVA_MAIN_CLASS="com.gitlab.pdftk_java.pdftk"
+JAVA_SRC_DIR="java"
+JAVA_RESOURCE_DIRS="resources/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,system-rules"
+JAVA_TEST_SRC_DIR="test"
+
+src_prepare() {
+	default
+	mkdir resources || die
+	cp -r {,resources/}java || die
+	rm -r resources/java/com/gitlab/pdftk_java/com/lowagie/text/pdf/codec || die
+	find resources/java -type f \( -name '*.java' -o -name '*.sh' \) -exec rm -rf {} + || die
+}
 
-src_install() {
-	java-pkg_newjar "build/jar/pdftk.jar"
-	java-pkg_dolauncher ${PN} --main com.gitlab.pdftk_java.pdftk
+src_test() {
+	# some tests seem to need special treatment
+	einfo "Runnig first test"
+	JAVA_TEST_RUN_ONLY=(
+		com.gitlab.pdftk_java.CatTest
+		com.gitlab.pdftk_java.DataTest
+		com.gitlab.pdftk_java.FormTest
+		com.gitlab.pdftk_java.MultipleTest
+	)
+	java-pkg-simple_src_test
+	einfo "Running second test"
+	JAVA_TEST_RUN_ONLY=()
+	JAVA_TEST_EXCLUDES=(
+		com.gitlab.pdftk_java.CatTest
+		com.gitlab.pdftk_java.DataTest
+		com.gitlab.pdftk_java.FormTest
+		com.gitlab.pdftk_java.MultipleTest
+	)
+	java-pkg-simple_src_test
 }