gentoo auto-resync : 29:11:2023 - 10:51:05

14 files changed, 157 insertions, 15 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index d76c31738c86..d0ffbf5faa70 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/aqute-bnd-annotation/Manifest b/dev-java/aqute-bnd-annotation/Manifest
deleted file mode 100644
index 00d7f3fdafe5..000000000000
--- a/dev-java/aqute-bnd-annotation/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST biz.aQute.bnd.annotation-6.3.1-sources.jar 50600 BLAKE2B 6ace86a803c378be17b4ecfb658eb17e9c95f4f8797cdf22cbb9a5acb2a382fe0ee6791ad0280a2de9d9e85fbe2732487e693b2c93f08145b3633810f480f8b9 SHA512 751855a173e6d5f9d09f6d63775b97d971cebbfc019053988ec7fe144d0f49b4d09b9a2339d63bb43cea51d09d7d766554255f727cad8d73d9c196097e58d0fd
-EBUILD aqute-bnd-annotation-6.3.1.ebuild 1624 BLAKE2B 3c4724748cd176b1e00ecc5872138885e6cd96516601547075b87d907742578777e725397769803d58d1c914a847174596160b028c8f6f11edf3dcea211a1207 SHA512 57215b20bb4e1c3b36211894573ff6122a47ffb9b3e47c1352c53b664736fb6efab191bd4ac67c7ee9db0d28940724d477f69e96e05d8f48d8443aae217ec1d1
-MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/bnd-annotation/Manifest b/dev-java/bnd-annotation/Manifest
new file mode 100644
index 000000000000..b2721619b0ab
--- /dev/null
+++ b/dev-java/bnd-annotation/Manifest
@@ -0,0 +1,5 @@
+DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c
+DIST biz.aQute.bnd.annotation-6.3.1-sources.jar 50600 BLAKE2B 6ace86a803c378be17b4ecfb658eb17e9c95f4f8797cdf22cbb9a5acb2a382fe0ee6791ad0280a2de9d9e85fbe2732487e693b2c93f08145b3633810f480f8b9 SHA512 751855a173e6d5f9d09f6d63775b97d971cebbfc019053988ec7fe144d0f49b4d09b9a2339d63bb43cea51d09d7d766554255f727cad8d73d9c196097e58d0fd
+EBUILD bnd-annotation-6.3.1.ebuild 1624 BLAKE2B 5b123ed653a5b60eddfe76d152f5e1656a38fde0e6fbbb30389082a5dcee3a875b5a2803fc31a606097c365119ad4f1759920dffbd5e0d0fcd24d34d8984b411 SHA512 ef01e2ee44eccef353ee36ce8d11241edb29f2111fc53555bad773455fb4ef3abf9d15e5c0982a087c389ecb3be0b7c4eef6b6109b2916b641d28d601ad4080c
+EBUILD bnd-annotation-7.0.0.ebuild 698 BLAKE2B 7aa6a511d7c4e62d0d48ce98affc30996fd048ed8b95e9ef65757f8edcbfa4f5229016b4c7b78c936687f9f42bd30438c938df764cfb8d22ace3c3e284521ea5 SHA512 9b96a807d1d165e1f5fab0f14bd20fd49d52518454cd83a86440db1c8276fc20cacf075ea5136ce02607fa7eede4da2eff26a065d728003968a27dc38faefe78
+MISC metadata.xml 294 BLAKE2B 66837ec99fde5f758bfca40e387481d9e99d8ea6c520b4ec74fd83cf51670aa2626277f231fb6e0159495da497d8c74725ec18fa2d09d4fc1223e0e84a13f58a SHA512 e79f2bc0d9b0e9981f3688d97299a4897f453695dbeebb6bd44e93706bb19e6b2542d3d89cc8f222cf353604bf47b6134ab8f67bb070650a558736a9ff5e6cc4
diff --git a/dev-java/aqute-bnd-annotation/aqute-bnd-annotation-6.3.1.ebuild b/dev-java/bnd-annotation/bnd-annotation-6.3.1.ebuild
index 0ec922b091fb..9522fc6820a9 100644
--- a/dev-java/aqute-bnd-annotation/aqute-bnd-annotation-6.3.1.ebuild
+++ b/dev-java/bnd-annotation/bnd-annotation-6.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
diff --git a/dev-java/bnd-annotation/bnd-annotation-7.0.0.ebuild b/dev-java/bnd-annotation/bnd-annotation-7.0.0.ebuild
new file mode 100644
index 000000000000..20be63876483
--- /dev/null
+++ b/dev-java/bnd-annotation/bnd-annotation-7.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="biz.aQute.bnd:biz.aQute.bnd.annotation:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="bnd Annotations Library"
+HOMEPAGE="https://bnd.bndtools.org/"
+SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.tar.gz -> aQute.bnd-${PV}.tar.gz"
+S="${WORKDIR}/bnd-${PV}"
+
+LICENSE="Apache-2.0 EPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	dev-java/osgi-cmpn:8
+	>=virtual/jdk-11:*
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bnd.annotation"
+JAVA_CLASSPATH_EXTRA="osgi-cmpn-8"
+JAVA_SRC_DIR="biz.aQute.bnd.annotation/src"
diff --git a/dev-java/aqute-bnd-annotation/metadata.xml b/dev-java/bnd-annotation/metadata.xml
index 75321cfb5598..cb6317e530db 100644
--- a/dev-java/aqute-bnd-annotation/metadata.xml
+++ b/dev-java/bnd-annotation/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">bndtools/bnd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/bnd-util/Manifest b/dev-java/bnd-util/Manifest
new file mode 100644
index 000000000000..a913dce1bc4b
--- /dev/null
+++ b/dev-java/bnd-util/Manifest
@@ -0,0 +1,3 @@
+DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c
+EBUILD bnd-util-7.0.0.ebuild 891 BLAKE2B 42c16f5644a3405e8a5c0750c6541ff361f86eb2650fa439334cbb404e3daa74a3b2403abbe525691bd3a9678d20dbd4f54932a3caac864c19c9b230a0606c29 SHA512 5cd357fa3f489b1461739a880ccecbd87079eb90a5a92d988fd3c8f5ac0ee4c26822363297c11206729bc341048f010f945aaccca5b2dd1d27d555d9f64ec8fa
+MISC metadata.xml 294 BLAKE2B 66837ec99fde5f758bfca40e387481d9e99d8ea6c520b4ec74fd83cf51670aa2626277f231fb6e0159495da497d8c74725ec18fa2d09d4fc1223e0e84a13f58a SHA512 e79f2bc0d9b0e9981f3688d97299a4897f453695dbeebb6bd44e93706bb19e6b2542d3d89cc8f222cf353604bf47b6134ab8f67bb070650a558736a9ff5e6cc4
diff --git a/dev-java/bnd-util/bnd-util-7.0.0.ebuild b/dev-java/bnd-util/bnd-util-7.0.0.ebuild
new file mode 100644
index 000000000000..eaeb09be96bb
--- /dev/null
+++ b/dev-java/bnd-util/bnd-util-7.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="biz.aQute.bnd:biz.aQute.bnd.util:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="AQute Bnd Utilities"
+HOMEPAGE="https://bnd.bndtools.org/"
+SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.tar.gz -> aQute.bnd-${PV}.tar.gz"
+S="${WORKDIR}/bnd-${PV}"
+
+LICENSE="Apache-2.0 EPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CP_DEPEND="dev-java/osgi-annotation:0"
+
+DEPEND="${CP_DEPEND}
+	~dev-java/bnd-annotation-${PV}:0
+	~dev-java/libg-${PV}:0
+	dev-java/osgi-cmpn:8
+	dev-java/osgi-core:0
+	dev-java/slf4j-api:0
+	>=virtual/jdk-17:*
+"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-17:*
+"
+
+JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bnd.util"
+JAVA_CLASSPATH_EXTRA="
+	bnd-annotation
+	libg
+	osgi-cmpn-8
+	osgi-core
+	slf4j-api
+"
+JAVA_SRC_DIR="biz.aQute.bnd.util/src"
diff --git a/dev-java/bnd-util/metadata.xml b/dev-java/bnd-util/metadata.xml
new file mode 100644
index 000000000000..cb6317e530db
--- /dev/null
+++ b/dev-java/bnd-util/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">bndtools/bnd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/libg/Manifest b/dev-java/libg/Manifest
index 6c32a0d549b7..a5718eae69a9 100644
--- a/dev-java/libg/Manifest
+++ b/dev-java/libg/Manifest
@@ -1,3 +1,5 @@
+DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c
 DIST bndlib-2.1.0.tar.gz 123217291 BLAKE2B ab8e6876b13db538746f77aa1fe7800e5a3b5e539e1980da78f69c64344f4964bf0a21f2329f7684b055d0de39a10c8df36e030922e9933b29fccb9a35aa669a SHA512 6965143ced45c15fc2316716de32e80506cc411d52309b24313fff37e0713a45ad200d5b3701f0d47a131a3163ec266ed8acb4544884cd1c59c9716c7a2b285e
 EBUILD libg-2.1.0-r2.ebuild 1386 BLAKE2B 18b2226cc5baf7163a3be41ff76f01d4299c8140a3c70deea384fc49940a7ec2da58422dd540eaf61ff15ae727b888917e21ea6e5969e6c05c2813e33631436e SHA512 7c8611502139b1ead43116b363b4e61d825e751d08d945551c307fae1179c245ea0686bc64e5b282892d93b905cb9c93e89449abeb289b31c87e7e23d1302dd0
