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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3DAA115817D for ; Wed, 12 Jun 2024 07:06:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 87622E2A0D; Wed, 12 Jun 2024 07:06:51 +0000 (UTC) Received: from smtp.gentoo.org (dev.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 61980E2A0D for ; Wed, 12 Jun 2024 07:06:51 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A5D5C33BE32 for ; Wed, 12 Jun 2024 07:06:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 42B3F119 for ; Wed, 12 Jun 2024 07:06:49 +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: <1718175998.d0685c963bcb2884c36207ca06b72e07b4692c59.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/pdftk/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/pdftk/Manifest 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: d0685c963bcb2884c36207ca06b72e07b4692c59 X-VCS-Branch: master Date: Wed, 12 Jun 2024 07:06:49 +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: 46d956f1-9ba0-42e5-8d5a-11cdfbddcd1a X-Archives-Hash: ddee8134bb9369a144e9b8419751cbbe commit: d0685c963bcb2884c36207ca06b72e07b4692c59 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Sun Jun 9 12:27:39 2024 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Wed Jun 12 07:06:38 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0685c96 app-text/pdftk: pdftk-9999-bc176.patch Bug: https://bugs.gentoo.org/923598 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/37095 Signed-off-by: Florian Schmaus gentoo.org> app-text/pdftk/Manifest | 1 + app-text/pdftk/pdftk-9999.ebuild | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app-text/pdftk/Manifest b/app-text/pdftk/Manifest index 45b3d4201b76..fc3d7b14b764 100644 --- a/app-text/pdftk/Manifest +++ b/app-text/pdftk/Manifest @@ -1,2 +1,3 @@ DIST pdftk-3.3.3_p20231025.tar.bz2 2246135 BLAKE2B 641a8947d7be2a219b1deb4619f8ea201b8c0616ca50cc1cc1b4363050d16a7b622437f2b75236373f27ed2539f975c081f4f95a09163656d0e130969a5f4b7e SHA512 7745a161e788af2538a1e45e49c3342b8d1496cfec1079b51d4efed66440ce07a27657623ffb59d3078aa9ee964e77cbe3f8258d7d699938c59e9c6a2980f51b +DIST pdftk-9999-bc176.patch 5016 BLAKE2B 1cdde6aa5fddf28a1fac6f52a40592993139ae19d6895421d36c2df61ad3f7ee2b5a2a8014be0da06e6953427933c152050ea6e5497a9844c5639851cbb0d77a SHA512 405576c55594ae1862eb4ebc9a1ca605fa33320b36672f2c0028257badfa666d0e7e5f1a5ef20e817824ace531a795799010befe709111f87c535353f1199b96 DIST pdftk-v3.3.3.tar.bz2 2205902 BLAKE2B 7802554cef4389670392ca2fda3dc4c041943ad21ecf47cfcd333dc1f0899796fabf9538388586f4e64a8a1fa5d7278a93f9e88c19a1ec510b24b85027888ad4 SHA512 48173d0c4698bc984221b56dff3e6434df7cf144dddfdbf684f8fa28b9eacfd0ebf9ebca0b87df3f9534a1ed13caa4c0866bd3e7a8cd06a21b46dfaedda9ea21 diff --git a/app-text/pdftk/pdftk-9999.ebuild b/app-text/pdftk/pdftk-9999.ebuild index de47cd90e2c1..9d2e3ead20b2 100644 --- a/app-text/pdftk/pdftk-9999.ebuild +++ b/app-text/pdftk/pdftk-9999.ebuild @@ -15,6 +15,8 @@ HOMEPAGE="https://gitlab.com/pdftk-java/pdftk" if [[ ${PV} == 9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/pdftk-java/pdftk/" + SRC_URI="https://gitlab.com/pdftk-java/pdftk/-/commit/3f1918c831c919d0a8fcf18c36cf40118398b995.patch -> + ${P}-bc176.patch" S="${WORKDIR}/pdftk-${PV}" else SRC_URI="https://gitlab.com/pdftk-java/pdftk/-/archive/v${PV}/pdftk-v${PV}.tar.bz2" @@ -27,7 +29,7 @@ SLOT="0" # Switch back to bcprov:0 once pdftk updates its bcprov dependency. CP_DEPEND=" - dev-java/bcprov:1.74 + dev-java/bcprov:0 dev-java/commons-lang:3.6 " @@ -46,6 +48,8 @@ RDEPEND=" DOCS=( CHANGELOG.md README.md ) +PATCHES=( "${DISTDIR}/pdftk-9999-bc176.patch" ) + JAVA_MAIN_CLASS="com.gitlab.pdftk_java.pdftk" JAVA_RESOURCE_DIRS="resources/java" JAVA_SRC_DIR="java" @@ -54,6 +58,7 @@ JAVA_TEST_GENTOO_CLASSPATH="junit-4,system-rules" JAVA_TEST_SRC_DIR="test" src_prepare() { + default #780585 java-pkg-2_src_prepare mkdir resources || die cp -r {,resources/}java || die