* [gentoo-commits] repo/gentoo:master commit in: dev-java/bnd/
@ 2024-04-21 12:34 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2024-04-21 12:34 UTC (permalink / raw
To: gentoo-commits
commit: 0ebca8ff826d7b5816897212fdd72883a2394017
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 21 12:33:36 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 21 12:33:36 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ebca8ff
dev-java/bnd: Stabilize 7.0.0 amd64, #930353
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/bnd/bnd-7.0.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/bnd/bnd-7.0.0.ebuild b/dev-java/bnd/bnd-7.0.0.ebuild
index fd077cefc878..61e84e856f6c 100644
--- a/dev-java/bnd/bnd-7.0.0.ebuild
+++ b/dev-java/bnd/bnd-7.0.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P}"
LICENSE="Apache-2.0 EPL-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"
BDEPEND="app-arch/zip"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/bnd/
@ 2024-05-06 1:51 Ionen Wolkens
0 siblings, 0 replies; 5+ messages in thread
From: Ionen Wolkens @ 2024-05-06 1:51 UTC (permalink / raw
To: gentoo-commits
commit: 32e3418b5f821b60391fd2a624c1e64ea77256f2
Author: Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Thu May 2 17:28:49 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon May 6 01:50:13 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32e3418b
dev-java/bnd: Keyword 7.0.0 x86, #927348
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-java/bnd/bnd-7.0.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/bnd/bnd-7.0.0.ebuild b/dev-java/bnd/bnd-7.0.0.ebuild
index 61e84e856f6c..b01e8447356e 100644
--- a/dev-java/bnd/bnd-7.0.0.ebuild
+++ b/dev-java/bnd/bnd-7.0.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P}"
LICENSE="Apache-2.0 EPL-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
BDEPEND="app-arch/zip"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/bnd/
@ 2024-12-07 13:10 Miroslav Šulc
0 siblings, 0 replies; 5+ messages in thread
From: Miroslav Šulc @ 2024-12-07 13:10 UTC (permalink / raw
To: gentoo-commits
commit: 1378f378a8d4178fabc8201ad9b86be9bc742007
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun Nov 17 21:19:56 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Dec 7 13:09:56 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1378f378
dev-java/bnd: add 7.1.0
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/39233/commits/7da37fec4652b13a9e2582c53a4a5d0e353ec08d
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/bnd/Manifest | 1 +
dev-java/bnd/bnd-7.1.0.ebuild | 100 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 101 insertions(+)
diff --git a/dev-java/bnd/Manifest b/dev-java/bnd/Manifest
index a890570b45c8..efb6528140b2 100644
--- a/dev-java/bnd/Manifest
+++ b/dev-java/bnd/Manifest
@@ -1 +1,2 @@
DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c
+DIST aQute.bnd-7.1.0.tar.gz 173448302 BLAKE2B 53c7fbbde15f27b0f96e1685ce7d4a03951360f57c9139ee36013138fae70034b0fe6b72300c2d9a0fe9dc5d2f8b5a75462e396e0383dd8b46237b43021bb35b SHA512 161a383b37cd2e6f75958d68c476c1e4fa581afc095e6c6081e4aa1822672f7ace0ec0948ee6bd5eba0c5d3490ef081bb7f4e5851ef590d4e6b9634a75963028
diff --git a/dev-java/bnd/bnd-7.1.0.ebuild b/dev-java/bnd/bnd-7.1.0.ebuild
new file mode 100644
index 000000000000..8a0cc65df29a
--- /dev/null
+++ b/dev-java/bnd/bnd-7.1.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2024 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:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="bndlib: A Swiss Army Knife for OSGi"
+HOMEPAGE="https://bnd.bndtools.org/"
+SRC_URI="https://github.com/bndtools/bnd/archive/${PV/_rc/.RC}.tar.gz -> aQute.bnd-${PV}.tar.gz"
+S="${WORKDIR}/${P/_rc/.RC}"
+
+LICENSE="Apache-2.0 EPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+BDEPEND="app-arch/zip"
+
+CP_DEPEND="
+ ~dev-java/bndlib-${PV}:0
+ dev-java/felix-resolver:0
+ dev-java/guava:0
+ dev-java/javaparser-core:0
+ dev-java/jline:2
+ dev-java/jtwig-core:0
+ dev-java/osgi-annotation:0
+ dev-java/osgi-cmpn:8
+ dev-java/osgi-core:0
+ dev-java/slf4j-simple:0
+ dev-java/snakeyaml:0
+ dev-java/xz-java:0
+"
+
+DEPEND="${CP_DEPEND}
+ dev-java/commons-lang:3.6
+ dev-java/eclipse-jdt-annotation:0
+ dev-java/felix-gogo-runtime:0
+ dev-java/slf4j-api:0
+ dev-java/jtwig-reflection:0
+ dev-java/osgi-service-log:0
+ dev-java/osgi-service-subsystem:0
+ >=virtual/jdk-17:*"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-17:*"
+
+PATCHES=(
+ "${FILESDIR}/bnd-7.0.0-aQute.bnd.main.bnd.patch"
+)
+
+JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bnd"
+JAVA_CLASSPATH_EXTRA="
+ commons-lang-3.6
+ eclipse-jdt-annotation
+ jtwig-reflection
+ felix-gogo-runtime
+ osgi-service-subsystem
+ slf4j-api
+"
+JAVA_MAIN_CLASS="aQute.bnd.main.bnd"
+JAVA_RESOURCE_DIRS="res"
+JAVA_SRC_DIR=(
+ "biz.aQute.bnd.exporters/src"
+ "biz.aQute.bnd.reporter/src"
+ "biz.aQute.bnd/src"
+ "biz.aQute.remote/src"
+ "biz.aQute.repository/src"
+ "biz.aQute.resolve/src"
+)
+
+src_prepare() {
+ default #780585
+ java-pkg-2_src_prepare
+ mkdir res || die
+
+ # java-pkg-simple wants resources in JAVA_RESOURCE_DIRS
+ pushd biz.aQute.bnd/src > /dev/null || die
+ find -type f \
+ ! -name '*.java' \
+ | xargs cp --parent -t ../../res || die
+ popd > /dev/null || die
+}
+
+src_compile() {
+ # There is another version of osgi-service-log in osgi-core-0
+ JAVA_GENTOO_CLASSPATH_EXTRA=":$(java-pkg_getjars --build-only osgi-service-log)"
+ java-pkg-simple_src_compile
+
+ # remove classes which are not in upstream's jar file
+ zip -d ${PN}.jar \
+ "*/remote/agent/*" \
+ "*/remote/embedded/*" \
+ "*/remote/main/*" \
+ "*/remote/plugin/*" \
+ "*/remote/test/*" \
+ || die
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/bnd/
@ 2025-01-06 10:24 Miroslav Šulc
0 siblings, 0 replies; 5+ messages in thread
From: Miroslav Šulc @ 2025-01-06 10:24 UTC (permalink / raw
To: gentoo-commits
commit: 88cb13ae82dc40d54212ce16cc1efbe418f2c51d
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun Jan 5 18:12:06 2025 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Jan 6 10:24:28 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88cb13ae
dev-java/bnd: drop 7.0.0
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/39990/commits/cdb49e6533a409124d436a2d2678f7bc6c10bb62
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/bnd/Manifest | 1 -
dev-java/bnd/bnd-7.0.0.ebuild | 100 ------------------------------------------
2 files changed, 101 deletions(-)
diff --git a/dev-java/bnd/Manifest b/dev-java/bnd/Manifest
index efb6528140b2..f909d128d99e 100644
--- a/dev-java/bnd/Manifest
+++ b/dev-java/bnd/Manifest
@@ -1,2 +1 @@
-DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c
DIST aQute.bnd-7.1.0.tar.gz 173448302 BLAKE2B 53c7fbbde15f27b0f96e1685ce7d4a03951360f57c9139ee36013138fae70034b0fe6b72300c2d9a0fe9dc5d2f8b5a75462e396e0383dd8b46237b43021bb35b SHA512 161a383b37cd2e6f75958d68c476c1e4fa581afc095e6c6081e4aa1822672f7ace0ec0948ee6bd5eba0c5d3490ef081bb7f4e5851ef590d4e6b9634a75963028
diff --git a/dev-java/bnd/bnd-7.0.0.ebuild b/dev-java/bnd/bnd-7.0.0.ebuild
deleted file mode 100644
index fa2a82a1e3f0..000000000000
--- a/dev-java/bnd/bnd-7.0.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2024 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:${PV}"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="bndlib: A Swiss Army Knife for OSGi"
-HOMEPAGE="https://bnd.bndtools.org/"
-SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.tar.gz -> aQute.bnd-${PV}.tar.gz"
-S="${WORKDIR}/${P}"
-
-LICENSE="Apache-2.0 EPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-
-BDEPEND="app-arch/zip"
-
-CP_DEPEND="
- ~dev-java/bndlib-${PV}:0
- dev-java/felix-resolver:0
- dev-java/guava:0
- dev-java/javaparser-core:0
- dev-java/jline:2
- dev-java/jtwig-core:0
- dev-java/osgi-annotation:0
- dev-java/osgi-cmpn:8
- dev-java/osgi-core:0
- dev-java/slf4j-simple:0
- dev-java/snakeyaml:0
- dev-java/xz-java:0
-"
-
-DEPEND="${CP_DEPEND}
- dev-java/commons-lang:3.6
- dev-java/eclipse-jdt-annotation:0
- dev-java/felix-gogo-runtime:0
- dev-java/slf4j-api:0
- dev-java/jtwig-reflection:0
- dev-java/osgi-service-log:0
- dev-java/osgi-service-subsystem:0
- >=virtual/jdk-17:*"
-
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-17:*"
-
-PATCHES=(
- "${FILESDIR}/bnd-7.0.0-aQute.bnd.main.bnd.patch"
-)
-
-JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bnd"
-JAVA_CLASSPATH_EXTRA="
- commons-lang-3.6
- eclipse-jdt-annotation
- jtwig-reflection
- felix-gogo-runtime
- osgi-service-subsystem
- slf4j-api
-"
-JAVA_MAIN_CLASS="aQute.bnd.main.bnd"
-JAVA_RESOURCE_DIRS="res"
-JAVA_SRC_DIR=(
- "biz.aQute.bnd.exporters/src"
- "biz.aQute.bnd.reporter/src"
- "biz.aQute.bnd/src"
- "biz.aQute.remote/src"
- "biz.aQute.repository/src"
- "biz.aQute.resolve/src"
-)
-
-src_prepare() {
- default #780585
- java-pkg-2_src_prepare
- mkdir res || die
-
- # java-pkg-simple wants resources in JAVA_RESOURCE_DIRS
- pushd biz.aQute.bnd/src > /dev/null || die
- find -type f \
- ! -name '*.java' \
- | xargs cp --parent -t ../../res || die
- popd > /dev/null || die
-}
-
-src_compile() {
- # There is another version of osgi-service-log in osgi-core-0
- JAVA_GENTOO_CLASSPATH_EXTRA=":$(java-pkg_getjars --build-only osgi-service-log)"
- java-pkg-simple_src_compile
-
- # remove classes which are not in upstream's jar file
- zip -d ${PN}.jar \
- "*/remote/agent/*" \
- "*/remote/embedded/*" \
- "*/remote/main/*" \
- "*/remote/plugin/*" \
- "*/remote/test/*" \
- || die
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/bnd/
@ 2025-01-07 10:39 Miroslav Šulc
0 siblings, 0 replies; 5+ messages in thread
From: Miroslav Šulc @ 2025-01-07 10:39 UTC (permalink / raw
To: gentoo-commits
commit: e97e580f0913839374f1f387170060b0eae8f4de
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Dec 23 09:32:42 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Jan 7 10:39:36 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e97e580f
dev-java/bnd: restrict to <=dev-java/javaparser-core-3.13.10:0
Fails to compile with javaparser-core-3.26.3
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/39825/commits/f9bc6184a5262a7df523b5fa556d04ffc5f6ada5
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/bnd/{bnd-7.1.0.ebuild => bnd-7.1.0-r1.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/bnd/bnd-7.1.0.ebuild b/dev-java/bnd/bnd-7.1.0-r1.ebuild
similarity index 98%
rename from dev-java/bnd/bnd-7.1.0.ebuild
rename to dev-java/bnd/bnd-7.1.0-r1.ebuild
index 23e53796649e..b7a5ea224d45 100644
--- a/dev-java/bnd/bnd-7.1.0.ebuild
+++ b/dev-java/bnd/bnd-7.1.0-r1.ebuild
@@ -23,7 +23,7 @@ CP_DEPEND="
~dev-java/bndlib-${PV}:0
dev-java/felix-resolver:0
dev-java/guava:0
- dev-java/javaparser-core:0
+ <=dev-java/javaparser-core-3.13.10:0
dev-java/jline:2
dev-java/jtwig-core:0
dev-java/osgi-annotation:0
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-01-07 10:39 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-07 10:39 [gentoo-commits] repo/gentoo:master commit in: dev-java/bnd/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2025-01-06 10:24 Miroslav Šulc
2024-12-07 13:10 Miroslav Šulc
2024-05-06 1:51 Ionen Wolkens
2024-04-21 12:34 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox