gentoo resync : 29.12.2022

3 files changed, 2 insertions, 72 deletions

diff --git a/dev-java/testng/Manifest b/dev-java/testng/Manifest
index a75e17309227..05945caf737a 100644
--- a/dev-java/testng/Manifest
+++ b/dev-java/testng/Manifest
@@ -1,4 +1,3 @@
 DIST testng-6.9.10.tar.gz 6271781 BLAKE2B 5b77f4b1d9bfdca6749a1d33f465a30bcd9ab9dd9fc37abf8148301c24d6bf287224d9886c0f681deac54e12f9460139ce2a2058b3d160c05cf8fcb9f7808373 SHA512 ed9ad1ced20904ab261d2a233f3fa43ee1ea31778e992cdd27459811b256a6998d8385dd01ff72821133208a1fbd72aa3599a4b8bc0eb4d7b696d34593f9567e
-EBUILD testng-6.9.10-r1.ebuild 1779 BLAKE2B 5cf66631e1d4ef2f41e5c4b160bf48ee5e8d6e552ade55f23e8d6cc38494b6288a92ae7252d19c7d46159d9f8b65f0c7bde834464ac8b6f999a1375ec36d3269 SHA512 a30bcb691a62567705ab7e523cd93109938c9b1261f31e2898e353216c1f7078b78baab8fc35cfce555957dd78cddb8a5cdea42a4a21608b84b8b6fc83f27dd0
-EBUILD testng-6.9.10.ebuild 1767 BLAKE2B 1669906b5f329a3be9f79e923cd4cf14e387ca2c6ceae961db89f4f3fd5b06fd67ed6222ee47710d9b68fc4c2dd77a0f92026f9305ea1d5815380ade542e3573 SHA512 ed934c76af7cace171fb6c7717a09703faca5c6ee1ba9a2a0b2a6c1e12d91b40da209e53e06608662111495dd530e7022bf4aa9c343b75c31d445d5d85026e61
+EBUILD testng-6.9.10-r1.ebuild 1775 BLAKE2B 3cadbbe7936ff93d9c27c9d7f92678a461b33dd19ad994b32d82bad86cebdd4aefb575da42f27bcb0da5f41c63a79195573c029fed143db03954b2e0bc4862f8 SHA512 d59e8f4762615b2365dd5d9ca1a4432246f4d142a760a586fca58402ae741b30fe93ca84a53caab154cfa73fb1f30636171b1f5cd6990f60a6ca5f1dcf251cbc
 MISC metadata.xml 315 BLAKE2B f3779acd8d9bdbe1e65e6fd147aafd16773a99db420ea47fffa6f8501e0160341cafc9f46d72a860de2bffe572c721177f9c5afdd320b991784ad8e6935c7674 SHA512 108fd9d1659bcd11c414264f52f42b60a7287962aad427f7773971fffbbf9b7d97cefb9a39b64c8d12e00d04cb1188d36031a2d7c94aa57929503299636c6616
diff --git a/dev-java/testng/testng-6.9.10-r1.ebuild b/dev-java/testng/testng-6.9.10-r1.ebuild
index 93be01d33c9d..03d59cd025a7 100644
--- a/dev-java/testng/testng-6.9.10-r1.ebuild
+++ b/dev-java/testng/testng-6.9.10-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Testing framework inspired by JUnit and NUnit with new features"
 HOMEPAGE="https://testng.org/"
 SRC_URI="https://github.com/cbeust/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 SLOT="0"
 IUSE="test"
 RESTRICT="test" # Occasionally fail or run *REALLY* slowly.
diff --git a/dev-java/testng/testng-6.9.10.ebuild b/dev-java/testng/testng-6.9.10.ebuild
deleted file mode 100644
index c644e8005e27..000000000000
--- a/dev-java/testng/testng-6.9.10.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 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="Testing framework inspired by JUnit and NUnit with new features"
-HOMEPAGE="https://testng.org/"
-SRC_URI="https://github.com/cbeust/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-SLOT="0"
-IUSE="test"
-RESTRICT="test" # Occasionally fail or run *REALLY* slowly.
-
-CDEPEND="dev-java/bsh:0
-	dev-java/guice:4
-	dev-java/junit:4
-	dev-java/ant-core:0
-	dev-java/snakeyaml:0
-	dev-java/jcommander:0"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.7
-	test? ( dev-java/assertj-core:2 )"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.7"
-
-S="${WORKDIR}/${P}"
-JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="ant-core,bsh,guice-4,jcommander,junit-4,snakeyaml"
-
-java_prepare() {
-	java-pkg_clean ! -path "./src/*"
-
-	cp -v src/generated/java/org/testng/internal/VersionTemplateJava \
-	   src/main/java/org/testng/internal/Version.java || die
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	java-pkg_addres ${PN}.jar src/main/resources
-}
-
-src_test() {
-	local DIR=src/test/java
-	local RES=src/test/resources
-	local CP=${PN}.jar:$(java-pkg_getjars --with-dependencies "${JAVA_GENTOO_CLASSPATH},assertj-core-2")
-
-	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
-	java -cp "${RES}:${DIR}:${CP}" -Dtest.resources.dir=${RES} org.testng.TestNG -listener test.invokedmethodlistener.MyListener src/test/resources/testng.xml || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher ${PN} --main org.testng.TestNG
-	java-pkg_register-ant-task
-
-	dodoc {ANNOUNCEMENT,CHANGES,TODO}.txt
-
-	if use doc; then
-		docinto html
-		dodoc -r doc
-	fi
-}