From 9991465b0b90d77b2a8a2ae833b6ecd99e6b5101 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 8 Jan 2025 06:41:21 +0000 Subject: gentoo auto-resync : 08:01:2025 - 06:41:21 --- dev-java/bnd/Manifest | 2 +- dev-java/bnd/bnd-7.1.0-r1.ebuild | 100 +++++++++++++++++++++++++++++++++++++++ dev-java/bnd/bnd-7.1.0.ebuild | 100 --------------------------------------- 3 files changed, 101 insertions(+), 101 deletions(-) create mode 100644 dev-java/bnd/bnd-7.1.0-r1.ebuild delete mode 100644 dev-java/bnd/bnd-7.1.0.ebuild (limited to 'dev-java/bnd') diff --git a/dev-java/bnd/Manifest b/dev-java/bnd/Manifest index 99781da478c8..2902dbc52d3d 100644 --- a/dev-java/bnd/Manifest +++ b/dev-java/bnd/Manifest @@ -1,4 +1,4 @@ AUX bnd-7.0.0-aQute.bnd.main.bnd.patch 1092 BLAKE2B 46df1673fb5e6a8e456aa7e66974333d0680bd7a8e2332e4d3d39c92d9f8fc2e3ffb0fa7fc6127f7d9747858f46f0f984a92ebed7beee9af9110d7df9c9c29ac SHA512 abd5bf36d6dc02562b9f209f85f96eb6e2a14797372a38d1e64aa76bb8e2c1b625707895e8ec9e05359de182d71e025d025bbaf00a372bbe29b9663a090d2588 DIST aQute.bnd-7.1.0.tar.gz 173448302 BLAKE2B 53c7fbbde15f27b0f96e1685ce7d4a03951360f57c9139ee36013138fae70034b0fe6b72300c2d9a0fe9dc5d2f8b5a75462e396e0383dd8b46237b43021bb35b SHA512 161a383b37cd2e6f75958d68c476c1e4fa581afc095e6c6081e4aa1822672f7ace0ec0948ee6bd5eba0c5d3490ef081bb7f4e5851ef590d4e6b9634a75963028 -EBUILD bnd-7.1.0.ebuild 2277 BLAKE2B 375f7a5ef8813696e272a8fb3a91dff758fbf0a34f84175d151a0531c2b6002b91de9cdfe67d9b3b567e6ae9284d6c2fad1b3ef6d9997c99d68ac4aba53db230 SHA512 1b48480b7b08c9c6f688d160dcd7a162e2cd166f112982a57b1b3ccb93be460e7d6122720cba9bde0208d8601985a0cec4d88018d312dfb356c3780d8023c397 +EBUILD bnd-7.1.0-r1.ebuild 2287 BLAKE2B e60fd2eda51b33ffcf362ad769ae73080938429e4fb04a70c435359161a5ba2b808c44edc33743b06853dd1dfe380179c7b08f88192e44e43303e241a8688366 SHA512 28eeaac67c98acc3ba0fdb72a2caaaaee874f21d8bd56c07e1192ed520a82dff2bd4aabb915c232fd07af13ea558c2c5263d171d393bdb083e65a36904c48055 MISC metadata.xml 294 BLAKE2B 66837ec99fde5f758bfca40e387481d9e99d8ea6c520b4ec74fd83cf51670aa2626277f231fb6e0159495da497d8c74725ec18fa2d09d4fc1223e0e84a13f58a SHA512 e79f2bc0d9b0e9981f3688d97299a4897f453695dbeebb6bd44e93706bb19e6b2542d3d89cc8f222cf353604bf47b6134ab8f67bb070650a558736a9ff5e6cc4 diff --git a/dev-java/bnd/bnd-7.1.0-r1.ebuild b/dev-java/bnd/bnd-7.1.0-r1.ebuild new file mode 100644 index 000000000000..b7a5ea224d45 --- /dev/null +++ b/dev-java/bnd/bnd-7.1.0-r1.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2025 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-3.13.10: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 +} diff --git a/dev-java/bnd/bnd-7.1.0.ebuild b/dev-java/bnd/bnd-7.1.0.ebuild deleted file mode 100644 index 23e53796649e..000000000000 --- a/dev-java/bnd/bnd-7.1.0.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2025 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 -} -- cgit v1.2.3