--- /var/portage/dev-java/cglib/cglib-2.2.ebuild	2010-04-24 20:47:55.000000000 +0300
+++ cglib-2.2.2.ebuild	2012-08-17 14:42:11.256522982 +0300
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/cglib-2.2.ebuild,v 1.6 2010/04/24 17:47:55 grobian Exp $
+# $Header:  $
 
-EAPI="2"
+EAPI="4"
 JAVA_PKG_IUSE="test doc examples source"
 
 inherit eutils java-pkg-2 java-ant-2
@@ -12,12 +12,12 @@
 HOMEPAGE="http://cglib.sourceforge.net"
 LICENSE="Apache-2.0"
 SLOT="2.2"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64"
 COMMON_DEP="dev-java/asm:3
 	>=dev-java/ant-core-1.7.0"
-RDEPEND=">=virtual/jre-1.4
+RDEPEND=">=virtual/jre-1.5
 	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
+DEPEND=">=virtual/jdk-1.5
 	app-arch/unzip
 	test? ( dev-java/junit )
 	${COMMON_DEP}"
@@ -25,30 +25,19 @@
 
 S=${WORKDIR}
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-build.patch"
-	# mem leak tests fail on ppc #284316
-	# assuming gc() guarantees to free all memory is wrong, so don't make them fail
-	epatch "${FILESDIR}/${P}-no-leak-test.patch"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="asm-3 ant-core"
 
-	cp "${FILESDIR}/words.txt" "${S}/src/test/net/sf/cglib/util/"
+java_prepare() {
+	find . -iname '*.jar' -print0 | xargs -0 rm -v
+	epatch "${FILESDIR}"/${P}-build.xml.patch
 }
 
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}/lib"
-	rm -v *.jar || die
-	java-pkg_jar-from asm-3 asm.jar
-	java-pkg_jar-from asm-3 asm-util.jar
-	java-pkg_jar-from asm-3 asm-commons.jar
-	java-pkg_jar-from ant-core ant.jar
-}
-
-EANT_TEST_JUNIT_INTO="lib"
-EANT_TEST_EXTRA_ARGS="-DdebugLocation=${T}/debug"
+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
 }