From: Petteri Räty Date: Fri, 20 Apr 2007 15:52:39 +0000 (+0000) Subject: Fix errors reported by java-pkg_ensure-dep. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=24995baa6256c323135493e462fa70735f2fba79;p=gentoo.git Fix errors reported by java-pkg_ensure-dep. Package-Manager: portage-2.1.2.4 --- diff --git a/dev-java/cglib/ChangeLog b/dev-java/cglib/ChangeLog index 29d4fd520a0b..5e1744935fe7 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.23 2007/04/20 14:25:43 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/ChangeLog,v 1.24 2007/04/20 15:52:39 betelgeuse Exp $ + + 20 Apr 2007; Petteri Räty cglib-2.1.3.ebuild: + Fix errors reported by java-pkg_ensure-dep. 20 Apr 2007; Petteri Räty cglib-2.2_beta1.ebuild: Add dev-java/ant-core to RDEPEND. diff --git a/dev-java/cglib/Manifest b/dev-java/cglib/Manifest index 9f70118f18f5..c4f5ff175f55 100644 --- a/dev-java/cglib/Manifest +++ b/dev-java/cglib/Manifest @@ -12,18 +12,18 @@ EBUILD cglib-2.0.2-r2.ebuild 1293 RMD160 7203b3e882d9546181bba97ae2447b72ff5fb13 MD5 c66cbf74980fd8df429fadda74edc840 cglib-2.0.2-r2.ebuild 1293 RMD160 7203b3e882d9546181bba97ae2447b72ff5fb13f cglib-2.0.2-r2.ebuild 1293 SHA256 e4e7fed9f8bae03f2f1cf5f04ce21cbf9cc876d93504567b04d5a008de844ea8 cglib-2.0.2-r2.ebuild 1293 -EBUILD cglib-2.1.3.ebuild 1283 RMD160 f974dea6bd6df94820e2cc0d25807ebdacd96af8 SHA1 afe60183f2785a612dd308cf1fe3abe933fb7d88 SHA256 a1a9262f3f26016cbac2519b18d024bfcf9bc971e6fff3b24e573dbdfa3e1117 -MD5 2038f9d5ae1a41d76d60dfb207ba1efc cglib-2.1.3.ebuild 1283 -RMD160 f974dea6bd6df94820e2cc0d25807ebdacd96af8 cglib-2.1.3.ebuild 1283 -SHA256 a1a9262f3f26016cbac2519b18d024bfcf9bc971e6fff3b24e573dbdfa3e1117 cglib-2.1.3.ebuild 1283 +EBUILD cglib-2.1.3.ebuild 1314 RMD160 db6fd8abc2a77701670e30e62f6fd7d1e1f6fa5f SHA1 0a1ac9b4593f2dd6f97b5ab1c380ebf214b265ae SHA256 7a97ef5a2470d996b07b7b990640f5e001357fcfc05a050139c714e018531d81 +MD5 0c0b96fdb2a2cb79839e8ff4151fc8b3 cglib-2.1.3.ebuild 1314 +RMD160 db6fd8abc2a77701670e30e62f6fd7d1e1f6fa5f cglib-2.1.3.ebuild 1314 +SHA256 7a97ef5a2470d996b07b7b990640f5e001357fcfc05a050139c714e018531d81 cglib-2.1.3.ebuild 1314 EBUILD cglib-2.2_beta1.ebuild 1273 RMD160 89684980de7e82b631ebc6d3d0d109ce5a0c948d SHA1 8de355b606613d5582cafbfc161d070744c1bf5a SHA256 cebdf1ac25ead6c63ba714ea0d936083a8da9391658502f3352a92c50a2adf76 MD5 d601d2f8faba27e515689b7603595616 cglib-2.2_beta1.ebuild 1273 RMD160 89684980de7e82b631ebc6d3d0d109ce5a0c948d cglib-2.2_beta1.ebuild 1273 SHA256 cebdf1ac25ead6c63ba714ea0d936083a8da9391658502f3352a92c50a2adf76 cglib-2.2_beta1.ebuild 1273 -MISC ChangeLog 3313 RMD160 966436e2120f11116b9bc4aef8276a253bc3ea96 SHA1 f1c95e5eaf1f903d39ce7bb7d40e656dd512daa2 SHA256 9150dc7e6a56c18fe5722ad98c37a02d120427c06f912e0701d1a5b0a7c6e1cd -MD5 e52f91461ca046f71a0c375c8d53df7a ChangeLog 3313 -RMD160 966436e2120f11116b9bc4aef8276a253bc3ea96 ChangeLog 3313 -SHA256 9150dc7e6a56c18fe5722ad98c37a02d120427c06f912e0701d1a5b0a7c6e1cd ChangeLog 3313 +MISC ChangeLog 3433 RMD160 26ef54255040d776f4290fcf9d4c2c4cb4a4583c SHA1 13d76ec832388b41e559140f0b085f3e35065721 SHA256 2ad190b1e1a8619784e8c7313eb6c6a86c9193b225a2f1d5b500098c48e68375 +MD5 44952dd0968d22060b764f74e24d4ca8 ChangeLog 3433 +RMD160 26ef54255040d776f4290fcf9d4c2c4cb4a4583c ChangeLog 3433 +SHA256 2ad190b1e1a8619784e8c7313eb6c6a86c9193b225a2f1d5b500098c48e68375 ChangeLog 3433 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157 @@ -40,7 +40,7 @@ SHA256 b242e175268370d139ced7f9fa9aa10e53a672eae7899b45a5e5b266f4285992 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGKM1rcxLzpIGCsLQRArZgAJkBqwmXx8E2LgwaG+MuVBNqoxZckACdFiUP -t+JkcmfrXUn02WMgaYxJ9CI= -=pUvA +iD8DBQFGKOHKcxLzpIGCsLQRAov7AJ9Ap+lsEKrjms+AT0JoeHiNOm6O7wCgmv6g +baQntnkfaiaJ49wIY7lNuds= +=n+/T -----END PGP SIGNATURE----- diff --git a/dev-java/cglib/cglib-2.1.3.ebuild b/dev-java/cglib/cglib-2.1.3.ebuild index c78f8836e647..cb6bc7c1528a 100644 --- a/dev-java/cglib/cglib-2.1.3.ebuild +++ b/dev-java/cglib/cglib-2.1.3.ebuild @@ -1,6 +1,9 @@ -# Copyright 1999-2006 Gentoo Foundation +# 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.4 2006/09/08 03:47:06 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/cglib-2.1.3.ebuild,v 1.5 2007/04/20 15:52:39 betelgeuse Exp $ + +JAVA_PKG_IUSE="doc source" +WANT_SPLIT_ANT="true" inherit eutils java-pkg-2 java-ant-2 @@ -12,12 +15,11 @@ LICENSE="Apache-1.1" SLOT="2.1" KEYWORDS="~x86 ~amd64" COMMON_DEP="=dev-java/asm-1.5* - =dev-java/aspectwerkz-2*" + =dev-java/aspectwerkz-2* + dev-java/ant-core" RDEPEND=">=virtual/jre-1.4 ${COMMON_DEP}" DEPEND=">=virtual/jdk-1.4 - source? ( app-arch/zip ) - >=dev-java/ant-core-1.5 dev-java/jarjar ${COMMON_DEP}" IUSE="doc source" @@ -27,22 +29,21 @@ S=${WORKDIR} src_unpack() { jar xf ${DISTDIR}/${A} || die "failed to unpack" - cd ${S}/lib - rm -f *.jar + cd "${S}/lib" + rm -v *.jar || die java-pkg_jar-from asm-1.5 java-pkg_jar-from aspectwerkz-2 - java-pkg_jar-from jarjar-1 java-pkg_jar-from ant-core ant.jar } src_compile() { - eant jar $(use_doc) + ANT_TASKS="jarjar-1" eant jar $(use_doc) } 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 + dodoc NOTICE README || die use doc && java-pkg_dohtml -r docs/* }