diff options
author | Adrian Almenar <strider@gentoo.org> | 2003-08-15 06:01:00 +0000 |
---|---|---|
committer | Adrian Almenar <strider@gentoo.org> | 2003-08-15 06:01:00 +0000 |
commit | d48a45b8042a7cb4e96787aa3e622606f9161adf (patch) | |
tree | 95f8a6fb5ccee80128da10f8ea61ea13d112d40a /dev-java | |
parent | Fixes to bug 21735 (diff) | |
download | gentoo-2-d48a45b8042a7cb4e96787aa3e622606f9161adf.tar.gz gentoo-2-d48a45b8042a7cb4e96787aa3e622606f9161adf.tar.bz2 gentoo-2-d48a45b8042a7cb4e96787aa3e622606f9161adf.zip |
Fixes bug 21887
Diffstat (limited to 'dev-java')
-rw-r--r-- | dev-java/antlr/ChangeLog | 7 | ||||
-rw-r--r-- | dev-java/antlr/Manifest | 10 | ||||
-rw-r--r-- | dev-java/antlr/antlr-2.7.1-r3.ebuild | 10 | ||||
-rw-r--r-- | dev-java/antlr/antlr-2.7.2.ebuild | 10 | ||||
-rw-r--r-- | dev-java/antlr/antlr-2.7.2_alpha2-r1.ebuild | 44 | ||||
-rw-r--r-- | dev-java/antlr/antlr-2.7.2_alpha2.ebuild | 42 | ||||
-rw-r--r-- | dev-java/antlr/files/digest-antlr-2.7.2_alpha2 | 1 | ||||
-rw-r--r-- | dev-java/antlr/files/digest-antlr-2.7.2_alpha2-r1 | 1 |
8 files changed, 22 insertions, 103 deletions
diff --git a/dev-java/antlr/ChangeLog b/dev-java/antlr/ChangeLog index 5993c6dd8494..18e08b681817 100644 --- a/dev-java/antlr/ChangeLog +++ b/dev-java/antlr/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/antlr # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.10 2003/04/06 02:25:48 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.11 2003/08/15 06:00:29 strider Exp $ + + 15 Aug 2003; Adrian Almenar <strider@gentoo.org> antlr-2.7.1-r3.ebuild, + antlr-2.7.2.ebuild, antlr-2.7.2_alpha2-r1.ebuild, antlr-2.7.2_alpha2.ebuild: + Fixes bug 21887, That makes the ebuild to build with jikes java compiler, + Thanks to Jonas Berlin <jberlin@cc.hut.fi> for the patch *antlr-2.7.2 (05 Apr 2003) 02 Apr 2003; Robin Johnson <robbat2@gentoo.org> antlr-2.7.2.ebuild, diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest index e3a5f70855f9..28a9b6bb72df 100644 --- a/dev-java/antlr/Manifest +++ b/dev-java/antlr/Manifest @@ -1,12 +1,8 @@ -MD5 364e3e0e42de16e34c80088d99996bcb antlr-2.7.2_alpha2.ebuild 932 -MD5 107f5f4df2a78096c9efb98fd1eb92c1 antlr-2.7.1-r3.ebuild 880 -MD5 3333134d4c10ff2482c231efb3d68c39 antlr-2.7.2.ebuild 946 -MD5 c62f99a8fd3f1f9acdeb6de15dfada71 antlr-2.7.2_alpha2-r1.ebuild 995 -MD5 1a8708b394fcd4c1d7464470608f806c ChangeLog 2190 +MD5 8efd9e1c9f6d4878b94ecb0eb816c117 antlr-2.7.1-r3.ebuild 950 +MD5 95f8efe0a281db216ad081d53e95a2c6 antlr-2.7.2.ebuild 999 +MD5 2f2dc23f5b6f3c9750f320402201b844 ChangeLog 2479 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 MD5 abd32014c7d5dc82f792f5e290b4527a files/antlr-2.7.2-gcc3-gentoo.patch 433 MD5 5eb1d6f0cdc3ffa1c2adbb6013b07f45 files/digest-antlr-2.7.1-r3 64 MD5 aab6733e0c585de1db478492c41e94b9 files/digest-antlr-2.7.2 64 -MD5 f704dae3668f143100f7296e6178c51e files/digest-antlr-2.7.2_alpha2-r1 66 MD5 abd32014c7d5dc82f792f5e290b4527a files/antlr-2.7.2_alpha2-gcc3-gentoo.patch 433 -MD5 f704dae3668f143100f7296e6178c51e files/digest-antlr-2.7.2_alpha2 66 diff --git a/dev-java/antlr/antlr-2.7.1-r3.ebuild b/dev-java/antlr/antlr-2.7.1-r3.ebuild index 5df0503befcb..5a01cef2cd16 100644 --- a/dev-java/antlr/antlr-2.7.1-r3.ebuild +++ b/dev-java/antlr/antlr-2.7.1-r3.ebuild @@ -1,20 +1,24 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.1-r3.ebuild,v 1.6 2003/02/13 10:06:44 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.1-r3.ebuild,v 1.7 2003/08/15 06:00:29 strider Exp $ S=${WORKDIR}/${P} DESCRIPTION="A parser generator for Java, C++ and Sather, written in Java" SRC_URI="http://www.antlr.org/D00100100/antlr-2.7.1.tar.gz" HOMEPAGE="http://www.antlr.org" DEPEND=">=virtual/jdk-1.2 - >=dev-java/jikes-1.13 + jikes? ( >=dev-java/jikes-1.13 ) >=sys-devel/gcc-2.95.3" LICENSE="ANTLR" SLOT="2" KEYWORDS="x86" +IUSE="jikes" src_compile() { - PATH=${PATH}:${JAVA_HOME}/bin JAVAC=jikes make all-jars || die + if [ -n "`use jikes`" ] ; then + export JAVAC=jikes + fi + PATH=${PATH}:${JAVA_HOME}/bin make all-jars || die cd lib/cpp econf || die emake || die diff --git a/dev-java/antlr/antlr-2.7.2.ebuild b/dev-java/antlr/antlr-2.7.2.ebuild index 64c30f3541f8..947ff668840d 100644 --- a/dev-java/antlr/antlr-2.7.2.ebuild +++ b/dev-java/antlr/antlr-2.7.2.ebuild @@ -1,17 +1,17 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.2.ebuild,v 1.3 2003/04/06 02:25:48 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.2.ebuild,v 1.4 2003/08/15 06:00:29 strider Exp $ S=${WORKDIR}/${P} DESCRIPTION="A parser generator for Java and C++, written in Java" SRC_URI="http://www.antlr.org/download/${P}.tar.gz" HOMEPAGE="http://www.antlr.org" DEPEND=">=virtual/jdk-1.2 - >=dev-java/jikes-1.13" + jikes? ( >=dev-java/jikes-1.13 )" SLOT="2" LICENSE="ANTLR" KEYWORDS="x86" -IUSE="" +IUSE="jikes" src_unpack() { unpack ${A} @@ -19,7 +19,9 @@ src_unpack() { } src_compile() { - export JAVAC=jikes + if [ -n "`use jikes`" ] ; then + export JAVAC=jikes + fi echo $CLASSPATH econf || die make antlr.jar antlr.debug.jar antlrall.jar all || die diff --git a/dev-java/antlr/antlr-2.7.2_alpha2-r1.ebuild b/dev-java/antlr/antlr-2.7.2_alpha2-r1.ebuild deleted file mode 100644 index 265a58441d24..000000000000 --- a/dev-java/antlr/antlr-2.7.2_alpha2-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.2_alpha2-r1.ebuild,v 1.2 2003/02/13 10:06:50 vapier Exp $ - -S=${WORKDIR}/${PN}-2.7.2a2 -DESCRIPTION="A parser generator for Java, C++ and Sather, written in Java" -SRC_URI="http://www.antlr.org/nirvana/antlr-2.7.2a2.tar.gz" -HOMEPAGE="http://www.antlr.org" -DEPEND=">=virtual/jdk-1.2 - >=dev-java/jikes-1.13" -SLOT="2" -LICENSE="ANTLR" -KEYWORDS="x86" -IUSE="" - -src_unpack() { - unpack ${A} - cd ${S} && patch -p1 <${FILESDIR}/${P}-gcc3-gentoo.patch || die -} - -src_compile() { - - if [ ! -f antlrall.jar ] ; then - ./mkalljar - fi - - export JAVAC=jikes - - echo $CLASSPATH - econf || die - make all || die -} - -src_install () { - insinto /usr/share/antlr - dojar antlr.debug.jar antlr.jar antlrall.jar - doins extras/antlr-mode.el - dohtml -r doc/* - cp -R examples ${D}/usr/share/doc/${P}/ - dodoc RIGHTS - cd lib/cpp - make DESTDIR=$D install -} - diff --git a/dev-java/antlr/antlr-2.7.2_alpha2.ebuild b/dev-java/antlr/antlr-2.7.2_alpha2.ebuild deleted file mode 100644 index 6864d8957830..000000000000 --- a/dev-java/antlr/antlr-2.7.2_alpha2.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.2_alpha2.ebuild,v 1.5 2003/02/13 10:06:55 vapier Exp $ - -S=${WORKDIR}/${PN}-2.7.2a2 -DESCRIPTION="A parser generator for Java, C++ and Sather, written in Java" -SRC_URI="http://www.antlr.org/nirvana/antlr-2.7.2a2.tar.gz" -HOMEPAGE="http://www.antlr.org" -DEPEND=">=virtual/jdk-1.2 - >=dev-java/jikes-1.13" -SLOT="2" -LICENSE="ANTLR" -KEYWORDS="x86" - -src_compile() { - - if [ ! -f antlrall.jar ] ; then - ./mkalljar - fi - - export JAVAC=jikes - - echo $CLASSPATH - econf || die - make all || die - -# cd lib/cpp -# econf || die -# emake || die -} - -src_install () { - insinto /usr/share/antlr - dojar antlr.debug.jar antlr.jar antlrall.jar - doins extras/antlr-mode.el - dohtml -r doc/* - cp -R examples ${D}/usr/share/doc/${P}/ - dodoc RIGHTS - cd lib/cpp - make DESTDIR=$D install -} - diff --git a/dev-java/antlr/files/digest-antlr-2.7.2_alpha2 b/dev-java/antlr/files/digest-antlr-2.7.2_alpha2 deleted file mode 100644 index 4f0a1a5460c8..000000000000 --- a/dev-java/antlr/files/digest-antlr-2.7.2_alpha2 +++ /dev/null @@ -1 +0,0 @@ -MD5 9c8b9cccf53effe450e755a66e67a27c antlr-2.7.2a2.tar.gz 1076842 diff --git a/dev-java/antlr/files/digest-antlr-2.7.2_alpha2-r1 b/dev-java/antlr/files/digest-antlr-2.7.2_alpha2-r1 deleted file mode 100644 index 4f0a1a5460c8..000000000000 --- a/dev-java/antlr/files/digest-antlr-2.7.2_alpha2-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 9c8b9cccf53effe450e755a66e67a27c antlr-2.7.2a2.tar.gz 1076842 |