Version bump. #394581

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

diff --git a/dev-java/oracle-jre-bin/ChangeLog b/dev-java/oracle-jre-bin/ChangeLog
index a67b42f704329e2c5eb9c12ee05beebf5845190e..b3330a1c0d48b507573292f209f651dbcd3f937d 100644 (file)
--- a/dev-java/oracle-jre-bin/ChangeLog
+++ b/dev-java/oracle-jre-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/oracle-jre-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.7 2011/11/21 10:50:21 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.8 2011/12/18 09:52:17 sera Exp $
+
+*oracle-jre-bin-1.7.0.2 (18 Dec 2011)
+
+  18 Dec 2011; Ralph Sennhauser <sera@gentoo.org>
+  +oracle-jre-bin-1.7.0.2.ebuild:
+  Version bump. #394581
 
   21 Nov 2011; Ralph Sennhauser <sera@gentoo.org>
   -oracle-jre-bin-1.7.0-r1.ebuild:

diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
index 0048f0ce0f5bcebdecf817c9d7118271d0861968..6f22a00037b8ce5cdff2fb91e945fb09e4a9c07b 100644 (file)
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -3,7 +3,10 @@ AUX oracle-jre-bin-1.7.env 1035 RMD160 e405b988e9779f846e925f397ddd40a6b3f762cb
 DIST UnlimitedJCEPolicyJDK7.zip 7426 RMD160 a4a6a284579f43d2df3532d279e143d2f03c2c3f SHA1 7d3c9ee89536b82cd21c680088b1bced16017253 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d
 DIST jre-7u1-linux-i586.tar.gz 33753969 RMD160 653313221a0dc0c7b69e158b003c8658eee8f529 SHA1 04f58ab69b479d475933d2270876fd6c9e97a3b6 SHA256 76bfa6d7b80e077a399bf69fbc8e031ee8f4094be0b6d1e30e247e7341ae2d40
 DIST jre-7u1-linux-x64.tar.gz 32352700 RMD160 5e032865ffd75961decf959fe4f166833a4f7593 SHA1 fcbd35065ac6040b4160ca93ecd5cf6521885303 SHA256 41d9e1c3f51f7c5041ae9f1c3f200a716903d8d010d5a771e6672766ae95ee92
+DIST jre-7u2-linux-i586.tar.gz 33811799 RMD160 727967586fc25ceeb3700fbc40f065fd60e3f9f5 SHA1 3c08b2da8612514642d76c5ab85fc22975f7a507 SHA256 00018d12a74a8b65cfbeccbce78223ffad46aadfa13209beeae7d98bb6bc69c3
+DIST jre-7u2-linux-x64.tar.gz 32423874 RMD160 6e8e37ba27f5b567450cb38344395e1f9200e442 SHA1 c1b7bc57d2a1d2c2237fe0ed902ec1b7986694bd SHA256 f2ac504f54e5c0952c07ce4a7718d23c627d514cf1250c0749dcdb6a55f9d53a
 EBUILD oracle-jre-bin-1.7.0.1-r1.ebuild 4446 RMD160 08485d7ab43561a1eed839869ecf002767746c4a SHA1 5ab39f0fac4d55cf0ec440ec20594aafcbddb444 SHA256 ee916842f5cba99285e4f1cb9073749f67eaf5082e89ca58fcec38f8114ffeec
 EBUILD oracle-jre-bin-1.7.0.1.ebuild 4303 RMD160 2eda125fdd34448b0da6c54f0e17b8798ed7ecd9 SHA1 7c051f1c0616178ef320c8400fe9003e1c1ff098 SHA256 25740905c8aa76edfd2be7d60f92986bc532b0ee4e5175b9771a1e43eb732029
-MISC ChangeLog 1435 RMD160 18567c16bd7b8a3fade417c3f984542ae334b1ce SHA1 45ef7827fd1ecc3596ae3394b9ae8101be38a14b SHA256 8db61900cb2865b1c8ba0ca7b12dce7e24a6cacbf06ab5c833b1f10048bfb2e3
+EBUILD oracle-jre-bin-1.7.0.2.ebuild 4420 RMD160 256fab17a0ad82806083013ca59de0a3a11be350 SHA1 3ee559c35669bd836ccad234d5e20a84e24f8be4 SHA256 8f0e517dc688605ec876896fc556ff7c5b9037166daf42f5ae80e9b9d44ff957
+MISC ChangeLog 1583 RMD160 1ae675d6fff77a80c8c128fc3d08eb4847d675ed SHA1 b1a1fb0cdf007c854d9c75952fba80d47e00890d SHA256 7f1a9d19520e2053dc023e2192686e92bddb56d9e8e608097c2821c87edfa2e6
 MISC metadata.xml 374 RMD160 4e6b6826d9ee188e0fa0b5a9a5e5d23b722e10f8 SHA1 0c90ab71e19ea1e34710e7944f268bd46943f57d SHA256 32decb0503e4843bf9157625a4c494955b4c93ccd079bec72da1c374c03b7fa8

diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.2.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.2.ebuild
new file mode 100644 (file)
index 0000000..ffd680a
--- /dev/null
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.2.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.2.ebuild,v 1.1 2011/12/18 09:52:17 sera Exp $
+
+EAPI="4"
+
+inherit java-vm-2 eutils prefix versionator
+
+UPDATE="$(get_version_component_range 4)"
+UPDATE="${UPDATE#0}"
+MY_PV="$(get_version_component_range 2)u${UPDATE}"
+S_PV="$(get_version_component_range 1-3)_0${UPDATE}"
+
+X86_AT="jre-${MY_PV}-linux-i586.tar.gz"
+AMD64_AT="jre-${MY_PV}-linux-x64.tar.gz"
+
+# This URIs need updating when bumping!
+JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre-7u2-download-1377135.html"
+JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
+
+JCE_DIR="UnlimitedJCEPolicy"
+JCE_FILE="${JCE_DIR}JDK7.zip"
+
+DESCRIPTION="Oracle's Java SE Runtime Environment"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+SRC_URI="x86? ( ${X86_AT} )
+       amd64? ( ${AMD64_AT} )
+       jce? ( ${JCE_FILE} )"
+
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="1.7"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="fetch strip"
+IUSE="X alsa jce nsplugin"
+
+DEPEND="jce? ( app-arch/unzip )"
+RDEPEND="${DEPEND}
+       X? (
+               x11-libs/libXext
+               x11-libs/libXi
+               x11-libs/libXrender
+               x11-libs/libXtst
+               x11-libs/libX11
+       )
+       alsa? ( media-libs/alsa-lib )
+       !prefix? ( sys-libs/glibc )"
+
+QA_TEXTRELS_x86="
+       opt/${P}/lib/i386/client/libjvm.so
+       opt/${P}/lib/i386/server/libjvm.so"
+
+S="${WORKDIR}/jre${S_PV}"
+
+pkg_nofetch() {
+       if use x86; then
+               AT=${X86_AT}
+       elif use amd64; then
+               AT=${AMD64_AT}
+       fi
+
+       einfo "Please download ${AT} from:"
+       einfo "${JRE_URI}"
+       einfo "and move it to ${DISTDIR}"
+
+       if use jce; then
+               einfo "Also download ${JCE_FILE} from:"
+               einfo ${JCE_URI}
+               einfo "and move it to ${DISTDIR}"
+       fi
+}
+
+src_prepare() {
+       if use jce; then
+               mv "${WORKDIR}"/${JCE_DIR} "${S}"/lib/security/ || die
+       fi
+}
+
+src_compile() {
+       # This needs to be done before CDS - #215225
+       java-vm_set-pax-markings "${S}"
+
+       # see bug #207282
+       einfo "Creating the Class Data Sharing archives"
+       if use x86; then
+               "${S}"/bin/java -client -Xshare:dump || die
+       fi
+       "${S}"/bin/java -server -Xshare:dump || die
+
+       # Create files used as storage for system preferences.
+       mkdir .systemPrefs || die
+       touch .systemPrefs/.system.lock || die
+       touch .systemPrefs/.systemRootModFile || die
+}
+
+src_install() {
+       # We should not need the ancient plugin for Firefox 2 anymore, plus it has
+       # writable executable segments
+       if use x86; then
+               rm -vf lib/i386/libjavaplugin_oji.so \
+                       lib/i386/libjavaplugin_nscp*.so
+               rm -vrf plugin/i386
+       fi
+       # Without nsplugin flag, also remove the new plugin
+       local arch=${ARCH};
+       use x86 && arch=i386;
+       if ! use nsplugin; then
+               rm -vf lib/${arch}/libnpjp2.so \
+                       lib/${arch}/libjavaplugin_jni.so
+       fi
+
+       dodir /opt/${P}
+       cp -pPR bin lib man "${ED}"/opt/${P} || die
+
+       # Remove empty dirs we might have copied
+       rmdir -v $(find "${D}" -type d -empty) || die
+
+       dodoc COPYRIGHT README
+
+       if use jce; then
+               dodir /opt/${P}/lib/security/strong-jce
+               mv "${ED}"/opt/${P}/lib/security/US_export_policy.jar \
+                       "${ED}"/opt/${P}/lib/security/strong-jce || die
+               mv "${ED}"/opt/${P}/lib/security/local_policy.jar \
+                       "${ED}"/opt/${P}/lib/security/strong-jce || die
+               dosym /opt/${P}/lib/security/${JCE_DIR}/US_export_policy.jar \
+                       /opt/${P}/lib/security/
+               dosym /opt/${P}/lib/security/${JCE_DIR}/local_policy.jar \
+                       /opt/${P}/lib/security/
+       fi
+
+       if use nsplugin; then
+               install_mozilla_plugin /opt/${P}/lib/${arch}/libnpjp2.so
+       fi
+
+       # Install desktop file for the Java Control Panel. Using VMHANDLE as file
+       # name to prevent file collision with jre and or other slots.
+       [[ -f "${ED}"/opt/${P}/lib/desktop/applications/sun_java.desktop ]] || die
+       sed -e "s/\(Name=\)Java/\1 Java Control Panel for Oracle JRE ${SLOT}/" \
+               -e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \
+               -e "s#Icon=.*#Icon=/opt/${P}/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png#" \
+               "${ED}"/opt/${P}/lib/desktop/applications/sun_java.desktop > \
+               "${T}"/${VMHANDLE}.desktop
+
+       domenu "${T}"/${VMHANDLE}.desktop
+
+       # bug #56444
+       cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
+       eprefixify "${T}"/fontconfig.properties
+       insinto /opt/${P}/lib/
+       doins "${T}"/fontconfig.properties
+
+       # bug #388127
+       dodir /etc/sandbox.d
+       echo 'SANDBOX_PREDICT="/dev/random:/proc/self/coredump_filter"' > "${D}/etc/sandbox.d/20${VMHANDLE}"
+
+       set_java_env
+       java-vm_revdep-mask
+}