Use EAPI 1 for slot deps. Fix license to Apache-2.0. Add app-arch/unzip to DEPEND. Don't build the nodeps jar because bundling deps is bad. Fix the source use flag and add the examples use flag. Fixes bug #210433.

(Portage version: 2.1.4.4)

3 files changed, 78 insertions, 1 deletions

diff --git a/dev-java/cglib/ChangeLog b/dev-java/cglib/ChangeLog
index a7284e8a83c2..d8be59c4ba4e 100644
--- a/dev-java/cglib/ChangeLog
+++ b/dev-java/cglib/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/cglib
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/ChangeLog,v 1.35 2008/01/14 13:49:21 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/ChangeLog,v 1.36 2008/02/17 16:44:40 betelgeuse Exp $
+
+*cglib-2.2_beta1-r1 (17 Feb 2008)
+
+  17 Feb 2008; Petteri Räty <betelgeuse@gentoo.org>
+  +files/2.2-nojarjar.patch, +cglib-2.2_beta1-r1.ebuild:
+  Use EAPI 1 for slot deps. Fix license to Apache-2.0. Add app-arch/unzip to
+  DEPEND. Don't build the nodeps jar because bundling deps is bad. Fix the
+  source use flag and add the examples use flag. Fixes bug #210433.
 
   14 Jan 2008; Vlastimil Babka <caster@gentoo.org> cglib-2.1.3.ebuild:
   Remove the now obsolete WANT_SPLIT_ANT variable.
diff --git a/dev-java/cglib/cglib-2.2_beta1-r1.ebuild b/dev-java/cglib/cglib-2.2_beta1-r1.ebuild
new file mode 100644
index 000000000000..f91daffe559c
--- /dev/null
+++ b/dev-java/cglib/cglib-2.2_beta1-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/cglib-2.2_beta1-r1.ebuild,v 1.1 2008/02/17 16:44:40 betelgeuse Exp $
+
+EAPI=1
+JAVA_PKG_IUSE="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="2.2"
+KEYWORDS="~amd64 ~ppc ~x86"
+COMMON_DEP="dev-java/asm:2.2
+	>=dev-java/ant-core-1.7.0"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${COMMON_DEP}"
+IUSE=""
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}/2.2-nojarjar.patch"
+
+	cd "${S}/lib"
+	rm -v *.jar || die
+	java-pkg_jar-from asm-2.2 asm.jar
+	java-pkg_jar-from asm-2.2 asm-util.jar
+	java-pkg_jar-from asm-2.2 asm-commons.jar
+	java-pkg_jar-from ant-core ant.jar
+}
+
+# Fail giving a NullPointerException
+RESTRICT="test"
+EANT_TEST_JUNIT_INTO="lib"
+
+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/2.2-nojarjar.patch b/dev-java/cglib/files/2.2-nojarjar.patch
new file mode 100644
index 000000000000..2a03bd8d76d0
--- /dev/null
+++ b/dev-java/cglib/files/2.2-nojarjar.patch
@@ -0,0 +1,18 @@
+diff -ur work.old/build.xml work/build.xml
+--- work.old/build.xml	2008-02-17 18:33:06.000000000 +0200
++++ work/build.xml	2008-02-17 18:33:26.000000000 +0200
+@@ -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.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">