Ebuild cleanup, use dolauncher to create executables to get rid of launchers in FILESDIR.

Package-Manager: portage-2.1.1

7 files changed, 11 insertions, 132 deletions

diff --git a/dev-java/javacc/Manifest b/dev-java/javacc/Manifest
index a6564f988e56..533aa20e7298 100644
--- a/dev-java/javacc/Manifest
+++ b/dev-java/javacc/Manifest
@@ -1,6 +1,3 @@
------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
@@ -9,10 +6,6 @@ AUX javacc-3.2-javadoc.patch 420 RMD160 975c2ccd7939010925463e99ad9b852bb66c1bfa
 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 31 RMD160 39b53c4846fbe45fb6cfddc9326a3d07c34df78f SHA1 3ca081d0eaffa83bcc997a27e3e1393e9fa0ec69 SHA256 4592bca52d0092d5069660576d4e27fee0e4a1bc2f1747b1c325b05c31818d0e
-MD5 26cc5551e6a59bf2c5daf087eba227c9 files/javacc-4.0 31
-RMD160 39b53c4846fbe45fb6cfddc9326a3d07c34df78f files/javacc-4.0 31
-SHA256 4592bca52d0092d5069660576d4e27fee0e4a1bc2f1747b1c325b05c31818d0e files/javacc-4.0 31
 AUX javacc-4.0-javadoc.patch 417 RMD160 7c0d1701da325311f7da4b57de29ce046f9a52e6 SHA1 3aa44549980c1f1278e0304415c210fb62c48e7a SHA256 6ad6f5191ecc851bc6f07707bc434abca5bfc3ae31e769b7163fc02bbd1a71c0
 MD5 072b4f9d084ce796693484a92fd12687 files/javacc-4.0-javadoc.patch 417
 RMD160 7c0d1701da325311f7da4b57de29ce046f9a52e6 files/javacc-4.0-javadoc.patch 417
@@ -21,40 +14,28 @@ AUX javacc.sh-3.2 400 RMD160 3e28632be360307175a6b995842f14c279d4485e SHA1 a324e
 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 javacc.sh-4.0 316 RMD160 f30d3b84058105fab1904b78cead11dda306d3d4 SHA1 8b3c50e1a1f6103f47acfebd8f3e73bb440e3a5b SHA256 91a26acd06183a69788b4889c468aa4afdd26c2ef59f5bb928da684d7713fb45
-MD5 0e6b22e02fb397569e7879cf2134c64e files/javacc.sh-4.0 316
-RMD160 f30d3b84058105fab1904b78cead11dda306d3d4 files/javacc.sh-4.0 316
-SHA256 91a26acd06183a69788b4889c468aa4afdd26c2ef59f5bb928da684d7713fb45 files/javacc.sh-4.0 316
 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 jjdoc-4.0 296 RMD160 fb59f211d9c8010329642e2b7390e68285ac0449 SHA1 3c17798600c7d997bdaa52cd4a6eba878da78d75 SHA256 e1fbf8f117622cefafcb61bc576ad6411063510516d4798391a0ae8068b4ef4d
-MD5 da1a7ac5f27089d8d821d7b68b3c6136 files/jjdoc-4.0 296
-RMD160 fb59f211d9c8010329642e2b7390e68285ac0449 files/jjdoc-4.0 296
-SHA256 e1fbf8f117622cefafcb61bc576ad6411063510516d4798391a0ae8068b4ef4d files/jjdoc-4.0 296
 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
-AUX jjtree-4.0 304 RMD160 9f9651da7c6615e17e5194693355ceb89fdbfeac SHA1 7571e2937d7effcc2aa1958ad352e421f117c2cb SHA256 fc1403332a6c4e9f75c5afc879d13e28455e78292f211e0ee15fa784d42d074a
-MD5 7dd28605528c12176ae9a37ad57fcf4b files/jjtree-4.0 304
-RMD160 9f9651da7c6615e17e5194693355ceb89fdbfeac files/jjtree-4.0 304
-SHA256 fc1403332a6c4e9f75c5afc879d13e28455e78292f211e0ee15fa784d42d074a files/jjtree-4.0 304
 DIST javacc-3.2.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 1722 RMD160 43ee1f1a53aa7266f22ba88a8bc2d954ec4464c4 SHA1 fa0aafb41976d6397922d0fbcf2732d20d3ae720 SHA256 4ea8bead39b44ef6eb61b306378954fec3d8ac3261b7816658c5589e299b0a48
 MD5 6c1ebcc79768612c5b81789b7d932074 javacc-3.2-r3.ebuild 1722
 RMD160 43ee1f1a53aa7266f22ba88a8bc2d954ec4464c4 javacc-3.2-r3.ebuild 1722
 SHA256 4ea8bead39b44ef6eb61b306378954fec3d8ac3261b7816658c5589e299b0a48 javacc-3.2-r3.ebuild 1722
