gentoo resync : 06.04.2022

3 files changed, 2 insertions, 60 deletions

diff --git a/dev-java/cglib/Manifest b/dev-java/cglib/Manifest
index bf7bdec40bcd..0e89cb99a2e6 100644
--- a/dev-java/cglib/Manifest
+++ b/dev-java/cglib/Manifest
@@ -1,4 +1,3 @@
 DIST cglib-RELEASE_3_3_0.tar.gz 151490 BLAKE2B d7ca4cc9ea6dad9f7a827c784ad13f93e8f31c817c5a0182a86b2ba759ccd3dfbec88d5178507599cd08a97a1ef13ba4880cab016b68b92dda3358bfb0a751c0 SHA512 635dcdb10a8fe83887a1dc8cf12844fe61b73a12fb530bf84d6ac53f75b0103820d76518cbc0d93d63dba86d13929f0df4dbae3b4943a402cf9f2af76f44161a
-EBUILD cglib-3.3.0-r1.ebuild 2078 BLAKE2B 5b08824f25fdcbaf87201b2328a7f31353662f1724eda0fe59e01f9d757657d3e06be2ffc7986c06553d633db9b192d0ed932da1084c0fa7d66cfe980a0338b5 SHA512 fb49e9889e13df00d0d64de33caaab86fc9f212b2720710484a81dc90769b9cf8e8a8e7b50f064d73234a62332a1fb973d7604e584d31abd3927c2cfc30405c0
-EBUILD cglib-3.3.0.ebuild 1488 BLAKE2B c0547570011c4dc76a9fe6a769499dd806278bb1ff7c70b4cd2cb388915f44d103bc5f4d1e3f26dcbf5251db68fe86ae4d86a19e4a814c5c2db40a29a72f1137 SHA512 984fa1a2fe01a3add9b9fe3f616a2a416356a43e499a76f8a5b21d738660ab184384e97de2391cdaaa9e4e28d6bb83f5258577715363e58a13a6dd8445c036cd
+EBUILD cglib-3.3.0-r1.ebuild 2076 BLAKE2B c422f04f799d55ffc657dd28d05ab0b5fe598c352ded8ebcbc941f1e317c68fcde850f25b5daca101c3ad611380702cd264c3e05d00411c0cc9a8d207421dd10 SHA512 25820a58538d0b281fdbe6579ba1f7ffff7a28cf4f6a77227eefc4fe1873c83f6cd0dc271985520c3119fcac8f102a0f1eca3f65400b93524313bd284371b9d7
 MISC metadata.xml 663 BLAKE2B b64f3da3e4d1dd5ac67867d982f124244f81c03e91b5d7140ee1b16a0fd0250751d41debf9a228150569b7e750929942d011afb0872e3e5098e6106639e0ee3b SHA512 d05d3d71c2511c289c2d1cd4ba638cdc488ee5ea5a8a0da8145929befb41c3efa64f672f12584974239039536c68051f7665730221364ffd20fb8f301672db42
diff --git a/dev-java/cglib/cglib-3.3.0-r1.ebuild b/dev-java/cglib/cglib-3.3.0-r1.ebuild
index 3a73e5eb1fb1..64fd2b7900fc 100644
--- a/dev-java/cglib/cglib-3.3.0-r1.ebuild
+++ b/dev-java/cglib/cglib-3.3.0-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/cglib/cglib/archive//${MY_PV}.tar.gz -> ${MY_P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 CDEPEND="dev-java/ant-core:0
 	dev-java/asm:9
diff --git a/dev-java/cglib/cglib-3.3.0.ebuild b/dev-java/cglib/cglib-3.3.0.ebuild
deleted file mode 100644
index a1d5a874f9a7..000000000000
--- a/dev-java/cglib/cglib-3.3.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# doc USE flag is not in IUSE as the docs does not compile because of errors
-JAVA_PKG_IUSE="examples source test"
-MAVEN_ID="cglib:cglib:3.3.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PV=RELEASE_${PV//./_}
-MY_P=cglib-${MY_PV}
-
-DESCRIPTION="cglib is a powerful, high performance and quality Code Generation Library"
-HOMEPAGE="https://github.com/cglib/cglib"
-SRC_URI="https://github.com/cglib/cglib/archive/refs/tags/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-CDEPEND="dev-java/ant-core:0
-	dev-java/asm:9
-"
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CDEPEND}
-"
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CDEPEND}
-"
-
-S="${WORKDIR}"
-
-JAVA_GENTOO_CLASSPATH="asm-9 ant-core"
-JAVA_SRC_DIR="${MY_P}/${PN}/src/main/java"
-JAVA_RESOURCE_DIRS="${MY_P}/${PN}/src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="${MY_P}/${PN}/src/test/java"
-JAVA_TEST_EXCLUDES=(
-	"net.sf.cglib.CodeGenTestCase"		# not a test class
-	"net.sf.cglib.TestAll"
-	"net.sf.cglib.TestGenerator"		# not a test class
-	"net.sf.cglib.proxy.TestEnhancer"	# broken tests
-	"net.sf.cglib.proxy.TestInterceptor"	# not a test class
-	"net.sf.cglib.reflect.TestFastClass"	# broken tests
-)
-
-src_install() {
-	java-pkg-simple_src_install
-
-	use examples && java-pkg_doexamples --subdir samples ${MY_P}/cglib-sample/src/main/java
-}