From: Petteri Räty Date: Thu, 1 Mar 2007 10:59:42 +0000 (+0000) Subject: Ebuild cleanup and depend on >=virtual/{jdk,jre}-1.4 because bundles 1.4 bytecode. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e155dbd3168d8715e2df8ae9152a4ed583b949f2;p=gentoo.git Ebuild cleanup and depend on >=virtual/{jdk,jre}-1.4 because bundles 1.4 bytecode. Package-Manager: portage-2.1.2-r12 --- diff --git a/dev-java/jarjar/ChangeLog b/dev-java/jarjar/ChangeLog index bdf37e17d6b7..fbe584290a5d 100644 --- a/dev-java/jarjar/ChangeLog +++ b/dev-java/jarjar/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/jarjar -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jarjar/ChangeLog,v 1.8 2006/09/23 02:05:33 nichoj Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jarjar/ChangeLog,v 1.9 2007/03/01 10:59:42 betelgeuse Exp $ + + 01 Mar 2007; Petteri Räty jarjar-0.6-r1.ebuild: + Ebuild cleanup and depend on >=virtual/{jdk,jre}-1.4 because bundles 1.4 + bytecode. 23 Sep 2006; Joshua Nichols jarjar-0.6.ebuild, jarjar-0.6-r1.ebuild: diff --git a/dev-java/jarjar/Manifest b/dev-java/jarjar/Manifest index 9a72f1fa5270..3991d9b14d90 100644 --- a/dev-java/jarjar/Manifest +++ b/dev-java/jarjar/Manifest @@ -1,20 +1,23 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX asm-2.0_alpha-buildfile.patch 1507 RMD160 83563c3081b6990e7b577e6e4c6396e8f653d06f SHA1 07bab9640e3d2aab338974384eb16a5a8d22932f SHA256 ed1e51fc9b5618d12a8e69616d5c185828636c5b25b80dc6a71bf9aa5696a719 MD5 898b954c34be9e78c40ef2bdef781b52 files/asm-2.0_alpha-buildfile.patch 1507 RMD160 83563c3081b6990e7b577e6e4c6396e8f653d06f files/asm-2.0_alpha-buildfile.patch 1507 SHA256 ed1e51fc9b5618d12a8e69616d5c185828636c5b25b80dc6a71bf9aa5696a719 files/asm-2.0_alpha-buildfile.patch 1507 DIST jarjar-src-0.6.zip 143055 RMD160 abd6c732873dbedbe25061eaf6eed02a31346b96 SHA1 545e3ec72b37a47ebcb07ddace62cf1e02412676 SHA256 98abc8626f51c3319cf2880ad50107ec08da14855b14c2d086c62523882e6acc -EBUILD jarjar-0.6-r1.ebuild 1230 RMD160 53e9a65222f224e1c933337454f590ab78dd31f7 SHA1 7799ce403dcdc47bd9e262f79837eabe5fa1810c SHA256 188b0f49cb3c0a1be5536fac7c0b913d76bd16774ee5feeb8f8a740dacf64659 -MD5 c7d8a63f1691a34606fc103abe68287a jarjar-0.6-r1.ebuild 1230 -RMD160 53e9a65222f224e1c933337454f590ab78dd31f7 jarjar-0.6-r1.ebuild 1230 -SHA256 188b0f49cb3c0a1be5536fac7c0b913d76bd16774ee5feeb8f8a740dacf64659 jarjar-0.6-r1.ebuild 1230 +EBUILD jarjar-0.6-r1.ebuild 1191 RMD160 ba4f52295e61e0b42a2e36dcfe535596441f8e41 SHA1 b166bac0b388f09689056701310d692a1253ac12 SHA256 8e53830b063e9fb68e7f531639ec3948268e294ce7936b0d9557155d46d8bd88 +MD5 2544c3e329df0318f8b68e37f9a8efc9 jarjar-0.6-r1.ebuild 1191 +RMD160 ba4f52295e61e0b42a2e36dcfe535596441f8e41 jarjar-0.6-r1.ebuild 1191 +SHA256 8e53830b063e9fb68e7f531639ec3948268e294ce7936b0d9557155d46d8bd88 jarjar-0.6-r1.ebuild 1191 EBUILD jarjar-0.6.ebuild 1113 RMD160 b205a1550381f0759d42a89598eceaac93e82b13 SHA1 2313992c612c744bebb4f805a54e1fca1df1668e SHA256 4653e461e30c9c8c77435ba69bead87228361f2bb3af345138cf51cc493bf8ca MD5 8d5151fd62543978f171cc8f17d13efa jarjar-0.6.ebuild 1113 RMD160 b205a1550381f0759d42a89598eceaac93e82b13 jarjar-0.6.ebuild 1113 SHA256 4653e461e30c9c8c77435ba69bead87228361f2bb3af345138cf51cc493bf8ca jarjar-0.6.ebuild 1113 -MISC ChangeLog 1673 RMD160 d93325a062888a49279ed8b81d039a086761d352 SHA1 d7cf4d2d316c41c96304a043155c73443609fbd1 SHA256 3de39085876f7d670ae07a007c542352c83ddefbc3b181c185595df26c286e7c -MD5 a38908c7e2c700f696c5cbb3b8efe967 ChangeLog 1673 -RMD160 d93325a062888a49279ed8b81d039a086761d352 ChangeLog 1673 -SHA256 3de39085876f7d670ae07a007c542352c83ddefbc3b181c185595df26c286e7c ChangeLog 1673 +MISC ChangeLog 1840 RMD160 81c5304b947887f9f590ec29845eb50791531e0c SHA1 9f36286a57330b058231ce69c86f9f80bfd078a0 SHA256 7acb75c2cb4f538d7b08007af249b0bb9cbd0373c29a82ba5c24ab477f837919 +MD5 3e76cf6e1bd33e9d4710ca6340f95f32 ChangeLog 1840 +RMD160 81c5304b947887f9f590ec29845eb50791531e0c ChangeLog 1840 +SHA256 7acb75c2cb4f538d7b08007af249b0bb9cbd0373c29a82ba5c24ab477f837919 ChangeLog 1840 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158 @@ -25,3 +28,10 @@ SHA256 e2b12935670115472cb52fe2f05dde873a9f5c8249b9b61acb0518ba73f6cb49 files/di MD5 d430ced52aa5bd267bdf6daffc0b1dee files/digest-jarjar-0.6-r1 235 RMD160 5816f44419fa10700ff539264b4cc22b831d87f0 files/digest-jarjar-0.6-r1 235 SHA256 e2b12935670115472cb52fe2f05dde873a9f5c8249b9b61acb0518ba73f6cb49 files/digest-jarjar-0.6-r1 235 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.2 (GNU/Linux) + +iD8DBQFF5rGscxLzpIGCsLQRAuIFAJ9CiZOYdBg7rT9AdEQX2qj1CbJa/wCdF2W0 +ReYWg2UyC3iIRZVyM6+3yY0= +=WXJ4 +-----END PGP SIGNATURE----- diff --git a/dev-java/jarjar/jarjar-0.6-r1.ebuild b/dev-java/jarjar/jarjar-0.6-r1.ebuild index 2a4a7534b28b..1aa93b63edcb 100644 --- a/dev-java/jarjar/jarjar-0.6-r1.ebuild +++ b/dev-java/jarjar/jarjar-0.6-r1.ebuild @@ -1,6 +1,6 @@ -# 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/jarjar/jarjar-0.6-r1.ebuild,v 1.3 2006/09/23 02:05:33 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jarjar/jarjar-0.6-r1.ebuild,v 1.4 2007/03/01 10:59:42 betelgeuse Exp $ inherit eutils java-pkg-2 java-ant-2 @@ -14,16 +14,16 @@ IUSE="doc source" COMMON_DEP=" =dev-java/asm-2.0* =dev-java/gnu-regexp-1*" -RDEPEND=">=virtual/jre-1.3 +RDEPEND=">=virtual/jre-1.4 ${COMMON_DEP}" -DEPEND=">=virtual/jdk-1.3 +DEPEND=">=virtual/jdk-1.4 app-arch/unzip >=dev-java/ant-core-1.4 source? ( app-arch/zip ) ${COMMON_DEP}" # FIXME looks like it bundles stuff from dev-java/java-getopt, ie -# gnu.getopt.*, so this should delete the bundled files, and then +# gnu.getopt.*, so this should delete the bundled files, and then # depend on java-getopt. Should also probably report upstream. -nichoj src_unpack() { @@ -36,13 +36,9 @@ src_unpack() { java-pkg_jar-from ant-core ant.jar } -src_compile() { - eant jar $(use_doc) -} - src_install() { java-pkg_newjar dist/${P}.jar ${PN}.jar - use doc && java-pkg_dohtml -r dist/javadoc/* + use doc && java-pkg_dojavadoc dist/javadoc use source && java-pkg_dosrc src/main/* }