summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2007-01-09 14:01:25 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2007-01-09 14:01:25 +0000
commit97babd7191ecf2b43e094ab50232c306c07f923c (patch)
tree83b70e22ddc5bdecf97669e4d2152853e8eb0794 /dev-java/bsh
parentRemove obsolete version. (diff)
downloadgentoo-2-97babd7191ecf2b43e094ab50232c306c07f923c.tar.gz
gentoo-2-97babd7191ecf2b43e094ab50232c306c07f923c.tar.bz2
gentoo-2-97babd7191ecf2b43e094ab50232c306c07f923c.zip
Ebuild cleanup. Fixes javadocs to install to the standard location.
(Portage version: 2.1.2_rc4-r7)
Diffstat (limited to 'dev-java/bsh')
-rw-r--r--dev-java/bsh/ChangeLog6
-rw-r--r--dev-java/bsh/bsh-2.0_beta4-r1.ebuild14
2 files changed, 11 insertions, 9 deletions
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 <betelgeuse@gentoo.org>
+ bsh-2.0_beta4-r1.ebuild:
+ Ebuild cleanup. Fixes javadocs to install to the standard location.
05 Jan 2007; Vlastimil Babka <caster@gentoo.org> bsh-1.3.0.ebuild,
bsh-2.0_beta1-r1.ebuild:
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