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/sun-jdk: ChangeLog sun-jdk-1.6.0.34.ebuild
Date: Thu, 23 Aug 2012 19:41:54
Message-Id: 20120823194113.71FD4204B6@flycatcher.gentoo.org
1 caster 12/08/23 19:41:13
2
3 Modified: ChangeLog
4 Added: sun-jdk-1.6.0.34.ebuild
5 Log:
6 Version bump, bug #431492. USE=examples on amd64 has broken distfile, so no demos will be installed.
7
8 (Portage version: 2.2.0_alpha116/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.331 dev-java/sun-jdk/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/sun-jdk/ChangeLog?rev=1.331&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/sun-jdk/ChangeLog?rev=1.331&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/sun-jdk/ChangeLog?r1=1.330&r2=1.331
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v
20 retrieving revision 1.330
21 retrieving revision 1.331
22 diff -u -r1.330 -r1.331
23 --- ChangeLog 3 Aug 2012 13:53:30 -0000 1.330
24 +++ ChangeLog 23 Aug 2012 19:41:13 -0000 1.331
25 @@ -1,6 +1,12 @@
26 # ChangeLog for dev-java/sun-jdk
27 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.330 2012/08/03 13:53:30 ago Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.331 2012/08/23 19:41:13 caster Exp $
30 +
31 +*sun-jdk-1.6.0.34 (23 Aug 2012)
32 +
33 + 23 Aug 2012; Vlastimil Babka <caster@g.o> +sun-jdk-1.6.0.34.ebuild:
34 + Version bump, bug #431492. USE=examples on amd64 has broken distfile, so no
35 + demos will be installed.
36
37 03 Aug 2012; Agostino Sarubbo <ago@g.o> sun-jdk-1.6.0.33-r1.ebuild:
38 Stable for amd64, wrt bug #421073
39
40
41
42 1.1 dev-java/sun-jdk/sun-jdk-1.6.0.34.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.34.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.34.ebuild?rev=1.1&content-type=text/plain
46
47 Index: sun-jdk-1.6.0.34.ebuild
48 ===================================================================
49 # Copyright 1999-2012 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.34.ebuild,v 1.1 2012/08/23 19:41:13 caster Exp $
52
53 EAPI="4"
54
55 inherit java-vm-2 eutils prefix versionator
56
57 # This URIs need to be updated when bumping!
58 JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk6-downloads-1637591.html"
59
60 MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
61 S_PV="$(replace_version_separator 3 '_')"
62
63 X86_AT="jdk-${MY_PV}-linux-i586.bin"
64 AMD64_AT="jdk-${MY_PV}-linux-x64.bin"
65 #IA64_AT="jdk-${MY_PV}-linux-ia64.bin"
66 SOL_X86_AT="jdk-${MY_PV}-solaris-i586.sh"
67 SOL_AMD64_AT="jdk-${MY_PV}-solaris-x64.sh"
68 SOL_SPARC_AT="jdk-${MY_PV}-solaris-sparc.sh"
69 SOL_SPARCv9_AT="jdk-${MY_PV}-solaris-sparcv9.sh"
70
71 X86_DEMOS="jdk-${MY_PV}-linux-i586-demos.tar.gz"
72 AMD64_DEMOS="jdk-${MY_PV}-linux-x64-demos.tar.gz"
73 #IA64_DEMOS="jdk-${MY_PV}-linux-ia64-demos.tar.gz"
74 SOL_X86_DEMOS="jdk-${MY_PV}-solaris-i586-demos.tar.Z"
75 SOL_AMD64_DEMOS="jdk-${MY_PV}-solaris-x64-demos.tar.Z"
76 SOL_SPARC_DEMOS="jdk-${MY_PV}-solaris-sparc-demos.tar.Z"
77 SOL_SPARCv9_DEMOS="jdk-${MY_PV}-solaris-sparcv9-demos.tar.Z"
78
79 DESCRIPTION="Oracle's Java SE Development Kit"
80 HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
81 SRC_URI="
82 x86? ( ${X86_AT}
83 examples? ( ${X86_DEMOS} ) )
84 amd64? ( ${AMD64_AT} )
85 x86-solaris? ( ${SOL_X86_AT}
86 examples? ( ${SOL_X86_DEMOS} ) )
87 x64-solaris? ( ${SOL_X86_AT} ${SOL_AMD64_AT}
88 examples? ( ${SOL_X86_DEMOS} ${SOL_AMD64_DEMOS} ) )
89 sparc-solaris? ( ${SOL_SPARC_AT}
90 examples? ( ${SOL_SPARC_DEMOS} ) )
91 sparc64-solaris? ( ${SOL_SPARC_AT} ${SOL_SPARCv9_AT}
92 examples? ( ${SOL_SPARC_DEMOS} ${SOL_SPARCv9_DEMOS} ) )"
93 # examples? ( ${AMD64_DEMOS} ) )
94 # ia64? ( ${IA64_AT}
95 # examples? ( ${IA64_DEMOS} ) )
96
97 LICENSE="Oracle-BCLA-JavaSE"
98 SLOT="1.6"
99 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
100
101 IUSE="X alsa derby doc examples jce kernel_SunOS nsplugin pax_kernel +source"
102
103 RESTRICT="fetch strip"
104
105 RDEPEND="
106 X? (
107 x11-libs/libX11
108 x11-libs/libXext
109 x11-libs/libXi
110 x11-libs/libXt
111 x11-libs/libXtst
112 )
113 alsa? ( media-libs/alsa-lib )
114 doc? ( dev-java/java-sdk-docs:1.6.0 )
115 jce? ( dev-java/sun-jce-bin:1.6 )
116 kernel_SunOS? ( app-arch/unzip )
117 !prefix? ( sys-libs/glibc )"
118 # scanelf won't create a PaX header, so depend on paxctl to avoid fallback
119 # marking. #427642
120 DEPEND="
121 pax_kernel? ( sys-apps/paxctl )"
122
123 S="${WORKDIR}/jdk${S_PV}"
124
125 _set_at() {
126 if use x86; then
127 AT=${X86_AT}
128 elif use amd64; then
129 AT=${AMD64_AT}
130 elif use ia64; then
131 AT=${IA64_AT}
132 elif use x86-solaris; then
133 AT=${SOL_X86_AT}
134 elif use x64-solaris; then
135 AT="${SOL_X86_AT} and ${SOL_AMD64_AT}"
136 elif use sparc-solaris; then
137 AT=${SOL_SPARC_AT}
138 elif use sparc64-solaris; then
139 AT="${SOL_SPARC_AT} and ${SOL_SPARCv9_AT}"
140 fi
141 }
142
143 _set_demos() {
144 if use x86; then
145 DEMOS=${X86_DEMOS}
146 elif use amd64; then
147 DEMOS=${AMD64_DEMOS}
148 elif use ia64; then
149 DEMOS=${IA64_DEMOS}
150 elif use x86-solaris; then
151 DEMOS=${SOL_X86_DEMOS}
152 elif use x64-solaris; then
153 DEMOS="${SOL_X86_DEMOS} and ${SOL_AMD64_DEMOS}"
154 elif use sparc-solaris; then
155 DEMOS=${SOL_SPARC_AT}
156 elif use sparc64-solaris; then
157 DEMOS="${SOL_SPARC_AT_DEMOS} and ${SOL_SPARCv9_DEMOS}"
158 fi
159 }
160
161 pkg_nofetch() {
162 _set_at
163 _set_demos
164
165 einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package"
166 einfo "has become fetch restricted again. Alternatives are switching to"
167 einfo "dev-java/icedtea-bin:6 or the source-based dev-java/icedtea:6"
168 einfo ""
169 einfo "Please download ${AT} from:"
170 einfo "${JDK_URI}"
171 einfo "and move it to ${DISTDIR}"
172
173 if use examples; then
174 einfo ""
175 einfo "Also download ${DEMOS} from:"
176 einfo "${JDK_URI}"
177 einfo "and move it to ${DISTDIR}"
178 fi
179 }
180
181 _sol_src_unpack() {
182 for i in ${AT}; do
183 [[ ${i} == "and" ]] && continue
184 rm -f "${S}"/jre/{LICENSE,README} "${S}"/LICENSE
185 # don't die on unzip, it always "fails"
186 unzip "${DISTDIR}"/${i}
187 done
188 for f in $(find "${S}" -name "*.pack") ; do
189 "${S}"/bin/unpack200 ${f} ${f%.pack}.jar
190 rm ${f}
191 done
192 if use examples ; then
193 for i in ${DEMOS}; do
194 [[ ${i} == "and" ]] && continue
195 use examples && unpack ${i}
196 done
197 mv "${WORKDIR}"/SUNWj6dmo/reloc/jdk/instances/jdk1.6.0/{demo,sample} \
198 "${S}"/ || die
199 fi
200 }
201
202 src_unpack() {
203 [[ ${PV} != 1.6.0.34 ]] && die "Check if amd64 examples distfile is available again before bumping. Chang SRC_URI and 'use examples' in src_{unpack,install}."
204 _set_at
205 _set_demos
206 if use kernel_SunOS; then
207 _sol_src_unpack
208 else
209 sh "${DISTDIR}"/${AT} -noregister || die "Failed to unpack"
210 use examples && ! use amd64 && unpack ${DEMOS}
211 fi
212 }
213
214 src_compile() {
215 # This needs to be done before CDS - #215225
216 java-vm_set-pax-markings "${S}"
217
218 # see bug #207282
219 einfo "Creating the Class Data Sharing archives"
220 if use x86; then
221 bin/java -client -Xshare:dump || die
222 fi
223 # limit heap size for large memory on x86 #405239
224 # this is a workaround and shouldn't be needed.
225 bin/java -server -Xmx64m -Xshare:dump || die
226 }
227
228 src_install() {
229 local dest="/opt/${P}"
230 local ddest="${ED}${dest}"
231
232 # We should not need the ancient plugin for Firefox 2 anymore, plus it has
233 # writable executable segments
234 if use x86; then
235 rm -vf {,jre/}lib/i386/libjavaplugin_oji.so \
236 {,jre/}lib/i386/libjavaplugin_nscp*.so
237 rm -vrf jre/plugin/i386
238 fi
239 # Without nsplugin flag, also remove the new plugin
240 local arch=${ARCH};
241 use x86 && arch=i386;
242 if ! use nsplugin; then
243 rm -vf {,jre/}lib/${arch}/libnpjp2.so \
244 {,jre/}lib/${arch}/libjavaplugin_jni.so
245 fi
246
247 dodir "${dest}"
248 cp -pPR bin include jre lib man "${ddest}" || die
249
250 if use derby; then
251 cp -pPR db "${ddest}" || die
252 fi
253
254 if use examples; then
255 if use amd64; then
256 ewarn "examples are not available in this version for amd64 due to upstream error (zero-byte distfile)"
257 else
258 cp -pPR demo sample "${ddest}" || die
259 fi
260 fi
261
262 # Remove empty dirs we might have copied
263 find "${D}" -type d -empty -exec rmdir -v {} + || die
264
265 dodoc COPYRIGHT
266 dohtml README.html
267
268 if use jce; then
269 dodir "${dest}"/jre/lib/security/strong-jce
270 mv "${ddest}"/jre/lib/security/US_export_policy.jar \
271 "${ddest}"/jre/lib/security/strong-jce || die
272 mv "${ddest}"/jre/lib/security/local_policy.jar \
273 "${ddest}"/jre/lib/security/strong-jce || die
274 dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar \
275 "${dest}"/jre/lib/security/US_export_policy.jar
276 dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar \
277 "${dest}"/jre/lib/security/local_policy.jar
278 fi
279
280 if use nsplugin; then
281 install_mozilla_plugin "${dest}"/jre/lib/${arch}/libnpjp2.so
282 fi
283
284 if use source; then
285 cp src.zip "${ddest}" || die
286 fi
287
288 # Install desktop file for the Java Control Panel.
289 # Using ${PN}-${SLOT} to prevent file collision with jre and or other slots.
290 # make_desktop_entry can't be used as ${P} would end up in filename.
291 newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
292 sun-jcontrol-${PN}-${SLOT}.png || die
293 sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT} (sun-jdk)#" \
294 -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
295 -e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}.png#" \
296 jre/lib/desktop/applications/sun_java.desktop > \
297 "${T}"/jcontrol-${PN}-${SLOT}.desktop || die
298 domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
299
300 # http://docs.oracle.com/javase/6/docs/technotes/guides/intl/fontconfig.html
301 rm "${ddest}"/jre/lib/fontconfig.* || die
302 cp "${FILESDIR}"/fontconfig.Gentoo.properties-r1 "${T}"/fontconfig.properties || die
303 eprefixify "${T}"/fontconfig.properties
304 insinto "${dest}"/jre/lib/
305 doins "${T}"/fontconfig.properties
306
307 set_java_env "${FILESDIR}/${VMHANDLE}.env-r1"
308 java-vm_revdep-mask
309 java-vm_sandbox-predict /dev/random
310 }
311
312 QA_TEXTRELS_x86="
313 opt/${P}/jre/lib/i386/client/libjvm.so
314 opt/${P}/jre/lib/i386/motif21/libmawt.so
315 opt/${P}/jre/lib/i386/server/libjvm.so"
316 QA_FLAGS_IGNORED="
317 /opt/${P}/bin/appletviewer
318 /opt/${P}/bin/apt
319 /opt/${P}/bin/extcheck
320 /opt/${P}/bin/idlj
321 /opt/${P}/bin/jar
322 /opt/${P}/bin/jarsigner
323 /opt/${P}/bin/java
324 /opt/${P}/bin/javac
325 /opt/${P}/bin/javadoc
326 /opt/${P}/bin/javah
327 /opt/${P}/bin/javap
328 /opt/${P}/bin/javaws
329 /opt/${P}/bin/jconsole
330 /opt/${P}/bin/jdb
331 /opt/${P}/bin/jhat
332 /opt/${P}/bin/jinfo
333 /opt/${P}/bin/jmap
334 /opt/${P}/bin/jps
335 /opt/${P}/bin/jrunscript
336 /opt/${P}/bin/jsadebugd
337 /opt/${P}/bin/jstack
338 /opt/${P}/bin/jstat
339 /opt/${P}/bin/jstatd
340 /opt/${P}/bin/keytool
341 /opt/${P}/bin/native2ascii
342 /opt/${P}/bin/orbd
343 /opt/${P}/bin/pack200
344 /opt/${P}/bin/policytool
345 /opt/${P}/bin/rmic
346 /opt/${P}/bin/rmid
347 /opt/${P}/bin/rmiregistry
348 /opt/${P}/bin/schemagen
349 /opt/${P}/bin/serialver
350 /opt/${P}/bin/servertool
351 /opt/${P}/bin/tnameserv
352 /opt/${P}/bin/unpack200
353 /opt/${P}/bin/wsgen
354 /opt/${P}/bin/wsimport
355 /opt/${P}/bin/xjc
356 /opt/${P}/demo/jvmti/gctest/lib/libgctest.so
357 /opt/${P}/demo/jvmti/heapTracker/lib/libheapTracker.so
358 /opt/${P}/demo/jvmti/heapViewer/lib/libheapViewer.so
359 /opt/${P}/demo/jvmti/minst/lib/libminst.so
360 /opt/${P}/demo/jvmti/mtrace/lib/libmtrace.so
361 /opt/${P}/demo/jvmti/versionCheck/lib/libversionCheck.so
362 /opt/${P}/demo/jvmti/waiters/lib/libwaiters.so
363 /opt/${P}/jre/bin/java
364 /opt/${P}/jre/bin/java_vm
365 /opt/${P}/jre/bin/javaws
366 /opt/${P}/jre/bin/keytool
367 /opt/${P}/jre/bin/orbd
368 /opt/${P}/jre/bin/pack200
369 /opt/${P}/jre/bin/policytool
370 /opt/${P}/jre/bin/rmid
371 /opt/${P}/jre/bin/rmiregistry
372 /opt/${P}/jre/bin/servertool
373 /opt/${P}/jre/bin/tnameserv
374 /opt/${P}/jre/bin/unpack200
375 /opt/${P}/jre/lib/jexec
376 /opt/${P}/lib/jexec
377 /opt/${P}/lib/visualvm/profiler/lib/deployed/jdk15/linux-amd64/libprofilerinterface.so
378 /opt/${P}/lib/visualvm/profiler/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so"
379 for java_system_arch in amd64 i386; do
380 QA_FLAGS_IGNORED+="
381 /opt/${P}/jre/lib/${java_system_arch}/headless/libmawt.so
382 /opt/${P}/jre/lib/${java_system_arch}/jli/libjli.so
383 /opt/${P}/jre/lib/${java_system_arch}/libattach.so
384 /opt/${P}/jre/lib/${java_system_arch}/libawt.so
385 /opt/${P}/jre/lib/${java_system_arch}/libcmm.so
386 /opt/${P}/jre/lib/${java_system_arch}/libdcpr.so
387 /opt/${P}/jre/lib/${java_system_arch}/libdeploy.so
388 /opt/${P}/jre/lib/${java_system_arch}/libdt_socket.so
389 /opt/${P}/jre/lib/${java_system_arch}/libfontmanager.so
390 /opt/${P}/jre/lib/${java_system_arch}/libhprof.so
391 /opt/${P}/jre/lib/${java_system_arch}/libinstrument.so
392 /opt/${P}/jre/lib/${java_system_arch}/libioser12.so
393 /opt/${P}/jre/lib/${java_system_arch}/libj2gss.so
394 /opt/${P}/jre/lib/${java_system_arch}/libj2pcsc.so
395 /opt/${P}/jre/lib/${java_system_arch}/libj2pkcs11.so
396 /opt/${P}/jre/lib/${java_system_arch}/libjaas_unix.so
397 /opt/${P}/jre/lib/${java_system_arch}/libjava_crw_demo.so
398 /opt/${P}/jre/lib/${java_system_arch}/libjavaplugin_jni.so
399 /opt/${P}/jre/lib/${java_system_arch}/libjava.so
400 /opt/${P}/jre/lib/${java_system_arch}/libjawt.so
401 /opt/${P}/jre/lib/${java_system_arch}/libJdbcOdbc.so
402 /opt/${P}/jre/lib/${java_system_arch}/libjdwp.so
403 /opt/${P}/jre/lib/${java_system_arch}/libjpeg.so
404 /opt/${P}/jre/lib/${java_system_arch}/libjsig.so
405 /opt/${P}/jre/lib/${java_system_arch}/libjsoundalsa.so
406 /opt/${P}/jre/lib/${java_system_arch}/libjsound.so
407 /opt/${P}/jre/lib/${java_system_arch}/libmanagement.so
408 /opt/${P}/jre/lib/${java_system_arch}/libmlib_image.so
409 /opt/${P}/jre/lib/${java_system_arch}/libnative_chmod_g.so
410 /opt/${P}/jre/lib/${java_system_arch}/libnative_chmod.so
411 /opt/${P}/jre/lib/${java_system_arch}/libnet.so
412 /opt/${P}/jre/lib/${java_system_arch}/libnio.so
413 /opt/${P}/jre/lib/${java_system_arch}/libnpjp2.so
414 /opt/${P}/jre/lib/${java_system_arch}/libnpt.so
415 /opt/${P}/jre/lib/${java_system_arch}/librmi.so
416 /opt/${P}/jre/lib/${java_system_arch}/libsaproc.so
417 /opt/${P}/jre/lib/${java_system_arch}/libsplashscreen.so
418 /opt/${P}/jre/lib/${java_system_arch}/libunpack.so
419 /opt/${P}/jre/lib/${java_system_arch}/libverify.so
420 /opt/${P}/jre/lib/${java_system_arch}/libzip.so
421 /opt/${P}/jre/lib/${java_system_arch}/motif21/libmawt.so
422 /opt/${P}/jre/lib/${java_system_arch}/native_threads/libhpi.so
423 /opt/${P}/jre/lib/${java_system_arch}/server/libjvm.so
424 /opt/${P}/jre/lib/${java_system_arch}/xawt/libmawt.so"
425 done
Report Message
Find on MARC Find on Google Groups