From: Vlastimil Babka Date: Thu, 14 Dec 2006 00:21:13 +0000 (+0000) Subject: Version bump, bug #133657. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dbc5616eb15001a37936fccc26e6635350cd1657;p=gentoo.git Version bump, bug #133657. Package-Manager: portage-2.1.2_rc3-r4 --- diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog index 2d3c8d5113e7..3dddc652f841 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-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.69 2006/12/03 21:22:30 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.70 2006/12/14 00:21:12 caster Exp $ + +*sun-jre-bin-1.6.0 (14 Dec 2006) + + 14 Dec 2006; Vlastimil Babka + +files/sun-jre-bin-1.6.env, +sun-jre-bin-1.6.0.ebuild: + Version bump, bug #133657. *sun-jre-bin-1.5.0.10 (03 Dec 2006) diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest index b926f3888dd7..2b46f038af9a 100644 --- a/dev-java/sun-jre-bin/Manifest +++ b/dev-java/sun-jre-bin/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX construct.sh 6959 RMD160 fdc0d503b412657a6b0864cfc7f18fa63bf43225 SHA1 966b9c8229ef3dfb588c108124f367cc993cb581 SHA256 55ca240c8cb0e01b0548e66b0c6446437ebeff541334ead256b5139c1e14ea3f MD5 94065b612df0046d9ae758943f9f6a75 files/construct.sh 6959 RMD160 fdc0d503b412657a6b0864cfc7f18fa63bf43225 files/construct.sh 6959 @@ -17,6 +14,10 @@ AUX sun-jre-bin-1.5.env 852 RMD160 7ef7c7692279324de8e22c4b68f729e27134590a SHA1 MD5 30d56311fb1996c78266a43da718a4e9 files/sun-jre-bin-1.5.env 852 RMD160 7ef7c7692279324de8e22c4b68f729e27134590a files/sun-jre-bin-1.5.env 852 SHA256 c8557635c09c381cf1eb3e23619c5bfd01c06f062364ac49cdbef36d567bb34e files/sun-jre-bin-1.5.env 852 +AUX sun-jre-bin-1.6.env 852 RMD160 ee3b29a24da833b3a4e19d55153ce8aa6cde02cc SHA1 7185b4946b367bc9057a2342899c6a83174755cd SHA256 aa0a81aa290b056981bf7b8a5e585bb9d735be225ac11c3b29d9c9d99e095a79 +MD5 7eb33864659e555b9520aaaece4f8ba5 files/sun-jre-bin-1.6.env 852 +RMD160 ee3b29a24da833b3a4e19d55153ce8aa6cde02cc files/sun-jre-bin-1.6.env 852 +SHA256 aa0a81aa290b056981bf7b8a5e585bb9d735be225ac11c3b29d9c9d99e095a79 files/sun-jre-bin-1.6.env 852 DIST j2re-1_4_2_12-linux-i586.bin 14339018 RMD160 a63313d5a57f770ec6cd6c89c56b101f7a77f964 SHA1 18631914aeff51fcd89d226dbe3396ea91d21408 SHA256 b80403dc39008f53e50c47a04322a2046b257654653ef41a05aca29b3636fb2f DIST j2re-1_4_2_13-linux-i586.bin 14363192 RMD160 ebe620a4a9ab5cd168345e5a26a58a759798854b SHA1 dded54dd6f926adf3aa17fe774ab5ae890f8313a SHA256 faaf24745233ef8cc112c848fb507b4aa1a274dd1f2adf6613bea2b6f60c79f2 DIST jdk-1_5_0_08-dlj-linux-amd64.bin 43854617 RMD160 c6669cba980b9097c6921041ee3af8753587ea37 SHA1 f43776629e50834be1f25060bcbe7f8ee0483173 SHA256 a4a4baa5488c7be8b109ed6c1f460a8b30861ae546c050c319de41e987bc857f @@ -25,6 +26,8 @@ DIST jdk-1_5_0_09-dlj-linux-amd64.bin 43863154 RMD160 c7f4310ff6714d5dd33c10398c DIST jdk-1_5_0_09-dlj-linux-i586.bin 49504315 RMD160 8e4bc83d553bd0e92607bd2e03451ec879d5928e SHA1 36a065b72af226804ff0b64b9c40859c7a879b6f SHA256 3318644bdcd1a1de4ea122b03a4607de16f30603e7f6c291c33575cbbc254f85 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-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.12-r2.ebuild 4608 RMD160 e6891977904969bddbea013b8f46fb0ae0da1263 SHA1 a384cfc5f10c28512b3aed25256cbdb8683db5c4 SHA256 eb93119c3ccec0d85f0578441b467aeba4a68229df21c620e501a3addb23f4b2 MD5 e304bb1cc98f7f73fb6c74db329784b9 sun-jre-bin-1.4.2.12-r2.ebuild 4608 RMD160 e6891977904969bddbea013b8f46fb0ae0da1263 sun-jre-bin-1.4.2.12-r2.ebuild 4608 @@ -49,10 +52,14 @@ EBUILD sun-jre-bin-1.5.0.10.ebuild 3839 RMD160 9953890d379a23266669ae40bec710b48 MD5 006e178438065b2ce976b59e5429c860 sun-jre-bin-1.5.0.10.ebuild 3839 RMD160 9953890d379a23266669ae40bec710b482b0ed55 sun-jre-bin-1.5.0.10.ebuild 3839 SHA256 93e25a95dd175e50a8398d90d0599214188e9a843bac505423954a671616d7fa sun-jre-bin-1.5.0.10.ebuild 3839 -MISC ChangeLog 13275 RMD160 8424c1b5e6e360348e4a48fbf9d61b5da480fcce SHA1 80ccd5303ec39ee00f1628b364e443cc119f4e1f SHA256 03aa2126c3aea0da9a8e21f6de44bdbe94ebfd1dc01ba168b3884373c18a5567 -MD5 a438ef29e6149a2755b73221d024bd44 ChangeLog 13275 -RMD160 8424c1b5e6e360348e4a48fbf9d61b5da480fcce ChangeLog 13275 -SHA256 03aa2126c3aea0da9a8e21f6de44bdbe94ebfd1dc01ba168b3884373c18a5567 ChangeLog 13275 +EBUILD sun-jre-bin-1.6.0.ebuild 3882 RMD160 967b27493f5dade14bccee0a626c5f70cd2d4e72 SHA1 bf720eea7f7a7e66cafe0b747a0beb1c3278e5ec SHA256 dc9b72020dbd0084421564773c733a104845f4d4f94ad872af2c1f82a2bea4cc +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 13443 RMD160 c15cde206430674704162b00e04fb6d89914c8d9 SHA1 ad29a76024e6d78a608f5a2f442a3300e85a125b SHA256 14eceaf229223fa0823a6ec6f3c22b94c23c22077bb634cd8a8f32dd18e438f7 +MD5 eb0b66adfd87d7b2dfb1966c54330174 ChangeLog 13443 +RMD160 c15cde206430674704162b00e04fb6d89914c8d9 ChangeLog 13443 +SHA256 14eceaf229223fa0823a6ec6f3c22b94c23c22077bb634cd8a8f32dd18e438f7 ChangeLog 13443 MISC metadata.xml 240 RMD160 8c29e03b578ddd40c82afe82d42498d4c855e745 SHA1 9d97dffe17dd3ea241edafeb9a12479d4e0bc17f SHA256 3736870ea8f5be547aa7555022da8690eba4e4c1cdfeac21a6cba84a7d1cc07f MD5 c7683734eb61c03c450e551efa7b4d5a metadata.xml 240 RMD160 8c29e03b578ddd40c82afe82d42498d4c855e745 metadata.xml 240 @@ -75,10 +82,6 @@ SHA256 659534b6f9466273b0a3523c862d3272fe23191edcec6bb3044b536c9d9a8d4c 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 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) - -iD8DBQFFc0AxcxLzpIGCsLQRAh2JAJ9VFpRFEvvDwKAPOalCMwsDWPqN3ACgmE/2 -SQ87T9Ck7Yc62oa765XAJDs= -=cv8g ------END PGP SIGNATURE----- +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 diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.6.0 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.6.0 new file mode 100644 index 000000000000..95693b0f544e --- /dev/null +++ b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.6.0 @@ -0,0 +1,6 @@ +MD5 2e0c075c27b09aed67f99475c3a19f83 jdk-6-dlj-linux-amd64.bin 56347832 +RMD160 b4d12bf55ea6baa465c227cff2d314d26de4876e jdk-6-dlj-linux-amd64.bin 56347832 +SHA256 f1f35d331809487bb922bbd3ca46de4abc3e45c482f94127f4ac8f3c8b3321c3 jdk-6-dlj-linux-amd64.bin 56347832 +MD5 f4481c4e064cec06a65d7751d9105c6d jdk-6-dlj-linux-i586.bin 62718862 +RMD160 4ff9f1f82b20f0dbd792e6765c02d87749e00aac jdk-6-dlj-linux-i586.bin 62718862 +SHA256 1c4f98edb6c1b379807d9dab61971c0271b2b4cf1f1be914cc85354744408467 jdk-6-dlj-linux-i586.bin 62718862 diff --git a/dev-java/sun-jre-bin/files/sun-jre-bin-1.6.env b/dev-java/sun-jre-bin/files/sun-jre-bin-1.6.env new file mode 100644 index 000000000000..b714ef5175e2 --- /dev/null +++ b/dev-java/sun-jre-bin/files/sun-jre-bin-1.6.env @@ -0,0 +1,16 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/files/sun-jre-bin-1.6.env,v 1.1 2006/12/14 00:21:13 caster Exp $ + +VERSION="Sun JRE @PV@" +JAVA_HOME=/opt/@P@ +JRE_HOME=/opt/@P@ +PATH="${JAVA_HOME}/bin:${JAVA_HOME}/javaws" +ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/javaws" +LDPATH="${JAVA_HOME}/lib/@PLATFORM@/:${JAVA_HOME}/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/lib/@PLATFORM@/xawt/:${JAVA_HOME}/lib/@PLATFORM@/server/" +MANPATH="/opt/@P@/man" +PROVIDES_TYPE="JRE" +PROVIDES_VERSION="1.6" +BOOTCLASSPATH="${JAVA_HOME}/lib/rt.jar:${JAVA_HOME}/lib/i18n.jar:${JAVA_HOME}/lib/sunrsasign.jar:${JAVA_HOME}/lib/jsse.jar:${JAVA_HOME}/lib/jce.jar:${JAVA_HOME}/lib/charsets.jar" +GENERATION="2" +ENV_VARS="JAVA_HOME JRE_HOME PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.ebuild new file mode 100644 index 000000000000..96158e5a018f --- /dev/null +++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2006 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.ebuild,v 1.1 2006/12/14 00:21:12 caster Exp $ + +inherit pax-utils eutils java-vm-2 + +#MY_PVA=${PV//./_} +MY_PVA=6 +#S="${WORKDIR}/jdk${PV}" + +X86_AT="jdk-${MY_PVA}-dlj-linux-i586.bin" +AMD64_AT="jdk-${MY_PVA}-dlj-linux-amd64.bin" +if use x86; then + At=${X86_AT} +elif use amd64; then + At=${AMD64_AT} +fi +DESCRIPTION="Sun's J2SE Development Kit, version ${PV}" +HOMEPAGE="http://java.sun.com/javase/6/" +SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} ) + amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )" +SLOT="1.6" +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 + ) + virtual/x11 + ) + )" + +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/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() { + if [ ! -r ${DISTDIR}/${At} ]; then + die "cannot read ${At}. Please check the permission and try again." + fi + + mkdir bundled-jdk + cd bundled-jdk + sh ${DISTDIR}/${At} --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 + dohtml Welcome.html + 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 + + 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" +}