Revision bump to support new Java system, and fixes bug #131137

Package-Manager: portage-2.1.1_pre1

6 files changed, 121 insertions, 14 deletions

diff --git a/dev-java/javacc/ChangeLog b/dev-java/javacc/ChangeLog
index bdd2a3b7fbe6..bf2fc74e69b1 100644
--- a/dev-java/javacc/ChangeLog
+++ b/dev-java/javacc/ChangeLog
@@ -1,6 +1,11 @@
 # 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.16 2006/01/22 05:08:34 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v 1.17 2006/07/03 14:29:20 nichoj Exp $
+
+*javacc-4.0-r1 (03 Jul 2006)
+
+  03 Jul 2006; Joshua Nichols <nichoj@gentoo.org> +javacc-4.0-r1.ebuild:
+  Revision bump to support new Java system, and fixes bug #131137
 
 *javacc-4.0 (22 Jan 2006)
 
diff --git a/dev-java/javacc/Manifest b/dev-java/javacc/Manifest
index abf914faefe2..9bdecf524ed1 100644
--- a/dev-java/javacc/Manifest
+++ b/dev-java/javacc/Manifest
@@ -1,26 +1,71 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 17b29e34c53e7f0fcda8b5607fdae8b5 ChangeLog 2597
-MD5 c1977d510ff18a454666499bed5aa797 files/digest-javacc-3.2-r3 62
-MD5 b4cf54b450f74c1d4979294a8c4956a7 files/digest-javacc-4.0 65
+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 288 RMD160 365aa2ae86c2fadc9db8ea60e124e8a808a2697f SHA1 0b50ed004318b813c6cfbd918ec098348e922b06 SHA256 8af1958c0e52f822f7e878760c98b6b79befa5b1fcf303b3bbad4bba3b6dc55b
 MD5 18194aa2d07acb0e68864770e95646ba files/javacc-4.0 288
+RMD160 365aa2ae86c2fadc9db8ea60e124e8a808a2697f files/javacc-4.0 288
+SHA256 8af1958c0e52f822f7e878760c98b6b79befa5b1fcf303b3bbad4bba3b6dc55b files/javacc-4.0 288
+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
+SHA256 6ad6f5191ecc851bc6f07707bc434abca5bfc3ae31e769b7163fc02bbd1a71c0 files/javacc-4.0-javadoc.patch 417
+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 javacc.sh-4.0 400 RMD160 3e28632be360307175a6b995842f14c279d4485e SHA1 a324e224a50ca171b8801d16e0053f730c9a08e3 SHA256 6119683e701f9a4bbaa822666ef182a568cc24b8b3bf28781997477c5ea8fd7a
 MD5 0254d70a0b74b6bdaf13ed190e83ce88 files/javacc.sh-4.0 400
+RMD160 3e28632be360307175a6b995842f14c279d4485e files/javacc.sh-4.0 400
+SHA256 6119683e701f9a4bbaa822666ef182a568cc24b8b3bf28781997477c5ea8fd7a files/javacc.sh-4.0 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 jjdoc-4.0 380 RMD160 7ca36b3778127ffa36f67e21a1bec6dc5b00532f SHA1 89991005404de5730de3a06f28100cfa8d7cd2d9 SHA256 9048d9b76d99fb88f2f601e875adf03eb74107ce0c3cbda6a95538445d9593f5
 MD5 27f05e9ef0c9b90262c6f9f43dae9633 files/jjdoc-4.0 380
+RMD160 7ca36b3778127ffa36f67e21a1bec6dc5b00532f files/jjdoc-4.0 380
+SHA256 9048d9b76d99fb88f2f601e875adf03eb74107ce0c3cbda6a95538445d9593f5 files/jjdoc-4.0 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
+AUX jjtree-4.0 388 RMD160 4ce976d84e6da3bc7432995793e4e6860059c407 SHA1 3379f898c24025bd957d3acf31327217d18e38a6 SHA256 247510c97a3c6b532fc161b17519b70cb7afead4af2a9976896eaee2f7bbe700
 MD5 169889bcf3545fed8164d19166f6216d files/jjtree-4.0 388
