From: Petteri Räty Date: Tue, 9 Jan 2007 14:01:25 +0000 (+0000) Subject: Ebuild cleanup. Fixes javadocs to install to the standard location. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=39b4d333414e25850718470b4acde669aae2732d;p=gentoo.git Ebuild cleanup. Fixes javadocs to install to the standard location. Package-Manager: portage-2.1.2_rc4-r7 --- diff --git a/dev-java/bsh/ChangeLog b/dev-java/bsh/ChangeLog index 33c8ade04cac..80ff73154634 100644 --- a/dev-java/bsh/ChangeLog +++ b/dev-java/bsh/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/bsh # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/ChangeLog,v 1.36 2007/01/05 20:23:36 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/ChangeLog,v 1.37 2007/01/09 14:01:25 betelgeuse Exp $ + + 09 Jan 2007; Petteri Räty + bsh-2.0_beta4-r1.ebuild: + Ebuild cleanup. Fixes javadocs to install to the standard location. 05 Jan 2007; Vlastimil Babka bsh-1.3.0.ebuild, bsh-2.0_beta1-r1.ebuild: diff --git a/dev-java/bsh/Manifest b/dev-java/bsh/Manifest index 4cf967f35b94..f4bced26b9f4 100644 --- a/dev-java/bsh/Manifest +++ b/dev-java/bsh/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX beanshell.desktop 266 RMD160 d77a685a926961bec93c8e247401fbd576f44a0a SHA1 a16b0f4954ff1bef3f6118a0c30e84643c982d34 SHA256 4ea47560973a52dd8330f6b5d659b5b410bd48aa5d607d5495e9effbf9497f72 MD5 32448cba89ef5394ffab7a7cdb399ded files/beanshell.desktop 266 RMD160 d77a685a926961bec93c8e247401fbd576f44a0a files/beanshell.desktop 266 @@ -34,18 +37,18 @@ EBUILD bsh-2.0_beta1-r1.ebuild 1162 RMD160 1a501b33f4f1c4c482e02564ace5807aa9fc7 MD5 6d3ff6f75c6bb45313d6fb3b344e105b bsh-2.0_beta1-r1.ebuild 1162 RMD160 1a501b33f4f1c4c482e02564ace5807aa9fc7838 bsh-2.0_beta1-r1.ebuild 1162 SHA256 2aeb735c00d06c21dac4ab0b22169e288cfa7dcb9ee0c020f66ba8c912d15384 bsh-2.0_beta1-r1.ebuild 1162 -EBUILD bsh-2.0_beta4-r1.ebuild 1634 RMD160 8811f4d1bda36416c665eb4e04eb264c36b1d4de SHA1 b342ba53027b441935653a98b9e4433414eca10e SHA256 e234852403b533def3743ead8b3e23da05b494ee7f308fa0c458fa9f84d22a9b -MD5 4ad35fb207329121b644e3debc38b386 bsh-2.0_beta4-r1.ebuild 1634 -RMD160 8811f4d1bda36416c665eb4e04eb264c36b1d4de bsh-2.0_beta4-r1.ebuild 1634 -SHA256 e234852403b533def3743ead8b3e23da05b494ee7f308fa0c458fa9f84d22a9b bsh-2.0_beta4-r1.ebuild 1634 +EBUILD bsh-2.0_beta4-r1.ebuild 1620 RMD160 d88697674d250a64ff6ef8d5140d3a29e41a719f SHA1 76a1d3b4f136b6b1398ded665a5c5fa5ef3d99ed SHA256 09acb861d9cec50ccf73eba940fa6e461cd00ca2f9f0e5d492385379c8d35afa +MD5 c21f61fd5fc728fdfaaf6f07711c7ccd bsh-2.0_beta4-r1.ebuild 1620 +RMD160 d88697674d250a64ff6ef8d5140d3a29e41a719f bsh-2.0_beta4-r1.ebuild 1620 +SHA256 09acb861d9cec50ccf73eba940fa6e461cd00ca2f9f0e5d492385379c8d35afa bsh-2.0_beta4-r1.ebuild 1620 EBUILD bsh-2.0_beta4.ebuild 2044 RMD160 952b245065fb075a9618644c8dd3249741d50a53 SHA1 b871fb716aad94d5baf30f24aafeb7f7a9847808 SHA256 66acd5467fca4d3e731a6760c5ae43230be4bbcd3f3a1f19035c688ee75584aa MD5 518e18b6f28f343c38056468a9fc20a3 bsh-2.0_beta4.ebuild 2044 RMD160 952b245065fb075a9618644c8dd3249741d50a53 bsh-2.0_beta4.ebuild 2044 SHA256 66acd5467fca4d3e731a6760c5ae43230be4bbcd3f3a1f19035c688ee75584aa bsh-2.0_beta4.ebuild 2044 -MISC ChangeLog 4555 RMD160 947432b75d82a60ce8edaea2e9678cd53514fe90 SHA1 01bb46efea35d37d47cbc708395d8a73a029d9df SHA256 29c0d96a13b396aeec1f57e85aac14b976793d7a113f30e97047597cc074b296 -MD5 97f4e8ee62c857974d32e4dfd1a6d84f ChangeLog 4555 -RMD160 947432b75d82a60ce8edaea2e9678cd53514fe90 ChangeLog 4555 -SHA256 29c0d96a13b396aeec1f57e85aac14b976793d7a113f30e97047597cc074b296 ChangeLog 4555 +MISC ChangeLog 4710 RMD160 34faf04a72d486fc58db1419c1f67361e5230f07 SHA1 f72d4b44f338b1951f27f3e06641aafa765ee2eb SHA256 aa2fe0fea5a0543bd2b8d1a76e6978a2eb5a79bbab73a6800eb579241c534237 +MD5 7e6864417528bdb2710cc790c3836297 ChangeLog 4710 +RMD160 34faf04a72d486fc58db1419c1f67361e5230f07 ChangeLog 4710 +SHA256 aa2fe0fea5a0543bd2b8d1a76e6978a2eb5a79bbab73a6800eb579241c534237 ChangeLog 4710 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157 @@ -62,3 +65,10 @@ SHA256 357f215c90d818f3da802676f4506777cebf2312a167604f99078a508434d6f4 files/di MD5 d029ac05f23494a1ec8cda385644f7d9 files/digest-bsh-2.0_beta4-r1 467 RMD160 a70cc8a98cbd04cc0a23b166168320972e034dba files/digest-bsh-2.0_beta4-r1 467 SHA256 357f215c90d818f3da802676f4506777cebf2312a167604f99078a508434d6f4 files/digest-bsh-2.0_beta4-r1 467 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQFFo6BucxLzpIGCsLQRAuPhAJwP28O138sTvZ6H5hmH+6QGh2Qv6wCfR/tw +YgL+ksHb6fNB1JM68QITbRo= +=Qf9N +-----END PGP SIGNATURE----- diff --git a/dev-java/bsh/bsh-2.0_beta4-r1.ebuild b/dev-java/bsh/bsh-2.0_beta4-r1.ebuild index ff96c4173f70..9efb70380141 100644 --- a/dev-java/bsh/bsh-2.0_beta4-r1.ebuild +++ b/dev-java/bsh/bsh-2.0_beta4-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/bsh/bsh-2.0_beta4-r1.ebuild,v 1.6 2006/12/07 22:36:29 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/bsh-2.0_beta4-r1.ebuild,v 1.7 2007/01/09 14:01:25 betelgeuse Exp $ inherit java-pkg-2 eutils java-ant-2 @@ -35,18 +35,16 @@ src_unpack() { cp ${FILESDIR}/bsh.Console ${FILESDIR}/bsh.Interpreter ${S} use readline && epatch ${FILESDIR}/bsh2-readline.patch -} -src_compile() { cd "${S}/lib/" + rm -v *.jar java-pkg_jar-from servletapi-2.4 java-pkg_jar-from bsf-2.3 use readline && java-pkg_jar-from libreadline-java - cd "${S}" - - eant $(use_doc) jarall } +EANT_BUILD_TARGET="jarall" + src_install() { java-pkg_newjar ${S}/dist/${P/_beta/b}.jar @@ -55,7 +53,7 @@ src_install() { java-pkg_dolauncher bsh-console --main bsh.Console java-pkg_dolauncher bsh-interpreter --main bsh.Interpreter - use doc && java-pkg_dohtml -r ${S}/javadoc/* + use doc && java-pkg_dojavadoc ${S}/javadoc newicon ${DISTDIR}/beanshell-icon.png beanshell.png