Bump to cglib-2.2.

(Portage version: 2.1.6.13/cvs/Linux i686)

7 files changed, 174 insertions, 9 deletions

diff --git a/dev-java/cglib/ChangeLog b/dev-java/cglib/ChangeLog
index cd63ff10b87b..732f069ff474 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.42 2008/03/30 17:14:43 corsair Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/ChangeLog,v 1.43 2009/09/03 15:43:38 elvanor Exp $
+
+*cglib-2.2 (03 Sep 2009)
+
+  03 Sep 2009; Jean-Noël Rivasseau <elvanor@gentoo.org>
+  +files/2.2-beta-nojarjar.patch, cglib-2.2_beta1-r1.ebuild,
+  +cglib-2.2.ebuild, +files/cglib-2.2-build.patch,
+  -files/2.2-nojarjar.patch, +files/words.txt:
+  cglib-2.2 final version bump. Tests now pass.
 
   30 Mar 2008; Markus Rothe <corsair@gentoo.org> cglib-2.0.2-r2.ebuild,
   cglib-2.1.3.ebuild, cglib-2.2_beta1-r1.ebuild:
diff --git a/dev-java/cglib/cglib-2.2.ebuild b/dev-java/cglib/cglib-2.2.ebuild
new file mode 100644
index 000000000000..82e6cb7ca538
--- /dev/null
+++ b/dev-java/cglib/cglib-2.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2009 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.1 2009/09/03 15:43:38 elvanor Exp $
+
+EAPI="2"
+JAVA_PKG_IUSE="test 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 ~ppc64 ~x86"
+COMMON_DEP="dev-java/asm:3
+	>=dev-java/ant-core-1.7.0"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	test? ( dev-java/junit )
+	${COMMON_DEP}"
+IUSE=""
+
+S=${WORKDIR}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-build.patch"
+	cp "${FILESDIR}/words.txt" "${S}/src/test/net/sf/cglib/util/"
+}
+
+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"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+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/cglib-2.2_beta1-r1.ebuild b/dev-java/cglib/cglib-2.2_beta1-r1.ebuild
index 949e0808ffd5..38d87563fc84 100644
--- a/dev-java/cglib/cglib-2.2_beta1-r1.ebuild
+++ b/dev-java/cglib/cglib-2.2_beta1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.2 2008/03/30 17:14:43 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/cglib-2.2_beta1-r1.ebuild,v 1.3 2009/09/03 15:43:38 elvanor Exp $
 
-EAPI=1
+EAPI="2"
 JAVA_PKG_IUSE="doc examples source"
 
 inherit eutils java-pkg-2 java-ant-2
@@ -24,11 +24,13 @@ IUSE=""
 
 S=${WORKDIR}
 
+src_prepare() {
+	epatch "${FILESDIR}/2.2-beta-nojarjar.patch"
+}
+
 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
diff --git a/dev-java/cglib/cglib-2.2_beta1.ebuild b/dev-java/cglib/cglib-2.2_beta1.ebuild
index 5a01e2e4a128..335dd735c7d6 100644
--- a/dev-java/cglib/cglib-2.2_beta1.ebuild
+++ b/dev-java/cglib/cglib-2.2_beta1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.ebuild,v 1.6 2008/03/11 15:27:14 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/cglib-2.2_beta1.ebuild,v 1.7 2009/09/03 15:43:38 elvanor Exp $
 
 JAVA_PKG_IUSE="doc source"
 
diff --git a/dev-java/cglib/files/2.2-nojarjar.patch b/dev-java/cglib/files/2.2-beta-nojarjar.patch
index 2a03bd8d76d0..2a03bd8d76d0 100644
--- a/dev-java/cglib/files/2.2-nojarjar.patch
+++ b/dev-java/cglib/files/2.2-beta-nojarjar.patch
diff --git a/dev-java/cglib/files/cglib-2.2-build.patch b/dev-java/cglib/files/cglib-2.2-build.patch
new file mode 100644
index 000000000000..c1c572dd0c74
--- /dev/null
+++ b/dev-java/cglib/files/cglib-2.2-build.patch
@@ -0,0 +1,47 @@
+--- build.xml.orig	2009-09-02 16:27:55.000000000 +0200
++++ build.xml	2009-09-03 17:24:23.000000000 +0200
+@@ -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>
+@@ -122,16 +122,7 @@
+     <jar basedir="${build.home}/classes" jarfile="${dist.home}/${component.name}-${component.version}.jar" >
+       <include name="**/*"/>
+       <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-3.1.jar" excludes="META-INF"/>
+-      <rule pattern="org.objectweb.asm.**" result="net.sf.cglib.asm.@1"/>
+-      <include name="**/*"/>
+-      <exclude name="samples/**"/>
+-    </jarjar> 
++    </jar>
+   </target>
+ 
+   <target depends="compile,javadoc" description="Create docs and source distribution" name="srcjar">
+@@ -239,16 +230,7 @@
+           failonerror="${test.failonerror}"
+           fork="yes" 
+           >
+-
+-  <!-- jvmarg value="-Xrunhprof:heap=all,file=debug.txt"/ --> 
+-  <!-- <jvmarg value="-verbose:gc"/> --> 
+-  <!-- <jvmarg value="-verbose:class"/> -->
+-  <!-- <jvmarg value="-Xprof"/> -->
+-  <!-- <jvmarg value="-server"/> -->
+-  <!-- <sysproperty key="cglib.debugLocation" value="debug"/> -->
+-  <!-- <jvmarg value="-Djava.security.policy==java.policy" /> -->
+-  <!-- <jvmarg value="-Djava.security.manager" />  -->
+- 
++		<sysproperty key="cglib.debugLocation" value="${debugLocation}"/>
+       <arg value="${test.entry}"/>
+         <classpath>
+           <pathelement path="${build.home}/classes"/>
diff --git a/dev-java/cglib/files/words.txt b/dev-java/cglib/files/words.txt
new file mode 100644
index 000000000000..263a4396d4ca
--- /dev/null
+++ b/dev-java/cglib/files/words.txt
@@ -0,0 +1,50 @@
+Casuarinaceae
+hylomorphic
+granitize
+biddably
+repulsive
+amphimictical
+trio
+toxodont
+nonreigning
+dragbar
+Moronidae
+unlanguishing
+metabolizable
+Osmerus
+goran
+spiritfulness
+tetrachloromethane
+baobab
+caroline
+radioconductor
+imband
+crinoline
+circummundane
+incontractile
+forerank
+modernization
+meal
+fishman
+underbuy
+pertain
+equiped
+cockal
+unshrined
+Harb
+heterotaxis
+commensurableness
+baggy
+sarcophilous
+tankard
+acervuline
+unverifiably
+premidnight
+strangles
+vitellus
+Socratean
+flock
+scourage
+feverlike
+citharist
+harn