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 dev-java/sun-jdk: ChangeLog sun-jdk-1.6.0.13.ebuild sun-jdk-1.5.0.18.ebuild sun-jdk-1.6.0.11.ebuild
Date: Thu, 26 Mar 2009 04:44:39
Message-Id: E1LmhSH-0001bV-I8@stork.gentoo.org
1 serkan 09/03/26 04:44:37
2
3 Modified: ChangeLog
4 Added: sun-jdk-1.6.0.13.ebuild sun-jdk-1.5.0.18.ebuild
5 Removed: sun-jdk-1.6.0.11.ebuild
6 Log:
7 Version bump wrt security bug #263810. Remove old.
8 (Portage version: 2.2_rc26/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.255 dev-java/sun-jdk/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/ChangeLog?rev=1.255&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/ChangeLog?rev=1.255&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/ChangeLog?r1=1.254&r2=1.255
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v
20 retrieving revision 1.254
21 retrieving revision 1.255
22 diff -u -r1.254 -r1.255
23 --- ChangeLog 11 Mar 2009 22:50:09 -0000 1.254
24 +++ ChangeLog 26 Mar 2009 04:44:37 -0000 1.255
25 @@ -1,6 +1,13 @@
26 # ChangeLog for dev-java/sun-jdk
27 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.254 2009/03/11 22:50:09 maekke Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.255 2009/03/26 04:44:37 serkan Exp $
30 +
31 +*sun-jdk-1.6.0.13 (26 Mar 2009)
32 +*sun-jdk-1.5.0.18 (26 Mar 2009)
33 +
34 + 26 Mar 2009; Serkan Kaba <serkan@g.o> +sun-jdk-1.5.0.18.ebuild,
35 + -sun-jdk-1.6.0.11.ebuild, +sun-jdk-1.6.0.13.ebuild:
36 + Version bump wrt security bug #263810. Remove old.
37
38 11 Mar 2009; Markus Meier <maekke@g.o> sun-jdk-1.6.0.12.ebuild:
39 amd64 stable, bug #261500
40
41
42
43 1.1 dev-java/sun-jdk/sun-jdk-1.6.0.13.ebuild
44
45 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.13.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.13.ebuild?rev=1.1&content-type=text/plain
47
48 Index: sun-jdk-1.6.0.13.ebuild
49 ===================================================================
50 # Copyright 1999-2009 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.13.ebuild,v 1.1 2009/03/26 04:44:37 serkan Exp $
53
54 inherit versionator java-vm-2 eutils pax-utils
55
56 UPDATE="$(get_version_component_range 4)"
57 UPDATE="${UPDATE#0}"
58 MY_PV="$(get_version_component_range 2)u${UPDATE}"
59 X86_AT="jdk-${MY_PV}-dlj-linux-i586.bin"
60 AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64.bin"
61
62 DESCRIPTION="Sun's J2SE Development Kit, version ${PV}"
63 HOMEPAGE="http://java.sun.com/javase/6/"
64 URL_BASE="http://download.java.net/dlj/binaries"
65 SRC_URI="x86? ( ${URL_BASE}/${X86_AT} )
66 amd64? ( ${URL_BASE}/${AMD64_AT} )"
67 SLOT="1.6"
68 LICENSE="dlj-1.1"
69 KEYWORDS="~amd64 ~x86"
70 RESTRICT="strip"
71 IUSE="X alsa doc examples jce nsplugin odbc"
72
73 QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so
74 opt/${P}/jre/lib/i386/libdeploy.so
75 opt/${P}/jre/lib/i386/client/libjvm.so
76 opt/${P}/jre/lib/i386/server/libjvm.so"
77
78 DEPEND="jce? ( =dev-java/sun-jce-bin-1.6.0* )"
79 RDEPEND="doc? ( =dev-java/java-sdk-docs-1.6.0* )
80 sys-libs/glibc
81 alsa? ( media-libs/alsa-lib )
82 X? (
83 x11-libs/libXext
84 x11-libs/libXi
85 x11-libs/libXp
86 x11-libs/libXtst
87 amd64? ( x11-libs/libXt )
88 x11-libs/libX11
89 )
90 odbc? ( dev-db/unixODBC )"
91
92 JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
93
94 S="${WORKDIR}/jdk$(replace_version_separator 3 _)"
95
96 src_unpack() {
97 sh "${DISTDIR}"/${A} --accept-license --unpack || die "Failed to unpack"
98 }
99
100 src_compile() {
101 # Set PaX markings on all JDK/JRE executables to allow code-generation on
102 # the heap by the JIT compiler. This needs to be done before CDS - #215225
103 pax-mark m $(list-paxables "${S}"{,/jre}/bin/*)
104
105 # see bug #207282
106 if use x86; then
107 einfo "Creating the Class Data Sharing archives"
108 "${S}"/bin/java -client -Xshare:dump || die
109 "${S}"/bin/java -server -Xshare:dump || die
110 fi
111 }
112
113 src_install() {
114 local dirs="bin include jre lib man"
115
116 dodir /opt/${P}
117
118 cp -pPR $dirs "${D}/opt/${P}/" || die "failed to copy"
119 dodoc COPYRIGHT || die
120 dohtml README.html || die
121
122 cp -pP src.zip "${D}/opt/${P}/" || die
123
124 if use examples; then
125 cp -pPR demo sample "${D}/opt/${P}/" || die
126 fi
127
128 if use jce; then
129 cd "${D}/opt/${P}/jre/lib/security"
130 dodir /opt/${P}/jre/lib/security/strong-jce
131 mv "${D}"/opt/${P}/jre/lib/security/US_export_policy.jar \
132 "${D}"/opt/${P}/jre/lib/security/strong-jce || die
133 mv "${D}"/opt/${P}/jre/lib/security/local_policy.jar \
134 "${D}"/opt/${P}/jre/lib/security/strong-jce || die
135 dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/
136 dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
137 fi
138
139 if use nsplugin; then
140 local plugin_dir="ns7-gcc29"
141 if has_version '>=sys-devel/gcc-3' ; then
142 plugin_dir="ns7"
143 fi
144
145 if use x86 ; then
146 install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so
147 install_mozilla_plugin /opt/${P}/jre/lib/i386/libnpjp2.so plugin2
148 else
149 install_mozilla_plugin /opt/${P}/jre/lib/amd64/libnpjp2.so
150 fi
151 fi
152
153 # create dir for system preferences
154 dodir /opt/${P}/jre/.systemPrefs
155 # Create files used as storage for system preferences.
156 touch "${D}"/opt/${P}/jre/.systemPrefs/.system.lock
157 chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.system.lock
158 touch "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
159 chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
160
161 if [[ -f "${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop ]]; then
162 # install control panel for Gnome/KDE
163 # The jre also installs these so make sure that they do not have the same
164 # Name
165 sed -e "s/\(Name=\)Java/\1 Java Control Panel for Sun JDK ${SLOT}/" \
166 -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/ControlPanel#" \
167 -e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \
168 "${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
169 "${T}"/sun_jdk-${SLOT}.desktop
170
171 domenu "${T}"/sun_jdk-${SLOT}.desktop
172 fi
173
174 # bug #56444
175 insinto /opt/${P}/jre/lib/
176 newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties
177
178 set_java_env
179 java-vm_revdep-mask
180 }
181
182 pkg_postinst() {
183 # Set as default VM if none exists
184 java-vm-2_pkg_postinst
185
186 if use x86 && use nsplugin; then
187 elog
188 elog "Two variants of the nsplugin are available via eselect java-nsplugin:"
189 elog "${VMHANDLE} and ${VMHANDLE}-plugin2 (the Next-Generation Plug-In) "
190 ewarn "Note that the ${VMHANDLE}-plugin2 works only in Firefox 3!"
191 elog "For more info see https://jdk6.dev.java.net/plugin2/"
192 elog
193 fi
194
195 if use amd64 && use nsplugin; then
196 elog
197 elog "This version finally brings a browser plugin for amd64"
198 elog "It is the so-called Next-Generation Plug-In (plugin2)"
199 elog "Use eselect java-nsplugin to select it (${VMHANDLE})."
200 ewarn "Note that it works only in Firefox 3 or newer browsers!"
201 elog "For more info see https://jdk6.dev.java.net/plugin2/"
202 elog
203 fi
204
205 elog "Please reinstall eclipse-sdk if you have it installed and want"
206 elog "workaround for bug #215150."
207 }
208
209
210
211 1.1 dev-java/sun-jdk/sun-jdk-1.5.0.18.ebuild
212
213 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.18.ebuild?rev=1.1&view=markup
214 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.18.ebuild?rev=1.1&content-type=text/plain
215
216 Index: sun-jdk-1.5.0.18.ebuild
217 ===================================================================
218 # Copyright 1999-2009 Gentoo Foundation
219 # Distributed under the terms of the GNU General Public License v2
220 # $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.18.ebuild,v 1.1 2009/03/26 04:44:37 serkan Exp $
221
222 inherit versionator java-vm-2 eutils pax-utils
223
224 UPDATE="$(get_version_component_range 4)"
225 UPDATE="${UPDATE#0}"
226 MY_PV="$(get_version_component_range 2-3)u${UPDATE}"
227
228 X86_AT="jdk-${MY_PV}-dlj-linux-i586.bin"
229 AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64.bin"
230
231 DESCRIPTION="Sun's J2SE Development Kit, version 1.5"
232 HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
233 SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} )
234 amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )"
235 SLOT="1.5"
236 LICENSE="dlj-1.1"
237 KEYWORDS="~amd64 ~x86"
238 RESTRICT="strip"
239 IUSE="X alsa doc examples jce nsplugin odbc"
240
241 QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so opt/${P}/jre/lib/i386/libdeploy.so"
242
243 DEPEND="jce? ( =dev-java/sun-jce-bin-1.5.0* )"
244 RDEPEND="sys-libs/glibc
245 alsa? ( media-libs/alsa-lib )
246 doc? ( =dev-java/java-sdk-docs-1.5.0* )
247 X? (
248 x11-libs/libXext
249 x11-libs/libXi
250 x11-libs/libXp
251 x11-libs/libXtst
252 x11-libs/libXt
253 x11-libs/libX11
254 )
255 odbc? ( dev-db/unixODBC )"
256
257 S="${WORKDIR}/jdk$(replace_version_separator 3 _)"
258
259 JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
260
261 src_unpack() {
262 sh "${DISTDIR}/${A}" --accept-license --unpack || die "Failed to unpack"
263 }
264
265 src_compile() {
266 # Set PaX markings on all JDK/JRE executables to allow code-generation on
267 # the heap by the JIT compiler. This needs to be done before CDS - #215225
268 pax-mark m $(list-paxables "${S}"{,/jre}/bin/*)
269
270 # see bug #207282
271 if use x86; then
272 einfo "Creating the Class Data Sharing archives"
273 "${S}"/bin/java -client -Xshare:dump || die
274 fi
275 }
276
277 src_install() {
278 local dirs="bin include jre lib man"
279
280 dodir /opt/${P}
281
282 cp -pPR ${dirs} "${D}/opt/${P}/" || die "failed to copy"
283 dodoc COPYRIGHT README.html || die
284 dohtml README.html || die
285
286 cp -pP src.zip "${D}/opt/${P}/" || die
287
288 if use examples; then
289 cp -pPR demo "${D}/opt/${P}/" || die
290 cp -pPR sample "${D}/opt/${P}/" || die
291 fi
292
293 if use jce; then
294 cd "${D}"/opt/${P}/jre/lib/security || die
295 dodir /opt/${P}/jre/lib/security/strong-jce
296 mv "${D}"/opt/${P}/jre/lib/security/US_export_policy.jar \
297 "${D}"/opt/${P}/jre/lib/security/strong-jce || die
298 mv "${D}"/opt/${P}/jre/lib/security/local_policy.jar \
299 "${D}"/opt/${P}/jre/lib/security/strong-jce || die
300 local jcedir="/opt/sun-jce-bin-1.5.0/jre/lib/security/unlimited-jce/"
301 dosym ${jcedir}/US_export_policy.jar \
302 /opt/${P}/jre/lib/security/ || die
303 dosym ${jcedir}/local_policy.jar \
304 /opt/${P}/jre/lib/security/ || die
305 fi
306
307 if use nsplugin; then
308 local plugin_dir="ns7-gcc29"
309 if has_version '>=sys-devel/gcc-3' ; then
310 plugin_dir="ns7"
311 fi
312
313 if use x86 ; then
314 install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so
315 else
316 eerror "No plugin available for amd64 arch"
317 fi
318 fi
319
320 # create dir for system preferences
321 dodir /opt/${P}/jre/.systemPrefs
322 # Create files used as storage for system preferences.
323 touch "${D}"/opt/${P}/jre/.systemPrefs/.system.lock
324 chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.system.lock
325 touch "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
326 chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
327
328 # install control panel for Gnome/KDE
329 if [[ -f ${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop ]]; then
330 sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
331 -e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \
332 "${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
333 "${T}"/sun_java-${SLOT}.desktop \
334 || die "Failed to sed .desktop file"
335
336 domenu "${T}"/sun_java-${SLOT}.desktop
337 fi
338
339 # bug #56444
340 insinto /opt/${P}/jre/lib/
341 newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties
342
343 set_java_env
344 java-vm_revdep-mask
345 }
346
347 pkg_postinst() {
348 # Set as default VM if none exists
349 java-vm-2_pkg_postinst
350
351 elog "The epoll-based implementation of SelectorProvider is not selected by"
352 elog "default."
353 elog "Use java -Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.EPollSelectorProvider"
354 elog ""
355 }
Report Message
Find on MARC Find on Google Groups