1 |
tomwij 14/03/28 14:56:47 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: oracle-jre-bin-1.8.0.0.ebuild |
5 |
Log: |
6 |
Version bump to 1.8.0.0; for bug #505040, reported by wevrn5, contribution by Krzysztof Miksa, reviewed and adjusted. |
7 |
|
8 |
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D) |
9 |
|
10 |
Revision Changes Path |
11 |
1.50 dev-java/oracle-jre-bin/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog?rev=1.50&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog?rev=1.50&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog?r1=1.49&r2=1.50 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v |
20 |
retrieving revision 1.49 |
21 |
retrieving revision 1.50 |
22 |
diff -u -r1.49 -r1.50 |
23 |
--- ChangeLog 26 Jan 2014 10:41:04 -0000 1.49 |
24 |
+++ ChangeLog 28 Mar 2014 14:56:47 -0000 1.50 |
25 |
@@ -1,6 +1,13 @@ |
26 |
# ChangeLog for dev-java/oracle-jre-bin |
27 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.49 2014/01/26 10:41:04 sera Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.50 2014/03/28 14:56:47 tomwij Exp $ |
30 |
+ |
31 |
+*oracle-jre-bin-1.8.0.0 (28 Mar 2014) |
32 |
+ |
33 |
+ 28 Mar 2014; Tom Wijsman <TomWij@g.o> +files/oracle-jre-bin-1.8.env, |
34 |
+ +oracle-jre-bin-1.8.0.0.ebuild: |
35 |
+ Version bump to 1.8.0.0; for bug #505040, reported by wevrn5, contribution by |
36 |
+ Krzysztof Miksa, reviewed and adjusted. |
37 |
|
38 |
26 Jan 2014; Ralph Sennhauser <sera@g.o> |
39 |
-oracle-jre-bin-1.7.0.45.ebuild: |
40 |
|
41 |
|
42 |
|
43 |
1.1 dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.0.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.0.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.0.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: oracle-jre-bin-1.8.0.0.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2014 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.0.ebuild,v 1.1 2014/03/28 14:56:47 tomwij Exp $ |
53 |
|
54 |
EAPI="5" |
55 |
|
56 |
inherit java-vm-2 eutils prefix versionator |
57 |
|
58 |
if [[ "$(get_version_component_range 4)" == 0 ]] ; then |
59 |
S_PV="$(get_version_component_range 1-3)" |
60 |
else |
61 |
MY_PV_EXT="u$(get_version_component_range 4)" |
62 |
S_PV="$(get_version_component_range 1-4)" |
63 |
fi |
64 |
|
65 |
MY_PV="$(get_version_component_range 2)${MY_PV_EXT}" |
66 |
|
67 |
X86_AT="jre-${MY_PV}-linux-i586.tar.gz" |
68 |
AMD64_AT="jre-${MY_PV}-linux-x64.tar.gz" |
69 |
|
70 |
# This URIs need updating when bumping! |
71 |
JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html" |
72 |
JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html" |
73 |
|
74 |
JCE_DIR="UnlimitedJCEPolicyJDK8" |
75 |
JCE_FILE="jce_policy-8.zip" |
76 |
|
77 |
DESCRIPTION="Oracle's Java SE Runtime Environment" |
78 |
HOMEPAGE="http://www.oracle.com/technetwork/java/javase/" |
79 |
SRC_URI=" |
80 |
x86? ( ${X86_AT} ) |
81 |
amd64? ( ${AMD64_AT} ) |
82 |
jce? ( ${JCE_FILE} )" |
83 |
|
84 |
LICENSE="Oracle-BCLA-JavaSE" |
85 |
SLOT="1.8" |
86 |
KEYWORDS="~amd64 ~x86" |
87 |
IUSE="X alsa fontconfig jce nsplugin pax_kernel" |
88 |
|
89 |
RESTRICT="fetch strip" |
90 |
QA_PREBUILT="*" |
91 |
|
92 |
RDEPEND=" |
93 |
X? ( |
94 |
x11-libs/libXext |
95 |
x11-libs/libXi |
96 |
x11-libs/libXrender |
97 |
x11-libs/libXtst |
98 |
x11-libs/libX11 |
99 |
) |
100 |
alsa? ( media-libs/alsa-lib ) |
101 |
fontconfig? ( media-libs/fontconfig ) |
102 |
!prefix? ( sys-libs/glibc )" |
103 |
# scanelf won't create a PaX header, so depend on paxctl to avoid fallback |
104 |
# marking. #427642 |
105 |
DEPEND=" |
106 |
jce? ( app-arch/unzip ) |
107 |
pax_kernel? ( sys-apps/paxctl )" |
108 |
|
109 |
S="${WORKDIR}/jre${S_PV}" |
110 |
|
111 |
pkg_nofetch() { |
112 |
if use x86; then |
113 |
AT=${X86_AT} |
114 |
elif use amd64; then |
115 |
AT=${AMD64_AT} |
116 |
fi |
117 |
|
118 |
einfo "Please download '${AT}' from:" |
119 |
einfo "'${JRE_URI}'" |
120 |
einfo "and move it to '${DISTDIR}'" |
121 |
|
122 |
if use jce; then |
123 |
einfo "Also download '${JCE_FILE}' from:" |
124 |
einfo "'${JCE_URI}'" |
125 |
einfo "and move it to '${DISTDIR}'" |
126 |
fi |
127 |
} |
128 |
|
129 |
src_prepare() { |
130 |
if use jce; then |
131 |
mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die |
132 |
fi |
133 |
} |
134 |
|
135 |
src_compile() { |
136 |
# This needs to be done before CDS - #215225 |
137 |
java-vm_set-pax-markings "${S}" |
138 |
|
139 |
# see bug #207282 |
140 |
einfo "Creating the Class Data Sharing archives" |
141 |
case ${ARCH} in |
142 |
arm|ia64) |
143 |
bin/java -client -Xshare:dump || die |
144 |
;; |
145 |
x86) |
146 |
bin/java -client -Xshare:dump || die |
147 |
bin/java -server -Xshare:dump || die |
148 |
;; |
149 |
*) |
150 |
bin/java -server -Xshare:dump || die |
151 |
;; |
152 |
esac |
153 |
|
154 |
# Create files used as storage for system preferences. |
155 |
mkdir .systemPrefs || die |
156 |
touch .systemPrefs/.system.lock || die |
157 |
touch .systemPrefs/.systemRootModFile || die |
158 |
} |
159 |
|
160 |
src_install() { |
161 |
local dest="/opt/${P}" |
162 |
local ddest="${ED}${dest}" |
163 |
|
164 |
# We should not need the ancient plugin for Firefox 2 anymore, plus it has |
165 |
# writable executable segments |
166 |
if use x86; then |
167 |
rm -vf lib/i386/libjavaplugin_oji.so \ |
168 |
lib/i386/libjavaplugin_nscp*.so |
169 |
rm -vrf plugin/i386 |
170 |
fi |
171 |
# Without nsplugin flag, also remove the new plugin |
172 |
local arch=${ARCH}; |
173 |
use x86 && arch=i386; |
174 |
if ! use nsplugin; then |
175 |
rm -vf lib/${arch}/libnpjp2.so \ |
176 |
lib/${arch}/libjavaplugin_jni.so |
177 |
fi |
178 |
|
179 |
dodir "${dest}" |
180 |
cp -pPR bin lib man "${ddest}" || die |
181 |
|
182 |
# Remove empty dirs we might have copied |
183 |
find "${D}" -type d -empty -exec rmdir -v {} + || die |
184 |
|
185 |
dodoc COPYRIGHT README |
186 |
|
187 |
if use jce; then |
188 |
dodir ${dest}/lib/security/strong-jce |
189 |
mv "${ddest}"/lib/security/US_export_policy.jar \ |
190 |
"${ddest}"/lib/security/strong-jce || die |
191 |
mv "${ddest}"/lib/security/local_policy.jar \ |
192 |
"${ddest}"/lib/security/strong-jce || die |
193 |
dosym "${dest}"/lib/security/${JCE_DIR}/US_export_policy.jar \ |
194 |
"${dest}"/lib/security/US_export_policy.jar |
195 |
dosym "${dest}"/lib/security/${JCE_DIR}/local_policy.jar \ |
196 |
"${dest}"/lib/security/local_policy.jar |
197 |
fi |
198 |
|
199 |
if use nsplugin; then |
200 |
install_mozilla_plugin "${dest}"/lib/${arch}/libnpjp2.so |
201 |
fi |
202 |
|
203 |
# Install desktop file for the Java Control Panel. |
204 |
# Using ${PN}-${SLOT} to prevent file collision with jre and or other slots. |
205 |
# make_desktop_entry can't be used as ${P} would end up in filename. |
206 |
newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \ |
207 |
sun-jcontrol-${PN}-${SLOT}.png || die |
208 |
sed -e "s#Name=.*#Name=Java Control Panel for Oracle JRE ${SLOT}#" \ |
209 |
-e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \ |
210 |
-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \ |
211 |
-e "s#Application;##" \ |
212 |
-e "/Encoding/d" \ |
213 |
lib/desktop/applications/sun_java.desktop > \ |
214 |
"${T}"/jcontrol-${PN}-${SLOT}.desktop || die |
215 |
domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop |
216 |
|
217 |
# Prune all fontconfig files so libfontconfig will be used and only install |
218 |
# a Gentoo specific one if fontconfig is disabled. |
219 |
# http://docs.oracle.com/javase/7/docs/technotes/guides/intl/fontconfig.html |
220 |
rm "${ddest}"/lib/fontconfig.* || die |
221 |
if ! use fontconfig; then |
222 |
cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die |
223 |
eprefixify "${T}"/fontconfig.properties |
224 |
insinto "${dest}"/lib/ |
225 |
doins "${T}"/fontconfig.properties |
226 |
fi |
227 |
|
228 |
set_java_env |
229 |
java-vm_revdep-mask |
230 |
java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
231 |
} |