Version bump. #394581

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

diff --git a/dev-java/oracle-jdk-bin/ChangeLog b/dev-java/oracle-jdk-bin/ChangeLog
index c4eafa2883e743ca7e0575a4c738b0367a4f520b..609f9fffeafcde629c5b0869d0081fe667f3cce0 100644 (file)
--- a/dev-java/oracle-jdk-bin/ChangeLog
+++ b/dev-java/oracle-jdk-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/oracle-jdk-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.8 2011/12/15 21:03:53 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.9 2011/12/18 09:42:39 sera Exp $
+
+*oracle-jdk-bin-1.7.0.2 (18 Dec 2011)
+
+  18 Dec 2011; Ralph Sennhauser <sera@gentoo.org>
+  +oracle-jdk-bin-1.7.0.2.ebuild:
+  Version bump. #394581
 
   15 Dec 2011; Fabian Groffen <grobian@gentoo.org>
   oracle-jdk-bin-1.7.0.1-r2.ebuild:

diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index e6266e961504fdad2d9e83bf3b09c67335c68a11..796af28e067fe0e4e40a3d8092fd8c339a612416 100644 (file)
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX fontconfig.Gentoo.properties 11196 RMD160 e11989b6be27297af68bdd7040439f4d3bd09916 SHA1 58a53f90a8d0409769d371f2e07b5bec27b02469 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c
 AUX oracle-jdk-bin-1.7.env 1000 RMD160 9067112ce8a31b450755ce6bbcdd1b24d5307e12 SHA1 66d5a3df445baded9d2b16fc7f24d8fcb1c340bd SHA256 a2422630fc1dd9851b580e42b065d44460d9ec818b203836687e67b2ab4f1c0f
 DIST UnlimitedJCEPolicyJDK7.zip 7426 RMD160 a4a6a284579f43d2df3532d279e143d2f03c2c3f SHA1 7d3c9ee89536b82cd21c680088b1bced16017253 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d
@@ -10,14 +7,14 @@ DIST jdk-7u1-solaris-i586.tar.gz 99355541 RMD160 7754cb0429596ac2aaae8b1d837eba0
 DIST jdk-7u1-solaris-sparc.tar.gz 104316010 RMD160 b767cb297e1105f6c197c799397ca155cc1ce422 SHA1 882527c5c14cf80676308cafed517a737a20c328 SHA256 b6d6e4a5c0b958c6c82464999efae0c067406d8cb8f21c01de12e44761e90c4c
 DIST jdk-7u1-solaris-sparcv9.tar.gz 12975640 RMD160 680e1235216b5748b3e0039b91a1735a9747c02b SHA1 bd7a6dadbca2f8250d4a64a6e8f265eed68c063f SHA256 a8758bcfa940d38b2053b9069d2b1f0febd2753804f61ac9cd58206b63327494
 DIST jdk-7u1-solaris-x64.tar.gz 9839985 RMD160 7608dd4fd2776b5d9158d53dbdf4a89d154f62f8 SHA1 b9ed10d8c2130350267943829b9a145aba87c577 SHA256 3e4adda9b8f6af1d59ed475bdf86f4a6db67fed82858574e4c74999c1167a3a1
