Removed java gen 1 ebuild, quoted vars.

(Portage version: 2.1.3.15)

9 files changed, 14 insertions, 143 deletions

diff --git a/dev-java/javacc/ChangeLog b/dev-java/javacc/ChangeLog
index 91b5236083b8..e331915b3d6d 100644
--- a/dev-java/javacc/ChangeLog
+++ b/dev-java/javacc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/javacc
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v 1.26 2007/08/10 19:13:54 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v 1.27 2007/10/24 04:48:36 wltjr Exp $
+
+  24 Oct 2007; William L. Thomson Jr. <wltjr@gentoo.org> -files/javacc-3.2,
+  -files/javacc.sh-3.2, -files/jjdoc-3.2, -files/jjtree-3.2,
+  -files/javacc-3.2-javadoc.patch, -javacc-3.2-r3.ebuild,
+  javacc-4.0-r4.ebuild:
+  Removed java gen 1 ebuild, quoted vars.
 
   10 Aug 2007; Petteri Räty <betelgeuse@gentoo.org> -javacc-4.0-r3.ebuild:
   Remove unused revision.
diff --git a/dev-java/javacc/files/digest-javacc-3.2-r3 b/dev-java/javacc/files/digest-javacc-3.2-r3
deleted file mode 100644
index 675206aa9f99..000000000000
--- a/dev-java/javacc/files/digest-javacc-3.2-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bc0fe5d325e24f2e7c95e5c962813354 javacc-3.2src.tar.gz 620640
-RMD160 3c9944db1ec889a1197b4b4d8ccdf2c8dd8eba7f javacc-3.2src.tar.gz 620640
-SHA256 1a91a5051033b5e4fbae634a3f41dc74f091e42895bd240b9d6091aef6bb0eec javacc-3.2src.tar.gz 620640
diff --git a/dev-java/javacc/files/javacc-3.2 b/dev-java/javacc/files/javacc-3.2
deleted file mode 100644
index d3dc5feac988..000000000000
--- a/dev-java/javacc/files/javacc-3.2
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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-3.2,v 1.2 2004/07/14 21:49:32 agriffis Exp $
-
-VERSION="JavaCC @PV@"
-JAVACC_HOME=/usr/share/@PN@
-ENV_VARS="JAVACC_HOME"
diff --git a/dev-java/javacc/files/javacc-3.2-javadoc.patch b/dev-java/javacc/files/javacc-3.2-javadoc.patch
deleted file mode 100644
index 0bbdab9a5b06..000000000000
--- a/dev-java/javacc/files/javacc-3.2-javadoc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru javacc-3.2/build.xml javacc-3.2-patched/build.xml
---- javacc-3.2/build.xml	2003-08-11 15:16:01.000000000 -0400
-+++ javacc-3.2-patched/build.xml	2005-06-25 00:37:53.000000000 -0400
-@@ -148,5 +148,10 @@
-   	<arg line="${version}" />
-   </exec>
-   </target>
-+   <target name="javadoc" depends="compile">
-+      <javadoc destdir="doc/api">
-+      	<fileset dir="src"/>
-+      </javadoc>
-+   </target>
- 
- </project>
diff --git a/dev-java/javacc/files/javacc.sh-3.2 b/dev-java/javacc/files/javacc.sh-3.2
deleted file mode 100644
index b5509e339980..000000000000
--- a/dev-java/javacc/files/javacc.sh-3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /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-3.2 b/dev-java/javacc/files/jjdoc-3.2
deleted file mode 100644
index f886ee838682..000000000000
--- a/dev-java/javacc/files/jjdoc-3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /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-3.2 b/dev-java/javacc/files/jjtree-3.2
deleted file mode 100644
index 3385f5c3ebb9..000000000000
--- a/dev-java/javacc/files/jjtree-3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /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
deleted file mode 100644
index ee8e1269f54f..000000000000
--- a/dev-java/javacc/javacc-3.2-r3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2007 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.10 2007/08/10 09:36:52 betelgeuse 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://${PN}.dev.java.net/files/documents/17/3616/${P}src.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 ppc amd64"
-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"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	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} ${S}/ || 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
-}
diff --git a/dev-java/javacc/javacc-4.0-r4.ebuild b/dev-java/javacc/javacc-4.0-r4.ebuild
index 832a40ef1069..b926dcd24c45 100644
--- a/dev-java/javacc/javacc-4.0-r4.ebuild
+++ b/dev-java/javacc/javacc-4.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/javacc-4.0-r4.ebuild,v 1.5 2007/08/10 18:24:38 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/javacc-4.0-r4.ebuild,v 1.6 2007/10/24 04:48:36 wltjr Exp $
 
 IUSE="doc examples source test"
 
@@ -24,7 +24,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch ${FILESDIR}/${P}-javadoc.patch
+	epatch "${FILESDIR}"/${P}-javadoc.patch
 	rm -v lib/junit*/*.jar || die
 }
 
@@ -52,18 +52,18 @@ src_install() {
 	fi
 	if use examples; then
 		dodir /usr/share/doc/${PF}/examples
-		cp -R examples/* ${D}/usr/share/doc/${PF}/examples
+		cp -R examples/* "${D}"/usr/share/doc/${PF}/examples
 	fi
 	use source && java-pkg_dosrc src/*
 
-	echo "JAVACC_HOME=/usr/share/javacc/" > ${T}/22javacc
-	doenvd ${T}/22javacc
+	echo "JAVACC_HOME=/usr/share/javacc/" > "${T}"/22javacc
+	doenvd "${T}"/22javacc
 
-	echo "export VERSION=4.0" > ${T}/pre
+	echo "export VERSION=4.0" > "${T}"/pre
 
 	local launcher
 	for launcher in javacc jjdoc jjtree
 	do
-		java-pkg_dolauncher ${launcher} -pre ${T}/pre --main ${launcher}
+		java-pkg_dolauncher ${launcher} -pre "${T}"/pre --main ${launcher}
 	done
 }