Fix LICENSE to Apache-2.0 from Apache-1.1 and use java-pkg_dojavadoc.

Package-Manager: portage-2.1.3_rc6

3 files changed, 28 insertions, 20 deletions

diff --git a/dev-java/cglib/ChangeLog b/dev-java/cglib/ChangeLog
index 76afad636412..42f7c01966c4 100644
--- a/dev-java/cglib/ChangeLog
+++ b/dev-java/cglib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/cglib
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/ChangeLog,v 1.29 2007/05/26 17:29:08 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/ChangeLog,v 1.30 2007/07/02 16:33:09 betelgeuse Exp $
+
+  02 Jul 2007; Petteri Räty <betelgeuse@gentoo.org> cglib-2.1.3.ebuild:
+  Fix LICENSE to Apache-2.0 from Apache-1.1 and use java-pkg_dojavadoc.
 
   26 May 2007; Krzysiek Pawlik <nelchael@gentoo.org> cglib-2.1.3.ebuild,
   cglib-2.2_beta1.ebuild:
diff --git a/dev-java/cglib/Manifest b/dev-java/cglib/Manifest
index 2e2d3b95e630..04c984ad76d5 100644
--- a/dev-java/cglib/Manifest
+++ b/dev-java/cglib/Manifest
@@ -12,18 +12,18 @@ EBUILD cglib-2.0.2-r2.ebuild 1175 RMD160 38004c951da0c58ceeca5ec59340a6deffba0c8
 MD5 3b208404552ad270d62e597a62fad155 cglib-2.0.2-r2.ebuild 1175
 RMD160 38004c951da0c58ceeca5ec59340a6deffba0c82 cglib-2.0.2-r2.ebuild 1175
 SHA256 d9d2da13b8cf0839c2d05ea273942078000b162ed00e4e265ae2ff21083c6ba9 cglib-2.0.2-r2.ebuild 1175
-EBUILD cglib-2.1.3.ebuild 1245 RMD160 55cad79fa57fd489382d7590b7edf66a995b1871 SHA1 e367916cc084c7a1f243f131a75c9905c0b0706a SHA256 bebf3b3b7e4701222ad0a4c9beb57aef6d3c6831d0f19c706f68e34a5d4f0fd0
-MD5 650eefe1096c5a0ac46b65a8a3617dc9 cglib-2.1.3.ebuild 1245
-RMD160 55cad79fa57fd489382d7590b7edf66a995b1871 cglib-2.1.3.ebuild 1245
-SHA256 bebf3b3b7e4701222ad0a4c9beb57aef6d3c6831d0f19c706f68e34a5d4f0fd0 cglib-2.1.3.ebuild 1245
+EBUILD cglib-2.1.3.ebuild 1340 RMD160 aa7f84318850b720e58be85dd86dfe32be8b4dbb SHA1 5477a62e00225c888322675718db4c0b93158986 SHA256 66f31ae6a2652a6cba5f8912655d22e96145bf8b2fe2072802ed76b7415bdf4a
+MD5 c884e1b33171f44237612b4eff9adaee cglib-2.1.3.ebuild 1340
+RMD160 aa7f84318850b720e58be85dd86dfe32be8b4dbb cglib-2.1.3.ebuild 1340
+SHA256 66f31ae6a2652a6cba5f8912655d22e96145bf8b2fe2072802ed76b7415bdf4a cglib-2.1.3.ebuild 1340
 EBUILD cglib-2.2_beta1.ebuild 1192 RMD160 212643b701ee9e09d15e079909da15ca0ff246f8 SHA1 c8328fc5ee4853a0e4b9a01f32a1e9070ef72ffb SHA256 a5e9a02b21b25dc6a1587f33cdc795ed285ca84a0874d921c814c0a9456ec8f8
 MD5 ba3fd3e93901f412a4f99ac60ea88cda cglib-2.2_beta1.ebuild 1192
 RMD160 212643b701ee9e09d15e079909da15ca0ff246f8 cglib-2.2_beta1.ebuild 1192
 SHA256 a5e9a02b21b25dc6a1587f33cdc795ed285ca84a0874d921c814c0a9456ec8f8 cglib-2.2_beta1.ebuild 1192