+DIST jdk-7u2-linux-i586.tar.gz 82444118 RMD160 e8aae676b31e18e221d86dbe9b7fd1d3ae37a94c SHA1 adcd78670ca075e245f998232b7cc4447f7453a2 SHA256 74faad48fef2c368276dbd1fd6c02520b0e9ebdcb1621916c1af345fc3ba65d1
+DIST jdk-7u2-linux-x64.tar.gz 81225513 RMD160 99e37d1a3b83bbce3c70abf5f9e2e9fa87c13c67 SHA1 bae2b56d2f371fc41dab437de55596c40f1bb8bf SHA256 411a204122c5e45876d6edae1a031b718c01e6175833740b406e8aafc37bc82d
+DIST jdk-7u2-solaris-i586.tar.gz 85324089 RMD160 5e2fa014d705d4fcf63928aeb0a50c61226a1ade SHA1 3ff3aab44ec4c6116729f216acbe314277bbdb02 SHA256 948d707215f517662a7413e6307cab42845fd8e70c388914e3314bedc57ccba8
+DIST jdk-7u2-solaris-sparc.tar.gz 90226316 RMD160 4d49fb48f51af35f466d53f6dbaedccba8604f78 SHA1 1c73591793e32e2a703707d6ccda3caa685ebc9f SHA256 fc5e7529819c0a18df6c282c331a547e62812b75198445a457024f5232b59abf
+DIST jdk-7u2-solaris-sparcv9.tar.gz 12904127 RMD160 c9694a5a139e4d3138e0b209bd407d8e467fe620 SHA1 720ded33fa746538a62e075f12c09fc9c3052f5b SHA256 9f1a50a8221193d5f7f70314ea09ead11830632043d4b389111874f759e7e7ab
+DIST jdk-7u2-solaris-x64.tar.gz 9702243 RMD160 a280030b3b9988978b086ea2130e59f1eaa8d9d7 SHA1 4778e25b1b7df6d5d3ef0862186c7c1d9d5707f9 SHA256 2c5567c2be431a74f3bf1b19af71efa5434451880503218466dd7109523913a8
 EBUILD oracle-jdk-bin-1.7.0.1-r1.ebuild 4707 RMD160 c214537b1297d66ac07da8f16df556e8082ffcda SHA1 f3d03ffce05847d8f70f94a33287d2fc8bd30089 SHA256 f62be3481cee5bbc83df49f61c52f46820edd52de410d37ea7386857b699d138
 EBUILD oracle-jdk-bin-1.7.0.1-r2.ebuild 5403 RMD160 feae6a543f873a5696780f661573840682807c5d SHA1 9c02dcb4b8104a4978dbbb8c695d0b34525ac7e8 SHA256 289ddd63edde45bb3713dced11f128819aca0c0176f6d899fbeff4274fd1acf8
-MISC ChangeLog 1813 RMD160 82d704d8ce058355b0413450d608973030353d04 SHA1 fc9a36faad3ffc5f620eb56af94a82ddd4ef1f51 SHA256 4e60adea3326043963fee710fe074e43ecefaa85d9494fc2c4a02969796b223a
+EBUILD oracle-jdk-bin-1.7.0.2.ebuild 5379 RMD160 1bb9b01896fb06a71a571ef52ff82e9b3d15832a SHA1 0169443394c7827c1c79dcbc9050b94386450bc7 SHA256 b9e54de277799abc10ce3b22a34eec0b1ce64d72ebb7bc29e15e356a4285ebdb
+MISC ChangeLog 1958 RMD160 70a90cd5ba9c968dea854d4e2ce57e8575243651 SHA1 ead3c0a61570a3ee6e19640b49795bfe954635fd SHA256 f21a38e95dd70f44ba0836d9dfdd3387da6ed3b187f07bddd7852fa535355b47
 MISC metadata.xml 447 RMD160 7d545e68fa24d3775c670d42dc2fae9a125f64a0 SHA1 be889d874ad2ab4f6a4be68ed2a33909c03ed1a2 SHA256 7f8266bbb1afdd6dcd6361bca86fc8178ce623c042a3eac3835bcbf03b6b9232
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (SunOS)
-
-iEYEARECAAYFAk7qYL8ACgkQX3X2B8XHTokqZACghywHNy549Toru7fi3x3q132t
-CzAAniEXlYB9tVU3PuwUVteB75DtcPSr
-=hcEv
------END PGP SIGNATURE-----

diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.2.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.2.ebuild
new file mode 100644 (file)
index 0000000..7bb3798
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.2.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2011 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.2.ebuild,v 1.1 2011/12/18 09:42:39 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="jdk-${MY_PV}-linux-i586.tar.gz"
+AMD64_AT="jdk-${MY_PV}-linux-x64.tar.gz"
+SOL_X86_AT="jdk-${MY_PV}-solaris-i586.tar.gz"
+SOL_AMD64_AT="jdk-${MY_PV}-solaris-x64.tar.gz"
+SOL_SPARC_AT="jdk-${MY_PV}-solaris-sparc.tar.gz"
+SOL_SPARCv9_AT="jdk-${MY_PV}-solaris-sparcv9.tar.gz"
+
+# This URIs need to be updated when bumping!
+JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk-7u2-download-1377129.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 Development Kit"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+SRC_URI="x86? ( ${X86_AT} )
+       amd64? ( ${AMD64_AT} )
+       x86-solaris? ( ${SOL_X86_AT} )
+       x64-solaris? ( ${SOL_X86_AT} ${SOL_AMD64_AT} )
+       sparc-solaris? ( ${SOL_SPARC_AT} )
+       sparc64-solaris? ( ${SOL_SPARC_AT} ${SOL_SPARCv9_AT} )
+       jce? ( ${JCE_FILE} )"
+
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="1.7"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+RESTRICT="fetch strip"
+IUSE="X alsa derby doc examples 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 )
+       doc? ( dev-java/java-sdk-docs:1.7 )
+       !prefix? ( sys-libs/glibc )"
+
+S="${WORKDIR}/jdk${S_PV}"
+
+QA_TEXTRELS_x86="
+       opt/${P}/jre/lib/i386/client/libjvm.so
+       opt/${P}/jre/lib/i386/server/libjvm.so"
+
+pkg_nofetch() {
+       if use x86; then
+               AT=${X86_AT}
+       elif use amd64; then
+               AT=${AMD64_AT}
+       elif use x86-solaris; then
+               AT=${SOL_X86_AT}
+       elif use x64-solaris; then
+               AT="${SOL_X86_AT} and ${SOL_AMD64_AT}"
+       elif use sparc-solaris; then
+               AT=${SOL_SPARC_AT}
+       elif use sparc64-solaris; then
+               AT="${SOL_SPARC_AT} and ${SOL_SPARCv9_AT}"
+       fi
+
+       einfo "Please download ${AT} from:"
+       einfo "${JDK_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}"/jre/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 jre/.systemPrefs || die
+       touch jre/.systemPrefs/.system.lock || die
+       touch jre/.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 {,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
+
+       dodir /opt/${P}
+       cp -pPR bin include jre lib man src.zip "${ED}"/opt/${P} || die
+
+       if use derby; then
+               cp -pPR db "${ED}"/opt/${P} || die
+       fi
+
+       if use examples; then
+               cp -pPR demo sample "${ED}"/opt/${P} || die
+       fi
+
+       # Remove empty dirs we might have copied
+       rmdir -v $(find "${D}" -type d -empty) || die
+
+       dodoc COPYRIGHT
+       dohtml README.html
+
+       if use jce; then
+               dodir /opt/${P}/jre/lib/security/strong-jce
+               mv "${ED}"/opt/${P}/jre/lib/security/US_export_policy.jar \
+                       "${ED}"/opt/${P}/jre/lib/security/strong-jce || die
+               mv "${ED}"/opt/${P}/jre/lib/security/local_policy.jar \
+                       "${ED}"/opt/${P}/jre/lib/security/strong-jce || die
+               dosym /opt/${P}/jre/lib/security/${JCE_DIR}/US_export_policy.jar \
+                       /opt/${P}/jre/lib/security/
+               dosym /opt/${P}/jre/lib/security/${JCE_DIR}/local_policy.jar \
+                       /opt/${P}/jre/lib/security/
+       fi
+
+       if use nsplugin; then
+               install_mozilla_plugin /opt/${P}/jre/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}/jre/lib/desktop/applications/sun_java.desktop ]] || die
+       sed -e "s/\(Name=\)Java/\1 Java Control Panel for Oracle JDK ${SLOT}/" \
+               -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
+               -e "s#Icon=.*#Icon=/opt/${P}/jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png#" \
+               "${ED}"/opt/${P}/jre/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}/jre/lib/
+       doins "${T}"/fontconfig.properties
+
+       set_java_env
+       java-vm_revdep-mask
+       java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}