+RMD160 4ce976d84e6da3bc7432995793e4e6860059c407 files/jjtree-4.0 388
+SHA256 247510c97a3c6b532fc161b17519b70cb7afead4af2a9976896eaee2f7bbe700 files/jjtree-4.0 388
+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-r1.ebuild 1224 RMD160 531ae94224c01c078562dfc46d07f2035002fb70 SHA1 b1e00b43638b5ebb7843619ad9517e7c9a573a5d SHA256 a80d3900977f1ba0c8d3eed0247c864754dd6b45a6caed108fba58a02aa35f51
+MD5 2489c06f708aef1b527eb183cbad65eb javacc-4.0-r1.ebuild 1224
+RMD160 531ae94224c01c078562dfc46d07f2035002fb70 javacc-4.0-r1.ebuild 1224
+SHA256 a80d3900977f1ba0c8d3eed0247c864754dd6b45a6caed108fba58a02aa35f51 javacc-4.0-r1.ebuild 1224
+EBUILD javacc-4.0.ebuild 1703 RMD160 aabae220561206d0734c9527dac6a76e246d21af SHA1 3c03b11f3fa5e5a7ef7c55d6a711603e2eca53b4 SHA256 8c1759842294cd4f3e8ad8eae2065bcc1714aca567ab3e146ebbbfd0a416ff57
 MD5 5ec3a0ccdbcfc94921cc60db8994d2e6 javacc-4.0.ebuild 1703
+RMD160 aabae220561206d0734c9527dac6a76e246d21af javacc-4.0.ebuild 1703
+SHA256 8c1759842294cd4f3e8ad8eae2065bcc1714aca567ab3e146ebbbfd0a416ff57 javacc-4.0.ebuild 1703
+MISC ChangeLog 2767 RMD160 4684e01f9f6bf05e8367952682e9c971d82672f2 SHA1 bac772597ccd8339241c1371dfe8b1eee2323e8b SHA256 55e368e57c3d3feb112a94bcd1698b5ffae86292b96150f3c6ccea4597ef9cf5
+MD5 fae15f52b9127b42938de1afc6613520 ChangeLog 2767
+RMD160 4684e01f9f6bf05e8367952682e9c971d82672f2 ChangeLog 2767
+SHA256 55e368e57c3d3feb112a94bcd1698b5ffae86292b96150f3c6ccea4597ef9cf5 ChangeLog 2767
+MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD0xF3ndWRXhKOboURAjooAKCjOM5H+3NM47WfGb28qzLj2Qo+ZACeOTz/
-MALfb1BVYDDDZzXl3Y7hA+8=
-=M8jr
------END PGP SIGNATURE-----
+RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
+SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
+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 241
+RMD160 1dd77fb36ae5e8dc91f6378939c30dd663534c0a files/digest-javacc-4.0 241
+SHA256 a9c2aa7d9d097add623a634a6904fe7ac71956cf189d0f6548847fd72c1316de files/digest-javacc-4.0 241
+MD5 de40103bc7d9de9df153de753e2b255d files/digest-javacc-4.0-r1 241
+RMD160 1dd77fb36ae5e8dc91f6378939c30dd663534c0a files/digest-javacc-4.0-r1 241
+SHA256 a9c2aa7d9d097add623a634a6904fe7ac71956cf189d0f6548847fd72c1316de files/digest-javacc-4.0-r1 241
diff --git a/dev-java/javacc/files/digest-javacc-3.2-r3 b/dev-java/javacc/files/digest-javacc-3.2-r3
index 5a33b72706cc..58f0caf19336 100644
--- a/dev-java/javacc/files/digest-javacc-3.2-r3
+++ b/dev-java/javacc/files/digest-javacc-3.2-r3
@@ -1 +1,3 @@
 MD5 bc0fe5d325e24f2e7c95e5c962813354 javacc-3.2.tar.gz 620640
+RMD160 3c9944db1ec889a1197b4b4d8ccdf2c8dd8eba7f javacc-3.2.tar.gz 620640
+SHA256 1a91a5051033b5e4fbae634a3f41dc74f091e42895bd240b9d6091aef6bb0eec javacc-3.2.tar.gz 620640
diff --git a/dev-java/javacc/files/digest-javacc-4.0 b/dev-java/javacc/files/digest-javacc-4.0
index a696fa472550..c1d25a43bdda 100644
--- a/dev-java/javacc/files/digest-javacc-4.0
+++ b/dev-java/javacc/files/digest-javacc-4.0
@@ -1 +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/digest-javacc-4.0-r1 b/dev-java/javacc/files/digest-javacc-4.0-r1
new file mode 100644
index 000000000000..c1d25a43bdda
--- /dev/null
+++ b/dev-java/javacc/files/digest-javacc-4.0-r1
@@ -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/javacc-4.0-r1.ebuild b/dev-java/javacc/javacc-4.0-r1.ebuild
new file mode 100644
index 000000000000..abfc4482525f
--- /dev/null
+++ b/dev-java/javacc/javacc-4.0-r1.ebuild
@@ -0,0 +1,50 @@
+# 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-r1.ebuild,v 1.1 2006/07/03 14:29:20 nichoj 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() {
+	eant jar $(use_doc)
+}
+
+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
+
+	java-pkg_dolauncher javacc --main javacc
+	java-pkg_dolauncher jjdoc --main jjdoc
+	java-pkg_dolauncher jjree --main jjtree
+}