cglib-3.2 version bump wrt#426380

3 files changed, 69 insertions, 27 deletions

diff --git a/dev-java/cglib/Manifest b/dev-java/cglib/Manifest
index dbc7c9b..0a44d27 100644
--- a/dev-java/cglib/Manifest
+++ b/dev-java/cglib/Manifest
@@ -1,6 +1,8 @@
-AUX cglib-2.2-build.patch 2269 SHA256 0528b998d5a276ed4daff1001e7b3178596af23bf72c84b53a693a1d437e6d35 SHA512 bbbce587260758d6c76bfc28efc1a0669321d26e893037f0d59048af35fecf5f88802a22041c6d592420905ca00aacaad677df2ece037adc88cf7856b97d68f3 WHIRLPOOL b3361652b1fb8c65b4abff4f6500b4d29aab8954232672c3e2e7d62ba4934f53b5bcd8ddc2498b1c42614c6e92943a8eb0b6cff58a249087b9948c5518f17d89
 AUX cglib-2.2.2-build.xml.patch 1895 SHA256 55d0007565b34d161e2797f67a56766630847cdd2dd81606c43021a8a90b14ca SHA512 382926dc292ac350214b1bf85ada33e5a1403bf592bfc18dd3e7a814703d1edf7b37e83839b7272d3a22d4beebbfde5543dfea5f05e9abbe1f26ae0aefd76cef WHIRLPOOL 55f7ce6f11a3971da4bdc395c5654876ea576758ff092f1cdd43aa081cebe3775505719723a1494d6ecdcf602968d969f490d6a610e299d13035d9dfd3216d47
+AUX cglib-3.0-build.xml.patch 1889 SHA256 24ba79aac76291a30c51e0461d4d1bf3042bd361a370cf6e72c5d21263dbbdd8 SHA512 e52fbc11e8d6dff7dad9ba08d643a8b94f11e0ccf8d6e80102def160a066024f39ff832ed5d6ef7824fdef52ea3316a6079acf3cee3ed74ffdf9cf177282dcab WHIRLPOOL 3b5f1dd1a86d5c5a156e3b8ea241f6db5747cc8627ba35e96f0c005693963b4d331b8f9cdf09aac90d9505ae3b022cec056abc7b0206c3f215caaf3d7d650cf4
 AUX words.txt 509 SHA256 6503d53d13bb738f22b04fb611eef0d858db29f12a1e53613cccab7c1a759b2c SHA512 504c2cbe8907c029a7fc6dfcda8a4f752dc1fe17c0db5c0b0f22f8f50a209d36182e7a8824ae16ced0e054f89ccfcac597fbb7095f9f084035dcb55b237b92b7 WHIRLPOOL ac43ce7fff13d303b415ca560e4bb34b70b4a3465e517ec5900a3c4aff0dbcb7d7bdfeccc4ef1fb94867e9f3c4e1bd1c9097cd99ba6e23220f41673d1f17654f
 DIST cglib-src-2.2.2.jar 1534374 SHA256 896000c74f71291e2931188b5494ffd7bdac8f0d75dfeeac1c40eb6e16cadcbb SHA512 1ba890056231d1dc2bca680f1e6bb61f9f3723c32591ab6afd32cae8f76cbbf64526091a67564beb389041ab442255146fbfa4d032d8f6e986a595d6d3765a78 WHIRLPOOL 9a95fc8ff44ac139f9fbd729038ad62b03fe2f206d7212d162ddb306db5175fec8e07ac5282b095551a5c0e7525f43b0db4f46298224e55b17840adece542e82
+DIST cglib-src-3.0.jar 1537863 SHA256 40f8cc721f80b820207f0061b10ad51151f577b2d7d94d93f19a85aa2551e674 SHA512 7791c36ed1908ddbc35a0bf1f4f54c3554b0fe4f707b318d7d24189fb513d8712335f2e41f90065e8eb102657d53699cc709a1b9f7a12a8f924c6a755969a829 WHIRLPOOL d9e4f80e7cbe1bc39aad654e437347551e13c66bcc3139f8991e870c123bdd83603a26b9d5a07a902c2fa668ba7cb42285417578b836e195f5660b691c6ddc79
 EBUILD cglib-2.2.2.ebuild 1256 SHA256 2c0047121b6a1f8dcfd2d55b9392702d46556390a4e350ca2d6c2e8db0ce4eeb SHA512 c470e02851a60e44792934e45f0827198923adc4e3711e0b7e45f900c5eba6ec10938a8534570abdb7ec4333f606c5bce686209d50760017a6a82d22ad407abb WHIRLPOOL b0df61cbb4d3565e763eff0b71003e3f355309feff0bedb2cc5aa15f7ce54466d3502684f910d0cec1ae61f1c63ac0404c0a7cc1bceb79ee40d51815735d9a98
