From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 63E9015812D for ; Mon, 06 Jan 2025 10:24:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A367CE079C; Mon, 06 Jan 2025 10:24:39 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 850D4E079C for ; Mon, 06 Jan 2025 10:24:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 99193340754 for ; Mon, 06 Jan 2025 10:24:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 324C519C8 for ; Mon, 06 Jan 2025 10:24:37 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1736159068.88cb13ae82dc40d54212ce16cc1efbe418f2c51d.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/bnd/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/bnd/Manifest dev-java/bnd/bnd-7.0.0.ebuild X-VCS-Directories: dev-java/bnd/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 88cb13ae82dc40d54212ce16cc1efbe418f2c51d X-VCS-Branch: master Date: Mon, 06 Jan 2025 10:24:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 57dcb418-a56c-4b13-95ad-36800a59a25c X-Archives-Hash: 5c79df4f6ec08c017c50d4b85a9df613 commit: 88cb13ae82dc40d54212ce16cc1efbe418f2c51d Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Sun Jan 5 18:12:06 2025 +0000 Commit: Miroslav Šulc gentoo 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 pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/39990/commits/cdb49e6533a409124d436a2d2678f7bc6c10bb62 Signed-off-by: Miroslav Šulc 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 -}