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

Gentoo Archives: gentoo-commits

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