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 | 433fcc7b5ff86453b20340f8a3ecc6f93ac2ae90 (patch) | |
| tree | cd17a233addd62f05e86760db8642bab49194f5c /dev-java/bsh | |
| parent | tp_smapi support for 2.6.27 (diff) | |
| download | historical-433fcc7b5ff86453b20340f8a3ecc6f93ac2ae90.tar.gz historical-433fcc7b5ff86453b20340f8a3ecc6f93ac2ae90.tar.bz2 historical-433fcc7b5ff86453b20340f8a3ecc6f93ac2ae90.zip | |
Updated patch to fix bug #238402 reported by André Terpstra <andre@terpstra.nu>. Fixed quoting of variables. Added necessary calls to die.
Package-Manager: portage-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/Manifest | 16 | ||||
| -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 |
4 files changed, 26 insertions, 10 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/Manifest b/dev-java/bsh/Manifest index 6a37b2396539..02fedf050863 100644 --- a/dev-java/bsh/Manifest +++ b/dev-java/bsh/Manifest @@ -1,7 +1,17 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX bsh2-readline.patch 5428 RMD160 b3515cc1115d9276b4d931994add2aea20c7f753 SHA1 a2a582b22d55b551ef904024e413a6ada4fa2486 SHA256 1816ace6e25bcd25940a4dc5213dd24bff9bf0708790a480a12f84a008c1ad47 -AUX bsh2.0b4-build.patch 1697 RMD160 f71476f78513c0a01a5c4f4978d7b0cb418be80a SHA1 b8836349b36157892a8f6e53e2a5affa8f806691 SHA256 336916f1385303b0c1641a22773407ee128a224067e257f603e6a67999c95b18 +AUX bsh2.0b4-build.patch 1645 RMD160 73712996206fa7f669113948d2e2e959b534a635 SHA1 57489d565e33f417471e9d1b97b9bfc80f4c2235 SHA256 b41a13782900fb8c5b9b847cb945d51fa6574b6634ff6e890549360ed05ab2df DIST beanshell-icon.png 29784 RMD160 0953be1f3046c795d36d0a95577c7b0230eb5d03 SHA1 cc8246e7c0f61f130d503a4ce989eef01296dc4f SHA256 a3df458c6e892ec328e8865f081da8c3f3d9ff4c979ecb701a57fc7cedacdef9 DIST bsh-2.0b4-src.jar 1636723 RMD160 710b4658bf05f99c9ca68498ebf75e7d6cc27e27 SHA1 69b36df249654a04e777ab899046c50b8cc844ac SHA256 beaa29a8bcbd00db2563a5a9f0fdcfa8ae268e959880baef0a59167ff1729f8e -EBUILD bsh-2.0_beta4-r3.ebuild 1687 RMD160 12f76979a3e8fde982341cc40bc39e8f69a5e32d SHA1 21e04254b79c2f3d184a339f2a56ffa81887cb18 SHA256 5e40450e1d53855d30870e1e26e46bf7c0b64876bf3a5d52ff778628a550a2cd -MISC ChangeLog 6564 RMD160 b36a671578dc9ee227f5201f187a36d59b2f0668 SHA1 d38489653d7d25bb4e72fe6a785a63395102fc38 SHA256 9fec9134f320f2a55076f1496ad98a6991d688974707aaf260c12a5491f62edb +EBUILD bsh-2.0_beta4-r3.ebuild 1701 RMD160 64f4e907ee5088d0242e9db258683d45e69005a2 SHA1 c8c7083d3411b1e9d26742efa6fb50e1da489823 SHA256 04b432c57a31eb83995626ef99a5b52db24fd7f2fc0bcab12b310e03cc104ea9 +MISC ChangeLog 6809 RMD160 2abbccdadde7762b3a62085b4d2d6f4ad9ac97c4 SHA1 51f2c58f90c4b21414bd7098d16e6da5de125e7d SHA256 e54888f418588d8607703c8a01e1aa0e910daa1651bec3ebff569e9ac2d06a52 MISC metadata.xml 255 RMD160 8a1c77aa2464db6dbcae8c2e7359353641da6c75 SHA1 1a45a2b9b2464b093e791c7958adde736af15a68 SHA256 2f8517d0bbd1824ac14a116b77250a6fb607b29129764d3fd26131d186097ded +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAkjX/7AACgkQRh6X64ivZaIJmgCfXDexJjJVYauNby0pPRF9mHiq +X3EAn32ZBl0A7deEnlkEDFpdVfLfbctV +=Qev6 +-----END PGP SIGNATURE----- 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 --> |