Add patch for a method in Main.java that is needed by testng.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28-gentoo-r1 i686

4 files changed, 109 insertions, 2 deletions

diff --git a/dev-java/gjdoc/ChangeLog b/dev-java/gjdoc/ChangeLog
index 0dee1b27bf09..aab4a0b08c5d 100644
--- a/dev-java/gjdoc/ChangeLog
+++ b/dev-java/gjdoc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/gjdoc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gjdoc/ChangeLog,v 1.35 2009/01/04 17:38:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gjdoc/ChangeLog,v 1.36 2009/02/15 01:30:29 betelgeuse Exp $
+
+*gjdoc-0.7.9-r1 (15 Feb 2009)
+
+  15 Feb 2009; Petteri Räty <betelgeuse@gentoo.org>
+  +files/0.7.9-main-execute.patch, +gjdoc-0.7.9-r1.ebuild:
+  Add patch for a method in Main.java that is needed by testng.
 
   04 Jan 2009; Raúl Porcel <armin76@gentoo.org> gjdoc-0.7.8.ebuild,
   gjdoc-0.7.9.ebuild:
diff --git a/dev-java/gjdoc/Manifest b/dev-java/gjdoc/Manifest
index ffbc9f98d4fc..b38d98be9bc6 100644
--- a/dev-java/gjdoc/Manifest
+++ b/dev-java/gjdoc/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 0.7.9-main-execute.patch 559 RMD160 de4c47497dc6e152d4401d6b4f2a6e0d61903640 SHA1 26b86453692624493b65a5bfca5f98039e7fc3e0 SHA256 bd7c71de9393a7fb1e9bd9ed729633647c19886d7d6e855e1272f5d8ead2c603
 AUX gjdoc 137 RMD160 fea337e7175295d679564390bb6a2006cf54966d SHA1 a2358dbdcbe9ae1f8e2e48c98e282f8883e7eb1e SHA256 f0d9f62aa69c3e5ad7a19806816b8e744388bf3f063e55f19e2f9bfbd32438f0
 AUX gjdoc-0.7.7-gcp.patch 1890 RMD160 f1b2a3619f87e157c0cfb0888cf00869cb41ae6d SHA1 f8b2565a2d5b8b46f4be02e3b4c12607a9d47bd6 SHA256 40ef075e32b931ab01b0594238a96b2650beccb303f23f5e4bbb66eb10219774
 DIST gjdoc-0.7.8.tar.gz 752319 RMD160 075203cf9090032c23e1a9056ce2ff28b3277639 SHA1 37b44dc0f431681b732db5f586a3a5b52899335a SHA256 17da1dc5b53287eace01045f748bfb2e5790929dc0514c498c62bd67689e9998
 DIST gjdoc-0.7.9.tar.gz 752491 RMD160 af597afd5c08b9a3c635087e82b9ff8a7b6eadb8 SHA1 83bed724431ed66148f7995f5fad633c7be641f7 SHA256 3d07eb7ea85c71614ae1ff8a64f70f9b9df0210194313ac159b71fef63389043
 EBUILD gjdoc-0.7.8.ebuild 2005 RMD160 208b9f1e19449b769104ffd8188a732305d216ab SHA1 3f7974fa90310ad0934b08db9f467b3edbc959c1 SHA256 a040ac1144099ebd6cef91afd07508b6edbc648117e474691832e020c4d67a67
+EBUILD gjdoc-0.7.9-r1.ebuild 2018 RMD160 118e18aa4f66d6ac735f675b9f0f6e08a24d44f5 SHA1 42c9fd451355ec3b442108a02cbe3632d714ef0c SHA256 dad765112f8e5f62d07a619a4e976a320f567f24ec40438d7442b0ac43324208
 EBUILD gjdoc-0.7.9.ebuild 1989 RMD160 e020e5666a4dccd31d377d25f7cf3f1a68f24a39 SHA1 448f7ee8d97355fc5c9495a674f198c4ebdebd72 SHA256 06b66512d612f27389b28f3f769d43d0a8afda0186eb1778f87c395ef34219ce
