gentoo resync : 05.12.2021

3 files changed, 2 insertions, 74 deletions

diff --git a/dev-java/bndlib/Manifest b/dev-java/bndlib/Manifest
index 9b6256c61ab4..fb228ddf67f4 100644
--- a/dev-java/bndlib/Manifest
+++ b/dev-java/bndlib/Manifest
@@ -1,4 +1,3 @@
 DIST bndlib-2.1.0.tar.gz 123217291 BLAKE2B ab8e6876b13db538746f77aa1fe7800e5a3b5e539e1980da78f69c64344f4964bf0a21f2329f7684b055d0de39a10c8df36e030922e9933b29fccb9a35aa669a SHA512 6965143ced45c15fc2316716de32e80506cc411d52309b24313fff37e0713a45ad200d5b3701f0d47a131a3163ec266ed8acb4544884cd1c59c9716c7a2b285e
-EBUILD bndlib-2.1.0-r1.ebuild 1634 BLAKE2B bc7bf92b7418b0c4f7e5dafc7fe4d1ad3460860108237730ddd2773321232c0e0bab50dbd27e4819c7139270ef755ea821cdce98e00dcb1d6a6f42f91cc0c145 SHA512 57dbd1539215383963118773f5888ef50b7602cc5f03918a54054bcc1a9e76fde9795e554fda9fdda697daf748921aa23562a795fcc8c06432e7da540ef09977
-EBUILD bndlib-2.1.0.ebuild 1633 BLAKE2B d3612e6f1f296b7326f8fccd826d5fb791bb3ea07a62213968c09315aec1bca37c79b40c8782a3947feb1eb1011bb8133c455bb49edb4b3cb0a5ebd83f3c943f SHA512 957f9543060c2f51e50641b3663d334efd20cf8ec04cdceb18824e82e125b33e330eba1346f8784b0ab5757e1ab868f00cf5450df515701cd3100c792cdcc6ad
+EBUILD bndlib-2.1.0-r1.ebuild 1631 BLAKE2B f3c81a45577ace8f44c44ccff352855cf225933a8d57218d75c59d81e5a029b8b707cd283ba5806e3c2902ea2e2b9d0a32b1da3bcf9b09ab481e0f401bad41e2 SHA512 ef287e8346c3bdd88535f9b1b7ff0653bb428c5b2b6f73e694dc3cf8e65db820488719696192bc5df32d941cba7654e1e8ea3ed0948cdada4ea385df3bd42986
 MISC metadata.xml 324 BLAKE2B 4abc17608a568a12af96dc0ddb7b82d55341ad891537e120633fd8517e09a339d805325988f3208050cde9b20aeb0a4dcab95e55ba13c66854a0d90b0e54551c SHA512 e9e23c794433024b0888c2d5859120c0ef39cd6b55df99035c3ea1761280bd4287fdeb4aaf8ff067bab1bea80dcdcc9060f74b43b1a6a004bad87eb69a9bd3c3
diff --git a/dev-java/bndlib/bndlib-2.1.0-r1.ebuild b/dev-java/bndlib/bndlib-2.1.0-r1.ebuild
index e8cfe3bbe14d..d8ef87b2b91e 100644
--- a/dev-java/bndlib/bndlib-2.1.0-r1.ebuild
+++ b/dev-java/bndlib/bndlib-2.1.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.REL.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 CDEPEND="dev-java/libg:0
 	dev-java/osgi-compendium:0
diff --git a/dev-java/bndlib/bndlib-2.1.0.ebuild b/dev-java/bndlib/bndlib-2.1.0.ebuild
deleted file mode 100644
index aaac79713088..000000000000
--- a/dev-java/bndlib/bndlib-2.1.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A swiss army knife for OSGi"
-HOMEPAGE="http://www.aqute.biz/Bnd/Bnd"
-SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.REL.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-
-CDEPEND="dev-java/libg:0
-	dev-java/osgi-compendium:0
-	dev-java/osgi-core-api:0
-	dev-java/osgi-enterprise-api:0"
-
-# Tests appear broken and cause a circular dependency.
-# test? ( dev-java/bnd-junit:0 )
-DEPEND=">=virtual/jdk-1.5
-	${CDEPEND}
-	test? ( dev-java/junit:4 )"
-
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-
-S="${WORKDIR}/bnd-${PV}.REL/biz.aQute.${PN}"
-
-EANT_BUILD_TARGET="build"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-# Tests appear broken and cause a circular dependency.
-RESTRICT="test"
-
-java_prepare() {
-	# Move the correct build.xml into place, needed for testing.
-	cp ../cnf/build.xml . || die
-
-	# Remove bundled jar files.
-	find . -name '*.jar' -delete > /dev/null
-
-	if ! use test ; then
-		rm -rf src/aQute/bnd/test || die "Failed to remove tests."
-	fi
-}
-
-src_compile() {
-	local extra_cp=""
-
-	if use test ; then
-		extra_cp=":$(java-pkg_getjars --build-only junit-4)"
-	fi
-
-	EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjars libg):$(java-pkg_getjars osgi-compendium):$(java-pkg_getjars osgi-core-api):$(java-pkg_getjars osgi-enterprise-api)${extra_cp}" \
-		java-pkg-2_src_compile
-}
-
-EANT_TEST_GENTOO_CLASSPATH="junit-4,bnd-junit"
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar generated/biz.aQute.${PN}.jar
-}