Removed all packed jars. Fixes #76738.

3 files changed, 47 insertions, 23 deletions

diff --git a/dev-java/cglib/ChangeLog b/dev-java/cglib/ChangeLog
index 44bb9674edd6..10388912641f 100644
--- a/dev-java/cglib/ChangeLog
+++ b/dev-java/cglib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/cglib
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/ChangeLog,v 1.3 2005/01/01 18:13:09 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/ChangeLog,v 1.4 2005/01/05 22:25:29 luckyduck Exp $
+
+  05 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> cglib-2.0.2.ebuild:
+  Removed all packed jars. Fixes #76738.
 
   27 Dec 2004; Lim Swee Tat <st_lim@gentoo.org> cglib-2.0.2.ebuild:
   Removed the version number from the jar
diff --git a/dev-java/cglib/cglib-2.0.2.ebuild b/dev-java/cglib/cglib-2.0.2.ebuild
index 5c936eff2057..a38596a20091 100644
--- a/dev-java/cglib/cglib-2.0.2.ebuild
+++ b/dev-java/cglib/cglib-2.0.2.ebuild
@@ -1,41 +1,50 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/cglib-2.0.2.ebuild,v 1.3 2005/01/01 18:13:09 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/cglib-2.0.2.ebuild,v 1.4 2005/01/05 22:25:29 luckyduck Exp $
 
-inherit java-pkg
+inherit eutils java-pkg
 
-DESCRIPTION="cglib is a Dynamic Java byte code generator"
-HOMEPAGE="http://cglib.sourceforge.net/"
+DESCRIPTION="cglib is a powerful, high performance and quality Code Generation Library, It is used to extend JAVA classes and implements interfaces at runtime."
 SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.jar"
-DEPEND=">=virtual/jdk-1.3
-	dev-java/asm
-	>=dev-java/ant-1.4"
-RDEPEND=">=virtual/jre-1.3"
-LICENSE="LGPL-2"
+HOMEPAGE="http://cglib.sourceforge.net"
+LICENSE="Apache-1.1"
 SLOT="2"
-KEYWORDS="x86 ~ppc ~amd64"
-IUSE="jikes doc"
+KEYWORDS="~x86 ~amd64"
+RDEPEND=">=virtual/jre-1.4
+	jikes? ( >=dev-java/jikes-1.21 )
+	=dev-java/asm-1.4*
+	=dev-java/aspectwerkz-2*"
+DEPEND=">=virtual/jdk-1.4
+	>=dev-java/ant-core-1.5"
+IUSE="doc jikes"
 
 S=${WORKDIR}
 
 src_unpack() {
-	cd ${S}
-	jar xf ${DISTDIR}/${A}
-	cd ${S}
-	echo "j2ee.jar.base.dir=`java-config --jdk-home`" > build.properties
+	jar xf ${DISTDIR}/${A} || die "failed to unpack"
+
+	epatch ${FILESDIR}/${P}-asm-1.4.3.patch
+
+	cd ${S}/lib
+	rm -f *.jar
+	java-pkg_jar-from asm-1.4
+	java-pkg_jar-from aspectwerkz-2
 }
 
 src_compile() {
 	local antflags="jar"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	use doc && antflags="${antflags} javadoc"
-	#use junit && antflags="${antflags} test"
-	ant ${antflags} || die "compilation failed"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	ant ${antflags} || die "builed to build"
 }
 
-src_install () {
+src_install() {
+	mv dist/${PN}-${PV}.jar dist/${PN}.jar
 	mv dist/${PN}-full-${PV}.jar dist/${PN}-full.jar
-	java-pkg_dojar dist/${PN}-full.jar || die "installation failed"
-	dodoc README NOTICE LICENSE
-	use doc && java-pkg_dohtml -r build/apidocs/*
+	java-pkg_dojar dist/${PN}.jar dist/${PN}-full.jar
+
+	dodoc LICENSE NOTICE README
+	if use doc; then
+		java-pkg_dohtml -r docs/*
+	fi
 }
diff --git a/dev-java/cglib/files/cglib-2.0.2-asm-1.4.3.patch b/dev-java/cglib/files/cglib-2.0.2-asm-1.4.3.patch
new file mode 100644
index 000000000000..f9d47e914d3e
--- /dev/null
+++ b/dev-java/cglib/files/cglib-2.0.2-asm-1.4.3.patch
@@ -0,0 +1,12 @@
+diff -uprN src.orig/test/net/sf/cglib/reflect/TestFastClass.java src/test/net/sf/cglib/reflect/TestFastClass.java
+--- src.orig/test/net/sf/cglib/reflect/TestFastClass.java	2005-01-05 19:33:15.945618576 +0100
++++ src/test/net/sf/cglib/reflect/TestFastClass.java	2005-01-05 19:34:21.957583232 +0100
+@@ -26,7 +26,7 @@ import net.sf.cglib.core.DefaultGenerato
+ import net.sf.cglib.transform.ClassTransformerTee;
+ import net.sf.cglib.transform.NullClassVisitor;
+ import net.sf.cglib.transform.TransformingClassGenerator;
+-import org.objectweb.asm.util.DumpClassVisitor;
++import org.objectweb.asm.util.ASMifierClassVisitor;
+ 
+ public class TestFastClass extends net.sf.cglib.CodeGenTestCase {
+     public static class Simple {