From 869d94bea549e9e4894221ddbd46d0e7d0994815 Mon Sep 17 00:00:00 2001
From: James Le Cuirot <chewi@gentoo.org>
Date: Mon, 19 Oct 2015 20:24:02 +0100
Subject: dev-java/gjdoc: EAPI bump and allow the new split anltr-2

Straight to stable because I don't want stable revdeps to hold up the
removal of the older antlr-2. I'm going to last-rite gjdoc soon
anyway.

Package-Manager: portage-2.2.20.1
---
 dev-java/gjdoc/gjdoc-0.7.9-r2.ebuild | 72 -----------------------------------
 dev-java/gjdoc/gjdoc-0.7.9-r3.ebuild | 73 ++++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 72 deletions(-)
 delete mode 100644 dev-java/gjdoc/gjdoc-0.7.9-r2.ebuild
 create mode 100644 dev-java/gjdoc/gjdoc-0.7.9-r3.ebuild

diff --git a/dev-java/gjdoc/gjdoc-0.7.9-r2.ebuild b/dev-java/gjdoc/gjdoc-0.7.9-r2.ebuild
deleted file mode 100644
index 1c1c4fae460c..000000000000
--- a/dev-java/gjdoc/gjdoc-0.7.9-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-JAVA_PKG_IUSE="source"
-
-inherit eutils autotools java-pkg-2
-
-DESCRIPTION="A javadoc compatible Java source documentation generator"
-HOMEPAGE="https://www.gnu.org/software/cp-tools/"
-SRC_URI="mirror://gnu/classpath/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-
-# 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:0[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
-
-	java-pkg_dolauncher ${PN} --main gnu.classpath.tools.gjdoc.Main
-	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}
-}
diff --git a/dev-java/gjdoc/gjdoc-0.7.9-r3.ebuild b/dev-java/gjdoc/gjdoc-0.7.9-r3.ebuild
new file mode 100644
index 000000000000..66f4a2edf2e9
--- /dev/null
+++ b/dev-java/gjdoc/gjdoc-0.7.9-r3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="source"
+
+inherit eutils autotools java-pkg-2
+
+DESCRIPTION="A javadoc compatible Java source documentation generator"
+HOMEPAGE="https://www.gnu.org/software/cp-tools/"
+SRC_URI="mirror://gnu/classpath/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+
+# 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"
+
+CDEPEND=">=dev-java/antlr-2.7.1:0[java(+)]"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.4"
+
+DEPEND="${CDEPEND}
+	>=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)
+}
+
+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
+
+	java-pkg_dolauncher ${PN} --main gnu.classpath.tools.gjdoc.Main
+	dodoc AUTHORS ChangeLog NEWS README
+
+	cd "${S}"/docs
+	emake DESTDIR="${D}" install
+
+	use source && java-pkg_dosrc "${S}/src"/{com,gnu}
+}
-- 
cgit v1.2.3-65-gdbad