Version bump. Fixes bug #218805.

Package-Manager: portage-2.1.5_rc3

3 files changed, 83 insertions, 5 deletions

diff --git a/dev-java/gjdoc/ChangeLog b/dev-java/gjdoc/ChangeLog
index 762aee2089dc..02f6c0ca222c 100644
--- a/dev-java/gjdoc/ChangeLog
+++ b/dev-java/gjdoc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/gjdoc
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gjdoc/ChangeLog,v 1.31 2008/04/22 13:52:03 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gjdoc/ChangeLog,v 1.32 2008/04/22 13:57:59 betelgeuse Exp $
+
+*gjdoc-0.7.9 (22 Apr 2008)
+
+  22 Apr 2008; Petteri Räty <betelgeuse@gentoo.org> +gjdoc-0.7.9.ebuild:
+  Version bump. Fixes bug #218805.
 
   22 Apr 2008; Petteri Räty <betelgeuse@gentoo.org> -gjdoc-0.7.7-r1.ebuild:
   Remove old version.
diff --git a/dev-java/gjdoc/Manifest b/dev-java/gjdoc/Manifest
index 27916467ed5f..4f07ad372413 100644
--- a/dev-java/gjdoc/Manifest
+++ b/dev-java/gjdoc/Manifest
@@ -4,13 +4,15 @@ Hash: SHA1
 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 2010 RMD160 db8f082694e25789556a6eaf01198c2301df5f16 SHA1 51cf8a5bc6aa75877493a78916821fa9f5533aa9 SHA256 c54635544d1f1b035d9a5dd3a7da0ea1b99883b525561568010d6658d6c49bba
-MISC ChangeLog 3859 RMD160 86a0e3977f160904012a3b1af644439778fa4127 SHA1 6a146d7788e55251cbe435012520cf01af102914 SHA256 3ed05968518b2d4b7f0a6470bd0414919e23c02854a117611ed7dac4cb803c4f
+EBUILD gjdoc-0.7.9.ebuild 1962 RMD160 45558a69199b28c6cd9dd625cb3a30b76e1cc4b2 SHA1 63f7d05a11052a791d46610228849b26b27383c5 SHA256 cf07513eaf803240d47c678c2ddfe0e29e3c254a5e5e1e44c2e92c7cf7370a5a
+MISC ChangeLog 3997 RMD160 27db4a81fc4c61f1d4310cbc87eed5dd643f58de SHA1 8e224391711785a17d62984db547de9fb8354f5a SHA256 0150998450a0261f24784f746d299312a498dc960d7160cca1c675b6db7db5af
 MISC metadata.xml 535 RMD160 2b7405a531e1016213ff45e73146de8f65911368 SHA1 c87752dba3c878d25f9ebb48ccf5b7e940b7fa66 SHA256 c8a221fbe6044b6dc49c2bd6de27a17f30e15734342c66ae5df87d510981f788
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgN7WYACgkQcxLzpIGCsLRPPQCfQR/htgvdKEGcDv4y498t5VgW
-4MoAnAkI3QPqppnS5nv38Izj4AIqFT64
-=y5ko
+iEYEARECAAYFAkgN7ssACgkQcxLzpIGCsLSmXgCfY0kwNO++xc12iRYukJ6kLVgC
+rwYAnjvKOoub4caKzOG8ISiRqStkBeez
+=k7S/
 -----END PGP SIGNATURE-----
diff --git a/dev-java/gjdoc/gjdoc-0.7.9.ebuild b/dev-java/gjdoc/gjdoc-0.7.9.ebuild
new file mode 100644
index 000000000000..09466f0b990d
--- /dev/null
+++ b/dev-java/gjdoc/gjdoc-0.7.9.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2008 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.ebuild,v 1.1 2008/04/22 13:57:59 betelgeuse Exp $
+
+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 ~ia64 ~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"
+
+# Refused to emerge with sun-jdk-1.3* complaining about wanting a bigger stack size
+DEPEND=">=dev-java/antlr-2.7.1
+		>=virtual/jdk-1.4"
+
+RDEPEND=">=virtual/jre-1.4
+		>=dev-java/antlr-2.7.1"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-0.7.7-gcp.patch"
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile() {
+	# 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"
+
+	emake || die "emake failed"
+}
+
+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
+
+	cd "${S}"/docs
+	emake DESTDIR="${D}" install || die "Failed to install documentation"
+
+	use source && java-pkg_dosrc "${S}/src"/{com,gnu}
+}