Removed java gen 1 ebuild, quoted vars.

Package-Manager: portage-2.1.3.15

10 files changed, 22 insertions, 189 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/Manifest b/dev-java/javacc/Manifest
index 9af2619a0afb..92128f248ff1 100644
--- a/dev-java/javacc/Manifest
+++ b/dev-java/javacc/Manifest
@@ -1,58 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX javacc-3.2 290 RMD160 9c5c089ecedc7eb10b2f799aaa2ad87070d11e5d SHA1 2012771f245c5f04d63e64582146d54bb7db387f SHA256 8138d597803536a706cdd04fd8351b899fc453071bdea3eeccbdd8692ba43f7a
-MD5 890206304fc74a131a30bb3f6140cfcb files/javacc-3.2 290
-RMD160 9c5c089ecedc7eb10b2f799aaa2ad87070d11e5d files/javacc-3.2 290
-SHA256 8138d597803536a706cdd04fd8351b899fc453071bdea3eeccbdd8692ba43f7a files/javacc-3.2 290
-AUX javacc-3.2-javadoc.patch 420 RMD160 975c2ccd7939010925463e99ad9b852bb66c1bfa SHA1 4be1c9b3c114c9ea8fd43f663690110fcfabc982 SHA256 3ca5377f469ee16449f63b5025b106de436ceb1741b6f436214c9924d8b6d07e
-MD5 87f8505fd21eebfd50d55549e4b63d35 files/javacc-3.2-javadoc.patch 420
-RMD160 975c2ccd7939010925463e99ad9b852bb66c1bfa files/javacc-3.2-javadoc.patch 420
-SHA256 3ca5377f469ee16449f63b5025b106de436ceb1741b6f436214c9924d8b6d07e files/javacc-3.2-javadoc.patch 420
 AUX javacc-4.0-javadoc.patch 420 RMD160 c6f5a4eae5171a56c2c4e97b2acd1173474c140d SHA1 0850545426fd8f5ee557abe6f7b2399c24f3bf50 SHA256 4bef6b418576e68921583a28e9ec7789ddea35c8b8b7b2a9a7e8803c2c67774d
 MD5 487f03138c541ddc21fde0a6b3234e07 files/javacc-4.0-javadoc.patch 420
 RMD160 c6f5a4eae5171a56c2c4e97b2acd1173474c140d files/javacc-4.0-javadoc.patch 420
 SHA256 4bef6b418576e68921583a28e9ec7789ddea35c8b8b7b2a9a7e8803c2c67774d files/javacc-4.0-javadoc.patch 420
-AUX javacc.sh-3.2 400 RMD160 3e28632be360307175a6b995842f14c279d4485e SHA1 a324e224a50ca171b8801d16e0053f730c9a08e3 SHA256 6119683e701f9a4bbaa822666ef182a568cc24b8b3bf28781997477c5ea8fd7a
-MD5 0254d70a0b74b6bdaf13ed190e83ce88 files/javacc.sh-3.2 400
-RMD160 3e28632be360307175a6b995842f14c279d4485e files/javacc.sh-3.2 400
-SHA256 6119683e701f9a4bbaa822666ef182a568cc24b8b3bf28781997477c5ea8fd7a files/javacc.sh-3.2 400
-AUX jjdoc-3.2 380 RMD160 7ca36b3778127ffa36f67e21a1bec6dc5b00532f SHA1 89991005404de5730de3a06f28100cfa8d7cd2d9 SHA256 9048d9b76d99fb88f2f601e875adf03eb74107ce0c3cbda6a95538445d9593f5
-MD5 27f05e9ef0c9b90262c6f9f43dae9633 files/jjdoc-3.2 380
-RMD160 7ca36b3778127ffa36f67e21a1bec6dc5b00532f files/jjdoc-3.2 380
-SHA256 9048d9b76d99fb88f2f601e875adf03eb74107ce0c3cbda6a95538445d9593f5 files/jjdoc-3.2 380
-AUX jjtree-3.2 388 RMD160 4ce976d84e6da3bc7432995793e4e6860059c407 SHA1 3379f898c24025bd957d3acf31327217d18e38a6 SHA256 247510c97a3c6b532fc161b17519b70cb7afead4af2a9976896eaee2f7bbe700
-MD5 169889bcf3545fed8164d19166f6216d files/jjtree-3.2 388
-RMD160 4ce976d84e6da3bc7432995793e4e6860059c407 files/jjtree-3.2 388
-SHA256 247510c97a3c6b532fc161b17519b70cb7afead4af2a9976896eaee2f7bbe700 files/jjtree-3.2 388
-DIST javacc-3.2src.tar.gz 620640 RMD160 3c9944db1ec889a1197b4b4d8ccdf2c8dd8eba7f SHA1 1fecdf90a5f71482ab853965f4406dd8ec9216df SHA256 1a91a5051033b5e4fbae634a3f41dc74f091e42895bd240b9d6091aef6bb0eec
 DIST javacc-4.0src.tar.gz 765150 RMD160 c33b1b9a518c229a87265bb4b200444a5b921380 SHA1 8aeb145aba941afc01e9c1d2c815161d5eef89f2 SHA256 062a35b89cf1bb4260627c32f480d26e17bf4595024e4b4e472a46fe1b24655f
