Use EAPI 1 for slot deps. Fix license to Apache-2.0. Add app-arch/unzip to DEPEND...

Package-Manager: portage-2.1.4.4

diff --git a/dev-java/cglib/ChangeLog b/dev-java/cglib/ChangeLog
index a7284e8a83c2ecd26004eead897d76582a318835..d8be59c4ba4ec1ddc7ebb6bf60b3912cf9b96862 100644 (file)
--- 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/Manifest b/dev-java/cglib/Manifest
index a0cd4587bd890ac49d40e78f7b1f44ffa143c35c..430a8b4e5c70c32456fc2af1c4a8d25a717327f6 100644 (file)
--- a/dev-java/cglib/Manifest
+++ b/dev-java/cglib/Manifest
@@ -1,9 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 2.2-nojarjar.patch 857 RMD160 32d2b4a2930b9aecec3c7510010b0b17429c0ae0 SHA1 7c65fb47f01528bca5828ed0acf5cd7373f8b80a SHA256 a5524ff15bf44e392d37918a2c032e31fa645af5f9b12db0ff249afcb83c0f9a
 AUX cglib-2.0.2-asm-1.4.3.patch 721 RMD160 3fe4b4b08f5a02efc1acbc43924fcc2c4dbf075c SHA1 c70c0ee78da474d92087aef4ff8d3287423aa724 SHA256 06997a5c61860cc5426ad0f7783447fd4f980692c21a321c533d54d87281f73a
 DIST cglib-src-2.0.2.jar 445834 RMD160 7f0e63ee69c090465db906288b87ff541fd00691 SHA1 414985d703e1adc433bea5188e10015d40450423 SHA256 91644a03487a9a0161a54e0c3644c34c44e507557dcf4b8b97a60dd91e67cd1c
 DIST cglib-src-2.1_3.jar 1610524 RMD160 9341441cb931f8494c5a0917db1b526ae06a6511 SHA1 9f1bb4dcdd99bacc166a917a3fa6489ba54c3c38 SHA256 652c7533f5c6d4bf66ba13871f70133e9ffdca648e49354cff7f39824282739e
 DIST cglib-src-2.2_beta1.jar 1502672 RMD160 f1498df604115cdb7f50932c094c3bd3bb689f67 SHA1 03ee5d15379b0f71753527c45e68fcfceee2eb72 SHA256 6722247e1cdd4c63f80245b488f22054e72c211c42ea33c7e7e88491c8455b21
 EBUILD cglib-2.0.2-r2.ebuild 1175 RMD160 38004c951da0c58ceeca5ec59340a6deffba0c82 SHA1 bfe43685f35c4bae835b141a347e00c1f0455035 SHA256 d9d2da13b8cf0839c2d05ea273942078000b162ed00e4e265ae2ff21083c6ba9
 EBUILD cglib-2.1.3.ebuild 1346 RMD160 da6bef29ec618138c29ae66dc816735be2dde3d6 SHA1 5b4dd629e5874bfca03022ebde276518d0eefbff SHA256 de3ae0ea0aea15249358405b273cb5dcf8bd78a8c18ba85e3392c44ca071fc03
+EBUILD cglib-2.2_beta1-r1.ebuild 1320 RMD160 6d3b6978241f01b7d961a682a858d3b6aa2a7ce4 SHA1 74d2fe69dd7942566c2782c7ba50b603d6843f33 SHA256 ae5d5baeb98ecceec277af01e183433c2bb1ef13a75a326c02124d09462da2b6
 EBUILD cglib-2.2_beta1.ebuild 1192 RMD160 212643b701ee9e09d15e079909da15ca0ff246f8 SHA1 c8328fc5ee4853a0e4b9a01f32a1e9070ef72ffb SHA256 a5e9a02b21b25dc6a1587f33cdc795ed285ca84a0874d921c814c0a9456ec8f8
-MISC ChangeLog 4794 RMD160 51a80ed6b8cc4b330fd151ef3265a1e8ff5fb034 SHA1 98ac7b9ce5bd4c70a61b6b117cac2cdb9d644668 SHA256 ca8147dfda223e5ed87bf3a12c00204f1eafb5f221511e08e41eb01bd1055929
+MISC ChangeLog 5164 RMD160 3bfe1831cd775a8538e8a06ce34e2c683d0a2308 SHA1 a6f6323026fb9ac7ebe77a50f5e29308ee8fe37f SHA256 62542e910d4370c63fd6ec3cf171aca77bd80f31306e6945a12d4d5b861cc37c
 MISC metadata.xml 350 RMD160 c14c634175d8f1c82e457ffc403744b777926f8b SHA1 bc4e48c65f4ad0493076bf0719362f8cce1cef65 SHA256 1364c70f5978d4b5277c64fec94ba77ca7da6d41a3bf851ad90e49b93f3f8ec8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHuGSXcxLzpIGCsLQRAudGAJ0cKhaQ5tNnRUEHHxypoyFXODv7QACfXHlW
+6xRqY3php4UK0m1TtXJi+/g=
+=HXkE
+-----END PGP SIGNATURE-----

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 (file)
index 0000000..f91daff
--- /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 (file)
index 0000000..2a03bd8
--- /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/**" />\r
+     </jar> \r
+ \r
+-    <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="compile.classpath"/>\r
+-    <jarjar basedir="${build.home}/classes" jarfile="${dist.home}/${component.name}-nodep-${component.version}.jar" >\r
+-      <zipfileset dir="lib" includes="asm*.txt"/>\r
+-      <zipfileset src="lib/asm.jar" excludes="META-INF"/>\r
+-      <rule pattern="org.objectweb.asm.**" result="net.sf.cglib.asm.@1"/>\r
+-      <include name="**/*"/>\r
+-      <exclude name="samples/**"/>\r
+-    </jarjar> \r
+   </target>\r
+ \r
+   <target depends="compile,javadoc" description="Create docs and source distribution" name="srcjar">\r