gentoo resync : 29.12.2022

2 files changed, 21 insertions, 14 deletions

diff --git a/dev-java/fontbox/Manifest b/dev-java/fontbox/Manifest
index 2ad57a9ac4f2..214bd963afa2 100644
--- a/dev-java/fontbox/Manifest
+++ b/dev-java/fontbox/Manifest
@@ -1,6 +1,8 @@
 DIST DejaVuSansMono.ttf 317336 BLAKE2B c80f50cea451963a75c66160596b67655afb19c9ea0d61b8a5cd38b81c66bdd89a24872d293fa8752b1ce0bb828d63caf91e682c283312d5828218943c63c095 SHA512 1af1ce3e6d34a0b89c93072d8646e92cceb45b276389d2dd0d84457ec1193394d2bcc49bf3ce99c9c6b2658cd1337fc40ee5c61957f74cd45dbc3d51b6aef417
 DIST NotoEmoji-Regular.ttf 418804 BLAKE2B e94f7b1d5bced052ff3f15a32ecce8f0f1dc2ef19565d3bcaa75b82676fbf0efeaa6efa1d25edf352b577acce17a45c6f0e7be1550c46a8c2ab6cef208cd6f11 SHA512 51b01ab0794be9f92c59679f6d56d4ce09ed959daeb9ec945bb837eb15a82ab302e83b29aab1972ac9cb648f7196a5f5ff4488a4622b36bedbc9cd0cab6dc3de
+DIST NotoSansSC-Regular.otf 8481960 BLAKE2B 3eee2c1e6be5e013d2ed679ccb361221e3e410150c7dc32d570382355e80e540c71be9009ece9951eea2379fb08fc05d8bcd65e941677660c55b450d660e8b03 SHA512 cbdd317d16099d24736457eef631353c7830a1a3c132b01f2cdc1e6a0c21a78e3b1fe8479b3f40179e7630a15cc23a093775bb22d521dba39376bb367d497b21
+DIST OpenSans-Regular.pfb 100962 BLAKE2B ff906c67a79df9d8deb9736f7439ba5429b72940b6a6fa49751fdea88adef70a3b57f28b2c31014da3206efe601095a8caeb98382fb36f8544afd0bec5cce355 SHA512 2787fcecc0feb1c9e6ff0d8de6193658413863e44eaab572751ca7e6c3b369c0a9731f4952cb0821f307760f0422f77c5f0d3fe7df6b054643fb39423e8d70ee
 DIST SourceSansProBold.otf 104072 BLAKE2B 2c6538ed97cca04a6a38a1bcca7def6c9e923f0e7a773c2715d50ca1a526b1ff683bc6544155b1e170fb828c3923d6b22cdf7017f9da9de164523f328c1cc187 SHA512 28a044a2685fbc8da7810d9ac7b6b93a95542d504d7d8e671f009b8ebb2f5b70c974be7ea78974b188d8e6ab17d65b08f276c054927857315d5aad26f6fe36fc
