Revision bump to fix bug #140829 - VERSION in env.

Package-Manager: portage-2.1.1_pre4-r1

7 files changed, 67 insertions, 14 deletions

diff --git a/dev-java/javacc/ChangeLog b/dev-java/javacc/ChangeLog
index bf2fc74e69b1..37fbd5e3a1ec 100644
--- a/dev-java/javacc/ChangeLog
+++ b/dev-java/javacc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/javacc
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v 1.17 2006/07/03 14:29:20 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v 1.18 2006/08/02 20:42:02 nelchael Exp $
+
+*javacc-4.0-r2 (02 Aug 2006)
+
+  02 Aug 2006; Krzysiek Pawlik <nelchael@gentoo.org> files/javacc-4.0,
+  files/javacc.sh-4.0, files/jjdoc-4.0, files/jjtree-4.0,
+  -javacc-4.0.ebuild, -javacc-4.0-r1.ebuild, +javacc-4.0-r2.ebuild:
+  Revision bump to fix bug #140829 - VERSION in env.
 
 *javacc-4.0-r1 (03 Jul 2006)
 
diff --git a/dev-java/javacc/files/digest-javacc-4.0-r2 b/dev-java/javacc/files/digest-javacc-4.0-r2
new file mode 100644
index 000000000000..c1d25a43bdda
--- /dev/null
+++ b/dev-java/javacc/files/digest-javacc-4.0-r2
@@ -0,0 +1,3 @@
+MD5 bf91835dc1bb4821f4b26fd552b43c8d javacc-4.0src.tar.gz 765150
+RMD160 c33b1b9a518c229a87265bb4b200444a5b921380 javacc-4.0src.tar.gz 765150
+SHA256 062a35b89cf1bb4260627c32f480d26e17bf4595024e4b4e472a46fe1b24655f javacc-4.0src.tar.gz 765150
diff --git a/dev-java/javacc/files/javacc-4.0 b/dev-java/javacc/files/javacc-4.0
index 3950bdf346f3..0dfd090606d6 100644
--- a/dev-java/javacc/files/javacc-4.0
+++ b/dev-java/javacc/files/javacc-4.0
@@ -1,7 +1 @@
-# 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"
+JAVACC_HOME=/usr/share/javacc/
diff --git a/dev-java/javacc/files/javacc.sh-4.0 b/dev-java/javacc/files/javacc.sh-4.0
index b5509e339980..1ccccf5f95d2 100644
--- a/dev-java/javacc/files/javacc.sh-4.0
+++ b/dev-java/javacc/files/javacc.sh-4.0
@@ -5,8 +5,7 @@
 #
 # Licensed under the GNU General Public License, v2
 
-. /etc/env.d/java/22javacc
-[ -f "${HOME}/.gentoo/env.d/22javacc" ] && . ${HOME}/.gentoo/env.d/22javacc
+export VERSION=4.0
 
 java=$(java-config --java)
 classpath=$(java-config --classpath=javacc)
diff --git a/dev-java/javacc/files/jjdoc-4.0 b/dev-java/javacc/files/jjdoc-4.0
index f886ee838682..f9eb01a253f4 100644
--- a/dev-java/javacc/files/jjdoc-4.0
+++ b/dev-java/javacc/files/jjdoc-4.0
@@ -5,8 +5,7 @@
 #
 # Licensed under the GNU General License, v2
 
-. /etc/env.d/java/22javacc
-[ -f "${HOME}/.gentoo/env.d/22javacc" ] && . ${HOME}/.gentoo/env.d/22javacc
+export VERSION=4.0
 
 java=$(java-config --java)
 classpath=$(java-config --classpath=javacc)
diff --git a/dev-java/javacc/files/jjtree-4.0 b/dev-java/javacc/files/jjtree-4.0
index 3385f5c3ebb9..423039e37dea 100644
--- a/dev-java/javacc/files/jjtree-4.0
+++ b/dev-java/javacc/files/jjtree-4.0
@@ -5,8 +5,7 @@
 #
 # Licensed under the GNU General Public License, v2
 
-. /etc/env.d/java/22javacc
-[ -f "${HOME}/.gentoo/env.d/22javacc" ] && . ${HOME}/.gentoo/env.d/22javacc
+export VERSION=4.0
 
 java=$(java-config --java)
 classpath=$(java-config --classpath=javacc)
diff --git a/dev-java/javacc/javacc-4.0-r2.ebuild b/dev-java/javacc/javacc-4.0-r2.ebuild
new file mode 100644
index 000000000000..7a1101fa6da0
--- /dev/null
+++ b/dev-java/javacc/javacc-4.0-r2.ebuild
@@ -0,0 +1,52 @@
+# 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-r2.ebuild,v 1.1 2006/08/02 20:42:02 nelchael Exp $
+
+inherit java-pkg-2 java-ant-2 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 source"
+DEPEND=">=virtual/jdk-1.3
+	sys-apps/sed
+	dev-java/ant-core
+	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 doc && antflags="${antflags} javadoc"
+	eant ${antflags} || die "compilation failed"
+}
+
+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/*
+
+	newenvd ${FILESDIR}/javacc-${PV} 22javacc
+
+	newbin ${FILESDIR}/javacc.sh-${PV} javacc
+	newbin ${FILESDIR}/jjdoc-${PV} jjdoc
+	newbin ${FILESDIR}/jjtree-${PV} jjtree
+}