From: Petteri Räty Date: Sun, 11 Feb 2007 12:01:12 +0000 (+0000) Subject: Version bump for bug #166305. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2b722d6c1771e39667c0af9f1d76a9526f25adfe;p=gentoo.git Version bump for bug #166305. Package-Manager: portage-2.1.2-r9 --- diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog index 00c158cf9cbf..c9722583b2c5 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 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.78 2007/01/23 11:37:49 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.79 2007/02/11 12:01:12 betelgeuse Exp $ + +*sun-jre-bin-1.5.0.11 (11 Feb 2007) + + 11 Feb 2007; Petteri Räty + +sun-jre-bin-1.5.0.11.ebuild: + Version bump for bug #166305. 23 Jan 2007; Vlastimil Babka files/construct-1.6.sh, files/construct.sh, -sun-jre-bin-1.5.0.09.ebuild, diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest index 9007ebf53023..778fcfa0f505 100644 --- a/dev-java/sun-jre-bin/Manifest +++ b/dev-java/sun-jre-bin/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX construct-1.6.sh 6798 RMD160 799ca391fbd21f367967d7c9ecd41426f4a72401 SHA1 014a26831f8f3cee9653d42cd194216cda2e1787 SHA256 32639949b003703e236257f3d2d3272659ab89c80b2819bdb552af2d5f3070d7 MD5 7d7c11a7876fbf6faa240eba586f7793 files/construct-1.6.sh 6798 RMD160 799ca391fbd21f367967d7c9ecd41426f4a72401 files/construct-1.6.sh 6798 @@ -25,6 +28,8 @@ SHA256 aa0a81aa290b056981bf7b8a5e585bb9d735be225ac11c3b29d9c9d99e095a79 files/su DIST j2re-1_4_2_13-linux-i586.bin 14363192 RMD160 ebe620a4a9ab5cd168345e5a26a58a759798854b SHA1 dded54dd6f926adf3aa17fe774ab5ae890f8313a SHA256 faaf24745233ef8cc112c848fb507b4aa1a274dd1f2adf6613bea2b6f60c79f2 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-jre-bin-1.4.2.13.ebuild 4618 RMD160 823867881b009f6ad46305d7e66636bb9b8bff65 SHA1 2ecb4097c1fff4bf9966aecdc326e03dd0e82ccc SHA256 64f8f7110279949bc0790855c224ac054e8f4dd8875140c89a5d873d1a65a2c0 @@ -35,6 +40,10 @@ EBUILD sun-jre-bin-1.5.0.10.ebuild 3834 RMD160 72308022c20493d257983923273a69156 MD5 6c9f98ce381ca8c4a5217e93492299df sun-jre-bin-1.5.0.10.ebuild 3834 RMD160 72308022c20493d257983923273a6915605b3487 sun-jre-bin-1.5.0.10.ebuild 3834 SHA256 cf44ef723fd0330947a669456833146be1b852fa6880ddeb85e96aacdd0afc26 sun-jre-bin-1.5.0.10.ebuild 3834 +EBUILD sun-jre-bin-1.5.0.11.ebuild 3746 RMD160 b456e093f3e115dca902584c2b60e03ed07f10d9 SHA1 89b057e2a689235af426031d78014add8a91c9d4 SHA256 a0fc1361913f4e2b60c997a25d55513efd793cb3ddb0e068692ae315a588c95f +MD5 bd5fdce02276d557016bd58e0fa30339 sun-jre-bin-1.5.0.11.ebuild 3746 +RMD160 b456e093f3e115dca902584c2b60e03ed07f10d9 sun-jre-bin-1.5.0.11.ebuild 3746 +SHA256 a0fc1361913f4e2b60c997a25d55513efd793cb3ddb0e068692ae315a588c95f sun-jre-bin-1.5.0.11.ebuild 3746 EBUILD sun-jre-bin-1.6.0-r1.ebuild 3871 RMD160 09f680e34a94f9bb722f8ad3323c08a2d23f6771 SHA1 070668f4aa8ffb6261683cf844ec9d20ab21b4a8 SHA256 b9cc97124230a73b0afe784d8df0086a6fa9339faac869a8ea9a7c630f5ef070 MD5 9b6a242ea5bba670fd5a3e56dca146d2 sun-jre-bin-1.6.0-r1.ebuild 3871 RMD160 09f680e34a94f9bb722f8ad3323c08a2d23f6771 sun-jre-bin-1.6.0-r1.ebuild 3871 @@ -43,10 +52,10 @@ EBUILD sun-jre-bin-1.6.0.ebuild 3882 RMD160 967b27493f5dade14bccee0a626c5f70cd2d MD5 eaabfc7a033301ed532b757f6d8f8c35 sun-jre-bin-1.6.0.ebuild 3882 RMD160 967b27493f5dade14bccee0a626c5f70cd2d4e72 sun-jre-bin-1.6.0.ebuild 3882 SHA256 dc9b72020dbd0084421564773c733a104845f4d4f94ad872af2c1f82a2bea4cc sun-jre-bin-1.6.0.ebuild 3882 -MISC ChangeLog 14856 RMD160 1b7fd73d91e0325a6185685517d71330d4696866 SHA1 8120c3fa375a2f5933c9cdbfd1ca581a2220d63e SHA256 80910651df9d3c1d7ca0279acb595adbb876003406acabeaf02728faee696cf5 -MD5 6862892c38c5e78b999a02ea7f04519c ChangeLog 14856 -RMD160 1b7fd73d91e0325a6185685517d71330d4696866 ChangeLog 14856 -SHA256 80910651df9d3c1d7ca0279acb595adbb876003406acabeaf02728faee696cf5 ChangeLog 14856 +MISC ChangeLog 15015 RMD160 79fd0373b16bfdcffaef6ec5f1fae3280c1a52a7 SHA1 2b7ac08966150c7b0ce9b5e52d098e351c87ebf8 SHA256 073de5a487ddec73f46fb754deeaa4bc324b415af3d60b2438e8da17fbf390bf +MD5 5a5c1029522d6afc939211455fee2426 ChangeLog 15015 +RMD160 79fd0373b16bfdcffaef6ec5f1fae3280c1a52a7 ChangeLog 15015 +SHA256 073de5a487ddec73f46fb754deeaa4bc324b415af3d60b2438e8da17fbf390bf ChangeLog 15015 MISC metadata.xml 240 RMD160 8c29e03b578ddd40c82afe82d42498d4c855e745 SHA1 9d97dffe17dd3ea241edafeb9a12479d4e0bc17f SHA256 3736870ea8f5be547aa7555022da8690eba4e4c1cdfeac21a6cba84a7d1cc07f MD5 c7683734eb61c03c450e551efa7b4d5a metadata.xml 240 RMD160 8c29e03b578ddd40c82afe82d42498d4c855e745 metadata.xml 240 @@ -57,9 +66,19 @@ SHA256 9a8ab82dadb094b1989330c320f789b97a576e08a21bc5e139f1428b8a2b582b files/di MD5 bfc73dd88d30c26b64d0590cb52d7547 files/digest-sun-jre-bin-1.5.0.10 563 RMD160 ce0632d08fdd27b76bd6e2de244a0516555aeef0 files/digest-sun-jre-bin-1.5.0.10 563 SHA256 f1f582a1bfca18c6375dc35e75bd199066d2361ffbf7e577a592afb4b351e34d files/digest-sun-jre-bin-1.5.0.10 563 +MD5 03a3655dea58f8ecfdf9b222a82c13d1 files/digest-sun-jre-bin-1.5.0.11 563 +RMD160 baf28f80473123c2c382cda0d6e3908a455aec27 files/digest-sun-jre-bin-1.5.0.11 563 +SHA256 d05c274f69904c60645c3639147b1741b3edeba807959724e8310ec9b1ea8b4b files/digest-sun-jre-bin-1.5.0.11 563 MD5 7cca7ffac6725b17472340fe8db317f6 files/digest-sun-jre-bin-1.6.0 521 RMD160 7329a96c4622d1ea677604d88299616019b8f1d2 files/digest-sun-jre-bin-1.6.0 521 SHA256 d5cebb938ce9873bffbdee08dfc2d4e46c0984e6d420221916b9acd94a0118c4 files/digest-sun-jre-bin-1.6.0 521 MD5 7cca7ffac6725b17472340fe8db317f6 files/digest-sun-jre-bin-1.6.0-r1 521 RMD160 7329a96c4622d1ea677604d88299616019b8f1d2 files/digest-sun-jre-bin-1.6.0-r1 521 SHA256 d5cebb938ce9873bffbdee08dfc2d4e46c0984e6d420221916b9acd94a0118c4 files/digest-sun-jre-bin-1.6.0-r1 521 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.2 (GNU/Linux) + +iD8DBQFFzwWXcxLzpIGCsLQRAldzAKCDGvkN5Hzs9MdCoxxHoDDvaEuKDgCdEQb+ +0ReVncBk18gmpMpNiMLo7oM= +=8+1T +-----END PGP SIGNATURE----- diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.11 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.11 new file mode 100644 index 000000000000..e6f312fcc9a8 --- /dev/null +++ b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-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-jre-bin/sun-jre-bin-1.5.0.11.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.11.ebuild new file mode 100644 index 000000000000..6805eccf564d --- /dev/null +++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.11.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2007 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.5.0.11.ebuild,v 1.1 2007/02/11 12:01:12 betelgeuse Exp $ + +inherit pax-utils eutils java-vm-2 + +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 nsplugin" + +RDEPEND=" + sys-libs/glibc + alsa? ( media-libs/alsa-lib ) + X? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXp + x11-libs/libXt + x11-libs/libXtst + )" + +DEPEND="" + +JAVA_PROVIDE="jdbc-stdext jdbc-rowset" + +PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar lib/ext/localedata.jar lib/plugin.jar lib/javaws.jar lib/deploy.jar" + +QA_TEXTRELS_x86="opt/${P}/lib/i386/motif21/libmawt.so + opt/${P}/lib/i386/libdeploy.so" + +src_unpack() { + if [ ! -r ${DISTDIR}/${A} ]; then + die "cannot read ${A}. Please check the permission and try again." + fi + + mkdir bundled-jdk + cd bundled-jdk + sh "${DISTDIR}/${A}" --accept-license --unpack || die "Failed to unpack" + + cd .. + bash ${FILESDIR}/construct.sh bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed" +} + +src_install() { + local dirs="bin 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}/bin/*) + + # only X86 has the plugin and javaws + use x86 && dirs="${dirs} javaws plugin" + dodir /opt/${P} + + for i in $dirs ; do + cp -pPR $i ${D}/opt/${P}/ || die "failed to copy" + done + dodoc CHANGES README THIRDPARTYLICENSEREADME.txt || die + dohtml Welcome.html || die + dodir /opt/${P}/share/ + + 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}/plugin/i386/$plugin_dir/libjavaplugin_oji.so + else + eerror "No plugin available for amd64 arch" + fi + fi + + # TODO Don't think we still needs these -nichoj + # 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 + + # FIXME figure out how to handle the control pannel conflict with + # sun-jdk-bin + + # 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}/plugin/desktop/sun_java.desktop > \ +# ${T}/sun_java-${SLOT}.desktop + +# domenu ${T}/sun_java-${SLOT}.desktop + + # bug #56444 + insinto /opt/${P}/lib/ + newins "${FILESDIR}"/fontconfig.Gentoo.properties \ + fontconfig.properties || die + + 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 "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" +}