+EBUILD cglib-3.0.ebuild 1256 SHA256 1f367535a38a198ba61485e81cf4c722ace80c7b7bc1ef00d18bb57793216a8e SHA512 a58c88324f3451a0e2c36340205c78d2f82989d8499a8de7f7238e0b46edb08906aecf29b5ff610604e05880c7aaff5433560ad9472ce0de49456a62ee2dd5ec WHIRLPOOL 148b8c84128f8fe433b7a88154535241efa289fd538dcdcc77cd0ced5502a2875505a510e7beab4728b1fc350fb20fd11827625493153cd0d917758b5e02cb8c
 MISC metadata.xml 205 SHA256 2ff0740a5424b0e10c7888541a248d1bd363a60911b0921b4cfe5c36590498ce SHA512 e7c77c724739d0af43cc338ded09dcbeee2a710eb0e49f1e656dc4c891bee85bfd6935bf70a191a1c5823f473643e676d64970416e5f1820ea466681016757c5 WHIRLPOOL 5b7f0c2a5243244fa06b072c8f0d9f53e7b6f45c7e1b74a0d945bdcc28b7137fddfd58e85b0d3e721e80963916ceae0d4cca59f48114ba26c47b24a91d6abb27
diff --git a/dev-java/cglib/cglib-3.0.ebuild b/dev-java/cglib/cglib-3.0.ebuild
new file mode 100644
index 0000000..25dbf5a
--- /dev/null
+++ b/dev-java/cglib/cglib-3.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header:  $
+
+EAPI="4"
+JAVA_PKG_IUSE="test doc examples source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="cglib is a powerful, high performance and quality Code Generation Library."
+SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.jar"
+HOMEPAGE="http://cglib.sourceforge.net"
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64"
+COMMON_DEP="dev-java/asm:4
+	>=dev-java/ant-core-1.7.0"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	test? ( dev-java/junit:0 )
+	${COMMON_DEP}"
+IUSE=""
+
+S=${WORKDIR}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="asm-4 ant-core"
+
+java_prepare() {
+	find . -iname '*.jar' -print0 | xargs -0 rm -v
+	epatch "${FILESDIR}"/${P}-build.xml.patch
+}
+
+EANT_TEST_EXTRA_ARGS="-Dcglib.debugLocation=${T}/debug"
+
+src_test() {
+	mkdir "${T}/debug"
+	cp -v "${FILESDIR}/words.txt" "${S}/src/test/net/sf/cglib/util/"
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar dist/${P}.jar ${PN}.jar
+
+	dodoc NOTICE README || die
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc src/proxy/net
+	use examples && java-pkg_doexamples --subdir samples src/proxy/samples
+}
diff --git a/dev-java/cglib/files/cglib-2.2-build.patch b/dev-java/cglib/files/cglib-3.0-build.xml.patch
index c1c572d..a40c169 100644
--- a/dev-java/cglib/files/cglib-2.2-build.patch
+++ b/dev-java/cglib/files/cglib-3.0-build.xml.patch
@@ -1,5 +1,6 @@
---- build.xml.orig	2009-09-02 16:27:55.000000000 +0200
-+++ build.xml	2009-09-03 17:24:23.000000000 +0200
+diff -Nru /tmp/cglib-3.0.orig/build.xml ./build.xml
+--- /tmp/cglib-3.0.orig/build.xml	2012-08-17 19:21:37.387574672 +0300
++++ ./build.xml	2012-08-17 19:26:58.982564260 +0300
 @@ -73,7 +73,7 @@
    <target depends="prepare" description="Compile shareable components" 
            name="compile">
@@ -9,39 +10,27 @@
        <classpath refid="compile.classpath"/>
        <compilerarg compiler="jikes" value="-nowarn"/>
      </javac>
-@@ -122,16 +122,7 @@
-     <jar basedir="${build.home}/classes" jarfile="${dist.home}/${component.name}-${component.version}.jar" >
-       <include name="**/*"/>
+@@ -124,14 +124,6 @@
        <exclude name="samples/**" />
--    </jar> 
--
+     </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-3.1.jar" excludes="META-INF"/>
+-      <zipfileset src="lib/asm-4.0.jar" excludes="META-INF"/>
 -      <rule pattern="org.objectweb.asm.**" result="net.sf.cglib.asm.@1"/>
 -      <include name="**/*"/>
 -      <exclude name="samples/**"/>
 -    </jarjar> 
-+    </jar>
    </target>
  
    <target depends="compile,javadoc" description="Create docs and source distribution" name="srcjar">
-@@ -239,16 +230,7 @@
-           failonerror="${test.failonerror}"
-           fork="yes" 
-           >
--
--  <!-- jvmarg value="-Xrunhprof:heap=all,file=debug.txt"/ --> 
--  <!-- <jvmarg value="-verbose:gc"/> --> 
--  <!-- <jvmarg value="-verbose:class"/> -->
--  <!-- <jvmarg value="-Xprof"/> -->
--  <!-- <jvmarg value="-server"/> -->
+@@ -246,7 +238,7 @@
+   <!-- <jvmarg value="-verbose:class"/> -->
+   <!-- <jvmarg value="-Xprof"/> -->
+   <!-- <jvmarg value="-server"/> -->
 -  <!-- <sysproperty key="cglib.debugLocation" value="debug"/> -->
--  <!-- <jvmarg value="-Djava.security.policy==java.policy" /> -->
--  <!-- <jvmarg value="-Djava.security.manager" />  -->
-- 
-+		<sysproperty key="cglib.debugLocation" value="${debugLocation}"/>
-       <arg value="${test.entry}"/>
-         <classpath>
-           <pathelement path="${build.home}/classes"/>
++  <sysproperty key="cglib.debugLocation" value="${cglib.debugLocation}"/>
+   <!-- <jvmarg value="-Djava.security.policy==java.policy" /> -->
+   <!-- <jvmarg value="-Djava.security.manager" />  -->
+