diff options
| -rw-r--r-- | dev-java/javacc/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-java/javacc/Manifest | 6 | ||||
| -rw-r--r-- | dev-java/javacc/files/digest-javacc-3.2-r2 | 1 | ||||
| -rw-r--r-- | dev-java/javacc/javacc-3.2-r2.ebuild | 44 | ||||
| -rw-r--r-- | dev-java/javacc/javacc-3.2-r3.ebuild | 33 |
5 files changed, 29 insertions, 62 deletions
diff --git a/dev-java/javacc/ChangeLog b/dev-java/javacc/ChangeLog index 7b42347885c0..1db0a8572e0a 100644 --- a/dev-java/javacc/ChangeLog +++ b/dev-java/javacc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/javacc # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v 1.13 2005/02/04 23:27:29 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v 1.14 2005/05/01 09:55:56 luckyduck Exp $ + + 01 May 2005; Jan Brinkmann <luckyduck@gentoo.org> -javacc-3.2-r2.ebuild, + javacc-3.2-r3.ebuild: + stable on ppc, did some cosmetic changes. introduced support for the jikes, + the examples and the source useflag. 05 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> javacc-3.2-r3.ebuild: stable on amd64 diff --git a/dev-java/javacc/Manifest b/dev-java/javacc/Manifest index bf47ee742abe..64c9030a18af 100644 --- a/dev-java/javacc/Manifest +++ b/dev-java/javacc/Manifest @@ -1,13 +1,11 @@ -MD5 aece2e46d18fd22e2bd7add96b4b837c javacc-3.2-r3.ebuild 1384 -MD5 72bc1517627dee34c1d37f0e682335cf javacc-3.2-r2.ebuild 1277 -MD5 315dba4aa50cab160037c6e4011df53c ChangeLog 1934 +MD5 cba053e9b1d79930b689ad7d5a67ab3d javacc-3.2-r3.ebuild 1595 +MD5 800fce62d22ff6939a5da61ff05c76ff ChangeLog 2151 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 MD5 34ffde7ed24a1315dbcba6b16557f644 files/jjdoc 127 MD5 890206304fc74a131a30bb3f6140cfcb files/javacc-3.2 290 MD5 6f5d6501b4f873ffbd9cbca5a847b897 files/javacc 128 MD5 f4614a490a4f23987e131ce4f47a0ddf files/jjtree 128 MD5 169889bcf3545fed8164d19166f6216d files/jjtree-3.2 388 -MD5 c1977d510ff18a454666499bed5aa797 files/digest-javacc-3.2-r2 62 MD5 c1977d510ff18a454666499bed5aa797 files/digest-javacc-3.2-r3 62 MD5 27f05e9ef0c9b90262c6f9f43dae9633 files/jjdoc-3.2 380 MD5 0254d70a0b74b6bdaf13ed190e83ce88 files/javacc.sh-3.2 400 diff --git a/dev-java/javacc/files/digest-javacc-3.2-r2 b/dev-java/javacc/files/digest-javacc-3.2-r2 deleted file mode 100644 index 5a33b72706cc..000000000000 --- a/dev-java/javacc/files/digest-javacc-3.2-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 bc0fe5d325e24f2e7c95e5c962813354 javacc-3.2.tar.gz 620640 diff --git a/dev-java/javacc/javacc-3.2-r2.ebuild b/dev-java/javacc/javacc-3.2-r2.ebuild deleted file mode 100644 index 64efbc4d2ffe..000000000000 --- a/dev-java/javacc/javacc-3.2-r2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/javacc-3.2-r2.ebuild,v 1.6 2005/02/04 23:27:29 luckyduck Exp $ - -inherit java-pkg - -DESCRIPTION="Java Compiler Compiler [tm] (JavaCC [tm]) - The Java Parser Generator" -HOMEPAGE="https://javacc.dev.java.net/servlets/ProjectHome" -SRC_URI="https://javacc.dev.java.net/files/documents/17/3616/javacc-3.2.tar.gz" -LICENSE="BSD" -SLOT="0" -KEYWORDS="x86 ~ppc ~amd64" -IUSE="doc" -DEPEND="virtual/jdk - sys-apps/sed - dev-java/ant" -RDEPEND="virtual/jre" - -src_compile() { - ant || die "compilation failed" - - cp ${FILESDIR}/${PN}-${PV} ${S}/ || die "Missing env file ${P}" - sed -i \ - -e "s:@PV@:${PV}:" \ - -e "s:@PN@:${PN}:" \ - ${PN}-${PV} || die "Failed to sed" -} - -src_install() { - if use doc ; then - java-pkg_dohtml -r www/* || die "Failed to install HTML files" - dodir /usr/share/${PN}/examples - cp -R examples ${D}/usr/share/${PN} || die "Failed to copy examples" - fi - java-pkg_dojar bin/lib/javacc.jar - - newbin ${FILESDIR}/javacc.sh-${PV} javacc - newbin ${FILESDIR}/jjdoc-${PV} jjdoc - newbin ${FILESDIR}/jjtree-${PV} jjtree - - dodir /etc/env.d/java - insinto /etc/env.d/java - newins ${PN}-${PV} 22javacc || die "Missing ${PF}" -} diff --git a/dev-java/javacc/javacc-3.2-r3.ebuild b/dev-java/javacc/javacc-3.2-r3.ebuild index 5164eb126ad2..b906b5a32ac6 100644 --- a/dev-java/javacc/javacc-3.2-r3.ebuild +++ b/dev-java/javacc/javacc-3.2-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/javacc-3.2-r3.ebuild,v 1.5 2005/02/04 23:27:29 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/javacc-3.2-r3.ebuild,v 1.6 2005/05/01 09:55:56 luckyduck Exp $ inherit java-pkg @@ -9,15 +9,19 @@ HOMEPAGE="https://javacc.dev.java.net/servlets/ProjectHome" SRC_URI="https://javacc.dev.java.net/files/documents/17/3616/javacc-3.2.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="x86 ~ppc amd64" -IUSE="doc" -DEPEND="virtual/jdk +KEYWORDS="x86 ppc amd64" +IUSE="doc examples jikes source" +DEPEND=">=virtual/jdk-1.3 sys-apps/sed - dev-java/ant" -RDEPEND="virtual/jre" + dev-java/ant-core + jikes? ( dev-java/jikes ) + source? ( app-arch/zip )" +RDEPEND=">=virtual/jre-1.3" src_compile() { - ant || die "compilation failed" + local antflags="jar" + use jikes && antflags="${antflags} -Dbuild.compiler=jikes" + ant ${antflags} || die "compilation failed" cp ${FILESDIR}/${PN}-${PV} ${S}/ || die "Missing env file ${P}" sed -i \ @@ -27,12 +31,17 @@ src_compile() { } src_install() { - if use doc ; then - java-pkg_dohtml -r www/* || die "Failed to install HTML files" - dodir /usr/share/${PN}/examples - cp -R examples ${D}/usr/share/${PN} || die "Failed to copy examples" + java-pkg_dojar bin/lib/${PN}.jar + + if use doc; then + dodoc README + java-pkg_dohtml -r www/* + fi + if use examples; then + dodir /usr/share/doc/${PF}/examples + cp -R examples/* ${D}/usr/share/doc/${PF}/examples fi - java-pkg_dojar bin/lib/javacc.jar + use source && java-pkg_dosrc src/* newbin ${FILESDIR}/javacc.sh-${PV} javacc newbin ${FILESDIR}/jjdoc-${PV} jjdoc |