Add src_test and fix javadoc generation.

Package-Manager: portage-2.1.2.1-r1

diff --git a/dev-java/javacc/ChangeLog b/dev-java/javacc/ChangeLog
index a949967a0d2d501317ee81800919d85362566baa..33fd12371a6f6cc7048dcfd9358cbac582288ff3 100644 (file)
--- a/dev-java/javacc/ChangeLog
+++ b/dev-java/javacc/ChangeLog
@@ -1,6 +1,12 @@
 # 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.19 2006/09/10 14:48:34 caster Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v 1.20 2007/03/08 15:18:58 betelgeuse Exp $
+
+*javacc-4.0-r4 (08 Mar 2007)
+
+  08 Mar 2007; Petteri Räty <betelgeuse@gentoo.org>
+  files/javacc-4.0-javadoc.patch, +javacc-4.0-r4.ebuild:
+  Add src_test and fix javadoc generation.
 
 *javacc-4.0-r3 (10 Sep 2006)
 

diff --git a/dev-java/javacc/Manifest b/dev-java/javacc/Manifest
index 533aa20e7298b5bda17a10503bc5088490556ba0..bda5dffd4f67233757c60f4658f53a38d4e0d78c 100644 (file)
--- a/dev-java/javacc/Manifest
+++ b/dev-java/javacc/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -6,10 +9,10 @@ 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-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-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
@@ -32,10 +35,14 @@ EBUILD javacc-4.0-r3.ebuild 1323 RMD160 8668ef122b640965204c2bd926d9a13b4690ce62
 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
+EBUILD javacc-4.0-r4.ebuild 1565 RMD160 f1fa700838faa892abb2cb0e8d0807a43c7e9f45 SHA1 a73144ea8efa5ae9e5820fb76ee0a828b6fad3f4 SHA256 0f35060f25f84bebc0aa8753b5af3783b34a52e1fc639cfea3234e1f5357f514
+MD5 185d7980d8ba7361f89a9bbda92bcefb javacc-4.0-r4.ebuild 1565
+RMD160 f1fa700838faa892abb2cb0e8d0807a43c7e9f45 javacc-4.0-r4.ebuild 1565
+SHA256 0f35060f25f84bebc0aa8753b5af3783b34a52e1fc639cfea3234e1f5357f514 javacc-4.0-r4.ebuild 1565
+MISC ChangeLog 3540 RMD160 572d289ece01fc84785788ff9686afd68195b791 SHA1 832b3bd645e6610423f6f54b9606bf1c75fabf20 SHA256 d75dc27d9b164375474fc611933ce59c2995ca0d06713fb1e3a6217eb298f876
+MD5 bedb8a7b2204fc0c0d2ee37b1e377e88 ChangeLog 3540
+RMD160 572d289ece01fc84785788ff9686afd68195b791 ChangeLog 3540
+SHA256 d75dc27d9b164375474fc611933ce59c2995ca0d06713fb1e3a6217eb298f876 ChangeLog 3540
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -46,3 +53,13 @@ SHA256 aa9a67ccbc12d3040a759ea35f5c8c3f79c899254085c54e22acb3d76bd2b16c files/di
 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
+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.2 (GNU/Linux)
+
+iD8DBQFF8ClmcxLzpIGCsLQRApppAJ4qu9rFswYSQHI5pkQH0OqetPeXtQCeJVuR
+rMKj0Js/XO9P3FYTFoqn+Uo=
+=JBgM
+-----END PGP SIGNATURE-----

diff --git a/dev-java/javacc/files/digest-javacc-4.0-r4 b/dev-java/javacc/files/digest-javacc-4.0-r4
new file mode 100644 (file)
index 0000000..c1d25a4
--- /dev/null
+++ b/dev-java/javacc/files/digest-javacc-4.0-r4
@@ -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/files/javacc-4.0-javadoc.patch b/dev-java/javacc/files/javacc-4.0-javadoc.patch
index f5467a4552e78518e9c1d9ce88f0b432db92d24f..41093de265666e0fedfb67646462703f945d8189 100644 (file)
--- a/dev-java/javacc/files/javacc-4.0-javadoc.patch
+++ b/dev-java/javacc/files/javacc-4.0-javadoc.patch
@@ -7,7 +7,7 @@ diff -ru javacc/build.xml javacc-patched/build.xml
    </target>
 +   <target name="javadoc" depends="compile">
 +      <javadoc destdir="doc/api" source="1.4">
-+              <fileset dir="src"/>
++              <packageset dir="src"/>
 +      </javadoc>
 +   </target>
  

diff --git a/dev-java/javacc/javacc-4.0-r4.ebuild b/dev-java/javacc/javacc-4.0-r4.ebuild
new file mode 100644 (file)
index 0000000..f773f4e
--- /dev/null
+++ b/dev-java/javacc/javacc-4.0-r4.ebuild
@@ -0,0 +1,69 @@
+# 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.1 2007/03/08 15:18:58 betelgeuse Exp $
+
+IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
+HOMEPAGE="https://javacc.dev.java.net/"
+SRC_URI="https://${PN}.dev.java.net/files/documents/17/26783/${P}src.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+DEPEND=">=virtual/jdk-1.4
+       dev-java/junit
+       test? ( dev-java/ant-junit )"
+RDEPEND=">=virtual/jre-1.4
+       dev-java/junit"
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       epatch ${FILESDIR}/${P}-javadoc.patch
+       rm -v lib/junit*/*.jar || die
+}
+
+_eant() {
+       # Most likely not needed at runtime but better safe than sorry
+       eant -Djunit.jar="$(java-pkg_getjar junit junit.jar)" "${@}"
+}
+
+src_compile() {
+       _eant jar $(use_doc)
+}
+
+src_test() {
+       ANT_TASKS="ant-junit" _eant test
+}
+
+src_install() {
+       java-pkg_dojar bin/lib/${PN}.jar
+
+       dodoc README || die
+
+       if use doc; then
+               java-pkg_dohtml -r www/*
+               java-pkg_dojavadoc 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/*
+
+       echo "JAVACC_HOME=/usr/share/javacc/" > ${T}/22javacc
+       doenvd ${T}/22javacc
+
+       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}
+       done
+}