Version bump for bug #166305.

Package-Manager: portage-2.1.2-r9

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 2eb82225cc470261294b41352cb06ef3500d821a..bce3aa9e259435054acd0a7c13670f34bbfc52d7 100644 (file)
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.184 2007/01/23 11:22:56 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.185 2007/02/11 11:43:45 betelgeuse Exp $
+
+*sun-jdk-1.5.0.11 (11 Feb 2007)
+
+  11 Feb 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +sun-jdk-1.5.0.11.ebuild:
+  Version bump for bug #166305.
 
   23 Jan 2007; Vlastimil Babka <caster@gentoo.org> -sun-jdk-1.5.0.09.ebuild:
   Remove vulnerable version.

diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 6b0b4dd5f3fe3bede60c5cc63881f1d477438542..6c0089b67c2d3f12257807c8989123ca8763ee60 100644 (file)
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX fontconfig.Gentoo.properties 10932 RMD160 ce1fb555f3f5f281f328c8016e12407ac0893819 SHA1 59f68c06f4f727bc72449a76bd4941cbee626373 SHA256 893b469c87ba547122fe158941c00512bf3f15046251f4b8639d967203d32bc1
 MD5 494118498b85e238421b123a4ba16347 files/fontconfig.Gentoo.properties 10932
 RMD160 ce1fb555f3f5f281f328c8016e12407ac0893819 files/fontconfig.Gentoo.properties 10932
@@ -18,6 +21,8 @@ DIST j2sdk-1_4_2_13-linux-i586.bin 36361814 RMD160 cefb731ae6740f36a17242aa79b36
 DIST jce_policy-1_4_2.zip 12195 RMD160 323340fa8a96f315a35b0ebc918731e6fe56c370 SHA1 ea17b649ebcaaf4246e9dd28dbc77926176c64ee SHA256 7bf6d683602686321affc0071ad2fc3890c19cf5bb5cc16a963052e17588c097
 DIST jdk-1_5_0_10-dlj-linux-amd64.bin 43906073 RMD160 2d13d637b6d7351410f9e18d581206a05091effe SHA1 b0c4440f7059b2d477a437e5c58f135820e86326 SHA256 5bbac3fb78db48f7f996e412d45229db3a0b759886f360504cca61c93d4b5f61
 DIST jdk-1_5_0_10-dlj-linux-i586.bin 49553457 RMD160 8aa7b53064831d800b8aeae67ffd3f5e4e2e3155 SHA1 fc4883d6da60940cbe4b6c2575478cead26313ff SHA256 e4300d88ae630f02132a4ce23afbdc40f994de91b37d4b64cb1da0b58df678fa
+DIST jdk-1_5_0_11-dlj-linux-amd64.bin 43954177 RMD160 bd865019d3fb2268800696207dba158ea2986a7f SHA1 151315b9eb70f81ac88712e151da5c0a5aeaca23 SHA256 98df66902f42f764cb89b12a1502b976f2e5ddb2aa5000e14846b90cef74e0db
+DIST jdk-1_5_0_11-dlj-linux-i586.bin 49598681 RMD160 74c5bd78450397006ea145580c3554d77b64a31d SHA1 965e4983da769b6c5d6ec79c942337bc8bee5c8a SHA256 da7c0217c1c6d47aad77a8b5ca0b30b01846c8090d5b1d5907862ef7122a1705
 DIST jdk-6-dlj-linux-amd64.bin 56347832 RMD160 b4d12bf55ea6baa465c227cff2d314d26de4876e SHA1 d51a60c80ac1a8173c53b9a389377b2774a50e92 SHA256 f1f35d331809487bb922bbd3ca46de4abc3e45c482f94127f4ac8f3c8b3321c3
 DIST jdk-6-dlj-linux-i586.bin 62718862 RMD160 4ff9f1f82b20f0dbd792e6765c02d87749e00aac SHA1 bc7a56952b362e472a0ec179e0852ca7bf0c0507 SHA256 1c4f98edb6c1b379807d9dab61971c0271b2b4cf1f1be914cc85354744408467
 EBUILD sun-jdk-1.4.2.13.ebuild 6310 RMD160 c05da39110b45b95820b4e47575f672f29c1f3db SHA1 7b28a74828fb683e84389ec9e245c0c73aa084af SHA256 7ff87aa6eaec9342d1a690e75a3ef4c94f2bf6b6a1f0265fb2e3b9bd9d2be47d
