Fix jce symlinks, bug #377665. Thanks to Philippe Chaintreuil <gentoo_bugs_peep@paral...

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

diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index a97f91465f337345ab0ea7a5c23f0cb8f2710ee0..61c9c990fc0273a715c77168d72da8065b2cd540 100644 (file)
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/sun-jre-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.201 2011/11/05 23:37:42 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.202 2011/11/11 21:06:44 sera Exp $
+
+*sun-jre-bin-1.6.0.29-r1 (11 Nov 2011)
+
+  11 Nov 2011; Ralph Sennhauser <sera@gentoo.org>
+  +sun-jre-bin-1.6.0.29-r1.ebuild:
+  Fix jce symlinks, bug #377665. Thanks to Philippe Chaintreuil
+  <gentoo_bugs_peep@parallaxshift.com> for investigating the issue
 
   05 Nov 2011; Vlastimil Babka <caster@gentoo.org>
   -sun-jre-bin-1.6.0.26.ebuild, -sun-jre-bin-1.6.0.27.ebuild,

diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest
index c58465ca6843703cfc457605616a28fc654302a9..5ff79ddc54ee12fc9d7bffb7c08d6b9af79a71cf 100644 (file)
--- a/dev-java/sun-jre-bin/Manifest
+++ b/dev-java/sun-jre-bin/Manifest
@@ -5,6 +5,7 @@ AUX sun-jre-bin-1.6.env 891 RMD160 59bc83699f17395aebc79bf5564ac2f3767aa614 SHA1
 AUX sun-jre-bin-1.6.env-r1 966 RMD160 7cb6cb5c5c482aebe3da916b7b5607f15eb95962 SHA1 cfc8dc648ba2795c748ce3b342ed28deac2fe7f8 SHA256 2825f19a60ecf19c4164a27aa24312c521145236c013759c62242a7772e44efe
 DIST jre-6u29-linux-i586.bin 21632980 RMD160 ce7ba2ec99643b6d47f6b634d7e9fa5877513b4a SHA1 6de26b992a9920117d2f156ff5bbddf2d5b28f77 SHA256 13bd1ce27709be7d05c07221185d4f572242b14a80cea67b557e761f5ba7e440
 DIST jre-6u29-linux-x64.bin 21230518 RMD160 53bb593ae6ff9f09bc1f00a94ebd6a3506260f87 SHA1 820399aed6db6c1960ba0942bc64c49a3b809b89 SHA256 624e566642ebe1dc41d07737d15e3a0ada754f36e7d27a789b4a44a2f2148e58
+EBUILD sun-jre-bin-1.6.0.29-r1.ebuild 4286 RMD160 f19049340ca89f27207f7a35c7e9dc46bf953631 SHA1 8eaf5236337af1a813b3576a9764080e8472c931 SHA256 671db0b290701b931eb26339958fe9857f7a1a135fae726fa6509f3af50f8b42
 EBUILD sun-jre-bin-1.6.0.29.ebuild 4275 RMD160 605f3e0f4996c3c98ceababbe55c9e0651ce0aab SHA1 76f8220984f0b7706a918e5dd5763512b439ddb2 SHA256 76efb1ae15a38c6b1c227cb365d01364a91a479715c7018c463161d8b1163ce1
-MISC ChangeLog 35376 RMD160 d9f997eccca0964fc017ed3239ee08ea1f089624 SHA1 fe641868e2e197b4d494ad26cd259d6a32079a36 SHA256 0ad3cc209a28defb55179aa3f2c8eb12db146c2d588b45b09b6c446375ece951
+MISC ChangeLog 35631 RMD160 f418854885a574f2b3dc9a727fcd0c6e90342ff3 SHA1 648cad4a82c65c6ddbe0ea0b59356e98311b23f8 SHA256 f2d0da778ef63db931dbc0d896da30e6e4d7a5f98e5ce03a671726c3b74e684a
 MISC metadata.xml 349 RMD160 ae6db154651b0c2b160e1e6956fb722cb52f2e8b SHA1 219312b9ae33153d205b514009927531ee14b93a SHA256 fe0ef52d77b220fb36e9c39d2148bf03ec11223d80320cdc066c0fa723a1ae7d

diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.29-r1.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.29-r1.ebuild
new file mode 100644 (file)
index 0000000..cb5a09a
--- /dev/null
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.29-r1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.29-r1.ebuild,v 1.1 2011/11/11 21:06:44 sera Exp $
+
+EAPI="4"
+
+inherit java-vm-2 eutils pax-utils prefix versionator
+
+MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
+S_PV="$(replace_version_separator 3 '_')"
+
+X86_AT="jre-${MY_PV}-linux-i586.bin"
+AMD64_AT="jre-${MY_PV}-linux-x64.bin"
+
+# check the URIs when bumping, no idea about their stability yet
+JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre-${MY_PV}-download-513650.html"
+
+DESCRIPTION="Oracle's Java SE Runtime Environment"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+SRC_URI="x86? ( ${X86_AT} )
+       amd64? ( ${AMD64_AT} )"
+
+LICENSE="Oracle-BCLA-JavaSE"
+KEYWORDS="~amd64 ~x86"
+SLOT="1.6"
+IUSE="X alsa jce nsplugin"
+
+RESTRICT="fetch strip"
+QA_TEXTRELS_x86="
+       opt/${P}/lib/i386/client/libjvm.so
+       opt/${P}/lib/i386/motif21/libmawt.so
+       opt/${P}/lib/i386/server/libjvm.so"
+
+RDEPEND="${DEPEND}
+       !prefix? ( sys-libs/glibc )
+       alsa? ( media-libs/alsa-lib )
+       X? (
+               x11-libs/libXext
+               x11-libs/libXi
+               x11-libs/libXrender
+               x11-libs/libXtst
+               x11-libs/libX11
+       )"
+DEPEND="jce? ( dev-java/sun-jce-bin:1.6 )"
+
+S="${WORKDIR}/jre${S_PV}"
+
+pkg_nofetch() {
+       if use x86; then
+               AT=${X86_AT}
+       elif use amd64; then
+               AT=${AMD64_AT}
+       fi
+
+       einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package has become fetch restricted again."
+       einfo "Alternatives are switching to dev-java/icedtea-bin or the source-based dev-java/icedtea:6"
+
+       einfo "Please download ${AT} from:"
+       einfo "${JRE_URI}"
+       einfo "and move it to ${DISTDIR}"
+}
+
+src_unpack() {
+       sh "${DISTDIR}"/${A} -noregister || die "Failed to unpack"
+}
+
+src_compile() {
+       # Set PaX markings on all JDK/JRE executables to allow code-generation on
+       # the heap by the JIT compiler. This needs to be done before CDS - #215225
+       pax-mark m $(list-paxables "${S}"/bin/*)
+
+       # 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
+}
+
+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/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar \
+                       /opt/${P}/lib/security/US_export_policy.jar
+               dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar \
+                       /opt/${P}/lib/security/local_policy.jar
+       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 jdk 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} (sun-jre-bin)/" \
+               -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-r1 "${T}"/fontconfig.properties || die
+       eprefixify "${T}"/fontconfig.properties
+       insinto /opt/${P}/lib/
+       doins "${T}"/fontconfig.properties
+
+       set_java_env "${FILESDIR}/${VMHANDLE}.env-r1"
+       java-vm_revdep-mask
+}