remove /etc/env.d/22javacc if left over from previous ebuilds, causes problems, see #61975

4 files changed, 66 insertions, 6 deletions

diff --git a/dev-java/javacc/ChangeLog b/dev-java/javacc/ChangeLog
index a5498cec3525..a622526bcaf6 100644
--- a/dev-java/javacc/ChangeLog
+++ b/dev-java/javacc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/javacc
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v 1.9 2004/08/31 03:50:50 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v 1.10 2004/09/05 11:27:44 axxo Exp $
+
+*javacc-3.2-r3 (05 Sep 2004)
+
+  05 Sep 2004; Thomas Matthijs <axxo@gentoo.org> +javacc-3.2-r3.ebuild:
+  remove /etc/env.d/22javacc if left over from previous ebuilds, causes
+  problems, see #61975
 
   30 Aug 2004; Chris Aniszczyk <zx@gentoo.org> -javacc-3.2-r1.ebuild,
   javacc-3.2-r2.ebuild:
diff --git a/dev-java/javacc/Manifest b/dev-java/javacc/Manifest
index d8f4d1dff76a..dc27d0d7a7d9 100644
--- a/dev-java/javacc/Manifest
+++ b/dev-java/javacc/Manifest
@@ -1,11 +1,13 @@
+MD5 580e250ab50c81cfa882f9ef5aef448f javacc-3.2-r3.ebuild 1360
+MD5 661cba0897b238f3524336693bdf5f26 javacc-3.2-r2.ebuild 1254
 MD5 35441c11c3d458d3a0ef049ebb4f7772 ChangeLog 1304
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 661cba0897b238f3524336693bdf5f26 javacc-3.2-r2.ebuild 1254
-MD5 6f5d6501b4f873ffbd9cbca5a847b897 files/javacc 128
-MD5 890206304fc74a131a30bb3f6140cfcb files/javacc-3.2 290
 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 0254d70a0b74b6bdaf13ed190e83ce88 files/javacc.sh-3.2 400
+MD5 c1977d510ff18a454666499bed5aa797 files/digest-javacc-3.2-r3 62
 MD5 27f05e9ef0c9b90262c6f9f43dae9633 files/jjdoc-3.2 380
-MD5 169889bcf3545fed8164d19166f6216d files/jjtree-3.2 388
+MD5 0254d70a0b74b6bdaf13ed190e83ce88 files/javacc.sh-3.2 400
diff --git a/dev-java/javacc/files/digest-javacc-3.2-r3 b/dev-java/javacc/files/digest-javacc-3.2-r3
new file mode 100644
index 000000000000..5a33b72706cc
--- /dev/null
+++ b/dev-java/javacc/files/digest-javacc-3.2-r3
@@ -0,0 +1 @@
+MD5 bc0fe5d325e24f2e7c95e5c962813354 javacc-3.2.tar.gz 620640
diff --git a/dev-java/javacc/javacc-3.2-r3.ebuild b/dev-java/javacc/javacc-3.2-r3.ebuild
new file mode 100644
index 000000000000..f190648b8fe0
--- /dev/null
+++ b/dev-java/javacc/javacc-3.2-r3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2004 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.1 2004/09/05 11:27:44 axxo 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"
+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
+		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}"
+}
+
+pkg_postrm() {
+	#close bug 61975
+	if [ -f /etc/env.d/22javacc ] ; then
+		rm -f /etc/env.d/22javacc
+	fi
+}