From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1055219-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id C8962138335
for <garchives@archives.gentoo.org>; Fri, 2 Nov 2018 01:17:23 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C3A83E07E2;
Fri, 2 Nov 2018 01:17:22 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 81FBEE07E2
for <gentoo-commits@lists.gentoo.org>; Fri, 2 Nov 2018 01:17:22 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id B253C335CA6
for <gentoo-commits@lists.gentoo.org>; Fri, 2 Nov 2018 01:17:19 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 814BA44F
for <gentoo-commits@lists.gentoo.org>; Fri, 2 Nov 2018 01:17:17 +0000 (UTC)
From: "Andrew John Hughes" <gnu_andrew@member.fsf.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andrew John Hughes" <gnu_andrew@member.fsf.org>
Message-ID: <1541121402.22b1d35cc4be3dc33bbb6592c5989a15e5d8c4b2.gnu_andrew@gentoo>
Subject: [gentoo-commits] proj/java:master commit in: dev-java/gnu-classpath/
X-VCS-Repository: proj/java
X-VCS-Files: dev-java/gnu-classpath/ChangeLog dev-java/gnu-classpath/gnu-classpath-0.99-r1.ebuild dev-java/gnu-classpath/gnu-classpath-0.99-r2.ebuild dev-java/gnu-classpath/gnu-classpath-9999.ebuild
X-VCS-Directories: dev-java/gnu-classpath/
X-VCS-Committer: gnu_andrew
X-VCS-Committer-Name: Andrew John Hughes
X-VCS-Revision: 22b1d35cc4be3dc33bbb6592c5989a15e5d8c4b2
X-VCS-Branch: master
Date: Fri, 2 Nov 2018 01:17:17 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 0c4a9720-e62e-413f-8eba-88d961976113
X-Archives-Hash: 77e3c5902b8a8530b1c918d5d8a8aa33
commit: 22b1d35cc4be3dc33bbb6592c5989a15e5d8c4b2
Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Fri Nov 2 01:16:42 2018 +0000
Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Fri Nov 2 01:16:42 2018 +0000
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=22b1d35c
dev-java/gnu-classpath: Merge gjdoc changes from main tree.
Package-Manager: Portage-2.3.50, Repoman-2.3.10
dev-java/gnu-classpath/ChangeLog | 7 ++++++
...0.99-r1.ebuild => gnu-classpath-0.99-r2.ebuild} | 29 ++++++++++++++++++++--
dev-java/gnu-classpath/gnu-classpath-9999.ebuild | 29 ++++++++++++++++++++--
3 files changed, 61 insertions(+), 4 deletions(-)
diff --git a/dev-java/gnu-classpath/ChangeLog b/dev-java/gnu-classpath/ChangeLog
index a8e7a4b1..deb35d54 100644
--- a/dev-java/gnu-classpath/ChangeLog
+++ b/dev-java/gnu-classpath/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2018 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.109 2010/04/29 19:50:01 caster Exp $
+*gnu-classpath-0.99-r2 (02 Nov 2018)
+
+ 02 Nov 2018; Andrew John Hughes <gnu_andrew@member.fsf.org>
+ +gnu-classpath-0.99-r2.ebuild, -gnu-classpath-0.99-r1.ebuild,
+ gnu-classpath-9999.ebuild:
+ dev-java/gnu-classpath: Merge gjdoc changes from main tree.
+
22 Oct 2018; Andrew John Hughes <gnu_andrew@member.fsf.org>
gnu-classpath-0.99-r1.ebuild, gnu-classpath-9999.ebuild:
dev-java/gnu-classpath: Remove references to dead packages
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.99-r1.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.99-r2.ebuild
similarity index 80%
rename from dev-java/gnu-classpath/gnu-classpath-0.99-r1.ebuild
rename to dev-java/gnu-classpath/gnu-classpath-0.99-r2.ebuild
index da6c27ac..c0043d66 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.99-r1.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.99-r2.ebuild
@@ -15,9 +15,9 @@ SLOT="0"
KEYWORDS="~amd64"
IUSE="alsa debug doc dssi examples gconf +gjdoc +gmp +gtk gstreamer qt4 xml"
+REQUIRED_USE="doc? ( gjdoc )"
RDEPEND="alsa? ( media-libs/alsa-lib )
- doc? ( >=dev-java/gnu-classpath-0.98:* )
dssi? ( >=media-libs/dssi-0.9 )
gconf? ( gnome-base/gconf:2= )
gjdoc? ( >=dev-java/antlr-2.7.7-r7:0 )
@@ -87,6 +87,13 @@ src_configure() {
myconf="--with-antlr-jar=${antlr}"
fi
+ if use doc; then
+ # Avoid a cyclic dependency on gjdoc by building gjdoc before
+ # the docs. First we need to trick configure. Hack alert!
+ echo -e "#!/bin/sh\necho gjdoc 0.8" > tools/gjdoc.build || die
+ chmod 755 tools/gjdoc.build || die
+ fi
+
ANTLR= econf \
$(use_enable alsa) \
$(use_enable debug ) \
@@ -98,7 +105,7 @@ src_configure() {
$(use_enable gstreamer gstreamer-peer) \
$(use_enable xml xmlj) \
$(use_enable dssi ) \
- $(use_with doc gjdoc) \
+ $(use_with doc gjdoc "${S}/tools/gjdoc.build") \
--enable-jni \
--disable-dependency-tracking \
--disable-plugin \
@@ -108,9 +115,27 @@ src_configure() {
${myconf}
}
+src_compile() {
+ if use doc; then
+ # Build gjdoc before the docs. We need to hack the real gjdoc
+ # script to run from the build directory instead.
+ sed -r "s:^(tools_dir=).*:\1${S}/tools:" tools/gjdoc > tools/gjdoc.build || die
+ emake -C lib
+ emake -C tools
+ fi
+
+ default
+}
+
src_install() {
emake DESTDIR="${D}" install
dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO
java-pkg_regjar /usr/share/classpath/glibj.zip
java-pkg_regjar /usr/share/classpath/tools.zip
+
+ if use doc; then
+ # Strangely the Makefile doesn't install these.
+ insinto "/usr/${PN}-${SLOT}/share/classpath/api"
+ doins -r doc/api/html/*
+ fi
}
diff --git a/dev-java/gnu-classpath/gnu-classpath-9999.ebuild b/dev-java/gnu-classpath/gnu-classpath-9999.ebuild
index 9d5c601f..4a2a905a 100644
--- a/dev-java/gnu-classpath/gnu-classpath-9999.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-9999.ebuild
@@ -15,9 +15,9 @@ SLOT="0"
KEYWORDS=""
IUSE="alsa debug doc dssi examples gconf +gjdoc +gmp +gtk gstreamer qt4 xml"
+REQUIRED_USE="doc? ( gjdoc )"
RDEPEND="alsa? ( media-libs/alsa-lib )
- doc? ( >=dev-java/gnu-classpath-0.98:* )
dssi? ( >=media-libs/dssi-0.9 )
gconf? ( gnome-base/gconf:2= )
gjdoc? ( >=dev-java/antlr-2.7.7-r7:0 )
@@ -85,6 +85,13 @@ src_configure() {
myconf="--with-antlr-jar=${antlr}"
fi
+ if use doc; then
+ # Avoid a cyclic dependency on gjdoc by building gjdoc before
+ # the docs. First we need to trick configure. Hack alert!
+ echo -e "#!/bin/sh\necho gjdoc 0.8" > tools/gjdoc.build || die
+ chmod 755 tools/gjdoc.build || die
+ fi
+
ANTLR= econf \
$(use_enable alsa) \
$(use_enable debug ) \
@@ -96,7 +103,7 @@ src_configure() {
$(use_enable gstreamer gstreamer-peer) \
$(use_enable xml xmlj) \
$(use_enable dssi ) \
- $(use_with doc gjdoc) \
+ $(use_with doc gjdoc "${S}/tools/gjdoc.build") \
--enable-jni \
--disable-dependency-tracking \
--disable-plugin \
@@ -106,9 +113,27 @@ src_configure() {
${myconf}
}
+src_compile() {
+ if use doc; then
+ # Build gjdoc before the docs. We need to hack the real gjdoc
+ # script to run from the build directory instead.
+ sed -r "s:^(tools_dir=).*:\1${S}/tools:" tools/gjdoc > tools/gjdoc.build || die
+ emake -C lib
+ emake -C tools
+ fi
+
+ default
+}
+
src_install() {
emake DESTDIR="${D}" install
dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO
java-pkg_regjar /usr/share/classpath/glibj.zip
java-pkg_regjar /usr/share/classpath/tools.zip
+
+ if use doc; then
+ # Strangely the Makefile doesn't install these.
+ insinto "/usr/${PN}-${SLOT}/share/classpath/api"
+ doins -r doc/api/html/*
+ fi
}