add patch from Josh Nichols <nichoj@alum.rpi.edu> to build api docs

Package-Manager: portage-2.0.51.22-r1

4 files changed, 51 insertions, 13 deletions

diff --git a/dev-java/javacc/ChangeLog b/dev-java/javacc/ChangeLog
index 1db0a8572e0a..20643eb75ada 100644
--- a/dev-java/javacc/ChangeLog
+++ b/dev-java/javacc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/javacc
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v 1.14 2005/05/01 09:55:56 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v 1.15 2005/06/29 19:21:59 axxo Exp $
+
+  29 Jun 2005; Thomas Matthijs <axxo@gentoo.org>
+  +files/javacc-3.2-javadoc.patch, javacc-3.2-r3.ebuild:
+  add patch from Josh Nichols <nichoj@alum.rpi.edu> to build api docs #97014
 
   01 May 2005; Jan Brinkmann <luckyduck@gentoo.org> -javacc-3.2-r2.ebuild,
   javacc-3.2-r3.ebuild:
diff --git a/dev-java/javacc/Manifest b/dev-java/javacc/Manifest
index 2a3b6fcbc3b3..1a5d3f56e7ac 100644
--- a/dev-java/javacc/Manifest
+++ b/dev-java/javacc/Manifest
@@ -1,11 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 62ef5e5acb719e617155bac31b5946a9 javacc-3.2-r3.ebuild 1727
+MD5 15ee795e811557cf829d411c44fee3d3 ChangeLog 2330
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 d2e3e93b2f3723150bd784511be34fb8 javacc-3.2-r3.ebuild 1594
-MD5 414cafc5314bbe589ec7c515b3a57b9b ChangeLog 2151
-MD5 169889bcf3545fed8164d19166f6216d files/jjtree-3.2 388
-MD5 c1977d510ff18a454666499bed5aa797 files/digest-javacc-3.2-r3 62
+MD5 87f8505fd21eebfd50d55549e4b63d35 files/javacc-3.2-javadoc.patch 420
+MD5 34ffde7ed24a1315dbcba6b16557f644 files/jjdoc 127
 MD5 890206304fc74a131a30bb3f6140cfcb files/javacc-3.2 290
+MD5 6f5d6501b4f873ffbd9cbca5a847b897 files/javacc 128
 MD5 f4614a490a4f23987e131ce4f47a0ddf files/jjtree 128
-MD5 34ffde7ed24a1315dbcba6b16557f644 files/jjdoc 127
-MD5 0254d70a0b74b6bdaf13ed190e83ce88 files/javacc.sh-3.2 400
+MD5 169889bcf3545fed8164d19166f6216d files/jjtree-3.2 388
+MD5 c1977d510ff18a454666499bed5aa797 files/digest-javacc-3.2-r3 62
 MD5 27f05e9ef0c9b90262c6f9f43dae9633 files/jjdoc-3.2 380
-MD5 6f5d6501b4f873ffbd9cbca5a847b897 files/javacc 128
+MD5 0254d70a0b74b6bdaf13ed190e83ce88 files/javacc.sh-3.2 400
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCwvT4/rLF9B432nYRAjD+AJsF50VWjaI07/adRPyTeewfpd/HNQCgyPt0
+vJsuz6l/jbZ47KeFDzdrKbU=
+=Hzcq
+-----END PGP SIGNATURE-----
diff --git a/dev-java/javacc/files/javacc-3.2-javadoc.patch b/dev-java/javacc/files/javacc-3.2-javadoc.patch
new file mode 100644
index 000000000000..0bbdab9a5b06
--- /dev/null
+++ b/dev-java/javacc/files/javacc-3.2-javadoc.patch
@@ -0,0 +1,14 @@
+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/javacc-3.2-r3.ebuild b/dev-java/javacc/javacc-3.2-r3.ebuild
index 7c17d3453d44..95f0a51150da 100644
--- a/dev-java/javacc/javacc-3.2-r3.ebuild
+++ b/dev-java/javacc/javacc-3.2-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 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.7 2005/05/01 22:12:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/javacc-3.2-r3.ebuild,v 1.8 2005/06/29 19:21:59 axxo Exp $
 
-inherit java-pkg
+inherit java-pkg eutils
 
 DESCRIPTION="Java Compiler Compiler [tm] (JavaCC [tm]) - The Java Parser Generator"
 HOMEPAGE="https://javacc.dev.java.net/servlets/ProjectHome"
@@ -18,16 +18,24 @@ DEPEND=">=virtual/jdk-1.3
 	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}/${PN}-${PV} ${S}/ || die "Missing env file ${P}"
+	cp ${FILESDIR}/${P} ${S}/ || die "Missing env file ${P}"
 	sed -i \
 		-e "s:@PV@:${PV}:" \
 		-e "s:@PN@:${PN}:" \
-		${PN}-${PV} || die "Failed to sed"
+		${P} || die "Failed to sed"
 }
 
 src_install() {
@@ -36,6 +44,7 @@ src_install() {
 	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
@@ -49,7 +58,7 @@ src_install() {
 
 	dodir /etc/env.d/java
 	insinto /etc/env.d/java
-	newins ${PN}-${PV} 22javacc || die "Missing ${PF}"
+	newins ${P} 22javacc || die "Missing ${PF}"
 }
 
 pkg_postinst() {