gentoo resync : 12.05.2022

3 files changed, 2 insertions, 68 deletions

diff --git a/dev-java/jrobin/Manifest b/dev-java/jrobin/Manifest
index 6abdd03c87d6..11da55c36cfb 100644
--- a/dev-java/jrobin/Manifest
+++ b/dev-java/jrobin/Manifest
@@ -1,4 +1,3 @@
 DIST jrobin-1.6.0-1.tar.gz 7340700 BLAKE2B 2db142423c3ad0006609b31fed38a4121e942f1253a5b6ed8b10f83c71c9b9fbf271346bad1f419f7337871cd4e61e59a4117de79a07715557335458944fccea SHA512 c5428906bf975f6c31f90185da3f0cbcaaff74d68e35e37b5e425340899fe01290d3d9813f1ecd60bd599512e3d62f635de290db9a9a1bd45292ac9c187b15c7
-EBUILD jrobin-1.6.0-r1.ebuild 1592 BLAKE2B ee87d6b590cdb056ddda0cd94c461e7f3260a62df371be8cf4c25e0f78abb911f44fe3371d89c1d6ffc5ea01395ae97b051cfc5644a0eefd2edd1a2748901ef5 SHA512 a6f70667b55ab8630e44d168c09252bab98f3c07a9764c082880f91081e79f7060b7a53f788c03dbbbf7e08ca0ade875e91f4b4f80ff3aebe1b9084d4a933402
-EBUILD jrobin-1.6.0-r2.ebuild 1724 BLAKE2B 165094d6048cb6a3f29e65a5b8eb6b62557cdfcce6b296e77ae9c0de07cb8d896b564528755c7d772d234b23ac2c075d7585f52721d837f7dc5a47228460ce47 SHA512 7bba4d9bd567192426b043b67eade26b58a629b5c3843ddf3576d0133cc2169c99307d98099d6ef1d837e5a65872db00401d86e1db15d447bdc5e8b04331d214
+EBUILD jrobin-1.6.0-r2.ebuild 1722 BLAKE2B 5b07e6ca9d891cc99031d89b0fcbb5453b6d9e22c12a17f963180fdc20e9e70e21a4506cfd312f2c7706d27e3f534c6b88f4797701d235a856fef2a8cb6d3d72 SHA512 24ddb33796aad0b772da6206dc6b2d0de3508664bbfab8ab5111973e45031eefc4bb995163d74aa4ad27665777c66d3afa1c347e96d4c27a7b531850171df890
 MISC metadata.xml 603 BLAKE2B eba31b8e000513e2a29e8e93e6a2405487d3665f4daa2fc0c7cf4e4e9fe6582441682374f5f06c2bdf19e8e64b276f9b85ee19c6923b629cd22f41c2b8d31037 SHA512 aa5eba1f7c5635afc0b288f20428cc03e5104bde59320abdb607bf0462ef34e6fdd58f3ab9253edc58181c53e82f273968b7bfabb3dc076af66021356cbde51c
diff --git a/dev-java/jrobin/jrobin-1.6.0-r1.ebuild b/dev-java/jrobin/jrobin-1.6.0-r1.ebuild
deleted file mode 100644
index 3b819e8ef465..000000000000
--- a/dev-java/jrobin/jrobin-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="JRobin is a 100% pure Java alternative to RRDTool"
-HOMEPAGE="http://www.jrobin.org/"
-SRC_URI="https://github.com/OpenNMS/${PN}/archive/${P}-1.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
-	test? (	dev-java/asm:4
-		>=dev-java/cglib-3.1:3
-		dev-java/easymock:3.2
-		dev-java/junit:4
-		dev-java/objenesis:0 )"
-
-S="${WORKDIR}/${PN}-${P}-1/src"
-JAVA_SRC_DIR="main/java"
-
-java_prepare() {
-	find "${WORKDIR}" -name "*.jar" -delete || die
-
-	# The tests need the resources in this directory for some reason.
-	mkdir -p test/java/target/classes || die
-	cd test/java/target/classes || die
-	ln -snf ../../../../main/resources/* . || die
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	jar uf "${PN}.jar" -C main/resources . || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher "${PN}-rrdtool" --main org.jrobin.cmd.RrdCommander
-}
-
-src_test() {
-	cd test/java || die
-
-	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars asm-4,cglib-3,easymock-3.2,junit-4,objenesis)"
-	local TESTS=$(find * -name "*Test.java")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -cp "${CP}" -d . $(find * -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
-
-pkg_postinst() {
-	elog "The rrdtool executable has been installed as ${PN}-rrdtool to"
-	elog "avoid conflicting with net-analyzer/rrdtool."
-}
diff --git a/dev-java/jrobin/jrobin-1.6.0-r2.ebuild b/dev-java/jrobin/jrobin-1.6.0-r2.ebuild
index 427e2dc13d7b..591a820c6055 100644
--- a/dev-java/jrobin/jrobin-1.6.0-r2.ebuild
+++ b/dev-java/jrobin/jrobin-1.6.0-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/OpenNMS/${PN}/archive/${P}-1.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # Common dependencies
 # POM: pom.xml