@@ -28,14 +33,18 @@ EBUILD sun-jdk-1.5.0.10.ebuild 4604 RMD160 b128a32bf2994ee5a3c81b7c8fb00861f7e1b
 MD5 ecc67efc4733391bf1f30a63a9cb40c4 sun-jdk-1.5.0.10.ebuild 4604
 RMD160 b128a32bf2994ee5a3c81b7c8fb00861f7e1ba49 sun-jdk-1.5.0.10.ebuild 4604
 SHA256 daaf95772de1f2e78e891fc34a2eb8141ab3db24ea66f53232c70ca32021a0d8 sun-jdk-1.5.0.10.ebuild 4604
+EBUILD sun-jdk-1.5.0.11.ebuild 4641 RMD160 f1e6c3a407a3b447b842e144f9ec559e60c57514 SHA1 2bcfc3f22e6697b4d2882db892c73129d8bc9bed SHA256 8f74013e64edbc50a70ef5e76828fb8b6c01f26f45df9b356927f45a2f8e5131
+MD5 32c27455fa016a3df16f5c6f844b2cdb sun-jdk-1.5.0.11.ebuild 4641
+RMD160 f1e6c3a407a3b447b842e144f9ec559e60c57514 sun-jdk-1.5.0.11.ebuild 4641
+SHA256 8f74013e64edbc50a70ef5e76828fb8b6c01f26f45df9b356927f45a2f8e5131 sun-jdk-1.5.0.11.ebuild 4641
 EBUILD sun-jdk-1.6.0-r1.ebuild 4829 RMD160 c5a112df1b4a01f520cf0220da854cdf8caebb9f SHA1 176a5cfde85f19d1693756413f24c3f90e2634c6 SHA256 224304e8e2d000da71bc5c411a50e659b18c988285fcc476ac73a4bd6439c184
 MD5 e4769c71f1d5c1f4f5fdd55fca98b14a sun-jdk-1.6.0-r1.ebuild 4829
 RMD160 c5a112df1b4a01f520cf0220da854cdf8caebb9f sun-jdk-1.6.0-r1.ebuild 4829
 SHA256 224304e8e2d000da71bc5c411a50e659b18c988285fcc476ac73a4bd6439c184 sun-jdk-1.6.0-r1.ebuild 4829
-MISC ChangeLog 36303 RMD160 d0bb69e48234223364a1b2c31e3347cd5c8e5d8b SHA1 64a783ad7483d31ef7599f206e1cc41788edae69 SHA256 1a615ec4b0e17950f28a29897b707ed55141b34960016cd7723dcffa68664055
-MD5 12af73e3fe9741de9110cadd96689c16 ChangeLog 36303
-RMD160 d0bb69e48234223364a1b2c31e3347cd5c8e5d8b ChangeLog 36303
-SHA256 1a615ec4b0e17950f28a29897b707ed55141b34960016cd7723dcffa68664055 ChangeLog 36303
+MISC ChangeLog 36454 RMD160 c1f1f4431b54ace26431aedb6f80377f67f8de2f SHA1 15c78a5977418cc1b775f69868905e87bca02f6c SHA256 dbcb9cd629cfdbd2aeee72a24a2c6f0f56e6478cbd33e0fae56547bf8f35c9b3
+MD5 54e61f7f82f8763f881b49dc1d0fa0eb ChangeLog 36454
+RMD160 c1f1f4431b54ace26431aedb6f80377f67f8de2f ChangeLog 36454
+SHA256 dbcb9cd629cfdbd2aeee72a24a2c6f0f56e6478cbd33e0fae56547bf8f35c9b3 ChangeLog 36454
 MISC metadata.xml 237 RMD160 e2fa73e8b206c77bc262fd54691289bf05696668 SHA1 47fb9d11272aa2245df406c2156c2482e166a1c3 SHA256 3e53f0c8fb262a6751adb4c188e045e0be6de8739c02ec1af079cba5512e696d
 MD5 2f36c2b94fc9625e5c96d8e558f6ffba metadata.xml 237
 RMD160 e2fa73e8b206c77bc262fd54691289bf05696668 metadata.xml 237
