gentoo auto-resync : 25:04:2024 - 23:59:45

7 files changed, 73 insertions, 46 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 22bdeef2c103..e4089a72d063 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/commons-vfs/Manifest b/dev-java/commons-vfs/Manifest
index 23bd6aa6ac87..c99173fce3b4 100644
--- a/dev-java/commons-vfs/Manifest
+++ b/dev-java/commons-vfs/Manifest
@@ -1,5 +1,7 @@
 AUX commons-vfs-2.0-build.xml 14505 BLAKE2B adcdc22f6d65d5c98676bde1598d0cfe48c903aa919f0426a699051e6b2a3060a46f87ee33f26579de7b3cdf822f749712234dd1b6482130d3f195b77d606a1e SHA512 a8ec511906b80562ac3f8a8c791703ce06f6fd0861ea5a29684e60716a2dff67ec5f497e11959a3f989fcc538f6c3f6dfebfa0fdaeb316965a2c30ee50001eab
 AUX commons-vfs-2.0-incompatibility.patch 2323 BLAKE2B d14a91d06c0b831026260f348c17c82b2725ffcbe00125146f0268d0ec5a95e87175ed23e35143c73654cfa5b14a34930adf01a48f9fc8c280cb3233308f9a77 SHA512 46287b86d2ba9b6d1a9aa3fb90fc0a64724e3862cbb534bdea39c384d4733f037ebf764ea3e6a8ffaccabe343af99097cbe9ba5eb115fef5029757b78cd4e98d
+AUX commons-vfs-2.0-utf8.patch 728 BLAKE2B 67d754b298b7613c0107e8e6c597660c31019679f251b58f67df12f872a619c01afb958fec04d144b230e1151a4437f3c2d7b92db9d94fa2f7cb45b1babf404a SHA512 e269c4d30c51107ddd183c2955be6da537b5b6d8efac763c39b13a4b1cf7b3018a3e8409358b09e3de0117ad6c79d533054337b9b92971c4d9bcb451d8d005c0
 DIST commons-vfs-2.0-src.tar.gz 335255 BLAKE2B 01c8bba3340487672682af5c6b341ab1e8335070a9b711b5c85cca659854d05881a0ff10c4b168497e3a75867a7225740edc6e56019e55c499256401fb0a53c5 SHA512 433828b9eba73df14dbedaa4037e3da1c69bf1892553c1ae4d213ba864e4ee579e0c7799f39e3cb4ec087d7c9223f54442be46de9c4916d7b7ff8a51214d6346
 EBUILD commons-vfs-2.0-r3.ebuild 1645 BLAKE2B 98a54b5e6859257fc5d1bf0535af224b593c6f0efb80b69eed54ccc38ae17c995e94841a8851547ec7e631750741c989091bf22393f97a7672f85aef96290c94 SHA512 24d0218f8548661663f96474a3a529d2c1978add24306ce3cd114900b769c815c8dc15226a7548ccbec2603a306036d82f22cef600a3114c66a54e6c8222f43f
+EBUILD commons-vfs-2.0-r4.ebuild 1477 BLAKE2B 237bfd2d874204acb357b0623defb408f170d28fe91e40b5a6382d05c5f56e2dc8985cae8daca18a30f23c7c6af140981858fb0381f831b76826c049bf0f4bce SHA512 ca2329227d2b7b353cf0faaf6ceb233517c0994f899514b8afd3639f0be3a3d27deec548c14e83445a2020dd6a4def602a7d2ea96c19c706550bd89b4d1183fb
 MISC metadata.xml 523 BLAKE2B c4cba3c890c33ac78a1266a0127d5ff394be884b99d243bcd2eff5516abdb2aefe861f244ffa741b30211c3527be774b3c15ae86c93aee6caf9bc60fe2e7b2de SHA512 c647d90719e4581dfefbf7dfb215136ab94e0b25a069e222dbfe50e90c5ad06ac7052a0ccfc41d82ad423c3d0fe2e410b1473ffd396e833d5581e44176e2b233
