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