5 files changed, 87 insertions, 34 deletions
diff --git a/dev-java/cglib/ChangeLog b/dev-java/cglib/ChangeLog
index 10388912641f..8a94479c3461 100644
--- a/dev-java/cglib/ChangeLog
+++ b/dev-java/cglib/ChangeLog
@@ -1,6 +1,15 @@
 # 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.4 2005/01/05 22:25:29 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/ChangeLog,v 1.5 2005/01/20 16:00:59 luckyduck Exp $
+
+*cglib-2.0.2-r1 (20 Jan 2005)
+
+  20 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> +cglib-2.0.2-r1.ebuild,
+  cglib-2.0.2.ebuild:
+  readded old version with ~ppc, -r1 doesnt make use of packed jars.
+
+  20 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> cglib-2.0.2.ebuild:
+  readded ~ppc. sorry :/
 
   05 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> cglib-2.0.2.ebuild:
   Removed all packed jars. Fixes #76738.
diff --git a/dev-java/cglib/Manifest b/dev-java/cglib/Manifest
index a7bce438fadf..ce0bef84fab8 100644
--- a/dev-java/cglib/Manifest
+++ b/dev-java/cglib/Manifest
@@ -1,5 +1,7 @@
-MD5 8ab58648cee9233c3304f0159db75d4c cglib-2.0.2.ebuild 1369
-MD5 556d5aca601a76e47aabec733b3b35cd ChangeLog 579
+MD5 8e5bb18d4de9ec4318d448bc5ad93698 cglib-2.0.2.ebuild 1139
+MD5 9b945bef073a5d71cbc5f977786ef9b1 cglib-2.0.2-r1.ebuild 1372
+MD5 7f18e86d772047cc82eb967accec0c6e ChangeLog 876
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 b6f8a58fff30e586496183aa9f0af130 files/digest-cglib-2.0.2 64
+MD5 b6f8a58fff30e586496183aa9f0af130 files/digest-cglib-2.0.2-r1 64
 MD5 a7a4f8f597ccfc2d44762869fa7e983f files/cglib-2.0.2-asm-1.4.3.patch 721
diff --git a/dev-java/cglib/cglib-2.0.2-r1.ebuild b/dev-java/cglib/cglib-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..58ae45e67c42
--- /dev/null
+++ b/dev-java/cglib/cglib-2.0.2-r1.ebuild
@@ -0,0 +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-r1.ebuild,v 1.1 2005/01/20 16:00:59 luckyduck Exp $
+
+inherit eutils java-pkg
+
+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"
+HOMEPAGE="http://cglib.sourceforge.net"
+LICENSE="Apache-1.1"
+SLOT="2"
+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() {
+	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 doc && antflags="${antflags} javadoc"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	ant ${antflags} || die "builed to build"
+}
+
+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}.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/cglib-2.0.2.ebuild b/dev-java/cglib/cglib-2.0.2.ebuild
index a38596a20091..08f88fe2b23e 100644
--- a/dev-java/cglib/cglib-2.0.2.ebuild
+++ b/dev-java/cglib/cglib-2.0.2.ebuild
@@ -1,50 +1,41 @@
 # 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.4 2005/01/05 22:25:29 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/cglib-2.0.2.ebuild,v 1.5 2005/01/20 16:00:59 luckyduck Exp $
 
-inherit eutils java-pkg
+inherit java-pkg
 
-DESCRIPTION="cglib is a powerful, high performance and quality Code Generation Library, It is used to extend JAVA classes and implements interfaces at runtime."
+DESCRIPTION="cglib is a Dynamic Java byte code generator"
+HOMEPAGE="http://cglib.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.jar"
-HOMEPAGE="http://cglib.sourceforge.net"
-LICENSE="Apache-1.1"
+DEPEND=">=virtual/jdk-1.3
+	dev-java/asm
+	>=dev-java/ant-1.4"
+RDEPEND=">=virtual/jre-1.3"
+LICENSE="LGPL-2"
 SLOT="2"
-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"
+KEYWORDS="x86 ~ppc ~amd64"
+IUSE="jikes doc"
 
 S=${WORKDIR}
 
 src_unpack() {
-	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
+	cd ${S}
+	jar xf ${DISTDIR}/${A}
+	cd ${S}
+	echo "j2ee.jar.base.dir=`java-config --jdk-home`" > build.properties
 }
 
 src_compile() {
 	local antflags="jar"
-	use doc && antflags="${antflags} javadoc"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} || die "builed to build"
+	use doc && antflags="${antflags} javadoc"
+	#use junit && antflags="${antflags} test"
+	ant ${antflags} || die "compilation failed"
 }
 
-src_install() {
-	mv dist/${PN}-${PV}.jar dist/${PN}.jar
+src_install () {
 	mv dist/${PN}-full-${PV}.jar dist/${PN}-full.jar
-	java-pkg_dojar dist/${PN}.jar dist/${PN}-full.jar
-
-	dodoc LICENSE NOTICE README
-	if use doc; then
-		java-pkg_dohtml -r docs/*
-	fi
+	java-pkg_dojar dist/${PN}-full.jar || die "installation failed"
+	dodoc README NOTICE LICENSE
+	use doc && java-pkg_dohtml -r build/apidocs/*
 }
diff --git a/dev-java/cglib/files/digest-cglib-2.0.2-r1 b/dev-java/cglib/files/digest-cglib-2.0.2-r1
new file mode 100644
index 000000000000..df076b21d49f
--- /dev/null
+++ b/dev-java/cglib/files/digest-cglib-2.0.2-r1
@@ -0,0 +1 @@
+MD5 c14210968339e92f2c6b16e59c3f9454 cglib-src-2.0.2.jar 445834