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

Gentoo Archives: gentoo-commits

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