-MISC ChangeLog 4081 RMD160 23ee47498878ee4e46e46ad26e9cc619aeb9d5b1 SHA1 2e8647264a7978f4f8c7420f2e53150f9e92a3cf SHA256 38c56807959d93d3f62f8f8f84135ff46952c1672c724af3a1df06460c53f391
-MD5 2625cdc4f194a1fbbd67853c4b26c682 ChangeLog 4081
-RMD160 23ee47498878ee4e46e46ad26e9cc619aeb9d5b1 ChangeLog 4081
-SHA256 38c56807959d93d3f62f8f8f84135ff46952c1672c724af3a1df06460c53f391 ChangeLog 4081
+MISC ChangeLog 4229 RMD160 601ae0e55ccde31699d6614b05fd2239b1873ffd SHA1 64ad24ab108b3df198e8d4ef47fc061706fc4c54 SHA256 e05659b1ac5e75caa90befeb9158fe247e752bce366eda624fd098807ef5da15
+MD5 ce05ca60870eb7c2e1103bb9fa7f3890 ChangeLog 4229
+RMD160 601ae0e55ccde31699d6614b05fd2239b1873ffd ChangeLog 4229
+SHA256 e05659b1ac5e75caa90befeb9158fe247e752bce366eda624fd098807ef5da15 ChangeLog 4229
 MISC metadata.xml 350 RMD160 c14c634175d8f1c82e457ffc403744b777926f8b SHA1 bc4e48c65f4ad0493076bf0719362f8cce1cef65 SHA256 1364c70f5978d4b5277c64fec94ba77ca7da6d41a3bf851ad90e49b93f3f8ec8
 MD5 726eb8665aed0d470be7fdf5eebf74b4 metadata.xml 350
 RMD160 c14c634175d8f1c82e457ffc403744b777926f8b metadata.xml 350
@@ -40,7 +40,7 @@ SHA256 b242e175268370d139ced7f9fa9aa10e53a672eae7899b45a5e5b266f4285992 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGWG64go/w9rxVVVERAi3EAJ45a5Rwb2snGiiYWUx182hN01/aEACfTFEV
-ymPRyZ/sQG0q7BkpeuuGAUs=
-=Agl4
+iD8DBQFGiSjPcxLzpIGCsLQRAlgRAJ9ewJ8yNvO+SqOOphnyDl9t4rcwfACfWRnt
+SDzpU/ejzgOLjDdZHz6LjiI=
+=pY1q
 -----END PGP SIGNATURE-----
diff --git a/dev-java/cglib/cglib-2.1.3.ebuild b/dev-java/cglib/cglib-2.1.3.ebuild
index 6e2f797bfa4d..75b26577b5d2 100644
--- a/dev-java/cglib/cglib-2.1.3.ebuild
+++ b/dev-java/cglib/cglib-2.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/cglib-2.1.3.ebuild,v 1.7 2007/05/26 17:29:08 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/cglib-2.1.3.ebuild,v 1.8 2007/07/02 16:33:09 betelgeuse Exp $
 
 JAVA_PKG_IUSE="doc source"
 WANT_SPLIT_ANT="true"
@@ -11,7 +11,7 @@ MY_PV=${PV/1./1_}
 DESCRIPTION="cglib is a powerful, high performance and quality Code Generation Library."
 SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${MY_PV}.jar"
 HOMEPAGE="http://cglib.sourceforge.net"
-LICENSE="Apache-1.1"
+LICENSE="Apache-2.0"
 SLOT="2.1"
 KEYWORDS="~amd64 ~ppc ~x86"
 COMMON_DEP="=dev-java/asm-1.5*
@@ -22,12 +22,12 @@ RDEPEND=">=virtual/jre-1.4
 DEPEND=">=virtual/jdk-1.4
 	dev-java/jarjar
 	${COMMON_DEP}"
-IUSE="doc source"
+IUSE=""
 
 S=${WORKDIR}
 
 src_unpack() {
-	jar xf ${DISTDIR}/${A} || die "failed to unpack"
+	unpack ${A}
 
 	cd "${S}/lib"
 	rm -v *.jar || die
@@ -36,14 +36,19 @@ src_unpack() {
 	java-pkg_jar-from ant-core ant.jar
 }
 
-src_compile() {
-	ANT_TASKS="jarjar-1" eant jar $(use_doc)
-}
+EANT_ANT_TASKS="jarjar-1"
+
+# Does not work against our current version of aspectwerkz
+# https://bugs.gentoo.org/show_bug.cgi?id=183997
+#src_test() {
+#	java-pkg_jar-from --into lib junit
+#	eant test
+#}
 
 src_install() {
 	java-pkg_newjar dist/${PN}-${MY_PV}.jar ${PN}.jar
 	java-pkg_newjar dist/${PN}-nodep-${MY_PV}.jar ${PN}-nodep.jar
 
 	dodoc NOTICE README || die
-	use doc && java-pkg_dohtml -r docs/*
+	use doc && java-pkg_dojavadoc docs/
 }