diff options
author | Thomas Matthijs <axxo@gentoo.org> | 2005-06-23 09:04:31 +0000 |
---|---|---|
committer | Thomas Matthijs <axxo@gentoo.org> | 2005-06-23 09:04:31 +0000 |
commit | daa47a442adb552974eeae958efe32ebac7c876e (patch) | |
tree | a001e5c2a1088dbb429834a4c36d1b985c3483f6 /dev-java/bsh | |
parent | Fix typos. (diff) | |
download | historical-daa47a442adb552974eeae958efe32ebac7c876e.tar.gz historical-daa47a442adb552974eeae958efe32ebac7c876e.tar.bz2 historical-daa47a442adb552974eeae958efe32ebac7c876e.zip |
fix 96799, sorry commited wrong ebuild
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'dev-java/bsh')
-rw-r--r-- | dev-java/bsh/ChangeLog | 6 | ||||
-rw-r--r-- | dev-java/bsh/Manifest | 11 | ||||
-rw-r--r-- | dev-java/bsh/bsh-2.0_beta4.ebuild | 11 | ||||
-rw-r--r-- | dev-java/bsh/files/bsh2.0b4-build.patch | 53 |
4 files changed, 70 insertions, 11 deletions
diff --git a/dev-java/bsh/ChangeLog b/dev-java/bsh/ChangeLog index f051704f1e6d..a8e7baa9b9df 100644 --- a/dev-java/bsh/ChangeLog +++ b/dev-java/bsh/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/bsh # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/ChangeLog,v 1.25 2005/06/22 17:22:37 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/ChangeLog,v 1.26 2005/06/23 09:04:31 axxo Exp $ + + 23 Jun 2005; Thomas Matthijs <axxo@gentoo.org> + +files/bsh2.0b4-build.patch, bsh-2.0_beta4.ebuild: + fix 96799, sorry commited wrong ebuild *bsh-2.0_beta4 (22 Jun 2005) diff --git a/dev-java/bsh/Manifest b/dev-java/bsh/Manifest index 7010a06a569c..0cc8b1ac88dc 100644 --- a/dev-java/bsh/Manifest +++ b/dev-java/bsh/Manifest @@ -4,22 +4,23 @@ Hash: SHA1 MD5 3e9db06b96be80b9500257a94feb42f8 bsh-2.0_beta1-r1.ebuild 1175 MD5 8bd71a260abed0bb42193acb1ec2c8df bsh-1.3.0.ebuild 870 MD5 550ad7ad9811ed65d58f9c04f25e64bf bsh-2.0_beta2.ebuild 2057 -MD5 5c90b2c9e77a52a3c77508bb6833d605 ChangeLog 3290 +MD5 e450b33e32256c4be5e4f6e13dd0b5f8 ChangeLog 3434 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 -MD5 f847319557a99a005d0fe36d211e68a6 bsh-2.0_beta4.ebuild 2053 +MD5 0c3de80925da02c41ccf26414d08101b bsh-2.0_beta4.ebuild 2081 MD5 5ec33004601026e3f5206a441853b1ed files/digest-bsh-1.3.0 58 MD5 e98c8ab811f673d6089a092d3b8a3d97 files/bsh.Console 856 MD5 c0ad0331cfc0855056051a83d34fc35f files/bsh.Interpreter 871 MD5 af516cc82d6597c5f6f49ad83916647e files/bsh2-build.patch 1704 MD5 b2666166806a0cf58b311a9a77511fdb files/digest-bsh-2.0_beta2 125 MD5 ce8a7b633b68257eda454f9739f56801 files/digest-bsh-2.0_beta4 125 +MD5 b2c7f4d348c2075960cec1811975f5c9 files/bsh2.0b4-build.patch 1697 MD5 356a59a8ed4e03783dc4ec5a143ef75f files/bsh2-readline.patch 5428 MD5 0321e1ba45e1f4f328eae0eecf037105 files/digest-bsh-2.0_beta1-r1 120 MD5 32448cba89ef5394ffab7a7cdb399ded files/beanshell.desktop 266 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) -iD8DBQFCuZ6L/rLF9B432nYRAsTiAKCDN+OjsWxVe85Y6AWIGI0GBO4Q6gCfTDTZ -hCjRwHQvXFyW6btgj/XuRYI= -=LZ9S +iD8DBQFCuntJ/rLF9B432nYRAgFgAKCLMIhRT9UMX3JmAdulcrdVPjonhQCbBmKy +2iz9uJ5TboxFKMDaIZ0Hm5g= +=Ur2o -----END PGP SIGNATURE----- diff --git a/dev-java/bsh/bsh-2.0_beta4.ebuild b/dev-java/bsh/bsh-2.0_beta4.ebuild index 873a0904d0dc..16ba10175611 100644 --- a/dev-java/bsh/bsh-2.0_beta4.ebuild +++ b/dev-java/bsh/bsh-2.0_beta4.ebuild @@ -1,10 +1,11 @@ # Copyright 1999-2005 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.ebuild,v 1.1 2005/06/22 17:22:37 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/bsh-2.0_beta4.ebuild,v 1.2 2005/06/23 09:04:31 axxo Exp $ inherit java-pkg eutils -MY_DIST=${P/_beta/b}-src.jar +MY_PV=${PV/_beta/b} +MY_DIST=${PN}-${MY_PV}-src.jar DESCRIPTION="BeanShell: A small embeddable Java source interpreter" HOMEPAGE="http://www.beanshell.org" @@ -14,7 +15,7 @@ SRC_URI="http://www.beanshell.org/${MY_DIST} LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~x86 ~amd64 ~ppc" -IUSE="doc gnome jikes junit kde readline" +IUSE="doc jikes junit readline" DEPEND="${RDEPEND} >=dev-java/ant-core-1.5.4" @@ -23,7 +24,7 @@ RDEPEND=">=virtual/jdk-1.4 =dev-java/servletapi-2.4* readline? ( dev-java/libreadline-java )" -S=${WORKDIR}/BeanShell +S=${WORKDIR}/BeanShell-${MY_PV} src_unpack() { # Extract the sources @@ -32,7 +33,7 @@ src_unpack() { # Apply the build patch cd ${S} - epatch ${FILESDIR}/bsh2-build.patch + epatch ${FILESDIR}/bsh${MY_PV}-build.patch # Copy the needed files cp ${FILESDIR}/bsh.Console ${FILESDIR}/bsh.Interpreter ${S} diff --git a/dev-java/bsh/files/bsh2.0b4-build.patch b/dev-java/bsh/files/bsh2.0b4-build.patch new file mode 100644 index 000000000000..7492e72b241d --- /dev/null +++ b/dev-java/bsh/files/bsh2.0b4-build.patch @@ -0,0 +1,53 @@ +--- 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 +@@ -108,49 +108,7 @@ + + <!-- Begin Targets --> + +- <!-- The javacc targets could be smarter... --> +- <target name="checkjjt"> +- <uptodate property="jjtree.notRequired" +- targetfile="${src-dir}/bsh/bsh.jj" +- > +- <srcfiles dir="${src-dir}/bsh" includes="bsh.jjt"/> +- </uptodate> +- </target> +- <target name="checkjj"> +- <uptodate property="javacc.notRequired" +- targetfile="${src-dir}/bsh/Parser.java" +- > +- <srcfiles dir="${src-dir}/bsh" includes="bsh.jj"/> +- </uptodate> +- </target> +- +- <!-- Create bsh.jj when bsh.jjt changes. --> +- <target name="jjtree" unless="jjtree.notRequired" depends="checkjjt"> +- <java classname="jjtree" +- fork="yes" +- failonerror="yes" > +- <arg +- line="-OUTPUT_DIRECTORY=${src-dir}/bsh ${src-dir}/bsh/bsh.jjt"/> +- <classpath> +- <fileset refid="lib-fileset"/> +- </classpath> +- </java> +- </target> +- +- <!-- Create Parser.java when bsh.jj changes. --> +- <target name="javacc" unless="javacc.notRequired" depends="checkjj"> +- <java classname="javacc" +- fork="yes" +- failonerror="yes" +- classpath="${javacc-lib}"> +- <arg line="-OUTPUT_DIRECTORY=${src-dir}/bsh ${src-dir}/bsh/bsh.jj"/> +- <classpath> +- <fileset refid="lib-fileset"/> +- </classpath> +- </java> +- </target> +- +- <target name="compile" depends="jjtree,javacc,builddir"> ++ <target name="compile" depends="builddir"> + <!-- exclude the ${excludes} as well as anything under a "bak" dir --> + <!--compiler="${build-compiler}"--> + <javac srcdir="${src-dir}:${test-src-dir}:${bsf-src-dir}:${classgen-src-dir}" |