1 |
betelgeuse 07/10/04 13:19:44 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: sun-jre-bin-1.6.0.03.ebuild |
5 |
sun-jre-bin-1.5.0.13.ebuild |
6 |
Log: |
7 |
Version bumps for bug #194699. |
8 |
(Portage version: 2.1.3.9) |
9 |
|
10 |
Revision Changes Path |
11 |
1.107 dev-java/sun-jre-bin/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jre-bin/ChangeLog?rev=1.107&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jre-bin/ChangeLog?rev=1.107&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jre-bin/ChangeLog?r1=1.106&r2=1.107 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v |
20 |
retrieving revision 1.106 |
21 |
retrieving revision 1.107 |
22 |
diff -u -r1.106 -r1.107 |
23 |
--- ChangeLog 22 Jul 2007 21:08:29 -0000 1.106 |
24 |
+++ ChangeLog 4 Oct 2007 13:19:43 -0000 1.107 |
25 |
@@ -1,6 +1,13 @@ |
26 |
# ChangeLog for dev-java/sun-jre-bin |
27 |
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.106 2007/07/22 21:08:29 caster Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.107 2007/10/04 13:19:43 betelgeuse Exp $ |
30 |
+ |
31 |
+*sun-jre-bin-1.6.0.03 (04 Oct 2007) |
32 |
+*sun-jre-bin-1.5.0.13 (04 Oct 2007) |
33 |
+ |
34 |
+ 04 Oct 2007; Petteri Räty <betelgeuse@g.o> |
35 |
+ +sun-jre-bin-1.5.0.13.ebuild, +sun-jre-bin-1.6.0.03.ebuild: |
36 |
+ Version bumps for bug #194699. |
37 |
|
38 |
22 Jul 2007; Vlastimil Babka <caster@g.o> |
39 |
-sun-jre-bin-1.4.2.14.ebuild, -sun-jre-bin-1.5.0.11.ebuild, |
40 |
|
41 |
|
42 |
|
43 |
1.1 dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: sun-jre-bin-1.6.0.03.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2007 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild,v 1.1 2007/10/04 13:19:43 betelgeuse Exp $ |
53 |
|
54 |
inherit versionator pax-utils eutils java-vm-2 |
55 |
|
56 |
UPDATE="$(get_version_component_range 4)" |
57 |
UPDATE="${UPDATE#0}" |
58 |
MY_PV="$(get_version_component_range 2)u${UPDATE}" |
59 |
|
60 |
SUFFIX=".bin" |
61 |
X86_AT="jdk-${MY_PV}-dlj-linux-i586${SUFFIX}" |
62 |
AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64${SUFFIX}" |
63 |
|
64 |
DESCRIPTION="Sun's J2SE Development Kit, version ${PV}" |
65 |
HOMEPAGE="http://java.sun.com/javase/6/" |
66 |
# This release is probably under a different url because tmarble is on holiday |
67 |
#SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} ) |
68 |
# amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )" |
69 |
URL_BASE="http://dlc.sun.com/dlj/binaries" |
70 |
SRC_URI="x86? ( ${URL_BASE}/${X86_AT} ) |
71 |
amd64? ( ${URL_BASE}/${AMD64_AT} )" |
72 |
SLOT="1.6" |
73 |
LICENSE="dlj-1.1" |
74 |
KEYWORDS="-* ~amd64 ~x86" |
75 |
RESTRICT="strip" |
76 |
IUSE="X alsa nsplugin" |
77 |
|
78 |
RDEPEND=" |
79 |
sys-libs/glibc |
80 |
x86? ( =virtual/libstdc++-3.3 ) |
81 |
alsa? ( media-libs/alsa-lib ) |
82 |
X? ( |
83 |
x11-libs/libX11 |
84 |
x11-libs/libXext |
85 |
x11-libs/libXi |
86 |
x11-libs/libXp |
87 |
x11-libs/libXtst |
88 |
)" |
89 |
|
90 |
DEPEND="" |
91 |
|
92 |
JAVA_PROVIDE="jdbc-stdext jdbc-rowset" |
93 |
|
94 |
QA_TEXTRELS_x86="opt/${P}/lib/i386/client/libjvm.so |
95 |
opt/${P}/lib/i386/motif21/libmawt.so |
96 |
opt/${P}/lib/i386/libdeploy.so |
97 |
opt/${P}/lib/i386/server/libjvm.so" |
98 |
|
99 |
src_unpack() { |
100 |
if [ ! -r ${DISTDIR}/${A} ]; then |
101 |
die "cannot read ${A}. Please check the permission and try again." |
102 |
fi |
103 |
|
104 |
mkdir bundled-jdk |
105 |
cd bundled-jdk |
106 |
sh ${DISTDIR}/${A} --accept-license --unpack || die "Failed to unpack" |
107 |
|
108 |
cd .. |
109 |
bash ${FILESDIR}/construct-1.6.sh bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed" |
110 |
} |
111 |
|
112 |
src_install() { |
113 |
local dirs="bin lib man" |
114 |
|
115 |
# Set PaX markings on all JDK/JRE executables to allow code-generation on |
116 |
# the heap by the JIT compiler. |
117 |
pax-mark m $(list-paxables ${S}/bin/*) |
118 |
|
119 |
# only X86 has the plugin and javaws |
120 |
use x86 && dirs="${dirs} javaws plugin" |
121 |
dodir /opt/${P} |
122 |
|
123 |
cp -pPR $dirs "${D}/opt/${P}/" || die "failed to copy" |
124 |
|
125 |
dodoc README THIRDPARTYLICENSEREADME.txt || die |
126 |
dohtml Welcome.html || die |
127 |
dodir /opt/${P}/share/ |
128 |
|
129 |
if use nsplugin; then |
130 |
local plugin_dir="ns7-gcc29" |
131 |
if has_version '>=sys-devel/gcc-3' ; then |
132 |
plugin_dir="ns7" |
133 |
fi |
134 |
|
135 |
if use x86 ; then |
136 |
install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so |
137 |
else |
138 |
eerror "No plugin available for amd64 arch" |
139 |
fi |
140 |
fi |
141 |
|
142 |
# install control panel for Gnome/KDE |
143 |
if [[ -e "${D}/opt/${P}/plugin/desktop/sun_java.desktop" ]]; then |
144 |
sed -e "s/\(Name=Java\)/\1 Control Panel for Sun JRE ${SLOT}/" \ |
145 |
-e "s#Exec=.*#Exec=/opt/${P}/bin/ControlPanel#" \ |
146 |
-e "s#Icon=.*#Icon=/opt/${P}/plugin/desktop/sun_java.png#" \ |
147 |
${D}/opt/${P}/plugin/desktop/sun_java.desktop > \ |
148 |
${T}/sun_jre-${SLOT}.desktop || die |
149 |
domenu ${T}/sun_jre-${SLOT}.desktop || die |
150 |
fi |
151 |
|
152 |
# bug #56444 |
153 |
insinto /opt/${P}/lib/ |
154 |
newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties |
155 |
|
156 |
set_java_env |
157 |
} |
158 |
|
159 |
pkg_postinst() { |
160 |
# Set as default VM if none exists |
161 |
java-vm-2_pkg_postinst |
162 |
|
163 |
if ! use X; then |
164 |
local xwarn="X11 libraries and/or" |
165 |
fi |
166 |
|
167 |
echo |
168 |
ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be installed." |
169 |
ewarn "Be careful which Java libraries you attempt to use." |
170 |
|
171 |
echo |
172 |
elog "Beginning with 1.5.0.10 the hotspot vm can use epoll" |
173 |
elog "The epoll-based implementation of SelectorProvider is not selected by" |
174 |
elog "default." |
175 |
elog "Use java -Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.EPollSelectorProvider" |
176 |
} |
177 |
|
178 |
|
179 |
|
180 |
1.1 dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild |
181 |
|
182 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild?rev=1.1&view=markup |
183 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild?rev=1.1&content-type=text/plain |
184 |
|
185 |
Index: sun-jre-bin-1.5.0.13.ebuild |
186 |
=================================================================== |
187 |
# Copyright 1999-2007 Gentoo Foundation |
188 |
# Distributed under the terms of the GNU General Public License v2 |
189 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild,v 1.1 2007/10/04 13:19:43 betelgeuse Exp $ |
190 |
|
191 |
inherit pax-utils eutils java-vm-2 |
192 |
|
193 |
MY_PVL=${PV%.*}_${PV##*.} |
194 |
MY_PVA=${PV//./_} |
195 |
#S="${WORKDIR}/jdk${MY_PVL}" |
196 |
|
197 |
X86_AT="jdk-${MY_PVA}-dlj-linux-i586.bin" |
198 |
AMD64_AT="jdk-${MY_PVA}-dlj-linux-amd64.bin" |
199 |
|
200 |
DESCRIPTION="Sun's J2SE Development Kit, version ${PV}" |
201 |
HOMEPAGE="http://java.sun.com/j2se/1.5.0/" |
202 |
SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} ) |
203 |
amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )" |
204 |
SLOT="1.5" |
205 |
LICENSE="dlj-1.1" |
206 |
KEYWORDS="-* ~amd64 ~x86" |
207 |
RESTRICT="strip" |
208 |
IUSE="X alsa nsplugin" |
209 |
|
210 |
RDEPEND=" |
211 |
sys-libs/glibc |
212 |
alsa? ( media-libs/alsa-lib ) |
213 |
X? ( |
214 |
x11-libs/libX11 |
215 |
x11-libs/libXext |
216 |
x11-libs/libXi |
217 |
x11-libs/libXp |
218 |
x11-libs/libXt |
219 |
x11-libs/libXtst |
220 |
)" |
221 |
|
222 |
DEPEND="" |
223 |
|
224 |
JAVA_PROVIDE="jdbc-stdext jdbc-rowset" |
225 |
|
226 |
QA_TEXTRELS_x86="opt/${P}/lib/i386/motif21/libmawt.so |
227 |
opt/${P}/lib/i386/libdeploy.so" |
228 |
|
229 |
src_unpack() { |
230 |
if [ ! -r ${DISTDIR}/${A} ]; then |
231 |
die "cannot read ${A}. Please check the permission and try again." |
232 |
fi |
233 |
|
234 |
mkdir bundled-jdk |
235 |
cd bundled-jdk |
236 |
sh "${DISTDIR}/${A}" --accept-license --unpack || die "Failed to unpack" |
237 |
|
238 |
cd .. |
239 |
bash ${FILESDIR}/construct.sh bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed" |
240 |
} |
241 |
|
242 |
src_install() { |
243 |
# Set PaX markings on all JDK/JRE executables to allow code-generation on |
244 |
# the heap by the JIT compiler. |
245 |
pax-mark m $(list-paxables ${S}/bin/*) |
246 |
|
247 |
local dirs="bin lib man" |
248 |
# only X86 has the plugin and javaws |
249 |
use x86 && dirs="${dirs} javaws plugin" |
250 |
dodir /opt/${P} |
251 |
|
252 |
cp -pPR ${dirs} "${D}/opt/${P}/" || die "failed to copy" |
253 |
|
254 |
dodoc CHANGES README THIRDPARTYLICENSEREADME.txt || die |
255 |
dohtml Welcome.html || die |
256 |
|
257 |
if use nsplugin; then |
258 |
local plugin_dir="ns7-gcc29" |
259 |
if has_version '>=sys-devel/gcc-3' ; then |
260 |
plugin_dir="ns7" |
261 |
fi |
262 |
|
263 |
if use x86 ; then |
264 |
install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so |
265 |
else |
266 |
eerror "No plugin available for amd64 arch" |
267 |
fi |
268 |
fi |
269 |
|
270 |
# FIXME figure out how to handle the control pannel conflict with |
271 |
# sun-jdk-bin |
272 |
|
273 |
# install control panel for Gnome/KDE |
274 |
# sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \ |
275 |
# -e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \ |
276 |
# ${D}/opt/${P}/plugin/desktop/sun_java.desktop > \ |
277 |
# ${T}/sun_java-${SLOT}.desktop |
278 |
|
279 |
# domenu ${T}/sun_java-${SLOT}.desktop |
280 |
|
281 |
# bug #56444 |
282 |
insinto /opt/${P}/lib/ |
283 |
newins "${FILESDIR}"/fontconfig.Gentoo.properties \ |
284 |
fontconfig.properties || die |
285 |
|
286 |
set_java_env |
287 |
} |
288 |
|
289 |
pkg_postinst() { |
290 |
# Set as default VM if none exists |
291 |
java-vm-2_pkg_postinst |
292 |
|
293 |
if ! use X; then |
294 |
local xwarn="X11 libraries and/or" |
295 |
fi |
296 |
|
297 |
echo |
298 |
ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be installed." |
299 |
ewarn "Be careful which Java libraries you attempt to use." |
300 |
|
301 |
echo |
302 |
elog "Beginning with 1.5.0.10 the hotspot vm can use epoll" |
303 |
elog "The epoll-based implementation of SelectorProvider is not selected by" |
304 |
elog "default." |
305 |
elog "Use java -Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.EPollSelectorProvider" |
306 |
} |
307 |
|
308 |
|
309 |
|
310 |
-- |
311 |
gentoo-commits@g.o mailing list |