5 files changed, 62 insertions, 98 deletions
diff --git a/dev-java/cglib/Manifest b/dev-java/cglib/Manifest
index b705b22e2e13..05fedfe5181c 100644
--- a/dev-java/cglib/Manifest
+++ b/dev-java/cglib/Manifest
@@ -1,4 +1,3 @@
-AUX cglib-3.1-build.xml.patch 1864 BLAKE2B 01fbf3ff50bcbcd4dea8b70db5a4fb6b0b3e5770a3d0c17f4fd5ed1106f5ac4f0e21054b81c06fbd731b1ba689ecc97f21db4fafcc9f84df3634ca70afe57401 SHA512 609cf02dd64fe57307ad9571f8b7d4bc3c7f9b452ce755fa968870fc252df08c985b5dc12647f8c543e39d57a01b532a4188d5ffc07359ddfc7967d32dfd978b
-DIST cglib-src-3.1.jar 1541525 BLAKE2B 46df8c11a8d05549c15a3bbf0f9789fbe4ad0540caa5be6d30f922aec95b55427cf36bff7740ba8c050c3c72749c6e9c98d8119a6de345126d7ef72343130568 SHA512 3b246b37f1c90acaefd4ba64f1f1db0b4d1fa64025f0e4e216ae7955e05701671bf8dc01d19c754286966cc5f8c06d78d02cb4f4500542f4448656768109c13f
-EBUILD cglib-3.1.ebuild 1127 BLAKE2B 89471d4fb3349610a09d7468cf5786ad2a2509ffe63bf08ca7bad52db12ff74d0622774cbeeeed673e7ede5649ffe6ce9b1efd3515c09524171bc30ec93c2d63 SHA512 59d439cc175332afe47931b43cf10c65e5fa46ccf81a6fad57059bb0dbad6e9f22f2ab4d51f8bf068449c0be7f180a1dbffb84aba69bf4a84f4e76cbdb2b1cfd
-MISC metadata.xml 554 BLAKE2B 253863978031d659d829e68719bab9dc8bc4a5d6134cd040dba882006eba9f6a6a5fec83efc83915bf7d4995af36752304252610d7163673584226c470ab7065 SHA512 480a6d306dd997a40cc695c42a4d51d12cd1ba131b5b3d80b4ca18ec751ba3dcf2394cb139c4c1a06ad98da30127c65c65eab036aaca167f46a6b63336f2c7ec
+DIST cglib-RELEASE_3_3_0.tar.gz 151490 BLAKE2B d7ca4cc9ea6dad9f7a827c784ad13f93e8f31c817c5a0182a86b2ba759ccd3dfbec88d5178507599cd08a97a1ef13ba4880cab016b68b92dda3358bfb0a751c0 SHA512 635dcdb10a8fe83887a1dc8cf12844fe61b73a12fb530bf84d6ac53f75b0103820d76518cbc0d93d63dba86d13929f0df4dbae3b4943a402cf9f2af76f44161a
+EBUILD cglib-3.3.0.ebuild 1483 BLAKE2B da5525827f1b554b0a4f3d1f9e0c6b6aa48c0b58b91a77664673d15e0694777110eb6d5a266850ca1fffd1063c05f0b89753651088676caf74ebd70c9d5a1477 SHA512 bd3a663a09c5420c2546548ccb725f894fc3304ada130e0c39d4ec6a1aa931c7e66be6247ed2509136f738699f654d0169820f3f7ddf955948fd290519ff7d44
+MISC metadata.xml 662 BLAKE2B 46cc12ace95ebd79e3ae91820fab1dbb71c570cbc19bbb9737bff384669ce771608038ba828239ebf0033281919ca41436875ebb9c8cc94377addf0cb3f4e07b SHA512 785d7be388aa2353dafedb8f8fb80a509ceccb26bdc4f59bfac17beb10fe351a0a0b98f4324d9825090e4a0fd110f4d77df5e81dba5111c52f3eff38a9d58dcc
diff --git a/dev-java/cglib/cglib-3.1.ebuild b/dev-java/cglib/cglib-3.1.ebuild
deleted file mode 100644
index 88dbbfbb6dd9..000000000000
--- a/dev-java/cglib/cglib-3.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="cglib is a powerful, high performance and quality Code Generation Library"
-HOMEPAGE="https://github.com/cglib/cglib"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.jar"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-
-IUSE=""
-
-COMMON_DEP="dev-java/asm:4
-	dev-java/ant-core:0"
-RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.6
-	test? ( dev-java/junit:4 )
-	${COMMON_DEP}"
-
-S="${WORKDIR}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="asm-4 ant-core"
-
-java_prepare() {
-	find . -iname '*.jar' -delete || die
-
-	# Get rid of some parts in XML.
-	epatch "${FILESDIR}"/${P}-build.xml.patch
-}
-
-src_install() {
-	java-pkg_newjar dist/${P}.jar ${PN}.jar
-
-	if use doc; then
-		java-pkg_dojavadoc docs
-	fi
-
-	if use source; then
-		java-pkg_dosrc src/proxy/net
-	fi
-
-	if use examples; then
-		java-pkg_doexamples --subdir samples src/proxy/samples
-	fi
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
diff --git a/dev-java/cglib/cglib-3.3.0.ebuild b/dev-java/cglib/cglib-3.3.0.ebuild
new file mode 100644
index 000000000000..df66cf8c3d65
--- /dev/null
+++ b/dev-java/cglib/cglib-3.3.0.ebuild
@@ -0,0 +1,57 @@
+# 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 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
+}
diff --git a/dev-java/cglib/files/cglib-3.1-build.xml.patch b/dev-java/cglib/files/cglib-3.1-build.xml.patch
deleted file mode 100644
index 0bf60be7b014..000000000000
--- a/dev-java/cglib/files/cglib-3.1-build.xml.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- build.xml.orig	2015-04-11 20:26:25.459688628 +0200
-+++ build.xml	2015-04-11 20:28:41.930026892 +0200
-@@ -73,7 +73,7 @@
-   <target depends="prepare" description="Compile shareable components" 
-           name="compile">
-     <javac debug="${compile.debug}" deprecation="${compile.deprecation}" destdir="${build.home}/classes" optimize="${compile.optimize}" srcdir="${source.home}"
--      target="${compile.target}" bootclasspath="${compile.bootclasspath}" extdirs="${compile.extdirs}" source="${compile.source}">
-+      target="${compile.target}" extdirs="${compile.extdirs}" source="${compile.source}">
-       <classpath refid="compile.classpath"/>
-       <compilerarg compiler="jikes" value="-nowarn"/>
-     </javac>
-@@ -123,15 +123,6 @@
-       <include name="**/*"/>
-       <exclude name="samples/**" />
-     </jar> 
--
--    <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="compile.classpath"/>
--    <jarjar basedir="${build.home}/classes" jarfile="${dist.home}/${component.name}-nodep-${component.version}.jar" >
--      <zipfileset dir="lib" includes="asm*.txt"/>
--      <zipfileset src="lib/asm-4.2.jar" excludes="META-INF"/>
--      <rule pattern="org.objectweb.asm.**" result="net.sf.cglib.asm.@1"/>
--      <include name="**/*"/>
--      <exclude name="samples/**"/>
--    </jarjar> 
-   </target>
- 
-   <target depends="compile,javadoc" description="Create docs and source distribution" name="srcjar">
-@@ -246,7 +237,7 @@
-   <!-- <jvmarg value="-verbose:class"/> -->
-   <!-- <jvmarg value="-Xprof"/> -->
-   <!-- <jvmarg value="-server"/> -->
--  <!-- <sysproperty key="cglib.debugLocation" value="debug"/> -->
-+  <sysproperty key="cglib.debugLocation" value="debug"/>
-   <!-- <jvmarg value="-Djava.security.policy==java.policy" /> -->
-   <!-- <jvmarg value="-Djava.security.manager" />  -->
-  
diff --git a/dev-java/cglib/metadata.xml b/dev-java/cglib/metadata.xml
index 5f26effad5fd..d6cfa73169ff 100644
--- a/dev-java/cglib/metadata.xml
+++ b/dev-java/cglib/metadata.xml
@@ -13,5 +13,7 @@
 	<upstream>
 		<remote-id type="github">cglib/cglib</remote-id>
 		<remote-id type="sourceforge">cglib</remote-id>
+		<bugs-to>https://github.com/cglib/cglib/issues</bugs-to>
+		<doc>https://github.com/cglib/cglib/wiki</doc>
 	</upstream>
 </pkgmetadata>