* [gentoo-commits] gentoo-x86 commit in dev-java/oracle-jdk-bin: oracle-jdk-bin-1.7.0.72.ebuild ChangeLog
@ 2014-11-04 18:13 Johann Schmitz (ercpe)
0 siblings, 0 replies; 2+ messages in thread
From: Johann Schmitz (ercpe) @ 2014-11-04 18:13 UTC (permalink / raw
To: gentoo-commits
ercpe 14/11/04 18:13:01
Modified: ChangeLog
Added: oracle-jdk-bin-1.7.0.72.ebuild
Log:
Version bump to 1.7.0.72 (bug #519182)
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 77C501ED)
Revision Changes Path
1.80 dev-java/oracle-jdk-bin/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog?rev=1.80&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog?rev=1.80&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog?r1=1.79&r2=1.80
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- ChangeLog 2 Nov 2014 11:14:03 -0000 1.79
+++ ChangeLog 4 Nov 2014 18:13:01 -0000 1.80
@@ -1,6 +1,12 @@
# ChangeLog for dev-java/oracle-jdk-bin
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.79 2014/11/02 11:14:03 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.80 2014/11/04 18:13:01 ercpe Exp $
+
+*oracle-jdk-bin-1.7.0.72 (04 Nov 2014)
+
+ 04 Nov 2014; Johann Schmitz <ercpe@gentoo.org>
+ +oracle-jdk-bin-1.7.0.72.ebuild:
+ Version bump to 1.7.0.72 (bug #519182)
02 Nov 2014; Vlastimil Babka <caster@gentoo.org>
-oracle-jdk-bin-1.7.0.65.ebuild, -oracle-jdk-bin-1.7.0.67.ebuild,
1.1 dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.72.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.72.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.72.ebuild?rev=1.1&content-type=text/plain
Index: oracle-jdk-bin-1.7.0.72.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.72.ebuild,v 1.1 2014/11/04 18:13:01 ercpe Exp $
EAPI="5"
inherit eutils java-vm-2 prefix versionator
# This URIs need to be updated when bumping!
JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html"
JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
# This is a list of archs supported by this update.
# Currently arm comes and goes.
AT_AVAILABLE=( amd64 x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris x86-macos x64-macos )
# Sometimes some or all of the demos are missing, this is to not have to rewrite half
# the ebuild when it happens.
DEMOS_AVAILABLE=( amd64 x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris x86-macos x64-macos )
FX_VERSION="2_2_71"
MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
S_PV="$(replace_version_separator 3 '_')"
AT_x86="jdk-${MY_PV}-linux-i586.tar.gz"
AT_amd64="jdk-${MY_PV}-linux-x64.tar.gz"
AT_arm="jdk-${MY_PV}-linux-arm-vfp-sflt.tar.gz jdk-${MY_PV}-linux-arm-vfp-hflt.tar.gz"
AT_x86_solaris="jdk-${MY_PV}-solaris-i586.tar.gz"
AT_x64_solaris="${AT_x86_solaris} jdk-${MY_PV}-solaris-x64.tar.gz"
AT_sparc_solaris="jdk-${MY_PV}-solaris-sparc.tar.gz"
AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.tar.gz"
AT_x86_macos="jdk-${MY_PV}-macosx-x64.dmg"
AT_x64_macos="jdk-${MY_PV}-macosx-x64.dmg"
FXDEMOS_linux="javafx_samples-${FX_VERSION}-linux.zip"
DEMOS_x86="${FXDEMOS_linux} jdk-${MY_PV}-linux-i586-demos.tar.gz"
DEMOS_amd64="${FXDEMOS_linux} jdk-${MY_PV}-linux-x64-demos.tar.gz"
DEMOS_arm="${FXDEMOS_linux} jdk-${MY_PV}-linux-arm-vfp-sflt-demos.tar.gz jdk-${MY_PV}-linux-arm-vfp-hflt-demos.tar.gz"
DEMOS_x86_solaris="jdk-${MY_PV}-solaris-i586-demos.tar.gz"
DEMOS_x64_solaris="${DEMOS_x86_solaris} jdk-${MY_PV}-solaris-x64-demos.tar.gz"
DEMOS_sparc_solaris="jdk-${MY_PV}-solaris-sparc-demos.tar.gz"
DEMOS_sparc64_solaris="${DEMOS_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz"
DEMOS_x86_macos="jdk-${MY_PV}-macosx-x86_64-demos.tar.gz"
DEMOS_x64_macos="jdk-${MY_PV}-macosx-x86_64-demos.tar.gz"
JCE_DIR="UnlimitedJCEPolicy"
JCE_FILE="${JCE_DIR}JDK7.zip"
DESCRIPTION="Oracle's Java SE Development Kit"
HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
for d in "${AT_AVAILABLE[@]}"; do
SRC_URI+=" ${d}? ("
SRC_URI+=" $(eval "echo \${$(echo AT_${d/-/_})}")"
if has ${d} "${DEMOS_AVAILABLE[@]}"; then
SRC_URI+=" examples? ( $(eval "echo \${$(echo DEMOS_${d/-/_})}") )"
fi
SRC_URI+=" )"
done
unset d
SRC_URI+=" jce? ( ${JCE_FILE} )"
LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
SLOT="1.7"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+X alsa aqua derby doc examples +fontconfig jce nsplugin pax_kernel selinux source"
RESTRICT="fetch strip"
QA_PREBUILT="*"
COMMON_DEP=""
RDEPEND="${COMMON_DEP}
X? ( !aqua? (
x11-libs/libX11
x11-libs/libXext
x11-libs/libXi
x11-libs/libXrender
x11-libs/libXtst
) )
alsa? ( media-libs/alsa-lib )
doc? ( dev-java/java-sdk-docs:1.7 )
fontconfig? ( media-libs/fontconfig )
!prefix? ( sys-libs/glibc )
selinux? ( sec-policy/selinux-java )"
# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
# marking. #427642
DEPEND="${COMMON_DEP}
jce? ( app-arch/unzip )
examples? ( kernel_linux? ( app-arch/unzip ) )
pax_kernel? ( sys-apps/paxctl )"
S="${WORKDIR}"/jdk${S_PV}
check_tarballs_available() {
local uri=$1; shift
local dl= unavailable=
for dl in "${@}"; do
[[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}"
done
if [[ -n "${unavailable}" ]]; then
if [[ -z ${_check_tarballs_available_once} ]]; then
einfo
einfo "Oracle requires you to download the needed files manually after"
einfo "accepting their license through a javascript capable web browser."
einfo
_check_tarballs_available_once=1
fi
einfo "Download the following files:"
for dl in ${unavailable}; do
einfo " ${dl}"
done
einfo "at '${uri}'"
einfo "and move them to '${DISTDIR}'"
einfo
einfo "If the above mentioned urls do not point to the correct version anymore,"
einfo "please download the files from Oracle's java download archive:"
einfo
einfo " http://www.oracle.com/technetwork/java/javase/downloads/java-archive-downloads-javase7-521261.html#jdk-${MY_PV}-oth-JPR"
einfo
fi
}
pkg_nofetch() {
local distfiles=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") )
if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") )
fi
check_tarballs_available "${JDK_URI}" "${distfiles[@]}"
use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}"
}
src_unpack() {
# Special case for ARM soft VS hard float.
if use arm ; then
if [[ ${CHOST} == *-hardfloat-* ]] ; then
unpack jdk-${MY_PV}-linux-arm-vfp-hflt.tar.gz
use examples && unpack jdk-${MY_PV}-linux-arm-vfp-hflt-demos.tar.gz
else
unpack jdk-${MY_PV}-linux-arm-vfp-sflt.tar.gz
use examples && unpack jdk-${MY_PV}-linux-arm-vfp-sflt-demos.tar.gz
fi
use examples && unpack javafx_samples-${FX_VERSION}-linux.zip
use jce && unpack ${JCE_FILE}
elif use x86-macos || use x64-macos ; then
pushd "${T}" > /dev/null
mkdir dmgmount
hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
-mountpoint "${T}"/dmgmount
xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ $(get_version_component_range 4).pkg
hdiutil detach "${T}"/dmgmount
zcat jdk1${MY_PV/u/0}.pkg/Payload | cpio -idv
mv Contents/Home "${S}"
popd > /dev/null
else
default
fi
}
src_prepare() {
if use jce; then
mv "${WORKDIR}"/${JCE_DIR} "${S}"/jre/lib/security/ || die
fi
}
src_install() {
local dest="/opt/${P}"
local ddest="${ED}${dest}"
# Create files used as storage for system preferences.
mkdir jre/.systemPrefs || die
touch jre/.systemPrefs/.system.lock || die
touch jre/.systemPrefs/.systemRootModFile || die
# We should not need the ancient plugin for Firefox 2 anymore, plus it has
# writable executable segments
if use x86; then
rm -vf {,jre/}lib/i386/libjavaplugin_oji.so \
{,jre/}lib/i386/libjavaplugin_nscp*.so
rm -vrf jre/plugin/i386
fi
# Without nsplugin flag, also remove the new plugin
local arch=${ARCH};
use x86 && arch=i386;
if ! use nsplugin; then
rm -vf {,jre/}lib/${arch}/libnpjp2.so \
{,jre/}lib/${arch}/libjavaplugin_jni.so
fi
dodoc COPYRIGHT
dohtml README.html
dodir "${dest}"
cp -pPR bin include jre lib man "${ddest}" || die
if use derby; then
cp -pPR db "${ddest}" || die
fi
if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
cp -pPR demo sample "${ddest}" || die
if use kernel_linux; then
cp -pPR "${WORKDIR}"/javafx-samples-${FX_VERSION//_/.} \
"${ddest}"/javafx-samples || die
fi
fi
if use jce; then
dodir "${dest}"/jre/lib/security/strong-jce
mv "${ddest}"/jre/lib/security/US_export_policy.jar \
"${ddest}"/jre/lib/security/strong-jce || die
mv "${ddest}"/jre/lib/security/local_policy.jar \
"${ddest}"/jre/lib/security/strong-jce || die
dosym "${dest}"/jre/lib/security/${JCE_DIR}/US_export_policy.jar \
"${dest}"/jre/lib/security/US_export_policy.jar
dosym "${dest}"/jre/lib/security/${JCE_DIR}/local_policy.jar \
"${dest}"/jre/lib/security/local_policy.jar
fi
if use nsplugin; then
install_mozilla_plugin "${dest}"/jre/lib/${arch}/libnpjp2.so
fi
if use source; then
cp -p src.zip "${ddest}" || die
fi
if use !arm && use !x86-macos && use !x64-macos ; then
# Install desktop file for the Java Control Panel.
# Using ${PN}-${SLOT} to prevent file collision with jre and or
# other slots. make_desktop_entry can't be used as ${P} would
# end up in filename.
newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
sun-jcontrol-${PN}-${SLOT}.png || die
sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT}#" \
-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
-e "s#Application;##" \
-e "/Encoding/d" \
jre/lib/desktop/applications/sun_java.desktop \
> "${T}"/jcontrol-${PN}-${SLOT}.desktop || die
domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
fi
# Prune all fontconfig files so libfontconfig will be used and only install
# a Gentoo specific one if fontconfig is disabled.
# http://docs.oracle.com/javase/7/docs/technotes/guides/intl/fontconfig.html
rm "${ddest}"/jre/lib/fontconfig.*
if ! use fontconfig; then
cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
eprefixify "${T}"/fontconfig.properties
insinto "${dest}"/jre/lib/
doins "${T}"/fontconfig.properties
fi
# This needs to be done before CDS - #215225
java-vm_set-pax-markings "${ddest}"
# see bug #207282
einfo "Creating the Class Data Sharing archives"
case ${ARCH} in
arm|ia64)
${ddest}/bin/java -client -Xshare:dump || die
;;
x86)
${ddest}/bin/java -client -Xshare:dump || die
# limit heap size for large memory on x86 #467518
# this is a workaround and shouldn't be needed.
${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
;;
*)
${ddest}/bin/java -server -Xshare:dump || die
;;
esac
# Remove empty dirs we might have copied
find "${D}" -type d -empty -exec rmdir -v {} + || die
if use x86-macos || use x64-macos ; then
# fix misc install_name issues
pushd "${ddest}"/jre/lib > /dev/null || die
local lib needed nlib npath
for lib in \
libJObjC libdecora-sse libglass libjavafx-{font,iio} \
libjfxmedia libjfxwebkit libprism-es2 ;
do
lib=${lib}.dylib
einfo "Fixing self-reference of ${lib}"
install_name_tool \
-id "${EPREFIX}${dest}/jre/lib/${lib}" \
"${lib}"
done
popd > /dev/null
for nlib in jdk1{5,6} ; do
install_name_tool -change \
/usr/lib/libgcc_s_ppc64.1.dylib \
$($(tc-getCC) -print-file-name=libgcc_s_ppc64.1.dylib) \
"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
install_name_tool -id \
"${EPREFIX}${dest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib \
"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
done
fi
set_java_env
java-vm_revdep-mask
java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-java/oracle-jdk-bin: oracle-jdk-bin-1.7.0.72.ebuild ChangeLog
@ 2014-11-07 6:03 Johann Schmitz (ercpe)
0 siblings, 0 replies; 2+ messages in thread
From: Johann Schmitz (ercpe) @ 2014-11-07 6:03 UTC (permalink / raw
To: gentoo-commits
ercpe 14/11/07 06:03:49
Modified: oracle-jdk-bin-1.7.0.72.ebuild ChangeLog
Log:
Fixed javafx dependency (bug #528414), corrected checksum of demos (bug #528490)
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 77C501ED)
Revision Changes Path
1.2 dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.72.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.72.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.72.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.72.ebuild?r1=1.1&r2=1.2
Index: oracle-jdk-bin-1.7.0.72.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.72.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- oracle-jdk-bin-1.7.0.72.ebuild 4 Nov 2014 18:13:01 -0000 1.1
+++ oracle-jdk-bin-1.7.0.72.ebuild 7 Nov 2014 06:03:49 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.72.ebuild,v 1.1 2014/11/04 18:13:01 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.72.ebuild,v 1.2 2014/11/07 06:03:49 ercpe Exp $
EAPI="5"
@@ -15,7 +15,7 @@
# Sometimes some or all of the demos are missing, this is to not have to rewrite half
# the ebuild when it happens.
DEMOS_AVAILABLE=( amd64 x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris x86-macos x64-macos )
-FX_VERSION="2_2_71"
+FX_VERSION="2_2_$(get_version_component_range 4)"
MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
S_PV="$(replace_version_separator 3 '_')"
1.81 dev-java/oracle-jdk-bin/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog?rev=1.81&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog?rev=1.81&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog?r1=1.80&r2=1.81
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- ChangeLog 4 Nov 2014 18:13:01 -0000 1.80
+++ ChangeLog 7 Nov 2014 06:03:49 -0000 1.81
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/oracle-jdk-bin
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.80 2014/11/04 18:13:01 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.81 2014/11/07 06:03:49 ercpe Exp $
+
+ 07 Nov 2014; Johann Schmitz <ercpe@gentoo.org> oracle-jdk-bin-1.7.0.72.ebuild:
+ Fixed javafx dependency (bug #528414), corrected checksum of demos (bug
+ #528490)
*oracle-jdk-bin-1.7.0.72 (04 Nov 2014)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-11-07 6:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-07 6:03 [gentoo-commits] gentoo-x86 commit in dev-java/oracle-jdk-bin: oracle-jdk-bin-1.7.0.72.ebuild ChangeLog Johann Schmitz (ercpe)
-- strict thread matches above, loose matches on Subject: below --
2014-11-04 18:13 Johann Schmitz (ercpe)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox