From 96527ae9a14702a3f13bfc26f8b2a465e1801a38 Mon Sep 17 00:00:00 2001
From: "Volkmar W. Pogatzki" <gentoo@pogatzki.net>
Date: Fri, 19 Dec 2025 10:39:09 +0100
Subject: [PATCH] dev-java/fontbox: new slot for ~2.0.32
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Old fop needs old fontbox.

Closes: https://bugs.gentoo.org/967695
Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
Part-of: https://github.com/gentoo/gentoo/pull/45090
Closes: https://github.com/gentoo/gentoo/pull/45090
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
---
 .../{fontbox-2.0.32.ebuild => fontbox-2.0.32-r1.ebuild}   | 4 ++--
 dev-java/fop/{fop-2.10-r1.ebuild => fop-2.10-r2.ebuild}   | 6 +++---
 .../{pdfbox-2.0.32.ebuild => pdfbox-2.0.32-r1.ebuild}     | 8 ++++----
 .../{xmpbox-2.0.32.ebuild => xmpbox-2.0.32-r1.ebuild}     | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename dev-java/fontbox/{fontbox-2.0.32.ebuild => fontbox-2.0.32-r1.ebuild} (98%)
 rename dev-java/fop/{fop-2.10-r1.ebuild => fop-2.10-r2.ebuild} (98%)
 rename dev-java/pdfbox/{pdfbox-2.0.32.ebuild => pdfbox-2.0.32-r1.ebuild} (98%)
 rename dev-java/xmpbox/{xmpbox-2.0.32.ebuild => xmpbox-2.0.32-r1.ebuild} (97%)

diff --git a/dev-java/fontbox/fontbox-2.0.32.ebuild b/dev-java/fontbox/fontbox-2.0.32-r1.ebuild
similarity index 98%
rename from dev-java/fontbox/fontbox-2.0.32.ebuild
rename to dev-java/fontbox/fontbox-2.0.32-r1.ebuild
index 6bcad5bf63627..e89ba15df458a 100644
--- a/dev-java/fontbox/fontbox-2.0.32.ebuild
+++ b/dev-java/fontbox/fontbox-2.0.32-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,7 +26,7 @@ SRC_URI="mirror://apache/pdfbox/${PV}/pdfbox-${PV}-src.zip
 S="${WORKDIR}/pdfbox-${PV}/${PN}"
 
 LICENSE="Apache-2.0"
-SLOT="0"
+SLOT="2"
 KEYWORDS="amd64 arm64 ppc64"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/pdfbox.apache.org.asc"
diff --git a/dev-java/fop/fop-2.10-r1.ebuild b/dev-java/fop/fop-2.10-r2.ebuild
similarity index 98%
rename from dev-java/fop/fop-2.10-r1.ebuild
rename to dev-java/fop/fop-2.10-r2.ebuild
index 7f308bf708e01..a92f49930a410 100644
--- a/dev-java/fop/fop-2.10-r1.ebuild
+++ b/dev-java/fop/fop-2.10-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -37,7 +37,7 @@ CP_DEPEND="
 	dev-java/bcpkix:0
 	dev-java/commons-io:1
 	dev-java/commons-logging:0
-	dev-java/fontbox:0
+	>=dev-java/fontbox-2.0.32-r1:2
 	dev-java/jakarta-servlet-api:6.1
 	dev-java/qdox:1.12
 	dev-java/sun-jai-bin:0
@@ -49,7 +49,7 @@ DEPEND="
 	>=virtual/jdk-1.8:*
 	test? (
 		dev-java/mockito:2
-		dev-java/pdfbox:0
+		>=dev-java/pdfbox-2.0.32-r1:2
 		dev-java/xmlunit:1
 	)
 "
diff --git a/dev-java/pdfbox/pdfbox-2.0.32.ebuild b/dev-java/pdfbox/pdfbox-2.0.32-r1.ebuild
similarity index 98%
rename from dev-java/pdfbox/pdfbox-2.0.32.ebuild
rename to dev-java/pdfbox/pdfbox-2.0.32-r1.ebuild
index 4f9eaa1c47a43..cf9f6ca248a57 100644
--- a/dev-java/pdfbox/pdfbox-2.0.32.ebuild
+++ b/dev-java/pdfbox/pdfbox-2.0.32-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -59,7 +59,7 @@ SRC_URI="mirror://apache/${PN}/${PV}/${P}-src.zip
 S="${WORKDIR}/${P}"
 
 LICENSE="Apache-2.0"
-SLOT="0"
+SLOT="2"
 KEYWORDS="amd64 arm64 ppc64"
 IUSE="+tools"
 
@@ -77,7 +77,7 @@ CP_DEPEND="
 	dev-java/bcprov:0
 	dev-java/bcutil:0
 	dev-java/commons-logging:0
-	~dev-java/fontbox-${PV}:0
+	~dev-java/fontbox-${PV}:2
 "
 DEPEND="
 	${CP_DEPEND}
@@ -251,7 +251,7 @@ src_install() {
 	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
+		java-pkg_dolauncher ${PN}-${SLOT} --main org.apache.pdfbox.tools.PDFBox
 	fi
 
 	if use doc; then
diff --git a/dev-java/xmpbox/xmpbox-2.0.32.ebuild b/dev-java/xmpbox/xmpbox-2.0.32-r1.ebuild
similarity index 97%
rename from dev-java/xmpbox/xmpbox-2.0.32.ebuild
rename to dev-java/xmpbox/xmpbox-2.0.32-r1.ebuild
index 87fd3b7ba3b82..9d77e9f75ca29 100644
--- a/dev-java/xmpbox/xmpbox-2.0.32.ebuild
+++ b/dev-java/xmpbox/xmpbox-2.0.32-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/pdfbox/${PV}/pdfbox-${PV}-src.zip
 S="${WORKDIR}/pdfbox-${PV}/${PN}"
 
 LICENSE="Apache-2.0"
-SLOT="0"
+SLOT="2"
 KEYWORDS="amd64 arm64 ppc64"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/pdfbox.apache.org.asc"