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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A181A15806E for ; Tue, 16 May 2023 14:02:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E5C5E0901; Tue, 16 May 2023 14:02:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 76043E0901 for ; Tue, 16 May 2023 14:02:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 A12E6340DB7 for ; Tue, 16 May 2023 14:02:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D646EA71 for ; Tue, 16 May 2023 14:02:18 +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: <1684245441.2c89bec539b30353c485318fcbbda9f1b5c09c94.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/pdftk/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/pdftk/pdftk-9999.ebuild X-VCS-Directories: app-text/pdftk/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 2c89bec539b30353c485318fcbbda9f1b5c09c94 X-VCS-Branch: master Date: Tue, 16 May 2023 14:02:18 +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: 62603933-7b47-46d3-9d35-1b7cb6934a51 X-Archives-Hash: 7850e8d025006abc5bec454baee1d263 commit: 2c89bec539b30353c485318fcbbda9f1b5c09c94 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Fri May 12 13:57:48 2023 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Tue May 16 13:57:21 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c89bec5 app-text/pdftk: update live ebuild Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Florian Schmaus gentoo.org> app-text/pdftk/pdftk-9999.ebuild | 80 +++++++++++++++++++++++++++++++--------- 1 file changed, 63 insertions(+), 17 deletions(-) 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 }