-MISC metadata.xml 324 BLAKE2B 4abc17608a568a12af96dc0ddb7b82d55341ad891537e120633fd8517e09a339d805325988f3208050cde9b20aeb0a4dcab95e55ba13c66854a0d90b0e54551c SHA512 e9e23c794433024b0888c2d5859120c0ef39cd6b55df99035c3ea1761280bd4287fdeb4aaf8ff067bab1bea80dcdcc9060f74b43b1a6a004bad87eb69a9bd3c3
+EBUILD libg-7.0.0.ebuild 1425 BLAKE2B 0b8bda88ace02d3037e67c7fb080c7c348fd41778a748f40ef10ea2c83a296cb143d725c1f731e2f2cc9615ed6c24c8492cee781c2f2d0e37725be795e3c10c3 SHA512 db903dca3b2ce16dd678994900e1884c33355cb0f34471d200549bcf25723bfb432699726656672628428dde4f4d28443f49edbe01c520db29f9476562a47e80
+MISC metadata.xml 294 BLAKE2B 66837ec99fde5f758bfca40e387481d9e99d8ea6c520b4ec74fd83cf51670aa2626277f231fb6e0159495da497d8c74725ec18fa2d09d4fc1223e0e84a13f58a SHA512 e79f2bc0d9b0e9981f3688d97299a4897f453695dbeebb6bd44e93706bb19e6b2542d3d89cc8f222cf353604bf47b6134ab8f67bb070650a558736a9ff5e6cc4
diff --git a/dev-java/libg/libg-7.0.0.ebuild b/dev-java/libg/libg-7.0.0.ebuild
new file mode 100644
index 000000000000..296b5c55c69c
--- /dev/null
+++ b/dev-java/libg/libg-7.0.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="biz.aQute.bnd:aQute.libg:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A library to be statically linked. Contains many small utilities"
+HOMEPAGE="https://bnd.bndtools.org/"
+SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.tar.gz -> aQute.bnd-${PV}.tar.gz"
+S="${WORKDIR}/bnd-${PV}"
+
+LICENSE="Apache-2.0 EPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+# aQute.bnd.test.jupiter does not exist
+# org.assertj.core.api.junit.jupiter does not exist
+RESTRICT="test" #839681
+
+CP_DEPEND="
+	dev-java/slf4j-api:0
+"
+
+# compile error with jdk:21, restricting to jdk:17
+# aQute.libg/src/aQute/lib/collections/SortedList.java:31: error: types List<T> and SortedSet<T> are incompatible;
+# public class SortedList<T> implements SortedSet<T>, List<T> {
+#        ^
+#   both define reversed(), but with unrelated return types
+#   where T is a type-variable:
+#     T extends Object declared in class SortedList
+DEPEND="${CP_DEPEND}
+	~dev-java/bnd-annotation-${PV}:0
+	dev-java/osgi-cmpn:8
+	virtual/jdk:17
+"
+
+# aQute.libg/src/aQute/libg/uri/URIUtil.java:161:
+# error: switch expressions are not supported in -source 11
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-17:*
+"
+
+JAVA_AUTOMATIC_MODULE_NAME="aQute.libg"
+JAVA_CLASSPATH_EXTRA="
+	bnd-annotation
+	osgi-cmpn-8
+"
+JAVA_SRC_DIR="aQute.libg/src"
diff --git a/dev-java/libg/metadata.xml b/dev-java/libg/metadata.xml
index 94feb65b0b18..cb6317e530db 100644
--- a/dev-java/libg/metadata.xml
+++ b/dev-java/libg/metadata.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">bndtools/bnd</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">bndtools/bnd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/woodstox-core/Manifest b/dev-java/woodstox-core/Manifest
index 782029eff8f4..c27f56e07bb7 100644
--- a/dev-java/woodstox-core/Manifest
+++ b/dev-java/woodstox-core/Manifest
@@ -1,3 +1,3 @@
 DIST woodstox-core-6.4.0.tar.gz 6030457 BLAKE2B 0506a4af84eff8ac11bc6363581f8de737116bd254d0c3b2f68a9ce062325934188c5a05eeff918ae012330d885ba7940f9dc1afb01ee951ff58cdcd1c86b2c7 SHA512 ca8033084c0355c5a321ab51ab6cfee62737b49ab98106fab0abb3ac8950ddd773dc91d864e4e62bdddaca1b7ba98f3639d1a61d8c436892b35193a8c838659f