@@ -46,6 +55,16 @@ SHA256 c4db2c43fa08b705c1e9ba316c8cecbcd2d3a7be5d3014cf4bf02e53b214b155 files/di
 MD5 bfc73dd88d30c26b64d0590cb52d7547 files/digest-sun-jdk-1.5.0.10 563
 RMD160 ce0632d08fdd27b76bd6e2de244a0516555aeef0 files/digest-sun-jdk-1.5.0.10 563
 SHA256 f1f582a1bfca18c6375dc35e75bd199066d2361ffbf7e577a592afb4b351e34d files/digest-sun-jdk-1.5.0.10 563
+MD5 03a3655dea58f8ecfdf9b222a82c13d1 files/digest-sun-jdk-1.5.0.11 563
+RMD160 baf28f80473123c2c382cda0d6e3908a455aec27 files/digest-sun-jdk-1.5.0.11 563
+SHA256 d05c274f69904c60645c3639147b1741b3edeba807959724e8310ec9b1ea8b4b files/digest-sun-jdk-1.5.0.11 563
 MD5 7cca7ffac6725b17472340fe8db317f6 files/digest-sun-jdk-1.6.0-r1 521
 RMD160 7329a96c4622d1ea677604d88299616019b8f1d2 files/digest-sun-jdk-1.6.0-r1 521
 SHA256 d5cebb938ce9873bffbdee08dfc2d4e46c0984e6d420221916b9acd94a0118c4 files/digest-sun-jdk-1.6.0-r1 521
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFFzwGEcxLzpIGCsLQRAinsAJ9txiUoszsboMv8hJ58Op0lGXTv2gCgm2lA
+WrAGzpY7lGO1KvAFAist4Qg=
+=z9cs
+-----END PGP SIGNATURE-----

diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.11 b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.11
new file mode 100644 (file)
index 0000000..e6f312f
--- /dev/null
+++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.11
@@ -0,0 +1,6 @@
+MD5 ace2fc1b8c9d381b4e297c66c5a9caa7 jdk-1_5_0_11-dlj-linux-amd64.bin 43954177
+RMD160 bd865019d3fb2268800696207dba158ea2986a7f jdk-1_5_0_11-dlj-linux-amd64.bin 43954177
+SHA256 98df66902f42f764cb89b12a1502b976f2e5ddb2aa5000e14846b90cef74e0db jdk-1_5_0_11-dlj-linux-amd64.bin 43954177
+MD5 9dfdad6a166ed403513c0a5509d82e4b jdk-1_5_0_11-dlj-linux-i586.bin 49598681
+RMD160 74c5bd78450397006ea145580c3554d77b64a31d jdk-1_5_0_11-dlj-linux-i586.bin 49598681
+SHA256 da7c0217c1c6d47aad77a8b5ca0b30b01846c8090d5b1d5907862ef7122a1705 jdk-1_5_0_11-dlj-linux-i586.bin 49598681

diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.11.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.11.ebuild
new file mode 100644 (file)
index 0000000..099eb51
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0.11.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.11.ebuild,v 1.1 2007/02/11 11:43:45 betelgeuse Exp $
+
+inherit java-vm-2 eutils pax-utils
+
+MY_PVL=${PV%.*}_${PV##*.}
+MY_PVA=${PV//./_}
+S="${WORKDIR}/jdk${MY_PVL}"
+
+X86_AT="jdk-${MY_PVA}-dlj-linux-i586.bin"
+AMD64_AT="jdk-${MY_PVA}-dlj-linux-amd64.bin"
+
+DESCRIPTION="Sun's J2SE Development Kit, version ${PV}"
+HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
+SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} )
+               amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )"
+SLOT="1.5"
+LICENSE="dlj-1.1"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="nostrip"
+IUSE="X alsa doc examples jce nsplugin"
+
+QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so opt/${P}/jre/lib/i386/libdeploy.so"
+
+DEPEND="
+       doc? ( =dev-java/java-sdk-docs-1.5.0* )
+       jce? ( =dev-java/sun-jce-bin-1.5.0* )"
+
+RDEPEND="
+       sys-libs/glibc
+       alsa? ( media-libs/alsa-lib )
+       doc? ( =dev-java/java-sdk-docs-1.5.0* )
+       X? ( || ( ( x11-libs/libX11
+                               x11-libs/libXext
+                               x11-libs/libXi
+                               x11-libs/libXp
+                               x11-libs/libXt
+                               x11-libs/libXtst
+                         )
+                               virtual/x11
+                       )
+               )"
+
+JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
+
+PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/lib/javaws.jar jre/lib/deploy.jar"
+
+src_unpack() {
+       if [ ! -r "${DISTDIR}/${A}" ]; then
+               die "cannot read ${A}. Please check the permission and try again."
+       fi
+
+       sh "${DISTDIR}/${A}" --accept-license --unpack || die "Failed to unpack"
+}
+
+src_install() {
+       local dirs="bin include jre lib man"
+
+       # Set PaX markings on all JDK/JRE executables to allow code-generation on
+       # the heap by the JIT compiler.
+       pax-mark m $(list-paxables ${S}{,/jre}/bin/*)
+
+       dodir /opt/${P}
+
+       for i in $dirs ; do
+               cp -pPR $i ${D}/opt/${P}/ || die "failed to copy"
+       done
+       dodoc COPYRIGHT README.html || die
+       dohtml README.html || die
+       dodir /opt/${P}/share/
+
+       cp -pPR src.zip ${D}/opt/${P}/share/ || die
+
+       if use examples; then
+               cp -pPR demo ${D}/opt/${P}/share/
+               if ( use x86 || use amd64 ); then
+                       cp -pPR sample ${D}/opt/${P}/share/
+               fi
+       fi
+
+       if use jce; then
+               cd ${D}/opt/${P}/jre/lib/security || die
+               dodir /opt/${P}/jre/lib/security/strong-jce
+               mv ${D}/opt/${P}/jre/lib/security/US_export_policy.jar \
+                       ${D}/opt/${P}/jre/lib/security/strong-jce || die
+               mv ${D}/opt/${P}/jre/lib/security/local_policy.jar \
+                       ${D}/opt/${P}/jre/lib/security/strong-jce || die
+               local jcedir="/opt/sun-jce-bin-1.5.0/jre/lib/security/unlimited-jce/"
+               dosym ${jcedir}/US_export_policy.jar \
+                       /opt/${P}/jre/lib/security/ || die
+               dosym ${jcedir}/local_policy.jar \
+                       /opt/${P}/jre/lib/security/ || die
+       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}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so
+               else
+                       eerror "No plugin available for amd64 arch"
+               fi
+       fi
+
+       # create dir for system preferences
+       dodir /opt/${P}/jre/.systemPrefs
+       # Create files used as storage for system preferences.
+       touch ${D}/opt/${P}/jre/.systemPrefs/.system.lock
+       chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.system.lock
+       touch ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile
+       chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile
+
+       # install control panel for Gnome/KDE
+       sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
+               -e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \
+               ${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
+               ${T}/sun_java-${SLOT}.desktop \
+               || die "Failed to sed .desktop file"
+
+       domenu ${T}/sun_java-${SLOT}.desktop
+
+       # bug #56444
+       insinto /opt/${P}/jre/lib/
+       newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties
+
+       set_java_env
+}
+
+pkg_postinst() {
+       # Set as default VM if none exists
+       java-vm-2_pkg_postinst
+
+       if ! use X; then
+               local xwarn="virtual/x11 and/or"
+       fi
+
+       echo
+       ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be installed."
+       ewarn "Be careful which Java libraries you attempt to use."
+
+       echo
+       elog " Be careful: ${P}'s Java compiler uses"
+       elog " '-source 1.5' as default. Some keywords such as 'enum'"
+       elog " are not valid identifiers any more in that mode,"
+       elog " which can cause incompatibility with certain sources."
+
+       echo
+       elog "Beginning with 1.5.0.10 the hotspot vm can use epoll"
+       elog "The epoll-based implementation of SelectorProvider is not selected by"
+       elog "default."
+       elog "Use java -Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.EPollSelectorProvider"
+}