diff --git a/dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild b/dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild
new file mode 100644
index 000000000000..f2cbfd6d3ba5
--- /dev/null
+++ b/dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A single API for accessing various different file systems"
+HOMEPAGE="https://commons.apache.org/vfs/"
+SRC_URI="https://archive.apache.org/dist/commons/vfs/source/${P}-src.tar.gz"
+S="${WORKDIR}/${P}/core"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+CP_DEPEND="
+	>=dev-java/ant-1.10.14-r3:0
+	dev-java/commons-collections:0
+	dev-java/commons-logging:0
+	dev-java/commons-net:0
+	dev-java/commons-httpclient:3
+	dev-java/jackrabbit-webdav:0
+	dev-java/jsch:0"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-incompatibility.patch
+	"${FILESDIR}"/commons-vfs-2.0-utf8.patch
+)
+
+JAVA_RESOURCE_DIRS="resources/src/main/java"
+JAVA_SRC_DIR="src/main/java"
+
+# The build.xml is generated from maven and can't run the tests properly
+# Use maven test to execute these manually but that means downloading deps from
+# the internet. Also the tests need to login to some ftp servers and samba
+# shares so I doubt they work for everyone.
+#src_test() {
+#	ANT_TASKS="ant-junit" eant test
+#}
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+	mkdir resources || die
+	find src/main/java -type f ! -name '*.java' ! -name 'package.html' \
+		| xargs cp --parent -t resources || die
+}
diff --git a/dev-java/commons-vfs/files/commons-vfs-2.0-utf8.patch b/dev-java/commons-vfs/files/commons-vfs-2.0-utf8.patch
new file mode 100644
index 000000000000..199fb380c3cb
--- /dev/null
+++ b/dev-java/commons-vfs/files/commons-vfs-2.0-utf8.patch
@@ -0,0 +1,13 @@
+diff --git a/src/main/java/org/apache/commons/vfs2/FileSystemManager.java b/src/main/java/org/apache/commons/vfs2/FileSystemManager.java
+index bb8cc2a..1e26559 100644
+--- a/src/main/java/org/apache/commons/vfs2/FileSystemManager.java
++++ b/src/main/java/org/apache/commons/vfs2/FileSystemManager.java
+@@ -98,7 +98,7 @@ public interface FileSystemManager
+     FileObject resolveFile(String name, FileSystemOptions fileSystemOptions)
+         throws FileSystemException;
+ 
+-    /**                               §
++    /**
+      * Locates a file by name.  The name is resolved as described
+      * <a href="#naming">above</a>.  That is, the name can be either
+      * an absolute URI, an absolute file name, or a relative path to
diff --git a/dev-java/jaxb-api/Manifest b/dev-java/jaxb-api/Manifest
index 50364689a856..b7fd27847139 100644
--- a/dev-java/jaxb-api/Manifest
+++ b/dev-java/jaxb-api/Manifest
@@ -2,10 +2,8 @@ AUX jaxb-api-2.3.3-dropSecurityManager.patch 487 BLAKE2B a48ac3cb91a1aa85355d36e
 AUX jaxb-api-4.0.2-dropSecurityManager.patch 686 BLAKE2B dc735f650e89111b153734f6fc5b23f50832a94fa7ed4153a3cebb8dee937643e786c994ddbe3e74f9d23905b3479b54bc91bb0d8040c2ee1d9b23d975290ea9 SHA512 8c803e02cb69ee31d0d5493bf59ec96af2c6fcc08f002cbcf7636c49e0fc3ca7bee53b2d9ec266b8d9cccd81ec621b7fd26b838ab68eda59381e1348ca168c9a
 DIST jaxb-api-2.3.3.tar.gz 193025 BLAKE2B 1cf4461fdc67cc05ee43e880c254290b9dbe8a40b1dc39444d8fb6656698876a4bb16c679ee551ec7baa95c07eaf83e2fe5638a71eafbb158805c14c38888cb8 SHA512 37d6705fc1563f0d35a215e2f176473ee5e817a4a3017afe22042a4235c86b8556ea1fb23210d07ca7ea3cd1e0a3271daa4be8c9652cfe92ce2898f1381de3bf
 DIST jaxb-api-3.0.1.tar.gz 420695 BLAKE2B 70da435e75f6fcb155d57ee20659897d7d1a72dc38e77f0348eaa767b56e2c5fbb7df88c3b0c794cfc7eaad3d839550a197288dab59520a63562f083388764c0 SHA512 16d62a1fd6045a57f1d215227ce75860340c286eb0986b1086a0312dbc8ca8119b25533c42fe54f367231ec1c34795fec6a9355417f71ce826ee28d5fb6cf9fe
-DIST jaxb-api-4.0.0.tar.gz 543827 BLAKE2B 12a113126290fdf46270d2713d88836e8f5d01059127747a343816a10deb45ecc8c8dc8cf2cf7e2b71754977900645d4fef6e08fa8c47f583945fea34bc62357 SHA512 eb4eab396b894ab801433e0e31f93a4980f3913176a1960591a69e4fd55f10f316a7edb712df323c59f7dc9ca6cebacb7257be06aec72446059dd8b93c6de175
 DIST jaxb-api-4.0.2.tar.gz 544391 BLAKE2B fc143248645eb7ea5e17724531c3b6bd902d8c787c735abf16a97259850386d330de67b96837fcbb2be74182e0abbca585e4d6766dd4efffc31b73cb6040e336 SHA512 9fa4cb55a2771011d372fee670672062a12d9eb12aeb3a250ec86cc7814d9ea9fe80aca01039b37f96d5997b15938b2371d8fa323a132caf3be1093e76db1869
 EBUILD jaxb-api-2.3.3-r2.ebuild 1129 BLAKE2B 78a2211037b92a7a67f977934a3707327df7f419a4b80143f0bebb30bcc2220135eac7349568f51a0d40b6a340a199e48b3051b4cf6eb91b0fe1c3031ac007c9 SHA512 e85c5bc5ee9722fb4dd20173272905ccdab81ff16c9d401e533a56179b8fd841e58192f134dfed45d4f8e0303efa3f4c9a9a2238e529177ccbee02942ffa78d7
 EBUILD jaxb-api-3.0.1-r1.ebuild 1116 BLAKE2B 0699bde40ccb4198c76f1df7c6de9be8e4f7d555a66e733c05d5942677cb208598b47aa73f2a3691a3b5c5ef6c19ff5e9e37135eb648f87628b39a6e11ed1138 SHA512 d93aba658f98491ba3d9f8d6a24fc1831848096f93ea5c6500dbac61b431087eedb18c16e943a43bd26846e8bb45e1ae5f7dfcbbdf87b146c869cdcda83e0dc3
-EBUILD jaxb-api-4.0.0.ebuild 1018 BLAKE2B beb5514fef39f1d4b937cbadff947b175b1c3624080a090924b63a9f17a8ba828306d0f6b677c0e052c64916345848e5ad09e2ef32e1e8812964bf440a271476 SHA512 52cff169b9af67d13699c6cbbe1f0454b869f25ba03c282ae1b75dca30fa8d0bb25cf2ca8f799b1eb2075b21abcdf174723a5db7c856b76bb09f8a24a49ca36c
-EBUILD jaxb-api-4.0.2.ebuild 1202 BLAKE2B 2602ea3420d4b9f97a1352525ac55cd80653345c821af78131c4bd9ce441389ec1736b6f77e64d320e47c5e4741230183079b8b986a8c5a665bc506c9b986c60 SHA512 146270fc0ddb15a4b01446ae07d57f56dcbec762a4034768df444682b6eb15d0b20b5de3136a331758f1022752eb21a9fa1a176786f89951c87c0694a758c6dd
+EBUILD jaxb-api-4.0.2.ebuild 1198 BLAKE2B ce6cdbb1c5f8016df6822631674ee53fb3e0066688f6c2d996414bd8254fb8bfb5604400b36f42bceb814924d4c9286393b2d302efde9f22c92585776b63644c SHA512 011a32d267f481e2a7449ab12fb448571111710317270fdc1ce3e9b80865eaab6eace9397950ae9bde1d66c7726f2ae81aec396d92d3256101d6de93f57c85ed
 MISC metadata.xml 366 BLAKE2B 82c8a5eb19ef5309a5d2f4c6773636711c9cc2a396e06c8c9dff7727c078dc7c7b8c627df5fefb616b05adf173e2107525cd7cf01f7c3277723d7b1f35506890 SHA512 a22da07b0393c19d36e22a1987b60ff4d47c09d0d521492e5798c5a6ac49eebc70e22f19f7d4353c2e39f038152bd998ca6fb15c6459e5b22a800e8e6975d5b7
diff --git a/dev-java/jaxb-api/jaxb-api-4.0.0.ebuild b/dev-java/jaxb-api/jaxb-api-4.0.0.ebuild
deleted file mode 100644
index 09661390a579..000000000000
--- a/dev-java/jaxb-api/jaxb-api-4.0.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="jakarta.xml.bind:jakarta.xml.bind-api:4.0.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Jakarta XML Binding API"
-HOMEPAGE="https://github.com/eclipse-ee4j/jaxb-api"
-SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-CP_DEPEND="dev-java/jakarta-activation:2"
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-11:*"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( {CONTRIBUTING,NOTICE,README}.md )
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="api/src/main/java"
-JAVA_RESOURCE_DIRS="api/src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="jaxb-api-test/src/test/java"
-JAVA_TEST_RESOURCE_DIRS="jaxb-api-test/src/test/resources"
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/jaxb-api/jaxb-api-4.0.2.ebuild b/dev-java/jaxb-api/jaxb-api-4.0.2.ebuild
index 98d999e2aa19..d0a0b6381a1a 100644
--- a/dev-java/jaxb-api/jaxb-api-4.0.2.ebuild
+++ b/dev-java/jaxb-api/jaxb-api-4.0.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="EPL-1.0"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 CP_DEPEND="dev-java/jakarta-activation:2"