Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Tom Wijsman (tomwij)" <tomwij@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/oracle-jdk-bin: oracle-jdk-bin-1.7.0.60.ebuild ChangeLog
Date: Wed, 28 May 2014 19:07:24
Message-Id: 20140528190721.2325C2004E@flycatcher.gentoo.org
1 tomwij 14/05/28 19:07:21
2
3 Modified: ChangeLog
4 Added: oracle-jdk-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.61 dev-java/oracle-jdk-bin/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog?rev=1.61&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog?rev=1.61&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog?r1=1.60&r2=1.61
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v
20 retrieving revision 1.60
21 retrieving revision 1.61
22 diff -u -r1.60 -r1.61
23 --- ChangeLog 23 May 2014 13:26:51 -0000 1.60
24 +++ ChangeLog 28 May 2014 19:07:20 -0000 1.61
25 @@ -1,6 +1,11 @@
26 # ChangeLog for dev-java/oracle-jdk-bin
27 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.60 2014/05/23 13:26:51 mrueg Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.61 2014/05/28 19:07:20 tomwij Exp $
30 +
31 +*oracle-jdk-bin-1.7.0.60 (28 May 2014)
32 +
33 + 28 May 2014; Tom Wijsman <TomWij@g.o> +oracle-jdk-bin-1.7.0.60.ebuild:
34 + Version bump to 1.7.0.60; fixes bug #511714, reported by Robert Forsman.
35
36 23 May 2014; Manuel Rüger <mrueg@g.o> oracle-jdk-bin-1.7.0.55.ebuild:
37 Add ~arm keyword. Fix bug #467168. Acked by ercpe.
38
39
40
41 1.1 dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.60.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.60.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.60.ebuild?rev=1.1&content-type=text/plain
45
46 Index: oracle-jdk-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-jdk-bin/oracle-jdk-bin-1.7.0.60.ebuild,v 1.1 2014/05/28 19:07:20 tomwij Exp $
51
52 EAPI="5"
53
54 inherit eutils java-vm-2 prefix versionator
55
56 # This URIs need to be updated when bumping!
57 JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html"
58 JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
59 # This is a list of archs supported by this update.
60 # Currently arm comes and goes.
61 AT_AVAILABLE=( amd64 x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris x86-macos x64-macos ) # arm
62 # Sometimes some or all of the demos are missing, this is to not have to rewrite half
63 # the ebuild when it happens.
64 DEMOS_AVAILABLE=( amd64 x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris x86-macos x64-macos ) # arm
65 FX_VERSION="2_2_60"
66
67 MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
68 S_PV="$(replace_version_separator 3 '_')"
69
70 AT_x86="jdk-${MY_PV}-linux-i586.tar.gz"
71 AT_amd64="jdk-${MY_PV}-linux-x64.tar.gz"
72 AT_arm="jdk-${MY_PV}-linux-arm-vfp-sflt.tar.gz jdk-${MY_PV}-linux-arm-vfp-hflt.tar.gz"
73 AT_x86_solaris="jdk-${MY_PV}-solaris-i586.tar.gz"
74 AT_x64_solaris="${AT_x86_solaris} jdk-${MY_PV}-solaris-x64.tar.gz"
75 AT_sparc_solaris="jdk-${MY_PV}-solaris-sparc.tar.gz"
76 AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.tar.gz"
77 AT_x86_macos="jdk-${MY_PV}-macosx-x64.dmg"
78 AT_x64_macos="jdk-${MY_PV}-macosx-x64.dmg"
79
80 FXDEMOS_linux="javafx_samples-${FX_VERSION}-linux.zip"
81
82 DEMOS_x86="${FXDEMOS_linux} jdk-${MY_PV}-linux-i586-demos.tar.gz"
83 DEMOS_amd64="${FXDEMOS_linux} jdk-${MY_PV}-linux-x64-demos.tar.gz"
84 DEMOS_arm="${FXDEMOS_linux} jdk-${MY_PV}-linux-arm-vfp-sflt-demos.tar.gz jdk-${MY_PV}-linux-arm-vfp-hflt-demos.tar.gz"
85 DEMOS_x86_solaris="jdk-${MY_PV}-solaris-i586-demos.tar.gz"
86 DEMOS_x64_solaris="${DEMOS_x86_solaris} jdk-${MY_PV}-solaris-x64-demos.tar.gz"
87 DEMOS_sparc_solaris="jdk-${MY_PV}-solaris-sparc-demos.tar.gz"
88 DEMOS_sparc64_solaris="${DEMOS_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz"
89 DEMOS_x86_macos="jdk-${MY_PV}-macosx-x86_64-demos.tar.gz"
90 DEMOS_x64_macos="jdk-${MY_PV}-macosx-x86_64-demos.tar.gz"
91
92 JCE_DIR="UnlimitedJCEPolicy"
93 JCE_FILE="${JCE_DIR}JDK7.zip"
94
95 DESCRIPTION="Oracle's Java SE Development Kit"
96 HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
97 for d in "${AT_AVAILABLE[@]}"; do
98 SRC_URI+=" ${d}? ("
99 SRC_URI+=" $(eval "echo \${$(echo AT_${d/-/_})}")"
100 if has ${d} "${DEMOS_AVAILABLE[@]}"; then
101 SRC_URI+=" examples? ( $(eval "echo \${$(echo DEMOS_${d/-/_})}") )"
102 fi
103 SRC_URI+=" )"
104 done
105 unset d
106 SRC_URI+=" jce? ( ${JCE_FILE} )"
107
108 LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
109 SLOT="1.7"
110 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
111 IUSE="+X alsa aqua derby doc examples +fontconfig jce nsplugin pax_kernel source"
112
113 RESTRICT="fetch strip"
114 QA_PREBUILT="*"
115
116 RDEPEND="
117 X? ( !aqua? (
118 x11-libs/libX11
119 x11-libs/libXext
120 x11-libs/libXi
121 x11-libs/libXrender
122 x11-libs/libXtst
123 ) )
124 alsa? ( media-libs/alsa-lib )
125 doc? ( dev-java/java-sdk-docs:1.7 )
126 fontconfig? ( media-libs/fontconfig )
127 !prefix? ( sys-libs/glibc )"
128 # scanelf won't create a PaX header, so depend on paxctl to avoid fallback
129 # marking. #427642
130 DEPEND="
131 jce? ( app-arch/unzip )
132 examples? ( kernel_linux? ( app-arch/unzip ) )
133 pax_kernel? ( sys-apps/paxctl )"
134
135 S="${WORKDIR}"/jdk${S_PV}
136
137 check_tarballs_available() {
138 local uri=$1; shift
139 local dl= unavailable=
140 for dl in "${@}"; do
141 [[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}"
142 done
143
144 if [[ -n "${unavailable}" ]]; then
145 if [[ -z ${_check_tarballs_available_once} ]]; then
146 einfo
147 einfo "Oracle requires you to download the needed files manually after"
148 einfo "accepting their license through a javascript capable web browser."
149 einfo
150 _check_tarballs_available_once=1
151 fi
152 einfo "Download the following files:"
153 for dl in ${unavailable}; do
154 einfo " ${dl}"
155 done
156 einfo "at '${uri}'"
157 einfo "and move them to '${DISTDIR}'"
158 einfo
159 fi
160 }
161
162 pkg_nofetch() {
163 local distfiles=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") )
164 if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
165 distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") )
166 fi
167 check_tarballs_available "${JDK_URI}" "${distfiles[@]}"
168
169 use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}"
170 }
171
172 src_unpack() {
173 # Special case for ARM soft VS hard float.
174 if use arm ; then
175 if [[ ${CHOST} == *-hardfloat-* ]] ; then
176 unpack jdk-${MY_PV}-linux-arm-vfp-hflt.tar.gz
177 use examples && unpack jdk-${MY_PV}-linux-arm-vfp-hflt-demos.tar.gz
178 else
179 unpack jdk-${MY_PV}-linux-arm-vfp-sflt.tar.gz
180 use examples && unpack jdk-${MY_PV}-linux-arm-vfp-sflt-demos.tar.gz
181 fi
182 use examples && unpack javafx_samples-${FX_VERSION}-linux.zip
183 use jce && unpack ${JCE_FILE}
184 elif use x86-macos || use x64-macos ; then
185 pushd "${T}" > /dev/null
186 mkdir dmgmount
187 hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
188 -mountpoint "${T}"/dmgmount
189 xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ $(get_version_component_range 4).pkg
190 hdiutil detach "${T}"/dmgmount
191 zcat jdk1${MY_PV/u/0}.pkg/Payload | cpio -idv
192 mv Contents/Home "${S}"
193 popd > /dev/null
194 else
195 default
196 fi
197 }
198
199 src_prepare() {
200 if use jce; then
201 mv "${WORKDIR}"/${JCE_DIR} "${S}"/jre/lib/security/ || die
202 fi
203 }
204
205 src_compile() {
206 # This needs to be done before CDS - #215225
207 java-vm_set-pax-markings "${S}"
208
209 # see bug #207282
210 einfo "Creating the Class Data Sharing archives"
211 case ${ARCH} in
212 arm|ia64)
213 bin/java -client -Xshare:dump || die
214 ;;
215 x86)
216 bin/java -client -Xshare:dump || die
217 bin/java -server -Xshare:dump || die
218 ;;
219 *)
220 bin/java -server -Xshare:dump || die
221 ;;
222 esac
223
224 # Create files used as storage for system preferences.
225 mkdir jre/.systemPrefs || die
226 touch jre/.systemPrefs/.system.lock || die
227 touch jre/.systemPrefs/.systemRootModFile || die
228 }
229
230 src_install() {
231 local dest="/opt/${P}"
232 local ddest="${ED}${dest}"
233
234 # We should not need the ancient plugin for Firefox 2 anymore, plus it has
235 # writable executable segments
236 if use x86; then
237 rm -vf {,jre/}lib/i386/libjavaplugin_oji.so \
238 {,jre/}lib/i386/libjavaplugin_nscp*.so
239 rm -vrf jre/plugin/i386
240 fi
241 # Without nsplugin flag, also remove the new plugin
242 local arch=${ARCH};
243 use x86 && arch=i386;
244 if ! use nsplugin; then
245 rm -vf {,jre/}lib/${arch}/libnpjp2.so \
246 {,jre/}lib/${arch}/libjavaplugin_jni.so
247 fi
248
249 dodoc COPYRIGHT
250 dohtml README.html
251
252 dodir "${dest}"
253 cp -pPR bin include jre lib man "${ddest}" || die
254
255 if use derby; then
256 cp -pPR db "${ddest}" || die
257 fi
258
259 if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
260 cp -pPR demo sample "${ddest}" || die
261 if use kernel_linux; then
262 cp -pPR "${WORKDIR}"/javafx-samples-${FX_VERSION//_/.} \
263 "${ddest}"/javafx-samples || die
264 fi
265 fi
266
267 if use jce; then
268 dodir "${dest}"/jre/lib/security/strong-jce
269 mv "${ddest}"/jre/lib/security/US_export_policy.jar \
270 "${ddest}"/jre/lib/security/strong-jce || die
271 mv "${ddest}"/jre/lib/security/local_policy.jar \
272 "${ddest}"/jre/lib/security/strong-jce || die
273 dosym "${dest}"/jre/lib/security/${JCE_DIR}/US_export_policy.jar \
274 "${dest}"/jre/lib/security/US_export_policy.jar
275 dosym "${dest}"/jre/lib/security/${JCE_DIR}/local_policy.jar \
276 "${dest}"/jre/lib/security/local_policy.jar
277 fi
278
279 if use nsplugin; then
280 install_mozilla_plugin "${dest}"/jre/lib/${arch}/libnpjp2.so
281 fi
282
283 if use source; then
284 cp src.zip "${ddest}" || die
285 fi
286
287 if use !x86-macos && use !x64-macos ; then
288 # Install desktop file for the Java Control Panel.
289 # Using ${PN}-${SLOT} to prevent file collision with jre and or
290 # other slots. make_desktop_entry can't be used as ${P} would
291 # end up in filename.
292 newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
293 sun-jcontrol-${PN}-${SLOT}.png || die
294 sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT}#" \
295 -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
296 -e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
297 -e "s#Application;##" \
298 -e "/Encoding/d" \
299 jre/lib/desktop/applications/sun_java.desktop \
300 > "${T}"/jcontrol-${PN}-${SLOT}.desktop || die
301 domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
302 fi
303
304 # Prune all fontconfig files so libfontconfig will be used and only install
305 # a Gentoo specific one if fontconfig is disabled.
306 # http://docs.oracle.com/javase/7/docs/technotes/guides/intl/fontconfig.html
307 rm "${ddest}"/jre/lib/fontconfig.*
308 if ! use fontconfig; then
309 cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
310 eprefixify "${T}"/fontconfig.properties
311 insinto "${dest}"/jre/lib/
312 doins "${T}"/fontconfig.properties
313 fi
314
315 # Remove empty dirs we might have copied
316 find "${D}" -type d -empty -exec rmdir -v {} + || die
317
318 if use x86-macos || use x64-macos ; then
319 # fix misc install_name issues
320 pushd "${ddest}"/jre/lib > /dev/null || die
321 local lib needed nlib npath
322 for lib in \
323 libJObjC libdecora-sse libglass libjavafx-{font,iio} \
324 libjfxmedia libjfxwebkit libprism-es2 ;
325 do
326 lib=${lib}.dylib
327 einfo "Fixing self-reference of ${lib}"
328 install_name_tool \
329 -id "${EPREFIX}${dest}/jre/lib/${lib}" \
330 "${lib}"
331 done
332 popd > /dev/null
333 for nlib in jdk1{5,6} ; do
334 install_name_tool -change \
335 /usr/lib/libgcc_s_ppc64.1.dylib \
336 $($(tc-getCC) -print-file-name=libgcc_s_ppc64.1.dylib) \
337 "${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
338 install_name_tool -id \
339 "${EPREFIX}${dest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib \
340 "${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
341 done
342 fi
343
344 set_java_env
345 java-vm_revdep-mask
346 java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
347 }
Report Message
Find on MARC Find on Google Groups