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

Gentoo Archives: gentoo-commits

From: "Vlastimil Babka (caster)" <caster@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/icedtea-bin: ChangeLog icedtea-bin-6.1.13.3-r2.ebuild icedtea-bin-6.1.13.3-r3.ebuild
Date: Fri, 27 Jun 2014 14:52:58
Message-Id: 20140627143425.325552004E@flycatcher.gentoo.org
1 caster 14/06/27 14:34:25
2
3 Modified: ChangeLog
4 Added: icedtea-bin-6.1.13.3-r2.ebuild
5 icedtea-bin-6.1.13.3-r3.ebuild
6 Log:
7 Revbump -r0 to -r2 (straight to stable) and -r1 to -r3, so that everyone gets the sandbox control files. Bug #502280.
8
9 (Portage version: 2.2.10/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 4E61DE84)
10
11 Revision Changes Path
12 1.65 dev-java/icedtea-bin/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/ChangeLog?rev=1.65&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/ChangeLog?rev=1.65&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/ChangeLog?r1=1.64&r2=1.65
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v
21 retrieving revision 1.64
22 retrieving revision 1.65
23 diff -u -r1.64 -r1.65
24 --- ChangeLog 12 Jun 2014 19:40:30 -0000 1.64
25 +++ ChangeLog 27 Jun 2014 14:34:24 -0000 1.65
26 @@ -1,6 +1,14 @@
27 # ChangeLog for dev-java/icedtea-bin
28 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.64 2014/06/12 19:40:30 jer Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.65 2014/06/27 14:34:24 caster Exp $
31 +
32 +*icedtea-bin-6.1.13.3-r3 (27 Jun 2014)
33 +*icedtea-bin-6.1.13.3-r2 (27 Jun 2014)
34 +
35 + 27 Jun 2014; Vlastimil Babka <caster@g.o>
36 + +icedtea-bin-6.1.13.3-r2.ebuild, +icedtea-bin-6.1.13.3-r3.ebuild:
37 + Revbump -r0 to -r2 (straight to stable) and -r1 to -r3, so that everyone gets
38 + the sandbox control files. Bug #502280.
39
40 12 Jun 2014; Jeroen Roovers <jer@g.o> icedtea-bin-6.1.13.3.ebuild,
41 icedtea-bin-6.1.13.3-r1.ebuild:
42
43
44
45 1.1 dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r2.ebuild
46
47 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r2.ebuild?rev=1.1&view=markup
48 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r2.ebuild?rev=1.1&content-type=text/plain
49
50 Index: icedtea-bin-6.1.13.3-r2.ebuild
51 ===================================================================
52 # Copyright 1999-2014 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 # $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r2.ebuild,v 1.1 2014/06/27 14:34:25 caster Exp $
55
56 EAPI="5"
57
58 inherit java-vm-2 multilib prefix
59
60 dist="http://dev.gentoo.org/~caster/distfiles/"
61 TARBALL_VERSION="${PV}"
62 PLUGIN_VERSION="${PV}"
63
64 DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
65 HOMEPAGE="http://icedtea.classpath.org"
66 SRC_URI="
67 amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2 )
68 x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2 )
69 doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.bz2 )
70 examples? (
71 amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 )
72 x86? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-x86.tar.bz2 )
73 )
74 nsplugin? (
75 amd64? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-amd64.tar.bz2 )
76 x86? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-x86.tar.bz2 )
77 )
78 source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
79
80 LICENSE="GPL-2-with-linking-exception"
81 SLOT="6"
82 KEYWORDS="-* amd64 x86"
83
84 IUSE="+X +alsa cjk +cups doc examples nsplugin selinux source"
85 REQUIRED_USE="nsplugin? ( X )"
86 RESTRICT="strip"
87
88 # 423161
89 QA_PREBUILT="opt/.*"
90
91 ALSA_COMMON_DEP="
92 >=media-libs/alsa-lib-1.0.20"
93 CUPS_COMMON_DEP="
94 >=net-print/cups-1.4"
95 X_COMMON_DEP="
96 >=dev-libs/glib-2.32:2
97 >=media-libs/freetype-2.4.9:2
98 >=x11-libs/gtk+-2.24:2
99 >=x11-libs/libX11-1.4
100 >=x11-libs/libXext-1.3
101 >=x11-libs/libXi-1.6
102 >=x11-libs/libXtst-1.2"
103
104 COMMON_DEP="
105 >=media-libs/giflib-4.1.6-r1
106 >=media-libs/libpng-1.6:0=
107 >=sys-devel/gcc-4.5.4
108 >=sys-libs/glibc-2.15
109 >=sys-libs/zlib-1.2.3-r1
110 || ( virtual/jpeg:62 media-libs/jpeg:62 )
111 nsplugin? (
112 >=dev-libs/atk-1.30.0
113 >=dev-libs/nspr-4.8
114 >=x11-libs/cairo-1.8.8
115 >=x11-libs/pango-1.24.5
116
117 )
118 selinux? ( sec-policy/selinux-java )"
119
120 RDEPEND="${COMMON_DEP}
121 X? (
122 ${X_COMMON_DEP}
123 media-fonts/dejavu
124 cjk? (
125 media-fonts/arphicfonts
126 media-fonts/baekmuk-fonts
127 media-fonts/lklug
128 media-fonts/lohit-fonts
129 media-fonts/sazanami
130 )
131 )
132 alsa? ( ${ALSA_COMMON_DEP} )
133 cups? ( ${CUPS_COMMON_DEP} )"
134
135 src_install() {
136 local dest="/opt/${P}"
137 local ddest="${ED}/${dest}"
138 dodir "${dest}"
139
140 # Ensures HeadlessGraphicsEnvironment is used.
141 if ! use X; then
142 rm -r jre/lib/$(get_system_arch)/xawt || die
143 fi
144
145 # doins can't handle symlinks.
146 cp -pRP bin include jre lib man "${ddest}" || die
147
148 # Remove on next bump as the needed marks are already set by icedtea ebuild.
149 java-vm_set-pax-markings "${ddest}"
150
151 dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README}
152
153 if use doc; then
154 dohtml -r ../doc/html/*
155 fi
156
157 if use examples; then
158 cp -pRP share/{demo,sample} "${ddest}" || die
159 fi
160
161 if use source; then
162 cp src.zip "${ddest}" || die
163 fi
164
165 if use nsplugin; then
166 cp -pPR ../icedtea-web-bin-${SLOT} "${ddest}"/.. || die
167 install_mozilla_plugin "/opt/icedtea-web-bin-${SLOT}/$(get_libdir)/IcedTeaPlugin.so"
168 docinto icedtea-web
169 dodoc ../doc/icedtea-web/*
170 fi
171
172 # Remove after next bump, handled by icedtea ebuild. Bug 390663
173 cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
174 eprefixify "${T}"/fontconfig.Gentoo.properties
175 insinto "${dest}"/jre/lib
176 doins "${T}"/fontconfig.Gentoo.properties
177
178 set_java_env
179 java-vm_revdep-mask "${dest}"
180 java-vm_sandbox-predict /proc/self/coredump_filter
181 }
182
183 pkg_preinst() {
184 if has_version "<=dev-java/icedtea-bin-1.10.4:${SLOT}"; then
185 # portage would preserve the symlink otherwise, related to bug #384397
186 rm -f "${EROOT}/usr/lib/jvm/icedtea6-bin"
187 elog "To unify the layout and simplify scripts, the identifier of Icedtea-bin-6*"
188 elog "has changed from 'icedtea6-bin' to 'icedtea-bin-6' starting from version 6.1.10.4"
189 elog "If you had icedtea6-bin as system VM, the change should be automatic, however"
190 elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
191 elog "and the same holds for any user VM settings. Sorry for the inconvenience."
192 fi
193 }
194
195 pkg_postinst() {
196 # Set as default VM if none exists
197 java-vm-2_pkg_postinst
198
199 if use nsplugin && [[ -z ${REPLACING_VERSIONS} ]]; then
200 elog "The icedtea-bin-${SLOT} browser plugin can be enabled using eselect java-nsplugin"
201 elog "Note that the plugin works only in browsers based on xulrunner-1.9.1+"
202 elog "such as Firefox 3.5+ and recent Chromium versions."
203 fi
204 }
205
206
207
208 1.1 dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r3.ebuild
209
210 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r3.ebuild?rev=1.1&view=markup
211 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r3.ebuild?rev=1.1&content-type=text/plain
212
213 Index: icedtea-bin-6.1.13.3-r3.ebuild
214 ===================================================================
215 # Copyright 1999-2014 Gentoo Foundation
216 # Distributed under the terms of the GNU General Public License v2
217 # $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r3.ebuild,v 1.1 2014/06/27 14:34:25 caster Exp $
218
219 EAPI="5"
220
221 inherit java-vm-2 multilib prefix
222
223 dist="http://dev.gentoo.org/~caster/distfiles/"
224 TARBALL_VERSION="${PV}"
225
226 DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
227 HOMEPAGE="http://icedtea.classpath.org"
228 SRC_URI="
229 amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2 )
230 x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2 )
231 doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.bz2 )
232 examples? (
233 amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 )
234 x86? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-x86.tar.bz2 )
235 )
236 source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
237
238 LICENSE="GPL-2-with-linking-exception"
239 SLOT="6"
240 KEYWORDS="-* ~amd64 ~x86"
241
242 IUSE="+X +alsa cjk +cups doc examples nsplugin selinux source webstart"
243 REQUIRED_USE="nsplugin? ( X )"
244 RESTRICT="strip"
245
246 # 423161
247 QA_PREBUILT="opt/.*"
248
249 ALSA_COMMON_DEP="
250 >=media-libs/alsa-lib-1.0.20"
251 CUPS_COMMON_DEP="
252 >=net-print/cups-1.4"
253 X_COMMON_DEP="
254 >=dev-libs/glib-2.32:2
255 >=media-libs/freetype-2.4.9:2
256 >=x11-libs/gtk+-2.24:2
257 >=x11-libs/libX11-1.4
258 >=x11-libs/libXext-1.3
259 >=x11-libs/libXi-1.6
260 >=x11-libs/libXtst-1.2"
261
262 COMMON_DEP="
263 >=media-libs/giflib-4.1.6-r1
264 >=media-libs/libpng-1.6:0=
265 >=sys-devel/gcc-4.5.4
266 >=sys-libs/glibc-2.15
267 >=sys-libs/zlib-1.2.3-r1
268 || ( virtual/jpeg:62 media-libs/jpeg:62 )
269 selinux? ( sec-policy/selinux-java )"
270
271 RDEPEND="${COMMON_DEP}
272 X? (
273 ${X_COMMON_DEP}
274 media-fonts/dejavu
275 cjk? (
276 media-fonts/arphicfonts
277 media-fonts/baekmuk-fonts
278 media-fonts/lklug
279 media-fonts/lohit-fonts
280 media-fonts/sazanami
281 )
282 )
283 alsa? ( ${ALSA_COMMON_DEP} )
284 cups? ( ${CUPS_COMMON_DEP} )"
285
286 PDEPEND="webstart? ( dev-java/icedtea-web:0 )
287 nsplugin? ( dev-java/icedtea-web:0[icedtea7] )"
288
289 src_install() {
290 local dest="/opt/${P}"
291 local ddest="${ED}/${dest}"
292 dodir "${dest}"
293
294 # Ensures HeadlessGraphicsEnvironment is used.
295 if ! use X; then
296 rm -r jre/lib/$(get_system_arch)/xawt || die
297 fi
298
299 # doins can't handle symlinks.
300 cp -pRP bin include jre lib man "${ddest}" || die
301
302 # Remove on next bump as the needed marks are already set by icedtea ebuild.
303 java-vm_set-pax-markings "${ddest}"
304
305 dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README}
306
307 if use doc; then
308 dohtml -r ../doc/html/*
309 fi
310
311 if use examples; then
312 cp -pRP share/{demo,sample} "${ddest}" || die
313 fi
314
315 if use source; then
316 cp src.zip "${ddest}" || die
317 fi
318
319 # Remove after next bump, handled by icedtea ebuild. Bug 390663
320 cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
321 eprefixify "${T}"/fontconfig.Gentoo.properties
322 insinto "${dest}"/jre/lib
323 doins "${T}"/fontconfig.Gentoo.properties
324
325 if use webstart || use nsplugin; then
326 dosym /usr/$(get_libdir)/icedtea${SLOT}-web/bin/itweb-settings ${dest}/bin/itweb-settings
327 dosym /usr/$(get_libdir)/icedtea${SLOT}-web/bin/itweb-settings ${dest}/jre/bin/itweb-settings
328 fi
329 if use webstart; then
330 dosym /usr/$(get_libdir)/icedtea${SLOT}-web/bin/javaws ${dest}/bin/javaws
331 dosym /usr/$(get_libdir)/icedtea${SLOT}-web/bin/javaws ${dest}/jre/bin/javaws
332 fi
333
334 set_java_env
335 java-vm_revdep-mask "${dest}"
336 java-vm_sandbox-predict /proc/self/coredump_filter
337 }
338
339 pkg_preinst() {
340 if has_version "<=dev-java/icedtea-bin-1.10.4:${SLOT}"; then
341 # portage would preserve the symlink otherwise, related to bug #384397
342 rm -f "${EROOT}/usr/lib/jvm/icedtea6-bin"
343 elog "To unify the layout and simplify scripts, the identifier of Icedtea-bin-6*"
344 elog "has changed from 'icedtea6-bin' to 'icedtea-bin-6' starting from version 6.1.10.4"
345 elog "If you had icedtea6-bin as system VM, the change should be automatic, however"
346 elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
347 elog "and the same holds for any user VM settings. Sorry for the inconvenience."
348 fi
349 }
350
351 pkg_postinst() {
352 if use nsplugin; then
353 if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 6.1.13.3-r1 ${REPLACING_VERSIONS} ]]; then
354 elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
355 elog "If you had icedtea-bin-6 nsplugin selected, you may see a related error below"
356 elog "The switch should complete properly during the subsequent installation of icedtea-web"
357 elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
358 fi
359 fi
360
361 # Set as default VM if none exists
362 java-vm-2_pkg_postinst
363 }
Report Message
Find on MARC Find on Google Groups