-MISC ChangeLog 4371 RMD160 a23a7e68e330d3b89b6b48abadd2ae658fbf7776 SHA1 927392bbb6c09be3e08b3cb210b0eb5281b3b366 SHA256 9ee37ae048966f6de8673c051bec59c51dd3ee611e9272e63c2d9bd35f2d6f2a
+MISC ChangeLog 4582 RMD160 7a9e8062c56a432692913b90cc873bdced34617f SHA1 fbf441ed99c470c2189eadc9abca4bd054686851 SHA256 59aae6c8d48f810f8a8e30e6cae9ee2accf67bdaa4a185b7657c3ae0d64652e5
 MISC metadata.xml 695 RMD160 4dd11b250b5ffc7575910d6a5aa1168434d9b5cf SHA1 1f585e7d22577f672efcbf80aa7e157801b14bde SHA256 e356a90f7928e2025d5a61f825f19df1bb548933a7091e113b29eeed7c1983ac
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmXcN0ACgkQcxLzpIGCsLSDmQCeNNpF75V7G2sBrhVNgPRTuXh7
+aZAAn1mnBh7FAWwyFNHXaKAylIweTraA
+=YPrD
+-----END PGP SIGNATURE-----
diff --git a/dev-java/gjdoc/files/0.7.9-main-execute.patch b/dev-java/gjdoc/files/0.7.9-main-execute.patch
new file mode 100644
index 000000000000..79a8e5f34730
--- /dev/null
+++ b/dev-java/gjdoc/files/0.7.9-main-execute.patch
@@ -0,0 +1,17 @@
+Index: src/com/sun/tools/javadoc/Main.java
+===================================================================
+RCS file: /sources/classpath/gjdoc/src/com/sun/tools/javadoc/Main.java,v
+retrieving revision 1.3
+diff -u -r1.3 Main.java
+--- src/com/sun/tools/javadoc/Main.java	12 May 2007 10:40:10 -0000	1.3
++++ src/com/sun/tools/javadoc/Main.java	15 Feb 2009 00:32:57 -0000
+@@ -6,4 +6,9 @@
+ 	 {
+ 	 	gnu.classpath.tools.gjdoc.Main.main(args);
+ 	 }
++
++	 public static int execute(String[] args)
++	 {
++		 return gnu.classpath.tools.gjdoc.Main.execute(args);
++	 }
+ }
diff --git a/dev-java/gjdoc/gjdoc-0.7.9-r1.ebuild b/dev-java/gjdoc/gjdoc-0.7.9-r1.ebuild
new file mode 100644
index 000000000000..a67d6bc2e0c1
--- /dev/null
+++ b/dev-java/gjdoc/gjdoc-0.7.9-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gjdoc/gjdoc-0.7.9-r1.ebuild,v 1.1 2009/02/15 01:30:29 betelgeuse Exp $
+
+EAPI=2
+JAVA_PKG_IUSE="source"
+
+inherit eutils autotools java-pkg-2
+
+DESCRIPTION="A javadoc compatible Java source documentation generator."
+HOMEPAGE="http://www.gnu.org/software/cp-tools/"
+SRC_URI="mirror://gnu/classpath/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+# Possible USE flags.
+#
+# native: to --enable-native
+# doc:    to generate javadoc
+# debug:  There is a debug doclet installed by default but maybe could
+#         have a wrapper that uses it.
+#
+IUSE="xmldoclet"
+
+RDEPEND=">=virtual/jre-1.4
+		>=dev-java/antlr-2.7.1[java]"
+
+# Refused to emerge with sun-jdk-1.3* complaining about wanting a bigger stack size
+DEPEND="${RDEPEND}
+		>=virtual/jdk-1.4"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.7.7-gcp.patch"
+	epatch "${FILESDIR}/0.7.9-main-execute.patch"
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+	# I think that configure will do --enable-native if it finds gcj
+	# so we'll disable it explicitly
+	local myc="--with-antlr-jar=$(java-pkg_getjar antlr antlr.jar) --disable-native"
+	myc="${myc} --disable-dependency-tracking"
+
+	# Does not work with gcc 3.* and without these it tries to use gij
+	# see bug #116804 for details
+
+	# TODO ideally, would respect JAVACFLAGS
+	JAVA="java" JAVAC="javac $(java-pkg_javac-args)" \
+		econf ${myc} \
+		$(use_enable xmldoclet) || die "econf failed"
+}
+
+src_compile() {
+	default # Don't use from java-pkg-2
+}
+
+src_install() {
+	local jars="com-sun-tools-doclets-Taglet gnu-classpath-tools-gjdoc com-sun-javadoc"
+	for jar in ${jars}; do
+		java-pkg_newjar ${jar}-${PV}.jar ${jar}.jar
+	done
+
+	dobin "${FILESDIR}"/gjdoc
+	dodoc AUTHORS ChangeLog NEWS README || die
+
+	cd "${S}"/docs
+	emake DESTDIR="${D}" install || die "Failed to install documentation"
+
+	use source && java-pkg_dosrc "${S}/src"/{com,gnu}
+}