diff options
Diffstat (limited to 'app-emulation')
4 files changed, 209 insertions, 2 deletions
diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog index 84af99350ef7..4e9fc0f5fb36 100644 --- a/app-emulation/emul-linux-x86-java/ChangeLog +++ b/app-emulation/emul-linux-x86-java/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-emulation/emul-linux-x86-java # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.47 2008/03/20 21:02:31 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.48 2008/03/26 22:21:55 caster Exp $ + +*emul-linux-x86-java-1.6.0.05 (26 Mar 2008) +*emul-linux-x86-java-1.5.0.15 (26 Mar 2008) + + 26 Mar 2008; Vlastimil Babka <caster@gentoo.org> + +emul-linux-x86-java-1.5.0.15.ebuild, + +emul-linux-x86-java-1.6.0.05.ebuild: + Version bump, security bug #212425. 20 Mar 2008; Peter Volkov <pva@gentoo.org> emul-linux-x86-java-1.4.2.17.ebuild: diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest index f931931ad8c7..39100e2839a7 100644 --- a/app-emulation/emul-linux-x86-java/Manifest +++ b/app-emulation/emul-linux-x86-java/Manifest @@ -7,12 +7,16 @@ AUX javasettings_Linux_x86.xml 1601 RMD160 e87fe605d34fd6060f58f511deea5a935697b DIST j2re-1_4_2_16-linux-i586.bin 14388621 RMD160 46885501b413a73a08f50695c335e11291389376 SHA1 7abc5f9354bc00109766f8f6302e39c4da938bcb SHA256 9293d00a35b31e7f78f6338ead3a811d2732290b90a3711814ee64cea5842045 DIST j2re-1_4_2_17-linux-i586.bin 14376647 RMD160 62de02a90f67d8965cebc563636d688f6745b7ca SHA1 a4282ea13048c76274222476abfb0954d42c35b8 SHA256 18aa1f5a4b223d3858d1d75913bb036963be4a9bb9b9bdc38ae2b714e1408654 DIST jdk-1_5_0_13-dlj-linux-i586.bin 49672592 RMD160 cf0ff373451612348ac54c9e78a0a57d7f5efbed SHA1 a025d81df269ed6ce663a34f52e5f0ea2a462bf2 SHA256 6836f531f5dedb94f680d8dd59d349f5f50aa42ca887ae7f4bc664437ac2a9b0 +DIST jdk-5.0u15-dlj-linux-i586.bin 49670009 RMD160 b7fcb7e92c91cf4ef428a434c35c400832d08f8d SHA1 e52af3bc81f268d73a94772428d612769473834b SHA256 b4b340f86e3c8f3bb2f9fa1762f1c3f428cee1efc658c4fb8793f5cf299b2ad5 DIST jdk-6u3-dlj-linux-i586.bin 68613151 RMD160 ba3ea6eb67f72f76f33f091633f8ac049d18b24c SHA1 86ba73cdcc2c22782a04b8191f157a5ac7caa490 SHA256 5c44208fbd5f90b3e6a0692ed9e1e98f5feb0c88aa0cfae5186dddb1f05f731b DIST jdk-6u4-dlj-linux-i586.bin 70455896 RMD160 3300edb3fb5e3ac4e32781ee7bc8cc6273b7c76d SHA1 24601838ae7216cbc5d75170b6aebf5e4012dec1 SHA256 955186f497a50106cd1788fcaf032eedc560985826c8a6c3cb7ab43220cad23c +DIST jdk-6u5-dlj-linux-i586.bin 70537386 RMD160 bd1bd2a6601b7e972c9c5f3e1cce4ce7d408b055 SHA1 ba7f5e5c0567db73cf8a9f3b41bcff32e2aed542 SHA256 b0f78f2e6baf88c1d7dc9334c6b86e621b2c9d629f5617f3f57a3bd7cbad0c99 EBUILD emul-linux-x86-java-1.4.2.16.ebuild 3769 RMD160 7a3507a376ce676b9a5fff849bc2bdebead25caf SHA1 9ba38f1e8b0b755d108597fc2cd159ce81ae8e7c SHA256 6fc5a292379bafb258675280bf776cdec26b2e247681172df38b611577cd540a EBUILD emul-linux-x86-java-1.4.2.17.ebuild 3534 RMD160 402ad696adc182da8a0a6a5312d9c000fd3034ca SHA1 234c0ab544dc5ba0a8974cd0c78ae9f153de6404 SHA256 63bbbe4a5db8be5578cd7d8a1839ffc97cd70d9a746da4c53b96b587a62e91e4 EBUILD emul-linux-x86-java-1.5.0.13.ebuild 2732 RMD160 f63414ff4dcd84c5a30a0a737461fce00110796d SHA1 019735d01ee9a581e5af3d73663f3787672ccccd SHA256 f366ba92df8ce5aaf28f8bd41056a3c6ea7de0f78ec7a10500a23f92f498cd10 +EBUILD emul-linux-x86-java-1.5.0.15.ebuild 2817 RMD160 0cc2b76bf8fc9d57cd794aa9cbe1c452f8f80d6f SHA1 87942781ecfae4ec29585a36727e792a83b5a529 SHA256 89b3b66ac51ad9a838d6ffcb895aa5fe8feefb7479eb1700031267d1415f1fb8 EBUILD emul-linux-x86-java-1.6.0.03.ebuild 2685 RMD160 762b2560025c42c000f238faa88cfbd4d6989a15 SHA1 dc22e96afcd88fdd5f4b655be332c57e316ebe2b SHA256 9cd0604f86dc6502afc35128e548387ba8745bd95f26e9766d67982ce54fcb6f EBUILD emul-linux-x86-java-1.6.0.04.ebuild 2686 RMD160 bb7111041a318706635655adefdefd51e1c1aed2 SHA1 108bea8082d06f38af0368feb6a935dd48266534 SHA256 1d03023a645676915c2316fc4ac4705e243e5c5022f7691e0d41acafa4f46c4a -MISC ChangeLog 9427 RMD160 61adcb69ecb8cea3ae78c54f3f1e1b60cb5533b6 SHA1 a736ff94a5ee1c58c8d5491ee998ea69c2925e11 SHA256 07f65b06f78b598ac8d826098785e1c7e8a3e556986f7bbd343a53a103ad994b +EBUILD emul-linux-x86-java-1.6.0.05.ebuild 2686 RMD160 fc6501276b5a7c2b523285453552aa7a67acbef0 SHA1 bd0b613df1ade5876861c1b455e7579237192eb8 SHA256 d29e7d7bf6b847efdfb2e8c008b05ff66bb698d467631f73c8277ce7ccc205f4 +MISC ChangeLog 9689 RMD160 170851236177919f9226b6f1489ee731006dd1ec SHA1 a40ccffcdc42b2dc51e99f7c7937d22abce47989 SHA256 8083e95cd10a9df91f77e5d08e759e97286d5de5a98a0b6ac40fae978e24894a MISC metadata.xml 179 RMD160 eb23cc92511920eee7575e49cb97e3cc57ec2ffe SHA1 5f572596a2c474e808cdb21b8c2bf80f7cc011b1 SHA256 28110c7811a1bdcba5e23efc7018238140b1e9460b78215f914b7253a8c09ca8 diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.15.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.15.ebuild new file mode 100644 index 000000000000..0be008d4172e --- /dev/null +++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.15.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.15.ebuild,v 1.1 2008/03/26 22:21:55 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-3)u${UPDATE}" + +At="jdk-${MY_PV}-dlj-linux-i586.bin" +DESCRIPTION="32bit version Sun's J2SE Development Kit" +HOMEPAGE="http://java.sun.com/j2se/1.5.0/" +SRC_URI="http://download.java.net/dlj/binaries/${At}" + +SLOT="1.5" +LICENSE="dlj-1.1" +KEYWORDS="-* ~amd64" +RESTRICT="strip" +IUSE="X alsa nsplugin" + +JAVA_VM_NO_GENERATION1=true + +RDEPEND="alsa? ( app-emulation/emul-linux-x86-soundlibs ) + X? ( app-emulation/emul-linux-x86-xlibs )" + +JAVA_PROVIDE="jdbc-stdext jdbc-rowset" + +QA_TEXTRELS_amd64="opt/${P}/lib/i386/motif21/libmawt.so + opt/${P}/lib/i386/libdeploy.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" + + "${S}"/bin/java -client -Xshare:dump +} + +src_install() { + # 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/*) + + dodir /opt/${P} + cp -pPR bin lib man javaws plugin "${D}/opt/${P}/" || die "failed to copy" + + dodoc CHANGES README THIRDPARTYLICENSEREADME.txt || die + dohtml Welcome.html || die + + if use nsplugin; then + local plugin_dir="ns7-gcc29" + if has_version '>=sys-devel/gcc-3' ; then + plugin_dir="ns7" + fi + + install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so + fi + + # 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 + + set_java_env +} + +pkg_postinst() { + # Set as default VM if none exists + java-vm-2_pkg_postinst + + if ! use X; then + local xwarn="X11 libraries 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" +} diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.05.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.05.ebuild new file mode 100644 index 000000000000..20c9dcd264ca --- /dev/null +++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.05.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.05.ebuild,v 1.1 2008/03/26 22:21:55 caster Exp $ + +inherit versionator pax-utils java-vm-2 eutils + +UPDATE="$(get_version_component_range 4)" +UPDATE="${UPDATE#0}" +MY_PV="$(get_version_component_range 2)u${UPDATE}" + +At="jdk-${MY_PV}-dlj-linux-i586.bin" +DESCRIPTION="32bit version Sun's J2SE Development Kit" +HOMEPAGE="http://java.sun.com/javase/6/" +#SRC_URI="http://download.java.net/dlj/binaries/${At}" +SRC_URI="http://dlc.sun.com/dlj/binaries/${At}" + +SLOT="1.6" +LICENSE="dlj-1.1" +KEYWORDS="-* ~amd64" +RESTRICT="strip" +IUSE="X alsa nsplugin" + +JAVA_VM_NO_GENERATION1=true + +RDEPEND="alsa? ( app-emulation/emul-linux-x86-soundlibs ) + X? ( app-emulation/emul-linux-x86-xlibs ) + app-emulation/emul-linux-x86-compat" + +JAVA_PROVIDE="jdbc-stdext jdbc-rowset" + +QA_TEXTRELS_amd64="opt/${P}/lib/i386/motif21/libmawt.so + opt/${P}/lib/i386/libdeploy.so + opt/${P}/lib/i386/client/libjvm.so + opt/${P}/lib/i386/server/libjvm.so" + +src_unpack() { + if [[ ! -r "${DISTDIR}"/${A} ]]; then + die "cannot read ${DISTDIR}/${A}. 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-${SLOT}.sh bundled-jdk sun-jdk-${PV} ${P} || die "construct-${SLOT}.sh failed" + + "${S}"/bin/java -client -Xshare:dump +} + +src_install() { + local dirs="bin lib man javaws plugin" + dodir /opt/${P} + + cp -pPR ${dirs} "${D}/opt/${P}/" || die "failed to copy" + + pax-mark m $(list-paxables "${D}"/opt/${P}/bin/*) + + dodoc 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 + + install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so + fi + + # 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 + + set_java_env +} + +pkg_postinst() { + # Set as default VM if none exists + java-vm-2_pkg_postinst + + if ! use X; then + local xwarn="X11 libraries 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." +} |