-EBUILD woodstox-core-6.4.0.ebuild 2850 BLAKE2B 6e67c932f4b4f6d0cbdfda5f9fa0a3a0947d34365d500022c14c6152f96310077ecc151f6f3c1ecf4de561cfd3da3be2d35512e641d89d1a04b3cc07c2cfb649 SHA512 d1dc7975e313e0a2f13742e8e2fd47b680062c0cbcaea5c518b540b69cde0205d7e72a1ca3dd43fb738341e0921b0b40ced66cccc35061ee66d97d496e7bd9ba
+EBUILD woodstox-core-6.4.0-r1.ebuild 2838 BLAKE2B a154b9b5ee77c49e971f157815f301f5d099ce9303d2c2bca2237ee669a2e2251e71552f4b4e3f08b6039119545bd3433fa9bb1779c0f0894073d170ced478c7 SHA512 6b5e816a78878c0fd2fc25234cf6c23100b64ade213e70aebc647c90ccef2d7246497da7c4d709976ef6c9eb14d397d92a13449c21d40f31566b583882d261cc
 MISC metadata.xml 366 BLAKE2B 2605af42f3dba4c792fde507b196dffd8f474581e64230e570e645754507323897bc100baae9af4851e018badcb06cb74e77725471ff3b6c28d99dd4f6824964 SHA512 9d6e03f3d734515b02329cfd788f581e88b95f3df6fcdb34884d935936034c284af861a595a7e08fad81bae4a27abb09100521d4ed0c94e39c6cff14fbf27769
diff --git a/dev-java/woodstox-core/woodstox-core-6.4.0.ebuild b/dev-java/woodstox-core/woodstox-core-6.4.0-r1.ebuild
index e3ac3d714258..f709dc1853a1 100644
--- a/dev-java/woodstox-core/woodstox-core-6.4.0.ebuild
+++ b/dev-java/woodstox-core/woodstox-core-6.4.0-r1.ebuild
@@ -43,7 +43,7 @@ CP_DEPEND="
 
 DEPEND="${CP_DEPEND}
 	>=virtual/jdk-11:*
-	dev-java/aqute-bnd-annotation:0
+	dev-java/bnd-annotation:0
 	dev-java/osgi-core:0"
 
 RDEPEND="${CP_DEPEND}
@@ -53,7 +53,7 @@ DOCS=( {README,SECURITY}.md release-notes/{CREDITS,VERSION} )
 
 S="${WORKDIR}/woodstox-${P}"
 
-JAVA_CLASSPATH_EXTRA="aqute-bnd-annotation,osgi-core"
+JAVA_CLASSPATH_EXTRA="bnd-annotation,osgi-core"
 JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
 JAVA_RESOURCE_DIRS="src/main/resources"