Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Andrew John Hughes <gnu_andrew@××××××××××.org>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/java:master commit in: dev-java/gnu-classpath/
Date: Fri, 02 Nov 2018 01:17:23
Message-Id: 1540170498.d065627314afc5273382ecff4d14fa37e982073e.gnu_andrew@gentoo
1 commit: d065627314afc5273382ecff4d14fa37e982073e
2 Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
3 AuthorDate: Mon Oct 22 01:08:18 2018 +0000
4 Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
5 CommitDate: Mon Oct 22 01:08:18 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=d0656273
7
8 dev-java/gnu-classpath: Remove references to dead packages
9
10 Package-Manager: Portage-2.3.50, Repoman-2.3.10
11
12 dev-java/gnu-classpath/ChangeLog | 6 ++-
13 dev-java/gnu-classpath/Manifest | 2 +-
14 .../gnu-classpath/gnu-classpath-0.99-r1.ebuild | 44 ++++++++--------------
15 dev-java/gnu-classpath/gnu-classpath-9999.ebuild | 44 ++++++++--------------
16 4 files changed, 38 insertions(+), 58 deletions(-)
17
18 diff --git a/dev-java/gnu-classpath/ChangeLog b/dev-java/gnu-classpath/ChangeLog
19 index 74ab0e3a..a8e7a4b1 100644
20 --- a/dev-java/gnu-classpath/ChangeLog
21 +++ b/dev-java/gnu-classpath/ChangeLog
22 @@ -1,7 +1,11 @@
23 # ChangeLog for dev-java/gnu-classpath
24 -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
25 +# Copyright 1999-2018 Gentoo Foundation; Distributed under the GPL v2
26 # $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.109 2010/04/29 19:50:01 caster Exp $
27
28 + 22 Oct 2018; Andrew John Hughes <gnu_andrew@××××××××××.org>
29 + gnu-classpath-0.99-r1.ebuild, gnu-classpath-9999.ebuild:
30 + dev-java/gnu-classpath: Remove references to dead packages
31 +
32 24 Jun 2015; Andrew John Hughes <gnu_andrew@××××××××××.org>
33 gnu-classpath-0.99-r1.ebuild, gnu-classpath-9999.ebuild:
34 Install Classpath binaries to /usr/libexec subdirectory. Use any slot for GMP.
35
36 diff --git a/dev-java/gnu-classpath/Manifest b/dev-java/gnu-classpath/Manifest
37 index 9cd615e2..fb9c0395 100644
38 --- a/dev-java/gnu-classpath/Manifest
39 +++ b/dev-java/gnu-classpath/Manifest
40 @@ -1 +1 @@
41 -DIST classpath-0.99.tar.gz 11078232 SHA256 f929297f8ae9b613a1a167e231566861893260651d913ad9b6c11933895fecc8 SHA512 d8f38677ecc6a0f4b26197ab16e9888c51043364141675ad69684828e2d0ecb93122249672e2e7997aea817cc4aac68c17ccf59bf8913afe81e9536bee6b73ac WHIRLPOOL 259d0ac0649472ac58fe79ef2886407f2e455da39d43f425c1380f885ba755bd627a4138c051da8f70e3bb50a3c97abd0be3a01731869d2ff90c5b0fd5aca0af
42 +DIST classpath-0.99.tar.gz 11078232 BLAKE2B cb62cc58b9ce75df98809298a6c6a588704a98a133e8a0378c372e6cc0e6b07c8f05d7bd23c52f2697e6a3b4bfc1f0cdfc7aa108f2f681af154e6fd8c59d9460 SHA512 d8f38677ecc6a0f4b26197ab16e9888c51043364141675ad69684828e2d0ecb93122249672e2e7997aea817cc4aac68c17ccf59bf8913afe81e9536bee6b73ac
43
44 diff --git a/dev-java/gnu-classpath/gnu-classpath-0.99-r1.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.99-r1.ebuild
45 index 15137b8c..da6c27ac 100644
46 --- a/dev-java/gnu-classpath/gnu-classpath-0.99-r1.ebuild
47 +++ b/dev-java/gnu-classpath/gnu-classpath-0.99-r1.ebuild
48 @@ -1,15 +1,14 @@
49 -# Copyright 1999-2015 Gentoo Foundation
50 +# Copyright 1999-2018 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 -# $Id$
53
54 EAPI=5
55
56 -inherit eutils java-pkg-2 base multilib
57 +inherit eutils java-pkg-2 multilib
58
59 MY_P=${P/gnu-/}
60 -DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the Java language"
61 +DESCRIPTION="Free core class libraries for use with VMs and compilers for the Java language"
62 SRC_URI="mirror://gnu/classpath/${MY_P}.tar.gz"
63 -HOMEPAGE="http://www.gnu.org/software/classpath"
64 +HOMEPAGE="https://www.gnu.org/software/classpath"
65
66 LICENSE="GPL-2-with-linking-exception"
67 SLOT="0"
68 @@ -18,21 +17,21 @@ KEYWORDS="~amd64"
69 IUSE="alsa debug doc dssi examples gconf +gjdoc +gmp +gtk gstreamer qt4 xml"
70
71 RDEPEND="alsa? ( media-libs/alsa-lib )
72 - doc? ( || ( >=dev-java/gjdoc-0.7.9-r2 >=dev-java/gnu-classpath-0.98:* ) )
73 + doc? ( >=dev-java/gnu-classpath-0.98:* )
74 dssi? ( >=media-libs/dssi-0.9 )
75 - gconf? ( gnome-base/gconf )
76 - gjdoc? ( >=dev-java/antlr-2.7.1:0 )
77 - gmp? ( >=dev-libs/gmp-4.2.4:* )
78 + gconf? ( gnome-base/gconf:2= )
79 + gjdoc? ( >=dev-java/antlr-2.7.7-r7:0 )
80 + gmp? ( >=dev-libs/gmp-4.2.4:0= )
81 gstreamer? (
82 >=media-libs/gstreamer-0.10.10:0.10
83 >=media-libs/gst-plugins-base-0.10.10:0.10
84 x11-libs/gtk+:2
85 )
86 gtk? (
87 - >=x11-libs/gtk+-2.8:2
88 - >=dev-libs/glib-2.0
89 - media-libs/freetype
90 - >=x11-libs/cairo-1.1.9
91 + >=x11-libs/gtk+-2.8:2=
92 + dev-libs/glib:2=
93 + media-libs/freetype:2=
94 + >=x11-libs/cairo-1.1.9:=
95 x11-libs/libICE
96 x11-libs/libSM
97 x11-libs/libX11
98 @@ -41,19 +40,16 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
99 x11-libs/libXtst
100 x11-libs/pango
101 )
102 - qt4? ( dev-qt/qtgui:4 )
103 - xml? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )"
104 + xml? ( >=dev-libs/libxml2-2.6.8:2= >=dev-libs/libxslt-1.1.11 )"
105
106 # java-config >2.1.11 needed for ecj version globbing
107 -# We should make the build not pickup the wrong antlr binary from pccts
108 DEPEND="app-arch/zip
109 - || ( dev-java/eclipse-ecj dev-java/ecj-gcj )
110 + dev-java/eclipse-ecj
111 >=dev-java/java-config-2.1.11
112 - gjdoc? ( !!dev-util/pccts )
113 gtk? (
114 + x11-base/xorg-proto
115 x11-libs/libXrender
116 >=x11-libs/libXtst-1.1.0
117 - x11-proto/xproto
118 )
119 >=virtual/jdk-1.5
120 ${RDEPEND}"
121 @@ -74,7 +70,7 @@ src_prepare() {
122 }
123
124 src_configure() {
125 - local ecj_pkg=""
126 + local ecj_pkg="eclipse-ecj"
127
128 # We require ecj anyway, so force it to avoid problems with bad versions of javac
129 export JAVAC="${EPREFIX}/usr/bin/ecj"
130 @@ -91,13 +87,6 @@ src_configure() {
131 myconf="--with-antlr-jar=${antlr}"
132 fi
133
134 - # fallback on ecj-gcj if eclipse-ecj is not available
135 - if java-config --classpath=eclipse-ecj &> /dev/null ; then
136 - ecj_pkg="eclipse_ecj"
137 - else
138 - ecj_pkg="ecj-gcj"
139 - fi
140 -
141 ANTLR= econf \
142 $(use_enable alsa) \
143 $(use_enable debug ) \
144 @@ -107,7 +96,6 @@ src_configure() {
145 $(use_enable gmp) \
146 $(use_enable gtk gtk-peer) \
147 $(use_enable gstreamer gstreamer-peer) \
148 - $(use_enable qt4 qt-peer) \
149 $(use_enable xml xmlj) \
150 $(use_enable dssi ) \
151 $(use_with doc gjdoc) \
152
153 diff --git a/dev-java/gnu-classpath/gnu-classpath-9999.ebuild b/dev-java/gnu-classpath/gnu-classpath-9999.ebuild
154 index 15ded7cb..9d5c601f 100644
155 --- a/dev-java/gnu-classpath/gnu-classpath-9999.ebuild
156 +++ b/dev-java/gnu-classpath/gnu-classpath-9999.ebuild
157 @@ -1,15 +1,14 @@
158 -# Copyright 1999-2015 Gentoo Foundation
159 +# Copyright 1999-2018 Gentoo Foundation
160 # Distributed under the terms of the GNU General Public License v2
161 -# $Id$
162
163 EAPI=5
164
165 -inherit eutils git-2 java-pkg-2 base multilib
166 +inherit eutils git-2 java-pkg-2 multilib
167
168 MY_P=${P/gnu-/}
169 -DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the Java language"
170 +DESCRIPTION="Free core class libraries for use with VMs and compilers for the Java language"
171 EGIT_REPO_URI="git://git.savannah.gnu.org/classpath.git"
172 -HOMEPAGE="http://www.gnu.org/software/classpath"
173 +HOMEPAGE="https://www.gnu.org/software/classpath"
174
175 LICENSE="GPL-2-with-linking-exception"
176 SLOT="0"
177 @@ -18,21 +17,21 @@ KEYWORDS=""
178 IUSE="alsa debug doc dssi examples gconf +gjdoc +gmp +gtk gstreamer qt4 xml"
179
180 RDEPEND="alsa? ( media-libs/alsa-lib )
181 - doc? ( || ( >=dev-java/gjdoc-0.7.9-r2 >=dev-java/gnu-classpath-0.98:* ) )
182 + doc? ( >=dev-java/gnu-classpath-0.98:* )
183 dssi? ( >=media-libs/dssi-0.9 )
184 - gconf? ( gnome-base/gconf )
185 - gjdoc? ( >=dev-java/antlr-2.7.1:0 )
186 - gmp? ( >=dev-libs/gmp-4.2.4:* )
187 + gconf? ( gnome-base/gconf:2= )
188 + gjdoc? ( >=dev-java/antlr-2.7.7-r7:0 )
189 + gmp? ( >=dev-libs/gmp-4.2.4:0= )
190 gstreamer? (
191 >=media-libs/gstreamer-0.10.10:0.10
192 >=media-libs/gst-plugins-base-0.10.10:0.10
193 x11-libs/gtk+:2
194 )
195 gtk? (
196 - >=x11-libs/gtk+-2.8:2
197 - >=dev-libs/glib-2.0
198 - media-libs/freetype
199 - >=x11-libs/cairo-1.1.9
200 + >=x11-libs/gtk+-2.8:2=
201 + dev-libs/glib:2=
202 + media-libs/freetype:2=
203 + >=x11-libs/cairo-1.1.9:=
204 x11-libs/libICE
205 x11-libs/libSM
206 x11-libs/libX11
207 @@ -41,19 +40,16 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
208 x11-libs/libXtst
209 x11-libs/pango
210 )
211 - qt4? ( dev-qt/qtgui:4 )
212 - xml? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )"
213 + xml? ( >=dev-libs/libxml2-2.6.8:2= >=dev-libs/libxslt-1.1.11 )"
214
215 # java-config >2.1.11 needed for ecj version globbing
216 -# We should make the build not pickup the wrong antlr binary from pccts
217 DEPEND="app-arch/zip
218 - || ( dev-java/eclipse-ecj dev-java/ecj-gcj )
219 + dev-java/eclipse-ecj
220 >=dev-java/java-config-2.1.11
221 - gjdoc? ( !!dev-util/pccts )
222 gtk? (
223 + x11-base/xorg-proto
224 x11-libs/libXrender
225 >=x11-libs/libXtst-1.1.0
226 - x11-proto/xproto
227 )
228 >=virtual/jdk-1.5
229 ${RDEPEND}"
230 @@ -72,7 +68,7 @@ src_prepare() {
231 }
232
233 src_configure() {
234 - local ecj_pkg=""
235 + local ecj_pkg="eclipse-ecj"
236
237 # We require ecj anyway, so force it to avoid problems with bad versions of javac
238 export JAVAC="${EPREFIX}/usr/bin/ecj"
239 @@ -89,13 +85,6 @@ src_configure() {
240 myconf="--with-antlr-jar=${antlr}"
241 fi
242
243 - # fallback on ecj-gcj if eclipse-ecj is not available
244 - if java-config --classpath=eclipse-ecj &> /dev/null ; then
245 - ecj_pkg="eclipse_ecj"
246 - else
247 - ecj_pkg="ecj-gcj"
248 - fi
249 -
250 ANTLR= econf \
251 $(use_enable alsa) \
252 $(use_enable debug ) \
253 @@ -105,7 +94,6 @@ src_configure() {
254 $(use_enable gmp) \
255 $(use_enable gtk gtk-peer) \
256 $(use_enable gstreamer gstreamer-peer) \
257 - $(use_enable qt4 qt-peer) \
258 $(use_enable xml xmlj) \
259 $(use_enable dssi ) \
260 $(use_with doc gjdoc) \
Report Message
Find on MARC Find on Google Groups