diff options
| author |   Serkan Kaba <serkan@gentoo.org> | 2008-09-22 20:27:18 +0000 |
|---|---|---|
| committer | Serkan Kaba <serkan@gentoo.org> | 2008-09-22 20:27:18 +0000 |
| commit | ae4069291f5a21edaa542ee949038819c9042eb3 (patch) | |
| tree | a5aadb0284193fb1a5c80d4946aa395a69819ffb /dev-java/bsh | |
| parent | tp_smapi support for 2.6.27 (diff) | |
| download | gentoo-2-ae4069291f5a21edaa542ee949038819c9042eb3.tar.gz gentoo-2-ae4069291f5a21edaa542ee949038819c9042eb3.tar.bz2 gentoo-2-ae4069291f5a21edaa542ee949038819c9042eb3.zip | |
Updated patch to fix bug #238402 reported by André Terpstra <andre@terpstra.nu>. Fixed quoting of variables. Added necessary calls to die.
(Portage version: 2.2_rc8/cvs/Linux 2.6.25-gentoo-r7 x86_64)
Diffstat (limited to 'dev-java/bsh')
| -rw-r--r-- | dev-java/bsh/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-java/bsh/bsh-2.0_beta4-r3.ebuild | 10 | ||||
| -rw-r--r-- | dev-java/bsh/files/bsh2.0b4-build.patch | 2 |
3 files changed, 13 insertions, 7 deletions
diff --git a/dev-java/bsh/ChangeLog b/dev-java/bsh/ChangeLog index b2a6c6dbd22d..08357ec1a46e 100644 --- a/dev-java/bsh/ChangeLog +++ b/dev-java/bsh/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/bsh # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/ChangeLog,v 1.51 2008/02/15 04:00:22 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/ChangeLog,v 1.52 2008/09/22 20:27:08 serkan Exp $ + + 22 Sep 2008; Serkan Kaba <serkan@gentoo.org> files/bsh2.0b4-build.patch, + bsh-2.0_beta4-r3.ebuild: + Updated patch to fix bug #238402 reported by André Terpstra + <andre@terpstra.nu>. Fixed quoting of variables. Added necessary calls to + die. 15 Feb 2008; Petteri Räty <betelgeuse@gentoo.org> bsh-2.0_beta4-r3.ebuild: diff --git a/dev-java/bsh/bsh-2.0_beta4-r3.ebuild b/dev-java/bsh/bsh-2.0_beta4-r3.ebuild index 41b8a7a38231..8af689ce748b 100644 --- a/dev-java/bsh/bsh-2.0_beta4-r3.ebuild +++ b/dev-java/bsh/bsh-2.0_beta4-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 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-r3.ebuild,v 1.6 2008/02/15 04:00:22 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/bsh-2.0_beta4-r3.ebuild,v 1.7 2008/09/22 20:27:08 serkan Exp $ EAPI=1 JAVA_PKG_IUSE="doc source" @@ -30,14 +30,14 @@ DEPEND="${RDEPEND} S=${WORKDIR}/BeanShell-${MY_PV} src_unpack() { - jar xf ${DISTDIR}/${MY_DIST} || die "failed to unpack" - cd "${S}" + jar xf "${DISTDIR}"/${MY_DIST} || die "failed to unpack" + cd "${S}" || die epatch "${FILESDIR}/bsh${MY_PV}-build.patch" use readline && epatch "${FILESDIR}/bsh2-readline.patch" - cd lib + cd lib || die rm -v *.jar || die java-pkg_jar-from servletapi-2.4 use readline && java-pkg_jar-from libreadline-java @@ -61,7 +61,7 @@ src_install() { use doc && java-pkg_dojavadoc javadoc use source && java-pkg_dosrc src/bsh - newicon ${DISTDIR}/beanshell-icon.png beanshell.png + newicon "${DISTDIR}"/beanshell-icon.png beanshell.png make_desktop_entry bsh-console "BeanShell Prompt" beanshell } diff --git a/dev-java/bsh/files/bsh2.0b4-build.patch b/dev-java/bsh/files/bsh2.0b4-build.patch index 7492e72b241d..3899d78cc648 100644 --- a/dev-java/bsh/files/bsh2.0b4-build.patch +++ b/dev-java/bsh/files/bsh2.0b4-build.patch @@ -1,5 +1,5 @@ --- build.xml 2005-06-22 18:01:39.000000000 +0200 -+++ /var/tmp/portage/bsh-2.0_beta4/work/BeanShell-2.0b4/build.xml 2005-06-22 18:02:48.000000000 +0200 ++++ build.xml 2005-06-22 18:02:48.000000000 +0200 @@ -108,49 +108,7 @@ <!-- Begin Targets --> |