diff options
| -rw-r--r-- | app-emulation/emul-linux-x86-java/ChangeLog | 6 | ||||
| -rw-r--r-- | app-emulation/emul-linux-x86-java/Manifest | 4 | ||||
| -rw-r--r-- | app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.23.ebuild | 112 |
3 files changed, 6 insertions, 116 deletions
diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog index c1299b7da453..a38a694917fb 100644 --- a/app-emulation/emul-linux-x86-java/ChangeLog +++ b/app-emulation/emul-linux-x86-java/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/emul-linux-x86-java # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.94 2010/12/10 21:56:21 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.95 2010/12/10 21:57:45 caster Exp $ + + 10 Dec 2010; Vlastimil Babka <caster@gentoo.org> + -emul-linux-x86-java-1.6.0.23.ebuild: + Retract *emul-linux-x86-java-1.6.0.23 (10 Dec 2010) diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest index 92242afe0335..ad0a9e4f93d6 100644 --- a/app-emulation/emul-linux-x86-java/Manifest +++ b/app-emulation/emul-linux-x86-java/Manifest @@ -1,8 +1,6 @@ AUX construct-1.6.sh 6799 RMD160 061317637fbdeeaaa7e7104dbc390bcf1bda763c SHA1 516bf0e3a8868c327c1120fc0bcd840d0c3a5c0b SHA256 4369309ba29da4dcdbda4ea614e2db00ff7e3a801fa58b897de818fe33d78e80 AUX emul-linux-x86-java-1.6.env 894 RMD160 86bb5a85c4a7b51a52016376438052673da53636 SHA1 8d62dde36f42a769246235662d6f9b25490cd4c8 SHA256 47fa2c1923a0ee6940cc1deb8a12258d900cacbeabcf3e69b5bbc85ce39dc4df DIST jdk-6u22-dlj-linux-i586.bin 83823265 RMD160 ea0d48585397f3f6b9a1aa09cd04ecff86cde2ad SHA1 a7b0a8f47aa5a35a48271f8013418c72b1bf1cac SHA256 3af78858159460ff4f9f828b77640e710f4a8b260167db396c6d0664b4eb0f5b -DIST jdk-6u23-dlj-linux-i586.bin 84523278 RMD160 3f03947f4b3cc9749e202cdf1098833b35ebf3b5 SHA1 5e7497c6356bc97345c609af18b6bd330b06e824 SHA256 eef04b7b8425769c6194079ce7c5a571bc413b474b27fe8e67c1913d2d8e51a9 EBUILD emul-linux-x86-java-1.6.0.22.ebuild 3470 RMD160 68db5ba70716ada902957fc0d517f0313b70320b SHA1 281ef9b2022d855e3f0cceeaa557a74c2f9a5211 SHA256 db05c704e7eb6308bd5c62c57621f7d9442013bc799069cbdcf296f87f0c2d13 -EBUILD emul-linux-x86-java-1.6.0.23.ebuild 3469 RMD160 b95b967446b5e269ad6109cc8556720f815b8543 SHA1 5c0c1ec5f2144916f9b0c795feea025576675f9e SHA256 3d3f4195bdd9c725f4723617fbc1a8ab10f064860b1e11a06c719e6ea1faf995 -MISC ChangeLog 19105 RMD160 91db8a203937b5e6054abf8ffad75287e2cf7ae6 SHA1 d6dc65f3740b2985d03afc2aed541566362acf13 SHA256 acbdeaeb61476af524103a668b70aab83b37ad173f40a180ab35ff14f4cbe2dd +MISC ChangeLog 19207 RMD160 b6be062877c477d251474150668083ee30819d32 SHA1 9fb51f4ed0b44faab67ca7d1c66d1b4c26382d1e SHA256 f758922d64d23657ec22fd9f42a651300b225d175eddd6af87b49dab623f284f MISC metadata.xml 179 RMD160 eb23cc92511920eee7575e49cb97e3cc57ec2ffe SHA1 5f572596a2c474e808cdb21b8c2bf80f7cc011b1 SHA256 28110c7811a1bdcba5e23efc7018238140b1e9460b78215f914b7253a8c09ca8 diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.23.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.23.ebuild deleted file mode 100644 index 93ccc17f0833..000000000000 --- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.23.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2010 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.23.ebuild,v 1.1 2010/12/10 21:56:21 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="Sun's Java SE Runtime Environment (32bit)" -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 )" - -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" -QA_DT_HASH="opt/${P}/.*" - -src_unpack() { - 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" -} - -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 - einfo "Creating the Class Data Sharing archives" - "${S}"/bin/java -client -Xshare:dump || die - "${S}"/bin/java -server -Xshare:dump || die -} - -src_install() { - local dirs="bin lib man 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 nsplugin; then - local plugin_dir="ns7-gcc29" - if has_version '>=sys-devel/gcc-3' ; then - plugin_dir="ns7" - fi - - install_mozilla_plugin /opt/${P}/lib/i386/libnpjp2.so - install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so old_oji - 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 - java-vm_revdep-mask -} - -pkg_postinst() { - # Set as default VM if none exists - java-vm-2_pkg_postinst - - elog - elog "Two variants of the nsplugin are available via eselect java-nsplugin." - elog "Note that starting with ${PN}-1.6.0.19 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 - - 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." -} |