Version bump of cglib to 3.0 (bug #426380). Contributed by Ivan Baidakou (dmol); improvements and EAPI bump by me.

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x77C501ED

4 files changed, 105 insertions, 6 deletions

diff --git a/dev-java/cglib/ChangeLog b/dev-java/cglib/ChangeLog
index 81cc0411ed52..6f13e0d76113 100644
--- a/dev-java/cglib/ChangeLog
+++ b/dev-java/cglib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/cglib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/ChangeLog,v 1.54 2013/09/01 11:36:42 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/ChangeLog,v 1.55 2013/09/11 17:28:09 ercpe Exp $
+
+*cglib-3.0 (11 Sep 2013)
+
+  11 Sep 2013; Johann Schmitz <ercpe@gentoo.org> +cglib-3.0.ebuild,
+  +files/cglib-3.0-build.xml.patch:
+  Version bump of cglib to 3.0 (bug #426380). Contributed by Ivan Baidakou
+  (dmol); improvements and EAPI bump by me.
 
   01 Sep 2013; Fabian Groffen <grobian@gentoo.org> cglib-2.0.2-r2.ebuild:
   Marked *-macos
diff --git a/dev-java/cglib/Manifest b/dev-java/cglib/Manifest
index 7d458a1dc310..30d093e2a016 100644
--- a/dev-java/cglib/Manifest
+++ b/dev-java/cglib/Manifest
@@ -5,21 +5,28 @@ AUX cglib-2.0.2-asm-1.4.3.patch 721 SHA256 06997a5c61860cc5426ad0f7783447fd4f980
 AUX cglib-2.2-build.patch 2269 SHA256 0528b998d5a276ed4daff1001e7b3178596af23bf72c84b53a693a1d437e6d35 SHA512 bbbce587260758d6c76bfc28efc1a0669321d26e893037f0d59048af35fecf5f88802a22041c6d592420905ca00aacaad677df2ece037adc88cf7856b97d68f3 WHIRLPOOL b3361652b1fb8c65b4abff4f6500b4d29aab8954232672c3e2e7d62ba4934f53b5bcd8ddc2498b1c42614c6e92943a8eb0b6cff58a249087b9948c5518f17d89
 AUX cglib-2.2-no-leak-test.patch 296 SHA256 128e0f94ab0881be8a57c42890ae602115adcc188be425be2ea4977690114a22 SHA512 ef01f6615a6563b565f9f4362c0d69e3ae55896f2b4b87368fea4ae4df7e490e8a6f83f2ba1caefc0d4ccc38631b3294ccb6977edb5ea6707c0bf327ef54c6a2 WHIRLPOOL 3709ad7247a152913b19a04d6061be41d55104260d7664408371fb7bc8bd2ad5f30a39306c98cbd2d3e9b383f334afe5a72e03a60817d61cfe1594e99165c214
 AUX cglib-2.2.3-build.patch 2092 SHA256 3cb1b5b6eab5d60011b914fc86cfdd89e40922727b061f96beb0f399f02e0f95 SHA512 f8b8414810dbd21d9ae2d804ed0a666f644d52f5c4a8985f3b6d6e278b68fc42620a34b2c618e51680fb4f7a63865a3a919beb26657cb7c65cbab04d395dc16a WHIRLPOOL 438e5dbbebe6bd71804fa1616ec9f127c8d4b934357fbf1bfffcfd2f34f1f3a9bcc386f227b7311d3dce48b88682e127390b9b2fb24408d124425a2363554321
+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.0.2.jar 445834 SHA256 91644a03487a9a0161a54e0c3644c34c44e507557dcf4b8b97a60dd91e67cd1c SHA512 6cfaf0b03043a2ae36a83eb4b4c23026d02943ee56bd89d9556a9670385844a181d220291efe5eb1c248854a2f2adf46ca9de041d4670f80672b3cc7d5ee8b42 WHIRLPOOL 8afcd44f17bdf7e52c00d9e5b21f390f8ae8316a6c40db063c2f4dd7e503059d6b985fe259871801c51a8847b0280f8fc78bb982ea02833065c57abddd172712
 DIST cglib-src-2.1_3.jar 1610524 SHA256 652c7533f5c6d4bf66ba13871f70133e9ffdca648e49354cff7f39824282739e SHA512 9bd34c3448870f9ba8e0e985b679bf077d9f0c66d815a93cede35b743958e0f0fe03382933d2a696a55f41ad8669ca392daef4ad0e12c17dd5744262984f4e14 WHIRLPOOL 44e999b8de2e3ba37e6667ee46e68fa463e6609ad08fd69b744e36719a9b4ff4d9e95fc626487b7a788dae128d514c70ee3900da6f217d4208d534b776305a24
 DIST cglib-src-2.2.jar 1520971 SHA256 762e0214f0d31f224e712a7a5b4768c16ad24741ba98fc2e94715ae390d07fcb SHA512 ef0694684345c08f6e107c5a32177b63f53e4779a729f3f28d98f6cde1d8edaa9cf9c8e1fc9325f5c22f4214f5795d34fb3a13bfe298705f424d569b3e7b7baa WHIRLPOOL a7072eab907cb08c2b44d2cacf837abac70fbcaf7af4c30483479c4994c27dfdad02c916dced3f75e45de73bc111ee3efc133ae30766cd7ed26695cfa63f7773
+DIST cglib-src-3.0.jar 1537863 SHA256 40f8cc721f80b820207f0061b10ad51151f577b2d7d94d93f19a85aa2551e674 SHA512 7791c36ed1908ddbc35a0bf1f4f54c3554b0fe4f707b318d7d24189fb513d8712335f2e41f90065e8eb102657d53699cc709a1b9f7a12a8f924c6a755969a829 WHIRLPOOL d9e4f80e7cbe1bc39aad654e437347551e13c66bcc3139f8991e870c123bdd83603a26b9d5a07a902c2fa668ba7cb42285417578b836e195f5660b691c6ddc79
 DIST cglib.2.2.3.zip 2417681 SHA256 23e605c9b8972d4944c90391aaecf7b00ed59096a0a8936bb16e5b30cdbaa1b2 SHA512 c7bcdc8035c1edcff45a2325d52dba464df0737d1e3941f59174a7e3e3896002a7de7d7fa47271b3575704aeed96e82a1041fb1a7f189bf37575323f02dcdd7b WHIRLPOOL b002b2c6d55a004bf5e3e3804942d2bb2a276382dfcab65304a3eb998aa80324386b3c7e0984969da0c41c75ad6be62543f7f83a6940d0c75c90bc05dcce7192
 EBUILD cglib-2.0.2-r2.ebuild 1446 SHA256 cbc091e6ce9cc7929d529838a77c6795f92e45a3c5a454daeaeaf1b2fc4a9fe3 SHA512 d840a5be8ddd5b69e04a42a783657c00978449ea911a5352dc643df499313b679c114ea0d5a41904860c23fef23169b42708325abbff381a49e553f88d44bf3a WHIRLPOOL cbd62e9dbd35ce6e26539a64ac2492c4d7d266d8b7056b6831c89b75715faf945807949ceba2dcb0d93af47afdda9b88429a93068d1eed6aa25834df3a2bd144
 EBUILD cglib-2.1.3.ebuild 1444 SHA256 200dad3ff471eed4e7fb35721286d4a8fea1cd49ccace3e24a7ddd2fbaff3c1a SHA512 9718386e9d175e27cc7125ee3104555101434c15f8c0d3b1ea49b6d53db4a92d38250234a871df789e61d28e80b94ae7dcfe5661d80ef889d004fdc0d3c6c889 WHIRLPOOL ce0ee8e47b0b608a66e78939ec4972d23dd4333ef51d769a18741040ff6b696edc7a80061c0786405e8fbee315eb8ff4380bb6e8781a87decb64adfd72fc0cda
 EBUILD cglib-2.2.3.ebuild 1731 SHA256 aa582b96fa3f7c446487e6cf53df28b76b7a0671e511c6482a30c544f3efb00f SHA512 ef4939fd61ee5fd47c113622f53e1629185605ef1e93c81121ad8858aca2160f6267a3870541925cec9ca147be62bd561eb4e7dfde807056a08ca9be6950978d WHIRLPOOL ce7a2eab523f9c613e0930b3fad5eb3c3a6b51c31ab73649bd3760c6a3171ab1e6cf9fb06fc253e9aa906801d83887580208c85e454a3fa85270c7a8df381086
 EBUILD cglib-2.2.ebuild 1667 SHA256 f83c644065b56ae349ebae527659b32be7ea298dbbb615d603d0d6cb2a3a654e SHA512 73f716f4669771a32333e4299054f960734c73cda7cc4b30d43498d25ecabbefe25e7c37e307cfa651f0b6cf1df4d12f1203e0c2a17c9d1fdcb420844932b86c WHIRLPOOL 47d4a725298495d899921556ce2fb402e1be3bb0f7b204f7c2872e322aa44f235bfc11ad6118c51962965d07edcc0fa40c274753781babd2ee607defa61fcd82
-MISC ChangeLog 7760 SHA256 c228f89ef297ab9eab647446c294cd4544d7f902c0cf5dc1362a9a3bd7904064 SHA512 eb72fcacb54bb0edb67b06b25a6933f609ddef9cde351af89f3f665e2f63ccc6436f1b6db052d6e618fb76f1c3d4838d92758320bd18cdcf818e461b112595e2 WHIRLPOOL b34ded61d7847f708ecd13f31fdf5e1531b90c2eca7300cc1cc48ddc1c19a04d088021db02f32f1256c02db46ccb5d4d513aa8be1edc851daddb38db7ef9278e
+EBUILD cglib-3.0.ebuild 1154 SHA256 78afcf832fdababc30ceb7e0d7a3b9368480b49e03407f7c2178471924589af5 SHA512 7d3f1a7bef6fcbbfe9ae15acf9bdf4c5ac2242296a8ff752da5df60c3265beea44a1265e2c04831b20cf63b87dc64eea4ad6f76c5552415f15a87b0d35cd09f0 WHIRLPOOL 85d63729e95d7394bb4a88290376f7d1bd2c5494887317dd0e3fdcedaf22bf3077e53cc0d6bb8491770b1b93ce242a7091ccdf7e380d5a423c7bce376ff88d1e
+MISC ChangeLog 8008 SHA256 105677e3ca7ccbbfd7dd4be84eed363c909f914b2db7a101673c8961c2a5b056 SHA512 aace79add1919eb09e3a5732a615875d5cdfe835a3c1e9fdc6938dce3d78914a2382ba88e86d680639ce17e3887b1f3fabd7fcd2d54a0303f36b680ee96eb81a WHIRLPOOL 76d76fac66555de73216e45217792b6ecaf92565a2b8691d896237a0dd6d8bbe4d9df2637d51fc827f5c4f048592c5694288b7c5261d510753cef64f266ae897
 MISC metadata.xml 350 SHA256 1364c70f5978d4b5277c64fec94ba77ca7da6d41a3bf851ad90e49b93f3f8ec8 SHA512 04161c63a03695cccba9f18a649b509fe03cdc69242f0e5aeb26e74ae3bd039c5a68c0553886945c4e63176f4bbd5f57f3c2d7a89088a7bcea52a8a3543cd3a1 WHIRLPOOL 1f6f0ed03a315a29149f410ae0f626e1be4f30c21ee74b3d10bcb2003a4b4818281c67eb6bb269170574662a6ab0e78ced558babe65c6eb9b82c3ec8b78e1d0e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (Darwin)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIjJugACgkQX3X2B8XHTomgHgCeMELw+0E/J/duLlj1GHhn/xD4
-x9EAnjcoHByPtsiF+kUY4q/7DsF9MwBh
-=Hie8
+iQEcBAEBCAAGBQJSMKgrAAoJEKCEBkJ3xQHtJEUH/1VAJrEe5ulSSaKaqMd6Rw2d
+o1JRv9el67pHXlmuRaa6jZK8BvkDTUCnfOfSCXjOV0hwhg6tFx9tnVN+vt1Y+1sK
+asQHPH/U4gHj9GBCf6NxsmDW4O2e/sBkFHilTKSbiDYcGyUoy4r8hQMBsFXqCmSn
+BO71HcgrRaWf4Trnl9ljwYN9kn5A7CJ32iC8v+Ex/HQHrcJlPyfVQPpUxtSIrPUL
+HyUmaL/USQlXVQHjGaNbAc3La84VynEcDucL8CLODHcdIpyTZt5mcsAI4tgHqhA1
+WYyu2gamd0TlkaXFc1H4JWHhXKMcQLdkmhbaIgZU3R591DTSA8WcAmUuMhSQmCs=
+=UFAw
 -----END PGP SIGNATURE-----
diff --git a/dev-java/cglib/cglib-3.0.ebuild b/dev-java/cglib/cglib-3.0.ebuild
new file mode 100644
index 000000000000..7b45d6f74b10
--- /dev/null
+++ b/dev-java/cglib/cglib-3.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/cglib-3.0.ebuild,v 1.1 2013/09/11 17:28:09 ercpe Exp $
+
+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="http://cglib.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.jar"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+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
+	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
+	epatch "${FILESDIR}"/${P}-build.xml.patch
+}
+
+src_install() {
+	java-pkg_newjar dist/${P}.jar ${PN}.jar
+
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc src/proxy/net
+	use examples && java-pkg_doexamples --subdir samples src/proxy/samples
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
diff --git a/dev-java/cglib/files/cglib-3.0-build.xml.patch b/dev-java/cglib/files/cglib-3.0-build.xml.patch
new file mode 100644
index 000000000000..a40c169d8016
--- /dev/null
+++ b/dev-java/cglib/files/cglib-3.0-build.xml.patch
@@ -0,0 +1,36 @@
+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">
+     <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>
+@@ -124,14 +124,6 @@
+       <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.0.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 +238,7 @@
+   <!-- <jvmarg value="-verbose:class"/> -->
+   <!-- <jvmarg value="-Xprof"/> -->
+   <!-- <jvmarg value="-server"/> -->
+-  <!-- <sysproperty key="cglib.debugLocation" value="debug"/> -->
++  <sysproperty key="cglib.debugLocation" value="${cglib.debugLocation}"/>
+   <!-- <jvmarg value="-Djava.security.policy==java.policy" /> -->
+   <!-- <jvmarg value="-Djava.security.manager" />  -->
+