-EBUILD javacc-4.0-r2.ebuild 1314 RMD160 62ae4e50d2d12d8898b47379ab29a56c12ecae36 SHA1 131ced4f51ba94eab4aee68281d6043fefe3f8e1 SHA256 7a72223ce4aedddcc7ca5be8455daf55bb32aa3f497ca507343e1cf748823d96
-MD5 791a52779eced9ede5b569f6caaf4237 javacc-4.0-r2.ebuild 1314
-RMD160 62ae4e50d2d12d8898b47379ab29a56c12ecae36 javacc-4.0-r2.ebuild 1314
-SHA256 7a72223ce4aedddcc7ca5be8455daf55bb32aa3f497ca507343e1cf748823d96 javacc-4.0-r2.ebuild 1314
-MISC ChangeLog 3050 RMD160 187b79a83fdcbd144ed3ec187639b4289423d3f9 SHA1 10a45a4f6116b408e53879782262b72f87cc4179 SHA256 eb044b84154287a6d83328a01cb155c3ba8a56a8de9afd96ff3a1b1fd36414b4
-MD5 f472334bd86f58cdeeaf6b225eb1683a ChangeLog 3050
-RMD160 187b79a83fdcbd144ed3ec187639b4289423d3f9 ChangeLog 3050
-SHA256 eb044b84154287a6d83328a01cb155c3ba8a56a8de9afd96ff3a1b1fd36414b4 ChangeLog 3050
+EBUILD javacc-4.0-r3.ebuild 1323 RMD160 8668ef122b640965204c2bd926d9a13b4690ce62 SHA1 ff9ec64e0ecf7b19dd6d565a1df08f839e9ee986 SHA256 d2cf2f71362e49227c834d4c75af3191f2d220784f1b10fb28c381a1e6380a09
+MD5 8c0e9048d767db55c8a5da6a56bbe8cb javacc-4.0-r3.ebuild 1323
+RMD160 8668ef122b640965204c2bd926d9a13b4690ce62 javacc-4.0-r3.ebuild 1323
+SHA256 d2cf2f71362e49227c834d4c75af3191f2d220784f1b10fb28c381a1e6380a09 javacc-4.0-r3.ebuild 1323
+MISC ChangeLog 3352 RMD160 1aac722d8223278913620112e0239c03c800e479 SHA1 202c5a0bb66c6a56d04d8c7c8d9d5907bafe9af0 SHA256 24cb5b1b7ca180c2f72456e08201e36e55f85f569024404b0fc2c5a72646044e
+MD5 d1d394a4bbdb1a4692be4bf7c22e913c ChangeLog 3352
+RMD160 1aac722d8223278913620112e0239c03c800e479 ChangeLog 3352
+SHA256 24cb5b1b7ca180c2f72456e08201e36e55f85f569024404b0fc2c5a72646044e ChangeLog 3352
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -62,13 +43,6 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata
 MD5 88b3752a9e33cf89efd7a950b122be0d files/digest-javacc-3.2-r3 232
 RMD160 d5038a955a16da64a7b26b49be3a17c70f13eec5 files/digest-javacc-3.2-r3 232
 SHA256 aa9a67ccbc12d3040a759ea35f5c8c3f79c899254085c54e22acb3d76bd2b16c files/digest-javacc-3.2-r3 232
-MD5 de40103bc7d9de9df153de753e2b255d files/digest-javacc-4.0-r2 241
-RMD160 1dd77fb36ae5e8dc91f6378939c30dd663534c0a files/digest-javacc-4.0-r2 241
-SHA256 a9c2aa7d9d097add623a634a6904fe7ac71956cf189d0f6548847fd72c1316de files/digest-javacc-4.0-r2 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFE0Q4/go/w9rxVVVERAu6WAKCo8D01DA+tf7GCzxZs8OsqJZzkUACglopc
-ozJ8FNavxPD0d2PM93BZ5gI=
-=awq9
------END PGP SIGNATURE-----
+MD5 de40103bc7d9de9df153de753e2b255d files/digest-javacc-4.0-r3 241
+RMD160 1dd77fb36ae5e8dc91f6378939c30dd663534c0a files/digest-javacc-4.0-r3 241
+SHA256 a9c2aa7d9d097add623a634a6904fe7ac71956cf189d0f6548847fd72c1316de files/digest-javacc-4.0-r3 241
diff --git a/dev-java/javacc/files/digest-javacc-4.0-r2 b/dev-java/javacc/files/digest-javacc-4.0-r2
deleted file mode 100644
index c1d25a43bdda..000000000000
--- a/dev-java/javacc/files/digest-javacc-4.0-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 0dfd090606d6..000000000000
--- a/dev-java/javacc/files/javacc-4.0
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 1ccccf5f95d2..000000000000
--- a/dev-java/javacc/files/javacc.sh-4.0
+++ /dev/null
@@ -1,13 +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
-
-export VERSION=4.0
-
-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
deleted file mode 100644
index f9eb01a253f4..000000000000
--- a/dev-java/javacc/files/jjdoc-4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /bin/sh
-#
-# Copyright (c) Gentoo Technologies, Inc.
-# Copyright (c) Karl Trygve Kalleberg <karltk@gentoo.org>
-#
-# Licensed under the GNU General License, v2
-
-export VERSION=4.0
-
-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
deleted file mode 100644
index 423039e37dea..000000000000
--- a/dev-java/javacc/files/jjtree-4.0
+++ /dev/null
@@ -1,13 +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
-
-export VERSION=4.0
-
-java=$(java-config --java)
-classpath=$(java-config --classpath=javacc)
-
-${java} -classpath ${classpath} jjtree "$@"
diff --git a/dev-java/javacc/javacc-4.0-r2.ebuild b/dev-java/javacc/javacc-4.0-r2.ebuild
deleted file mode 100644
index 7a1101fa6da0..000000000000
--- a/dev-java/javacc/javacc-4.0-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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
-}