Version bump (bug #118576).

(Portage version: 2.1_pre3-r1)

10 files changed, 158 insertions, 21 deletions

diff --git a/dev-java/javacc/ChangeLog b/dev-java/javacc/ChangeLog
index 20643eb75ada..bdd2a3b7fbe6 100644
--- a/dev-java/javacc/ChangeLog
+++ b/dev-java/javacc/ChangeLog
@@ -1,6 +1,13 @@
 # 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.15 2005/06/29 19:21:59 axxo Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v 1.16 2006/01/22 05:08:34 nichoj Exp $
+
+*javacc-4.0 (22 Jan 2006)
+
+  22 Jan 2006; Joshua Nichols <nichoj@gentoo.org> +files/javacc-4.0,
+  +files/javacc.sh-4.0, +files/jjdoc-4.0, +files/jjtree-4.0,
+  +files/javacc-4.0-javadoc.patch, javacc-3.2-r3.ebuild, +javacc-4.0.ebuild:
+  Version bump (bug #118576).
 
   29 Jun 2005; Thomas Matthijs <axxo@gentoo.org>
   +files/javacc-3.2-javadoc.patch, javacc-3.2-r3.ebuild:
diff --git a/dev-java/javacc/Manifest b/dev-java/javacc/Manifest
index ca422fd1e6b2..06001b10dc35 100644
--- a/dev-java/javacc/Manifest
+++ b/dev-java/javacc/Manifest
@@ -1,19 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 62ef5e5acb719e617155bac31b5946a9 javacc-3.2-r3.ebuild 1727
 MD5 15ee795e811557cf829d411c44fee3d3 ChangeLog 2330
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 87f8505fd21eebfd50d55549e4b63d35 files/javacc-3.2-javadoc.patch 420
-MD5 890206304fc74a131a30bb3f6140cfcb files/javacc-3.2 290
-MD5 169889bcf3545fed8164d19166f6216d files/jjtree-3.2 388
 MD5 c1977d510ff18a454666499bed5aa797 files/digest-javacc-3.2-r3 62
-MD5 27f05e9ef0c9b90262c6f9f43dae9633 files/jjdoc-3.2 380
+MD5 b4cf54b450f74c1d4979294a8c4956a7 files/digest-javacc-4.0 65
+MD5 890206304fc74a131a30bb3f6140cfcb files/javacc-3.2 290
+MD5 87f8505fd21eebfd50d55549e4b63d35 files/javacc-3.2-javadoc.patch 420
+MD5 890206304fc74a131a30bb3f6140cfcb files/javacc-4.0 290
+MD5 072b4f9d084ce796693484a92fd12687 files/javacc-4.0-javadoc.patch 417
 MD5 0254d70a0b74b6bdaf13ed190e83ce88 files/javacc.sh-3.2 400
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC07+P/rLF9B432nYRAqChAKDDUVld840mRru6TVmNn+o1PjyeJwCfY86M
-xE7yv2f1FFYr6ooRdl+csJs=
-=o++5
------END PGP SIGNATURE-----
+MD5 0254d70a0b74b6bdaf13ed190e83ce88 files/javacc.sh-4.0 400
+MD5 27f05e9ef0c9b90262c6f9f43dae9633 files/jjdoc-3.2 380
+MD5 27f05e9ef0c9b90262c6f9f43dae9633 files/jjdoc-4.0 380
+MD5 169889bcf3545fed8164d19166f6216d files/jjtree-3.2 388
+MD5 169889bcf3545fed8164d19166f6216d files/jjtree-4.0 388
+MD5 cc2909c8d1376aae22b177f15843b0c6 javacc-3.2-r3.ebuild 1720
+MD5 9837ee41adab2766e091ab6170521905 javacc-4.0.ebuild 1704
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
diff --git a/dev-java/javacc/files/digest-javacc-4.0 b/dev-java/javacc/files/digest-javacc-4.0
new file mode 100644
index 000000000000..a696fa472550
--- /dev/null
+++ b/dev-java/javacc/files/digest-javacc-4.0
@@ -0,0 +1 @@
+MD5 bf91835dc1bb4821f4b26fd552b43c8d javacc-4.0src.tar.gz 765150
diff --git a/dev-java/javacc/files/javacc-4.0 b/dev-java/javacc/files/javacc-4.0
new file mode 100644
index 000000000000..3950bdf346f3
--- /dev/null
+++ b/dev-java/javacc/files/javacc-4.0
@@ -0,0 +1,7 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/files/javacc-4.0,v 1.1 2006/01/22 05:08:34 nichoj Exp $
+
+VERSION="JavaCC @PV@"
+JAVACC_HOME=/usr/share/@PN@
+ENV_VARS="JAVACC_HOME"
diff --git a/dev-java/javacc/files/javacc-4.0-javadoc.patch b/dev-java/javacc/files/javacc-4.0-javadoc.patch
new file mode 100644
index 000000000000..f5467a4552e7
--- /dev/null
+++ b/dev-java/javacc/files/javacc-4.0-javadoc.patch
@@ -0,0 +1,14 @@
+diff -ru javacc/build.xml javacc-patched/build.xml
+--- javacc/build.xml	2003-08-11 15:16:01.000000000 -0400
++++ javacc-patched/build.xml	2005-06-25 00:37:53.000000000 -0400
+@@ -150,5 +150,10 @@
+   	<arg line="${version}" />
+   </exec>
+   </target>
++   <target name="javadoc" depends="compile">
++      <javadoc destdir="doc/api" source="1.4">
++      	<fileset dir="src"/>
++      </javadoc>
++   </target>
+ 
+ </project>
diff --git a/dev-java/javacc/files/javacc.sh-4.0 b/dev-java/javacc/files/javacc.sh-4.0
new file mode 100644
index 000000000000..b5509e339980
--- /dev/null
+++ b/dev-java/javacc/files/javacc.sh-4.0
@@ -0,0 +1,14 @@
+#! /bin/sh
+#
+# Copyright (c) 2004, Gentoo Technologies, Inc.
+# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org>
+#
+# Licensed under the GNU General Public License, v2
+
+. /etc/env.d/java/22javacc
+[ -f "${HOME}/.gentoo/env.d/22javacc" ] && . ${HOME}/.gentoo/env.d/22javacc
+
+java=$(java-config --java)
+classpath=$(java-config --classpath=javacc)
+
+${java} -classpath ${classpath} javacc "$@"
diff --git a/dev-java/javacc/files/jjdoc-4.0 b/dev-java/javacc/files/jjdoc-4.0
new file mode 100644
index 000000000000..f886ee838682
--- /dev/null
+++ b/dev-java/javacc/files/jjdoc-4.0
@@ -0,0 +1,14 @@
+#! /bin/sh
+#
+# Copyright (c) Gentoo Technologies, Inc.
+# Copyright (c) Karl Trygve Kalleberg <karltk@gentoo.org>
+#
+# Licensed under the GNU General License, v2
+
+. /etc/env.d/java/22javacc
+[ -f "${HOME}/.gentoo/env.d/22javacc" ] && . ${HOME}/.gentoo/env.d/22javacc
+
+java=$(java-config --java)
+classpath=$(java-config --classpath=javacc)
+
+${java} -classpath ${classpath} jjdoc "$@"
diff --git a/dev-java/javacc/files/jjtree-4.0 b/dev-java/javacc/files/jjtree-4.0
new file mode 100644
index 000000000000..3385f5c3ebb9
--- /dev/null
+++ b/dev-java/javacc/files/jjtree-4.0
@@ -0,0 +1,14 @@
+#! /bin/sh
+#
+# Copyright (c) Gentoo Technologies, Inc.
+# Copyright (c) Karl Trygve Kalleberg <karltk@gentoo.org>
+#
+# Licensed under the GNU General Public License, v2
+
+. /etc/env.d/java/22javacc
+[ -f "${HOME}/.gentoo/env.d/22javacc" ] && . ${HOME}/.gentoo/env.d/22javacc
+
+java=$(java-config --java)
+classpath=$(java-config --classpath=javacc)
+
+${java} -classpath ${classpath} jjtree "$@"
diff --git a/dev-java/javacc/javacc-3.2-r3.ebuild b/dev-java/javacc/javacc-3.2-r3.ebuild
index 95f0a51150da..94052d421fbf 100644
--- a/dev-java/javacc/javacc-3.2-r3.ebuild
+++ b/dev-java/javacc/javacc-3.2-r3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.8 2005/06/29 19:21:59 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/javacc-3.2-r3.ebuild,v 1.9 2006/01/22 05:08:34 nichoj Exp $
 
 inherit java-pkg eutils
 
 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"
+SRC_URI="https://${PN}.dev.java.net/files/documents/17/3616/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="x86 ppc amd64"
diff --git a/dev-java/javacc/javacc-4.0.ebuild b/dev-java/javacc/javacc-4.0.ebuild
new file mode 100644
index 000000000000..63ed43bcfaf4
--- /dev/null
+++ b/dev-java/javacc/javacc-4.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/javacc-4.0.ebuild,v 1.1 2006/01/22 05:08:34 nichoj Exp $
+
+inherit java-pkg eutils
+
+DESCRIPTION="Java Compiler Compiler"
+HOMEPAGE="https://javacc.dev.java.net/servlets/ProjectHome"
+SRC_URI="https://${PN}.dev.java.net/files/documents/17/26783/${P}src.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc examples jikes source"
+DEPEND=">=virtual/jdk-1.3
+	sys-apps/sed
+	dev-java/ant-core
+	jikes? ( dev-java/jikes )
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jre-1.3"
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-javadoc.patch
+}
+
+src_compile() {
+	local antflags="jar"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	use doc && antflags="${antflags} javadoc"
+	ant ${antflags} || die "compilation failed"
+
+	cp ${FILESDIR}/${P} ${WORKDIR}/${PN}/ || die "Missing env file ${P}"
+	sed -i \
+		-e "s:@PV@:${PV}:" \
+		-e "s:@PN@:${PN}:" \
+		${P} || die "Failed to sed"
+}
+
+src_install() {
+	java-pkg_dojar bin/lib/${PN}.jar
+
+	if use doc; then
+		dodoc README
+		java-pkg_dohtml -r www/*
+		java-pkg_dohtml -r doc/api
+	fi
+	if use examples; then
+		dodir /usr/share/doc/${PF}/examples
+		cp -R examples/* ${D}/usr/share/doc/${PF}/examples
+	fi
+	use source && java-pkg_dosrc src/*
+
+	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 ${P} 22javacc || die "Missing ${PF}"
+}
+
+pkg_postinst() {
+	#close bug 61975
+	if [ -f /etc/env.d/22javacc ] ; then
+		rm -f /etc/env.d/22javacc
+	fi
+}