From 8c6c85824c711136985ed29767f9e7bdb7b6eb13 Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Thu, 8 Jul 2010 22:26:52 +0000 Subject: [PATCH] Version bump. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- dev-java/sun-jre-bin/ChangeLog | 8 +- dev-java/sun-jre-bin/Manifest | 5 +- .../sun-jre-bin/sun-jre-bin-1.6.0.21.ebuild | 149 ++++++++++++++++++ 3 files changed, 160 insertions(+), 2 deletions(-) create mode 100644 dev-java/sun-jre-bin/sun-jre-bin-1.6.0.21.ebuild diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog index 8e134e4a0987..f394a60a15b8 100644 --- a/dev-java/sun-jre-bin/ChangeLog +++ b/dev-java/sun-jre-bin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/sun-jre-bin # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.177 2010/06/30 21:12:21 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.178 2010/07/08 22:26:52 caster Exp $ + +*sun-jre-bin-1.6.0.21 (08 Jul 2010) + + 08 Jul 2010; Vlastimil Babka + +sun-jre-bin-1.6.0.21.ebuild: + Version bump. 30 Jun 2010; Vlastimil Babka -sun-jre-bin-1.5.0.22.ebuild, -files/sun-jre-bin-1.5.env, diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest index 5dd41672bae9..f4f0b21a9d6e 100644 --- a/dev-java/sun-jre-bin/Manifest +++ b/dev-java/sun-jre-bin/Manifest @@ -3,6 +3,9 @@ AUX fontconfig.Gentoo.properties 10932 RMD160 ce1fb555f3f5f281f328c8016e12407ac0 AUX sun-jre-bin-1.6.env 891 RMD160 59bc83699f17395aebc79bf5564ac2f3767aa614 SHA1 1e431f6a7990c4c0684e95a73da32e132183331b SHA256 6fd0124892813113266857364834fb8fa9f08db9f72045e639ec0b5acdfc4c09 DIST jdk-6u20-dlj-linux-amd64.bin 84885416 RMD160 4a62ba9ea54128fe227afd3ff1678286d41616df SHA1 3612cd55715cee3c02894818f9edbd08d71bdea1 SHA256 1e482a05a3741f215613fed15e5d6644520614533b2393ec807674cc2e2d8a88 DIST jdk-6u20-dlj-linux-i586.bin 84828910 RMD160 6f015c434363e8ac89cdf435c3c71634dea01d8a SHA1 b9866ab9923ba88d95fe3629ece3a6dbbbad1300 SHA256 dbfc1338fd18b59b66701de87ee8d553b8a7fce348966ee8a50728d08e474dbe +DIST jdk-6u21-dlj-linux-amd64.bin 83943620 RMD160 1f92cffd74d1b719c47e518ff2e0b67a1a9f0c6e SHA1 daa6a31e3e3bac4d3ce7fdea6f063ea1a26ce855 SHA256 64ae764d69eb3172c813bf749653e1bb7329ae96af4677e0012732d28d3127aa +DIST jdk-6u21-dlj-linux-i586.bin 83916252 RMD160 8901ce27934a7038cd025913bcba6e44b62bfd88 SHA1 7ed1d64dca5f1b3bdf2031b08c56f79a51b16929 SHA256 64d171d38781077b014e49ac2ebe90b6e9de152f033c8a592b3f9661ff57914a EBUILD sun-jre-bin-1.6.0.20.ebuild 4660 RMD160 6a49dd5f5b5c6e4b0838efd6c7fa6c21726e60f9 SHA1 28ce528ca63dc2628822676cea78ccd4568e9525 SHA256 cd39ad890f9a8dd3313a4bf60d476a21792f71e97f229c4bdf7a33e8cf3aea47 -MISC ChangeLog 31522 RMD160 0ac7a9cafbbc552f352802dad76475ad79d9d238 SHA1 4dc59db97b11398d091efa666a0b67581d38f234 SHA256 9ca1aedd31ff0a51047c37e51ef7fea9be051be09fedb86f183cb2794be0343f +EBUILD sun-jre-bin-1.6.0.21.ebuild 4662 RMD160 3c82195469b7ec6f86fa53ec7caf28dab2065288 SHA1 2f2bcf6bdfbe8740150ea52a139c628265fdc084 SHA256 a2990c198c9915fd5e86f171815f2d36e1e6b24774660b3e1c05e3f969ba2e6c +MISC ChangeLog 31659 RMD160 658295efb2a52e21d129d6df82dc5579fe42054b SHA1 71278d4c1d5c6c8c1fca30c0bc79f39779d609b3 SHA256 d1315631a0b70feb2d7a70e2744b67f222d4752f848bbb91593549efe2033d95 MISC metadata.xml 349 RMD160 ae6db154651b0c2b160e1e6956fb722cb52f2e8b SHA1 219312b9ae33153d205b514009927531ee14b93a SHA256 fe0ef52d77b220fb36e9c39d2148bf03ec11223d80320cdc066c0fa723a1ae7d diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.21.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.21.ebuild new file mode 100644 index 000000000000..19de12606d55 --- /dev/null +++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.21.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2010 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.21.ebuild,v 1.1 2010/07/08 22:26:52 caster Exp $ + +inherit versionator pax-utils eutils java-vm-2 + +UPDATE="$(get_version_component_range 4)" +UPDATE="${UPDATE#0}" +MY_PV="$(get_version_component_range 2)u${UPDATE}" + +SUFFIX=".bin" +X86_AT="jdk-${MY_PV}-dlj-linux-i586${SUFFIX}" +AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64${SUFFIX}" + +DESCRIPTION="Sun's Java SE Runtime Environment" +HOMEPAGE="http://java.sun.com/javase/6/" +URL_BASE="http://download.java.net/dlj/binaries" +SRC_URI="x86? ( ${URL_BASE}/${X86_AT} ) + amd64? ( ${URL_BASE}/${AMD64_AT} )" +SLOT="1.6" +LICENSE="dlj-1.1" +KEYWORDS="-* ~amd64 ~x86" +RESTRICT="strip" +IUSE="X alsa jce nsplugin odbc" + +DEPEND="jce? ( =dev-java/sun-jce-bin-1.6.0* )" +RDEPEND="${DEPEND} + sys-libs/glibc + x86? ( =virtual/libstdc++-3.3 ) + alsa? ( media-libs/alsa-lib ) + X? ( + x11-libs/libXext + x11-libs/libXi + x11-libs/libXp + x11-libs/libXtst + amd64? ( x11-libs/libXt ) + x11-libs/libX11 + ) + odbc? ( dev-db/unixODBC )" + +JAVA_PROVIDE="jdbc-stdext jdbc-rowset" + +QA_TEXTRELS_x86="opt/${P}/lib/i386/client/libjvm.so + opt/${P}/lib/i386/motif21/libmawt.so + opt/${P}/lib/i386/libdeploy.so + opt/${P}/lib/i386/server/libjvm.so" + +src_unpack() { + mkdir bundled-jdk + cd bundled-jdk + sh "${DISTDIR}"/${A} --accept-license --unpack || die "Failed to unpack" + + cd .. + bash "${FILESDIR}/construct-1.6.sh" bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed" +} + +src_compile() { + # Set PaX markings on all JDK/JRE executables to allow code-generation on + # the heap by the JIT compiler. This has to be done before CDS - #215225 + pax-mark m $(list-paxables "${S}"/bin/*) + + # see bug #207282 + if use x86; then + einfo "Creating the Class Data Sharing archives" + "${S}"/bin/java -client -Xshare:dump || die + "${S}"/bin/java -server -Xshare:dump || die + fi +} + +src_install() { + local dirs="bin lib man" + + # only X86 has the plugin and javaws + use x86 && dirs="${dirs} javaws plugin" + dodir /opt/${P} + + cp -pPR $dirs "${D}/opt/${P}/" || die "failed to copy" + + dodoc README THIRDPARTYLICENSEREADME.txt || die + dohtml Welcome.html || die + dodir /opt/${P}/share/ + + if use jce; then + cd "${D}/opt/${P}/lib/security" + dodir /opt/${P}/lib/security/strong-jce + mv "${D}"/opt/${P}/lib/security/US_export_policy.jar \ + "${D}"/opt/${P}/lib/security/strong-jce || die + mv "${D}"/opt/${P}/lib/security/local_policy.jar \ + "${D}"/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/ + dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/lib/security/ + fi + + if use nsplugin; then + local plugin_dir="ns7-gcc29" + if has_version '>=sys-devel/gcc-3' ; then + plugin_dir="ns7" + fi + + if use x86 ; then + install_mozilla_plugin /opt/${P}/lib/i386/libnpjp2.so + install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so old_oji + else + install_mozilla_plugin /opt/${P}/lib/amd64/libnpjp2.so + fi + fi + + # install control panel for Gnome/KDE + if [[ -e "${D}/opt/${P}/plugin/desktop/sun_java.desktop" ]]; then + sed -e "s/\(Name=Java\)/\1 Control Panel for Sun JRE ${SLOT}/" \ + -e "s#Exec=.*#Exec=/opt/${P}/bin/ControlPanel#" \ + -e "s#Icon=.*#Icon=/opt/${P}/plugin/desktop/sun_java.png#" \ + "${D}/opt/${P}/plugin/desktop/sun_java.desktop" > \ + "${T}/sun_jre-${SLOT}.desktop" || die + domenu "${T}/sun_jre-${SLOT}.desktop" || die + fi + + # bug #56444 + insinto /opt/${P}/lib/ + newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties + + set_java_env + java-vm_revdep-mask +} + +pkg_postinst() { + # Set as default VM if none exists + java-vm-2_pkg_postinst + + if use x86 && use nsplugin; then + elog + elog "Two variants of the nsplugin are available via eselect java-nsplugin:" + elog "Note that starting with ${PN}-1.6.0.18-r1 their naming and the default changed," + elog "users with the old plugin set are switched to the new default automatically." + elog "The default ${VMHANDLE} is the new 'plugin2' which works in Firefox 3 (xulrunner-1.9)" + elog "and newer, the ${VMHANDLE}-old_oji is the old plugin using the OJI API" + elog "that was removed in Firefox 3.6 (xulrunner-1.9.2)." + elog "For more info see https://jdk6.dev.java.net/plugin2/" + elog + fi + + if use amd64 && use nsplugin; then + elog + elog "The amd64 version ships the new 'plugin2' browser plugin which works" + elog "in Firefox 3+ and other recent browser versions." + elog "For more info see https://jdk6.dev.java.net/plugin2/" + elog + fi +} -- 2.26.2