1 |
caster 11/04/26 15:04:45 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: sun-jdk-1.6.0.25.ebuild |
5 |
Removed: sun-jdk-1.6.0.23.ebuild |
6 |
Log: |
7 |
Version bump. |
8 |
|
9 |
(Portage version: 2.2.0_alpha28/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.301 dev-java/sun-jdk/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/sun-jdk/ChangeLog?rev=1.301&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/sun-jdk/ChangeLog?rev=1.301&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/sun-jdk/ChangeLog?r1=1.300&r2=1.301 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v |
21 |
retrieving revision 1.300 |
22 |
retrieving revision 1.301 |
23 |
diff -u -r1.300 -r1.301 |
24 |
--- ChangeLog 21 Feb 2011 18:35:33 -0000 1.300 |
25 |
+++ ChangeLog 26 Apr 2011 15:04:44 -0000 1.301 |
26 |
@@ -1,6 +1,12 @@ |
27 |
# ChangeLog for dev-java/sun-jdk |
28 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.300 2011/02/21 18:35:33 fauli Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.301 2011/04/26 15:04:44 caster Exp $ |
31 |
+ |
32 |
+*sun-jdk-1.6.0.25 (26 Apr 2011) |
33 |
+ |
34 |
+ 26 Apr 2011; Vlastimil Babka <caster@g.o> -sun-jdk-1.6.0.23.ebuild, |
35 |
+ +sun-jdk-1.6.0.25.ebuild: |
36 |
+ Version bump. |
37 |
|
38 |
21 Feb 2011; Christian Faulhammer <fauli@g.o> |
39 |
sun-jdk-1.6.0.24.ebuild: |
40 |
|
41 |
|
42 |
|
43 |
1.1 dev-java/sun-jdk/sun-jdk-1.6.0.25.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.25.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.25.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: sun-jdk-1.6.0.25.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2011 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.25.ebuild,v 1.1 2011/04/26 15:04:44 caster 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 Java SE Development Kit" |
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 derby 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 |
QA_DT_HASH="opt/${P}/.*" |
78 |
|
79 |
DEPEND="jce? ( =dev-java/sun-jce-bin-1.6.0* )" |
80 |
RDEPEND="${DEPEND} |
81 |
doc? ( =dev-java/java-sdk-docs-1.6.0* ) |
82 |
sys-libs/glibc |
83 |
alsa? ( media-libs/alsa-lib ) |
84 |
X? ( |
85 |
x11-libs/libXext |
86 |
x11-libs/libXi |
87 |
x11-libs/libXp |
88 |
x11-libs/libXtst |
89 |
amd64? ( x11-libs/libXt ) |
90 |
x11-libs/libX11 |
91 |
) |
92 |
odbc? ( dev-db/unixODBC )" |
93 |
|
94 |
JAVA_PROVIDE="jdbc-stdext jdbc-rowset" |
95 |
|
96 |
S="${WORKDIR}/jdk$(replace_version_separator 3 _)" |
97 |
|
98 |
src_unpack() { |
99 |
sh "${DISTDIR}"/${A} --accept-license --unpack || die "Failed to unpack" |
100 |
} |
101 |
|
102 |
src_compile() { |
103 |
# Set PaX markings on all JDK/JRE executables to allow code-generation on |
104 |
# the heap by the JIT compiler. This needs to be done before CDS - #215225 |
105 |
pax-mark m $(list-paxables "${S}"{,/jre}/bin/*) |
106 |
|
107 |
# see bug #207282 |
108 |
if use x86; then |
109 |
einfo "Creating the Class Data Sharing archives" |
110 |
"${S}"/bin/java -client -Xshare:dump || die |
111 |
"${S}"/bin/java -server -Xshare:dump || die |
112 |
fi |
113 |
} |
114 |
|
115 |
src_install() { |
116 |
local dirs="bin include jre lib man" |
117 |
|
118 |
use derby && dirs="${dirs} db" |
119 |
|
120 |
dodir /opt/${P} |
121 |
|
122 |
cp -pPR $dirs "${D}/opt/${P}/" || die "failed to copy" |
123 |
dodoc COPYRIGHT || die |
124 |
dohtml README.html || die |
125 |
|
126 |
cp -pP src.zip "${D}/opt/${P}/" || die |
127 |
|
128 |
if use examples; then |
129 |
cp -pPR demo sample "${D}/opt/${P}/" || die |
130 |
fi |
131 |
|
132 |
if use jce; then |
133 |
cd "${D}/opt/${P}/jre/lib/security" |
134 |
dodir /opt/${P}/jre/lib/security/strong-jce |
135 |
mv "${D}"/opt/${P}/jre/lib/security/US_export_policy.jar \ |
136 |
"${D}"/opt/${P}/jre/lib/security/strong-jce || die |
137 |
mv "${D}"/opt/${P}/jre/lib/security/local_policy.jar \ |
138 |
"${D}"/opt/${P}/jre/lib/security/strong-jce || die |
139 |
dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/ |
140 |
dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/ |
141 |
fi |
142 |
|
143 |
if use nsplugin; then |
144 |
local plugin_dir="ns7-gcc29" |
145 |
if has_version '>=sys-devel/gcc-3' ; then |
146 |
plugin_dir="ns7" |
147 |
fi |
148 |
|
149 |
if use x86 ; then |
150 |
install_mozilla_plugin /opt/${P}/jre/lib/i386/libnpjp2.so |
151 |
install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so old_oji |
152 |
else |
153 |
install_mozilla_plugin /opt/${P}/jre/lib/amd64/libnpjp2.so |
154 |
fi |
155 |
fi |
156 |
|
157 |
# create dir for system preferences |
158 |
dodir /opt/${P}/jre/.systemPrefs |
159 |
# Create files used as storage for system preferences. |
160 |
touch "${D}"/opt/${P}/jre/.systemPrefs/.system.lock |
161 |
chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.system.lock |
162 |
touch "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile |
163 |
chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile |
164 |
|
165 |
if [[ -f "${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop ]]; then |
166 |
# install control panel for Gnome/KDE |
167 |
# The jre also installs these so make sure that they do not have the same |
168 |
# Name |
169 |
sed -e "s/\(Name=\)Java/\1 Java Control Panel for Sun JDK ${SLOT}/" \ |
170 |
-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/ControlPanel#" \ |
171 |
-e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \ |
172 |
"${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop > \ |
173 |
"${T}"/sun_jdk-${SLOT}.desktop |
174 |
|
175 |
domenu "${T}"/sun_jdk-${SLOT}.desktop |
176 |
fi |
177 |
|
178 |
# bug #56444 |
179 |
insinto /opt/${P}/jre/lib/ |
180 |
newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties |
181 |
|
182 |
set_java_env |
183 |
java-vm_revdep-mask |
184 |
} |
185 |
|
186 |
pkg_postinst() { |
187 |
# Set as default VM if none exists |
188 |
java-vm-2_pkg_postinst |
189 |
|
190 |
if use x86 && use nsplugin; then |
191 |
elog |
192 |
elog "Two variants of the nsplugin are available via eselect java-nsplugin:" |
193 |
elog "Note that starting with ${PN}-1.6.0.18-r1 their naming and the default changed," |
194 |
elog "users with the old plugin set are switched to the new default automatically." |
195 |
elog "The default ${VMHANDLE} is the new 'plugin2' which works in Firefox 3 (xulrunner-1.9)" |
196 |
elog "and newer, the ${VMHANDLE}-old_oji is the old plugin using the OJI API" |
197 |
elog "that was removed in Firefox 3.6 (xulrunner-1.9.2)." |
198 |
elog "For more info see https://jdk6.dev.java.net/plugin2/" |
199 |
elog |
200 |
fi |
201 |
|
202 |
if use amd64 && use nsplugin; then |
203 |
elog |
204 |
elog "The amd64 version ships the new 'plugin2' browser plugin which works" |
205 |
elog "in Firefox 3+ and other recent browser versions." |
206 |
elog "For more info see https://jdk6.dev.java.net/plugin2/" |
207 |
elog |
208 |
fi |
209 |
} |