1 |
caster 09/05/31 11:19:18 |
2 |
|
3 |
Modified: metadata.xml ChangeLog |
4 |
Added: sun-jdk-1.6.0.14.ebuild |
5 |
Log: |
6 |
Version bump. See http://java.sun.com/javase/6/webnotes/6u14.html for the new (mostly experimental) features. Added a derby USE flag, installing the bundled Java DB - bug #161570. |
7 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.6 dev-java/sun-jdk/metadata.xml |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/metadata.xml?rev=1.6&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/metadata.xml?rev=1.6&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/metadata.xml?r1=1.5&r2=1.6 |
15 |
|
16 |
Index: metadata.xml |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/metadata.xml,v |
19 |
retrieving revision 1.5 |
20 |
retrieving revision 1.6 |
21 |
diff -u -r1.5 -r1.6 |
22 |
--- metadata.xml 8 Aug 2008 05:29:56 -0000 1.5 |
23 |
+++ metadata.xml 31 May 2009 11:19:18 -0000 1.6 |
24 |
@@ -4,6 +4,7 @@ |
25 |
<herd>java</herd> |
26 |
<longdescription>Sun Java Development Kit Package. AKA.J2SE</longdescription> |
27 |
<use> |
28 |
+ <flag name="derby">Enable Installation of Bundled Derby (Java DB)</flag> |
29 |
<flag name="jce">Enable Java Cryptographic Extension Unlimited Strength Policy files</flag> |
30 |
</use> |
31 |
</pkgmetadata> |
32 |
|
33 |
|
34 |
|
35 |
1.259 dev-java/sun-jdk/ChangeLog |
36 |
|
37 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/ChangeLog?rev=1.259&view=markup |
38 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/ChangeLog?rev=1.259&content-type=text/plain |
39 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/ChangeLog?r1=1.258&r2=1.259 |
40 |
|
41 |
Index: ChangeLog |
42 |
=================================================================== |
43 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v |
44 |
retrieving revision 1.258 |
45 |
retrieving revision 1.259 |
46 |
diff -u -r1.258 -r1.259 |
47 |
--- ChangeLog 29 May 2009 20:30:58 -0000 1.258 |
48 |
+++ ChangeLog 31 May 2009 11:19:18 -0000 1.259 |
49 |
@@ -1,6 +1,14 @@ |
50 |
# ChangeLog for dev-java/sun-jdk |
51 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
52 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.258 2009/05/29 20:30:58 caster Exp $ |
53 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.259 2009/05/31 11:19:18 caster Exp $ |
54 |
+ |
55 |
+*sun-jdk-1.6.0.14 (31 May 2009) |
56 |
+ |
57 |
+ 31 May 2009; Vlastimil Babka <caster@g.o> +sun-jdk-1.6.0.14.ebuild, |
58 |
+ metadata.xml: |
59 |
+ Version bump. See http://java.sun.com/javase/6/webnotes/6u14.html for the |
60 |
+ new (mostly experimental) features. Added a derby USE flag, installing the |
61 |
+ bundled Java DB - bug #161570. |
62 |
|
63 |
29 May 2009; Vlastimil Babka <caster@g.o> sun-jdk-1.4.2.19.ebuild, |
64 |
-sun-jdk-1.5.0.17.ebuild, sun-jdk-1.5.0.18.ebuild, |
65 |
|
66 |
|
67 |
|
68 |
1.1 dev-java/sun-jdk/sun-jdk-1.6.0.14.ebuild |
69 |
|
70 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.14.ebuild?rev=1.1&view=markup |
71 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.14.ebuild?rev=1.1&content-type=text/plain |
72 |
|
73 |
Index: sun-jdk-1.6.0.14.ebuild |
74 |
=================================================================== |
75 |
# Copyright 1999-2009 Gentoo Foundation |
76 |
# Distributed under the terms of the GNU General Public License v2 |
77 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.14.ebuild,v 1.1 2009/05/31 11:19:18 caster Exp $ |
78 |
|
79 |
inherit versionator java-vm-2 eutils pax-utils |
80 |
|
81 |
UPDATE="$(get_version_component_range 4)" |
82 |
UPDATE="${UPDATE#0}" |
83 |
MY_PV="$(get_version_component_range 2)u${UPDATE}" |
84 |
X86_AT="jdk-${MY_PV}-dlj-linux-i586.bin" |
85 |
AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64.bin" |
86 |
|
87 |
DESCRIPTION="Sun's Java SE Development Kit" |
88 |
HOMEPAGE="http://java.sun.com/javase/6/" |
89 |
URL_BASE="http://download.java.net/dlj/binaries" |
90 |
SRC_URI="x86? ( ${URL_BASE}/${X86_AT} ) |
91 |
amd64? ( ${URL_BASE}/${AMD64_AT} )" |
92 |
SLOT="1.6" |
93 |
LICENSE="dlj-1.1" |
94 |
KEYWORDS="~amd64 ~x86" |
95 |
RESTRICT="strip" |
96 |
IUSE="X alsa derby doc examples jce nsplugin odbc" |
97 |
|
98 |
QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so |
99 |
opt/${P}/jre/lib/i386/libdeploy.so |
100 |
opt/${P}/jre/lib/i386/client/libjvm.so |
101 |
opt/${P}/jre/lib/i386/server/libjvm.so" |
102 |
QA_DT_HASH="opt/${P}/.*" |
103 |
|
104 |
DEPEND="jce? ( =dev-java/sun-jce-bin-1.6.0* )" |
105 |
RDEPEND="doc? ( =dev-java/java-sdk-docs-1.6.0* ) |
106 |
sys-libs/glibc |
107 |
alsa? ( media-libs/alsa-lib ) |
108 |
X? ( |
109 |
x11-libs/libXext |
110 |
x11-libs/libXi |
111 |
x11-libs/libXp |
112 |
x11-libs/libXtst |
113 |
amd64? ( x11-libs/libXt ) |
114 |
x11-libs/libX11 |
115 |
) |
116 |
odbc? ( dev-db/unixODBC )" |
117 |
|
118 |
JAVA_PROVIDE="jdbc-stdext jdbc-rowset" |
119 |
|
120 |
S="${WORKDIR}/jdk$(replace_version_separator 3 _)" |
121 |
|
122 |
src_unpack() { |
123 |
sh "${DISTDIR}"/${A} --accept-license --unpack || die "Failed to unpack" |
124 |
} |
125 |
|
126 |
src_compile() { |
127 |
# Set PaX markings on all JDK/JRE executables to allow code-generation on |
128 |
# the heap by the JIT compiler. This needs to be done before CDS - #215225 |
129 |
pax-mark m $(list-paxables "${S}"{,/jre}/bin/*) |
130 |
|
131 |
# see bug #207282 |
132 |
if use x86; then |
133 |
einfo "Creating the Class Data Sharing archives" |
134 |
"${S}"/bin/java -client -Xshare:dump || die |
135 |
"${S}"/bin/java -server -Xshare:dump || die |
136 |
fi |
137 |
} |
138 |
|
139 |
src_install() { |
140 |
local dirs="bin include jre lib man" |
141 |
|
142 |
use derby && dirs="${dirs} db" |
143 |
|
144 |
dodir /opt/${P} |
145 |
|
146 |
cp -pPR $dirs "${D}/opt/${P}/" || die "failed to copy" |
147 |
dodoc COPYRIGHT || die |
148 |
dohtml README.html || die |
149 |
|
150 |
cp -pP src.zip "${D}/opt/${P}/" || die |
151 |
|
152 |
if use examples; then |
153 |
cp -pPR demo sample "${D}/opt/${P}/" || die |
154 |
fi |
155 |
|
156 |
if use jce; then |
157 |
cd "${D}/opt/${P}/jre/lib/security" |
158 |
dodir /opt/${P}/jre/lib/security/strong-jce |
159 |
mv "${D}"/opt/${P}/jre/lib/security/US_export_policy.jar \ |
160 |
"${D}"/opt/${P}/jre/lib/security/strong-jce || die |
161 |
mv "${D}"/opt/${P}/jre/lib/security/local_policy.jar \ |
162 |
"${D}"/opt/${P}/jre/lib/security/strong-jce || die |
163 |
dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/ |
164 |
dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/ |
165 |
fi |
166 |
|
167 |
if use nsplugin; then |
168 |
local plugin_dir="ns7-gcc29" |
169 |
if has_version '>=sys-devel/gcc-3' ; then |
170 |
plugin_dir="ns7" |
171 |
fi |
172 |
|
173 |
if use x86 ; then |
174 |
install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so |
175 |
install_mozilla_plugin /opt/${P}/jre/lib/i386/libnpjp2.so plugin2 |
176 |
else |
177 |
install_mozilla_plugin /opt/${P}/jre/lib/amd64/libnpjp2.so |
178 |
fi |
179 |
fi |
180 |
|
181 |
# create dir for system preferences |
182 |
dodir /opt/${P}/jre/.systemPrefs |
183 |
# Create files used as storage for system preferences. |
184 |
touch "${D}"/opt/${P}/jre/.systemPrefs/.system.lock |
185 |
chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.system.lock |
186 |
touch "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile |
187 |
chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile |
188 |
|
189 |
if [[ -f "${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop ]]; then |
190 |
# install control panel for Gnome/KDE |
191 |
# The jre also installs these so make sure that they do not have the same |
192 |
# Name |
193 |
sed -e "s/\(Name=\)Java/\1 Java Control Panel for Sun JDK ${SLOT}/" \ |
194 |
-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/ControlPanel#" \ |
195 |
-e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \ |
196 |
"${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop > \ |
197 |
"${T}"/sun_jdk-${SLOT}.desktop |
198 |
|
199 |
domenu "${T}"/sun_jdk-${SLOT}.desktop |
200 |
fi |
201 |
|
202 |
# bug #56444 |
203 |
insinto /opt/${P}/jre/lib/ |
204 |
newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties |
205 |
|
206 |
set_java_env |
207 |
java-vm_revdep-mask |
208 |
} |
209 |
|
210 |
pkg_postinst() { |
211 |
# Set as default VM if none exists |
212 |
java-vm-2_pkg_postinst |
213 |
|
214 |
if use x86 && use nsplugin; then |
215 |
elog |
216 |
elog "Two variants of the nsplugin are available via eselect java-nsplugin:" |
217 |
elog "${VMHANDLE} and ${VMHANDLE}-plugin2 (the Next-Generation Plug-In) " |
218 |
ewarn "Note that the ${VMHANDLE}-plugin2 works only in Firefox 3!" |
219 |
elog "For more info see https://jdk6.dev.java.net/plugin2/" |
220 |
elog |
221 |
fi |
222 |
|
223 |
if use amd64 && use nsplugin; then |
224 |
elog |
225 |
elog "This version finally brings a browser plugin for amd64" |
226 |
elog "It is the so-called Next-Generation Plug-In (plugin2)" |
227 |
elog "Use eselect java-nsplugin to select it (${VMHANDLE})." |
228 |
ewarn "Note that it works only in Firefox 3 or newer browsers!" |
229 |
elog "For more info see https://jdk6.dev.java.net/plugin2/" |
230 |
elog |
231 |
fi |
232 |
|
233 |
elog "Please reinstall eclipse-sdk if you have it installed and want" |
234 |
elog "workaround for bug #215150." |
235 |
} |