-EBUILD javacc-3.2-r3.ebuild 1730 RMD160 66de16c79ab63d4c5ad3b7bdbc612c8ceff2249c SHA1 5a5c6265283598fa88a58a38e0f4c22215f07f37 SHA256 9a8f23f4b4dd32164654fa460be15fee6beb25da25775593a39504daa8dcbb31
-MD5 e85e897bfb7edc55faad3d9a8824276a javacc-3.2-r3.ebuild 1730
-RMD160 66de16c79ab63d4c5ad3b7bdbc612c8ceff2249c javacc-3.2-r3.ebuild 1730
-SHA256 9a8f23f4b4dd32164654fa460be15fee6beb25da25775593a39504daa8dcbb31 javacc-3.2-r3.ebuild 1730
-EBUILD javacc-4.0-r4.ebuild 1567 RMD160 f0a1a466e35830e02688bb6720e677cb69537a70 SHA1 74a82589a67ca822a007edd94c572ad7c8df21d4 SHA256 ac0614b3d24531a4a84687550b862f191ce2c59d4b9099a75c97348e76b0a82e
-MD5 2cf81418a6088d5376d896fe3bcf029d javacc-4.0-r4.ebuild 1567
-RMD160 f0a1a466e35830e02688bb6720e677cb69537a70 javacc-4.0-r4.ebuild 1567
-SHA256 ac0614b3d24531a4a84687550b862f191ce2c59d4b9099a75c97348e76b0a82e javacc-4.0-r4.ebuild 1567
-MISC ChangeLog 4188 RMD160 6765384ab31d1a69215da045512373637779eb51 SHA1 eaaa33c1ce486c361f9e4551133cd912add515f4 SHA256 a03e81e47d337f1300efa6c84ffe4a3a8f3d3616db69f3d121421b992e53b21d
-MD5 f79dbb7260d242a65d7283854d58d360 ChangeLog 4188
-RMD160 6765384ab31d1a69215da045512373637779eb51 ChangeLog 4188
-SHA256 a03e81e47d337f1300efa6c84ffe4a3a8f3d3616db69f3d121421b992e53b21d ChangeLog 4188
+EBUILD javacc-4.0-r4.ebuild 1579 RMD160 fabc1e72e374af727657d59061235448daeaf92d SHA1 e7ecaf5b456219f9c8eea2a497489cd71896bfe0 SHA256 eb2d2f807352d1145db32c8571c6b0d86d3d0eed6ff44d91253916e4bd4d339e
+MD5 76b5eaa332b4ea79de69f7f9a2a16ffb javacc-4.0-r4.ebuild 1579
+RMD160 fabc1e72e374af727657d59061235448daeaf92d javacc-4.0-r4.ebuild 1579
+SHA256 eb2d2f807352d1145db32c8571c6b0d86d3d0eed6ff44d91253916e4bd4d339e javacc-4.0-r4.ebuild 1579
+MISC ChangeLog 4445 RMD160 a35923fddff620e97368f3caefecc2fb9946446f SHA1 ed714c785680a7a767aea75cb43eadbfb712154c SHA256 14d0655572c9708babab0d5243d6a8495ad512bece5881a972ce55965e5fed74
+MD5 66f8fa92bde89803d9d944312a687fc8 ChangeLog 4445
+RMD160 a35923fddff620e97368f3caefecc2fb9946446f ChangeLog 4445
+SHA256 14d0655572c9708babab0d5243d6a8495ad512bece5881a972ce55965e5fed74 ChangeLog 4445
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
-MD5 0abda62031a5aad4fee8eceebd439835 files/digest-javacc-3.2-r3 241
-RMD160 188462a1221ddda389c91b1cc48375c8749b26a6 files/digest-javacc-3.2-r3 241
-SHA256 4fb54b65a6688e29305426895c7c670e657a61a5914121bea5f212f0bb037bdd files/digest-javacc-3.2-r3 241
 MD5 de40103bc7d9de9df153de753e2b255d files/digest-javacc-4.0-r4 241
 RMD160 1dd77fb36ae5e8dc91f6378939c30dd663534c0a files/digest-javacc-4.0-r4 241
 SHA256 a9c2aa7d9d097add623a634a6904fe7ac71956cf189d0f6548847fd72c1316de files/digest-javacc-4.0-r4 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGvLj0cxLzpIGCsLQRAsCBAKCaueY9G8Xu9HUsbFS816wfBdmb2QCfbD3M
-0eZ20z2o2MiIoZmmBud7Ybs=
-=A4gQ
------END PGP SIGNATURE-----
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
 }