-DIST pdfbox-2.0.24-src.zip 15651754 BLAKE2B 5d0220c28c2be18a66aa66c2540d3e1d85ecc6826f632e6c9a0193f2f02dca645909b0a54c707d856bb2886d52b0b5fb706503b4f89f0eb7aede8e612bebfa8e SHA512 5d55b3cadbbae266d90c47f5b10c9b09b6dc16f53b77a0cf15c78e62fc69afc7b6eab5a4329608ecdf25de9194b38db1f7d23e7d71af473cc1bf7b09b0028642
-EBUILD fontbox-2.0.24.ebuild 1762 BLAKE2B 483d3d83508a4db99f14ef171c480b4c06d262a913b967922ab223975636e8176165ae65dc38c01c97e3b1c61264d4bd53d367cb63530eeefd542eea9e4cc851 SHA512 72917eac46cbc8be4636a35dbd2b8ccebe3c9fd271895be79e20a309b8ebef3373974dd5fb6cccf5f4d3c45689274497f4d3997615ece8f2680eb0fcad504e1c
+DIST pdfbox-2.0.26-src.zip 15766524 BLAKE2B eafedf1db5a54d36cb42111b736ad79adfcc106630fa4b2bc57873dcfbdbbb7bd0e9408611b0d8771909e719813e388430944ae0fbaf800bdc859595de2b101b SHA512 e14c57e28d10324dbcb6ad239bad5751a2dab0035bbd80427afd03f65467ec1376ddd7d08e7cefd4d950b149f85d8f505f6f50cc3093fd65bb8a2cbb2b8c7c1e
+EBUILD fontbox-2.0.26.ebuild 1959 BLAKE2B aec4115a79052a22fdf2c82604a75c9af57e01aaf10dc4fcb640f9959f8553f68775c25d15ff16a18a907b13765fe4f405e086c99627c72918d05a3b507221de SHA512 e09fdd42a7ef24a11a6714c11717f65e80f5329b4b9073928fbc4cf91f2bbd240ce8959f087e59dd741f8b4d0dcd7cfab8e436ad6fe6100a206f16f65a7d085b
 MISC metadata.xml 571 BLAKE2B 1ffa3f19fb3e5035c5a73503ce6abbeb02de7ea42fb74e21eecb30aa3827085802644b797f197f35d9001d86ec969b0cc6cbdaa634ab0d003fa65bd03c3d09ab SHA512 e1b958bb3eff6c3428581dd3851b8857048e81df192b87ad91fc61d3074a4ebf88dfecf6310ac96a3da6ba6b96d476ef1e258781e36b8f0c5cbf3110d5608f8e
diff --git a/dev-java/fontbox/fontbox-2.0.24.ebuild b/dev-java/fontbox/fontbox-2.0.26.ebuild
index ee8d0a7099de..693dc662a08d 100644
--- a/dev-java/fontbox/fontbox-2.0.24.ebuild
+++ b/dev-java/fontbox/fontbox-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/fontbox/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 fontbox-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 fontbox-2.0.26.ebuild
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.pdfbox:fontbox:2.0.24"
+MAVEN_ID="org.apache.pdfbox:fontbox:2.0.26"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
@@ -19,26 +19,27 @@ SRC_URI="mirror://apache/pdfbox/${PV}/pdfbox-${PV}-src.zip
 		https://issues.apache.org/jira/secure/attachment/12684264/SourceSansProBold.otf
 		https://issues.apache.org/jira/secure/attachment/12896461/NotoEmoji-Regular.ttf
 		https://issues.apache.org/jira/secure/attachment/12809395/DejaVuSansMono.ttf
+		https://issues.apache.org/jira/secure/attachment/13036376/NotoSansSC-Regular.otf
+		http://mirrors.ctan.org/fonts/opensans/type1/OpenSans-Regular.pfb
 	)"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pdfbox-${PV}/${PN}/pom.xml
 # commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
 
-CDEPEND="dev-java/commons-logging:0"
-DEPEND="${CDEPEND}
+CP_DEPEND="dev-java/commons-logging:0"
+DEPEND="${CP_DEPEND}
 	>=virtual/jdk-1.8:*"
-RDEPEND="${CDEPEND}
+RDEPEND="${CP_DEPEND}
 	>=virtual/jre-1.8:*"
 BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}/pdfbox-${PV}/${PN}"
 
-JAVA_GENTOO_CLASSPATH="commons-logging"
 JAVA_SRC_DIR="src/main/java"
 JAVA_RESOURCE_DIRS="src/main/resources"
 
@@ -47,11 +48,15 @@ JAVA_TEST_SRC_DIR="src/test/java"
 JAVA_TEST_RESOURCE_DIRS="src/test/resources"
 
 src_test() {
-	mkdir --parents target/pdfs || die
-	cp "${DISTDIR}"/DejaVuSansMono.ttf \
-		"${DISTDIR}"/NotoEmoji-Regular.ttf \
+	mkdir --parents target/{pdfs,fonts} || die
+	cp \
 		"${DISTDIR}"/SourceSansProBold.otf \
+		"${DISTDIR}"/NotoEmoji-Regular.ttf \
+		"${DISTDIR}"/DejaVuSansMono.ttf \
+		"${DISTDIR}"/NotoSansSC-Regular.otf \
 		"target/pdfs" || die
+	cp "${DISTDIR}"/OpenSans-Regular.pfb \
+		"target/fonts" || die
 
 	java-pkg-simple_src_test
 }