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 app-emulation/emul-linux-x86-java: ChangeLog emul-linux-x86-java-1.6.0.17.ebuild emul-linux-x86-java-1.5.0.22.ebuild
Date: Wed, 04 Nov 2009 11:30:00
Message-Id: E1N5e3p-0001hq-Ns@stork.gentoo.org
1 caster 09/11/04 11:29:57
2
3 Modified: ChangeLog
4 Added: emul-linux-x86-java-1.6.0.17.ebuild
5 emul-linux-x86-java-1.5.0.22.ebuild
6 Log:
7 Version bump, security bug #291817
8 (Portage version: 2.2_rc48/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.79 app-emulation/emul-linux-x86-java/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog?rev=1.79&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog?rev=1.79&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog?r1=1.78&r2=1.79
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v
20 retrieving revision 1.78
21 retrieving revision 1.79
22 diff -u -r1.78 -r1.79
23 --- ChangeLog 29 Sep 2009 16:00:39 -0000 1.78
24 +++ ChangeLog 4 Nov 2009 11:29:57 -0000 1.79
25 @@ -1,6 +1,14 @@
26 # ChangeLog for app-emulation/emul-linux-x86-java
27 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.78 2009/09/29 16:00:39 caster Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.79 2009/11/04 11:29:57 caster Exp $
30 +
31 +*emul-linux-x86-java-1.6.0.17 (04 Nov 2009)
32 +*emul-linux-x86-java-1.5.0.22 (04 Nov 2009)
33 +
34 + 04 Nov 2009; Vlastimil Babka <caster@g.o>
35 + +emul-linux-x86-java-1.5.0.22.ebuild,
36 + +emul-linux-x86-java-1.6.0.17.ebuild:
37 + Version bump, security bug #291817
38
39 *emul-linux-x86-java-1.5.0.21 (29 Sep 2009)
40
41
42
43
44 1.1 app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.17.ebuild
45
46 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.17.ebuild?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.17.ebuild?rev=1.1&content-type=text/plain
48
49 Index: emul-linux-x86-java-1.6.0.17.ebuild
50 ===================================================================
51 # Copyright 1999-2009 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 # $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.17.ebuild,v 1.1 2009/11/04 11:29:57 caster Exp $
54
55 inherit versionator pax-utils java-vm-2 eutils
56
57 UPDATE="$(get_version_component_range 4)"
58 UPDATE="${UPDATE#0}"
59 MY_PV="$(get_version_component_range 2)u${UPDATE}"
60
61 At="jdk-${MY_PV}-dlj-linux-i586.bin"
62 DESCRIPTION="Sun's Java SE Runtime Environment (32bit)"
63 HOMEPAGE="http://java.sun.com/javase/6/"
64 #SRC_URI="http://download.java.net/dlj/binaries/${At}"
65 SRC_URI="http://dlc.sun.com/dlj/binaries/${At}"
66
67 SLOT="1.6"
68 LICENSE="dlj-1.1"
69 KEYWORDS="-* ~amd64"
70 RESTRICT="strip"
71 IUSE="X alsa nsplugin"
72
73 JAVA_VM_NO_GENERATION1=true
74
75 RDEPEND="alsa? ( app-emulation/emul-linux-x86-soundlibs )
76 X? ( app-emulation/emul-linux-x86-xlibs )
77 app-emulation/emul-linux-x86-compat"
78
79 JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
80
81 QA_TEXTRELS_amd64="opt/${P}/lib/i386/motif21/libmawt.so
82 opt/${P}/lib/i386/libdeploy.so
83 opt/${P}/lib/i386/client/libjvm.so
84 opt/${P}/lib/i386/server/libjvm.so"
85 QA_DT_HASH="opt/${P}/.*"
86
87 src_unpack() {
88 mkdir bundled-jdk
89 cd bundled-jdk
90 sh "${DISTDIR}"/${At} --accept-license --unpack || die "Failed to unpack"
91
92 cd ..
93 bash "${FILESDIR}"/construct-${SLOT}.sh bundled-jdk sun-jdk-${PV} ${P} || die "construct-${SLOT}.sh failed"
94 }
95
96 src_compile() {
97 # Set PaX markings on all JDK/JRE executables to allow code-generation on
98 # the heap by the JIT compiler. This has to be done before CDS - #215225
99 pax-mark m $(list-paxables "${S}"/bin/*)
100
101 # see bug #207282
102 einfo "Creating the Class Data Sharing archives"
103 "${S}"/bin/java -client -Xshare:dump || die
104 "${S}"/bin/java -server -Xshare:dump || die
105 }
106
107 src_install() {
108 local dirs="bin lib man javaws plugin"
109 dodir /opt/${P}
110
111 cp -pPR ${dirs} "${D}/opt/${P}/" || die "failed to copy"
112
113 dodoc README THIRDPARTYLICENSEREADME.txt || die
114 dohtml Welcome.html || die
115 dodir /opt/${P}/share/
116
117 if use nsplugin; then
118 local plugin_dir="ns7-gcc29"
119 if has_version '>=sys-devel/gcc-3' ; then
120 plugin_dir="ns7"
121 fi
122
123 install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
124 install_mozilla_plugin /opt/${P}/lib/i386/libnpjp2.so plugin2
125 fi
126
127 # FIXME figure out how to handle the control pannel conflict with
128 # sun-jdk-bin
129
130 # install control panel for Gnome/KDE
131 # sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
132 # -e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \
133 # ${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
134 # ${T}/sun_java-${SLOT}.desktop
135
136 # domenu ${T}/sun_java-${SLOT}.desktop
137
138 set_java_env
139 java-vm_revdep-mask
140 }
141
142 pkg_postinst() {
143 # Set as default VM if none exists
144 java-vm-2_pkg_postinst
145
146 elog
147 elog "Two variants of the nsplugin are available via eselect java-nsplugin:"
148 elog "${VMHANDLE} and ${VMHANDLE}-plugin2 (the Next-Generation Plug-In) "
149 ewarn "Note that the ${VMHANDLE}-plugin2 works only in Firefox 3!"
150 elog "For more info see https://jdk6.dev.java.net/plugin2/"
151 elog
152
153 if ! use X; then
154 local xwarn="X11 libraries and/or"
155 fi
156
157 echo
158 ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be installed."
159 ewarn "Be careful which Java libraries you attempt to use."
160 }
161
162
163
164 1.1 app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.22.ebuild
165
166 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.22.ebuild?rev=1.1&view=markup
167 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.22.ebuild?rev=1.1&content-type=text/plain
168
169 Index: emul-linux-x86-java-1.5.0.22.ebuild
170 ===================================================================
171 # Copyright 1999-2009 Gentoo Foundation
172 # Distributed under the terms of the GNU General Public License v2
173 # $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.22.ebuild,v 1.1 2009/11/04 11:29:57 caster Exp $
174
175 inherit versionator pax-utils eutils java-vm-2
176
177 UPDATE="$(get_version_component_range 4)"
178 UPDATE="${UPDATE#0}"
179 MY_PV="$(get_version_component_range 2-3)u${UPDATE}"
180
181 At="jdk-${MY_PV}-dlj-linux-i586.bin"
182 DESCRIPTION="Sun's Java SE Runtime Environment (32bit)"
183 HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
184 SRC_URI="http://download.java.net/dlj/binaries/${At}"
185
186 SLOT="1.5"
187 LICENSE="dlj-1.1"
188 KEYWORDS="-* ~amd64"
189 RESTRICT="strip"
190 IUSE="X alsa nsplugin"
191
192 JAVA_VM_NO_GENERATION1=true
193
194 RDEPEND="alsa? ( app-emulation/emul-linux-x86-soundlibs )
195 X? ( app-emulation/emul-linux-x86-xlibs )"
196
197 JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
198
199 QA_TEXTRELS_amd64="opt/${P}/lib/i386/motif21/libmawt.so
200 opt/${P}/lib/i386/libdeploy.so"
201 QA_DT_HASH="opt/${P}/.*"
202
203 src_unpack() {
204 mkdir bundled-jdk
205 cd bundled-jdk
206 sh "${DISTDIR}"/${At} --accept-license --unpack || die "Failed to unpack"
207
208 cd ..
209 bash "${FILESDIR}"/construct.sh bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
210 }
211
212 src_compile() {
213 # Set PaX markings on all JDK/JRE executables to allow code-generation on
214 # the heap by the JIT compiler. This has to be done before CDS - #215225
215 pax-mark m $(list-paxables "${S}"/bin/*)
216
217 # see bug #207282
218 einfo "Creating the Class Data Sharing archives"
219 "${S}"/bin/java -client -Xshare:dump || die
220 }
221
222 src_install() {
223 dodir /opt/${P}
224 cp -pPR bin lib man javaws plugin "${D}/opt/${P}/" || die "failed to copy"
225
226 dodoc CHANGES README THIRDPARTYLICENSEREADME.txt || die
227 dohtml Welcome.html || die
228
229 if use nsplugin; then
230 local plugin_dir="ns7-gcc29"
231 if has_version '>=sys-devel/gcc-3' ; then
232 plugin_dir="ns7"
233 fi
234
235 install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
236 fi
237
238 # FIXME figure out how to handle the control pannel conflict with
239 # sun-jdk-bin
240
241 # install control panel for Gnome/KDE
242 # sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
243 # -e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \
244 # ${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
245 # ${T}/sun_java-${SLOT}.desktop
246
247 # domenu ${T}/sun_java-${SLOT}.desktop
248
249 set_java_env
250 java-vm_revdep-mask
251 }
252
253 pkg_postinst() {
254 # Set as default VM if none exists
255 java-vm-2_pkg_postinst
256
257 if ! use X; then
258 local xwarn="X11 libraries and/or"
259 fi
260
261 echo
262 ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be installed."
263 ewarn "Be careful which Java libraries you attempt to use."
264
265 echo
266 elog "Beginning with 1.5.0.10 the hotspot vm can use epoll"
267 elog "The epoll-based implementation of SelectorProvider is not selected by"
268 elog "default."
269 elog "Use java -Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.EPollSelectorProvider"
270 }
Report Message
Find on MARC Find on Google Groups