1 |
commit: 22b1d35cc4be3dc33bbb6592c5989a15e5d8c4b2 |
2 |
Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> |
3 |
AuthorDate: Fri Nov 2 01:16:42 2018 +0000 |
4 |
Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> |
5 |
CommitDate: Fri Nov 2 01:16:42 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=22b1d35c |
7 |
|
8 |
dev-java/gnu-classpath: Merge gjdoc changes from main tree. |
9 |
|
10 |
Package-Manager: Portage-2.3.50, Repoman-2.3.10 |
11 |
|
12 |
dev-java/gnu-classpath/ChangeLog | 7 ++++++ |
13 |
...0.99-r1.ebuild => gnu-classpath-0.99-r2.ebuild} | 29 ++++++++++++++++++++-- |
14 |
dev-java/gnu-classpath/gnu-classpath-9999.ebuild | 29 ++++++++++++++++++++-- |
15 |
3 files changed, 61 insertions(+), 4 deletions(-) |
16 |
|
17 |
diff --git a/dev-java/gnu-classpath/ChangeLog b/dev-java/gnu-classpath/ChangeLog |
18 |
index a8e7a4b1..deb35d54 100644 |
19 |
--- a/dev-java/gnu-classpath/ChangeLog |
20 |
+++ b/dev-java/gnu-classpath/ChangeLog |
21 |
@@ -2,6 +2,13 @@ |
22 |
# Copyright 1999-2018 Gentoo Foundation; Distributed under the GPL v2 |
23 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.109 2010/04/29 19:50:01 caster Exp $ |
24 |
|
25 |
+*gnu-classpath-0.99-r2 (02 Nov 2018) |
26 |
+ |
27 |
+ 02 Nov 2018; Andrew John Hughes <gnu_andrew@××××××××××.org> |
28 |
+ +gnu-classpath-0.99-r2.ebuild, -gnu-classpath-0.99-r1.ebuild, |
29 |
+ gnu-classpath-9999.ebuild: |
30 |
+ dev-java/gnu-classpath: Merge gjdoc changes from main tree. |
31 |
+ |
32 |
22 Oct 2018; Andrew John Hughes <gnu_andrew@××××××××××.org> |
33 |
gnu-classpath-0.99-r1.ebuild, gnu-classpath-9999.ebuild: |
34 |
dev-java/gnu-classpath: Remove references to dead packages |
35 |
|
36 |
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.99-r1.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.99-r2.ebuild |
37 |
similarity index 80% |
38 |
rename from dev-java/gnu-classpath/gnu-classpath-0.99-r1.ebuild |
39 |
rename to dev-java/gnu-classpath/gnu-classpath-0.99-r2.ebuild |
40 |
index da6c27ac..c0043d66 100644 |
41 |
--- a/dev-java/gnu-classpath/gnu-classpath-0.99-r1.ebuild |
42 |
+++ b/dev-java/gnu-classpath/gnu-classpath-0.99-r2.ebuild |
43 |
@@ -15,9 +15,9 @@ SLOT="0" |
44 |
KEYWORDS="~amd64" |
45 |
|
46 |
IUSE="alsa debug doc dssi examples gconf +gjdoc +gmp +gtk gstreamer qt4 xml" |
47 |
+REQUIRED_USE="doc? ( gjdoc )" |
48 |
|
49 |
RDEPEND="alsa? ( media-libs/alsa-lib ) |
50 |
- doc? ( >=dev-java/gnu-classpath-0.98:* ) |
51 |
dssi? ( >=media-libs/dssi-0.9 ) |
52 |
gconf? ( gnome-base/gconf:2= ) |
53 |
gjdoc? ( >=dev-java/antlr-2.7.7-r7:0 ) |
54 |
@@ -87,6 +87,13 @@ src_configure() { |
55 |
myconf="--with-antlr-jar=${antlr}" |
56 |
fi |
57 |
|
58 |
+ if use doc; then |
59 |
+ # Avoid a cyclic dependency on gjdoc by building gjdoc before |
60 |
+ # the docs. First we need to trick configure. Hack alert! |
61 |
+ echo -e "#!/bin/sh\necho gjdoc 0.8" > tools/gjdoc.build || die |
62 |
+ chmod 755 tools/gjdoc.build || die |
63 |
+ fi |
64 |
+ |
65 |
ANTLR= econf \ |
66 |
$(use_enable alsa) \ |
67 |
$(use_enable debug ) \ |
68 |
@@ -98,7 +105,7 @@ src_configure() { |
69 |
$(use_enable gstreamer gstreamer-peer) \ |
70 |
$(use_enable xml xmlj) \ |
71 |
$(use_enable dssi ) \ |
72 |
- $(use_with doc gjdoc) \ |
73 |
+ $(use_with doc gjdoc "${S}/tools/gjdoc.build") \ |
74 |
--enable-jni \ |
75 |
--disable-dependency-tracking \ |
76 |
--disable-plugin \ |
77 |
@@ -108,9 +115,27 @@ src_configure() { |
78 |
${myconf} |
79 |
} |
80 |
|
81 |
+src_compile() { |
82 |
+ if use doc; then |
83 |
+ # Build gjdoc before the docs. We need to hack the real gjdoc |
84 |
+ # script to run from the build directory instead. |
85 |
+ sed -r "s:^(tools_dir=).*:\1${S}/tools:" tools/gjdoc > tools/gjdoc.build || die |
86 |
+ emake -C lib |
87 |
+ emake -C tools |
88 |
+ fi |
89 |
+ |
90 |
+ default |
91 |
+} |
92 |
+ |
93 |
src_install() { |
94 |
emake DESTDIR="${D}" install |
95 |
dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO |
96 |
java-pkg_regjar /usr/share/classpath/glibj.zip |
97 |
java-pkg_regjar /usr/share/classpath/tools.zip |
98 |
+ |
99 |
+ if use doc; then |
100 |
+ # Strangely the Makefile doesn't install these. |
101 |
+ insinto "/usr/${PN}-${SLOT}/share/classpath/api" |
102 |
+ doins -r doc/api/html/* |
103 |
+ fi |
104 |
} |
105 |
|
106 |
diff --git a/dev-java/gnu-classpath/gnu-classpath-9999.ebuild b/dev-java/gnu-classpath/gnu-classpath-9999.ebuild |
107 |
index 9d5c601f..4a2a905a 100644 |
108 |
--- a/dev-java/gnu-classpath/gnu-classpath-9999.ebuild |
109 |
+++ b/dev-java/gnu-classpath/gnu-classpath-9999.ebuild |
110 |
@@ -15,9 +15,9 @@ SLOT="0" |
111 |
KEYWORDS="" |
112 |
|
113 |
IUSE="alsa debug doc dssi examples gconf +gjdoc +gmp +gtk gstreamer qt4 xml" |
114 |
+REQUIRED_USE="doc? ( gjdoc )" |
115 |
|
116 |
RDEPEND="alsa? ( media-libs/alsa-lib ) |
117 |
- doc? ( >=dev-java/gnu-classpath-0.98:* ) |
118 |
dssi? ( >=media-libs/dssi-0.9 ) |
119 |
gconf? ( gnome-base/gconf:2= ) |
120 |
gjdoc? ( >=dev-java/antlr-2.7.7-r7:0 ) |
121 |
@@ -85,6 +85,13 @@ src_configure() { |
122 |
myconf="--with-antlr-jar=${antlr}" |
123 |
fi |
124 |
|
125 |
+ if use doc; then |
126 |
+ # Avoid a cyclic dependency on gjdoc by building gjdoc before |
127 |
+ # the docs. First we need to trick configure. Hack alert! |
128 |
+ echo -e "#!/bin/sh\necho gjdoc 0.8" > tools/gjdoc.build || die |
129 |
+ chmod 755 tools/gjdoc.build || die |
130 |
+ fi |
131 |
+ |
132 |
ANTLR= econf \ |
133 |
$(use_enable alsa) \ |
134 |
$(use_enable debug ) \ |
135 |
@@ -96,7 +103,7 @@ src_configure() { |
136 |
$(use_enable gstreamer gstreamer-peer) \ |
137 |
$(use_enable xml xmlj) \ |
138 |
$(use_enable dssi ) \ |
139 |
- $(use_with doc gjdoc) \ |
140 |
+ $(use_with doc gjdoc "${S}/tools/gjdoc.build") \ |
141 |
--enable-jni \ |
142 |
--disable-dependency-tracking \ |
143 |
--disable-plugin \ |
144 |
@@ -106,9 +113,27 @@ src_configure() { |
145 |
${myconf} |
146 |
} |
147 |
|
148 |
+src_compile() { |
149 |
+ if use doc; then |
150 |
+ # Build gjdoc before the docs. We need to hack the real gjdoc |
151 |
+ # script to run from the build directory instead. |
152 |
+ sed -r "s:^(tools_dir=).*:\1${S}/tools:" tools/gjdoc > tools/gjdoc.build || die |
153 |
+ emake -C lib |
154 |
+ emake -C tools |
155 |
+ fi |
156 |
+ |
157 |
+ default |
158 |
+} |
159 |
+ |
160 |
src_install() { |
161 |
emake DESTDIR="${D}" install |
162 |
dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO |
163 |
java-pkg_regjar /usr/share/classpath/glibj.zip |
164 |
java-pkg_regjar /usr/share/classpath/tools.zip |
165 |
+ |
166 |
+ if use doc; then |
167 |
+ # Strangely the Makefile doesn't install these. |
168 |
+ insinto "/usr/${PN}-${SLOT}/share/classpath/api" |
169 |
+ doins -r doc/api/html/* |
170 |
+ fi |
171 |
} |