From 2b68b410ddd2f78a8046d1cbbcfab22ea08152ba Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Sun, 16 Dec 2007 13:47:25 +0000 Subject: Version bump, bug #166789; Don't export JAVA in 1.5's env file. (Portage version: 2.1.4_rc9) --- dev-java/ibm-jre-bin/ChangeLog | 9 +- .../ibm-jre-bin/files/digest-ibm-jre-bin-1.6.0.0 | 12 ++ dev-java/ibm-jre-bin/files/ibm-jre-bin-1.5.env | 4 +- dev-java/ibm-jre-bin/files/ibm-jre-bin-1.6.env | 15 ++ dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.0.ebuild | 178 +++++++++++++++++++++ 5 files changed, 215 insertions(+), 3 deletions(-) create mode 100644 dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.6.0.0 create mode 100644 dev-java/ibm-jre-bin/files/ibm-jre-bin-1.6.env create mode 100644 dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.0.ebuild (limited to 'dev-java/ibm-jre-bin') diff --git a/dev-java/ibm-jre-bin/ChangeLog b/dev-java/ibm-jre-bin/ChangeLog index f4118b7b73e1..e9d8c3361916 100644 --- a/dev-java/ibm-jre-bin/ChangeLog +++ b/dev-java/ibm-jre-bin/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-java/ibm-jre-bin # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.79 2007/12/12 15:14:09 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.80 2007/12/16 13:47:25 caster Exp $ + +*ibm-jre-bin-1.6.0.0 (16 Dec 2007) + + 16 Dec 2007; Vlastimil Babka + files/ibm-jre-bin-1.5.env, +files/ibm-jre-bin-1.6.env, + +ibm-jre-bin-1.6.0.0.ebuild: + Version bump, bug #166789; Don't export JAVA in 1.5's env file. *ibm-jre-bin-1.5.0.6-r1 (12 Dec 2007) diff --git a/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.6.0.0 b/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.6.0.0 new file mode 100644 index 000000000000..b97b5aa566a5 --- /dev/null +++ b/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.6.0.0 @@ -0,0 +1,12 @@ +MD5 5102334b3281d6e2524f260cfa697165 ibm-java-jre-6.0-0.0-linux-i386.tgz 59585416 +RMD160 6d85e42351a64330530f9c541d4fa6dd27ae36ba ibm-java-jre-6.0-0.0-linux-i386.tgz 59585416 +SHA256 26a66f36239b619df7c79b97c67e03f08cc8a9334e9cdf13c224fb6ce7975d33 ibm-java-jre-6.0-0.0-linux-i386.tgz 59585416 +MD5 873574a900491a1ae74f9732567c3bb0 ibm-java-jre-6.0-0.0-linux-ppc.tgz 61777287 +RMD160 eb53658709bd7153fe549a4b1a787b85caf9ddff ibm-java-jre-6.0-0.0-linux-ppc.tgz 61777287 +SHA256 1353e0d6412f6bc5cd545ffbea057dade7a64a0f69f3fa6865c7e2c5833f020f ibm-java-jre-6.0-0.0-linux-ppc.tgz 61777287 +MD5 6127befecbda30a69bec9c9c40221145 ibm-java-jre-6.0-0.0-linux-ppc64.tgz 63455903 +RMD160 3d041835fd70ac716ddc58bf15a2e17e84b01817 ibm-java-jre-6.0-0.0-linux-ppc64.tgz 63455903 +SHA256 126a9c424821e56eaf81822f3e1d975f4cbb49e8ea67cf40588fc2125f61161f ibm-java-jre-6.0-0.0-linux-ppc64.tgz 63455903 +MD5 9a875338f1ebe81c469f8a935ae6351b ibm-java-jre-6.0-0.0-linux-x86_64.tgz 57941136 +RMD160 56643afe91ec2726878f0b75b872797acb8b7ca4 ibm-java-jre-6.0-0.0-linux-x86_64.tgz 57941136 +SHA256 aff47c49671e85984c2112d27429d5550d7415b94f3482cb26a9de7a3cdd10aa ibm-java-jre-6.0-0.0-linux-x86_64.tgz 57941136 diff --git a/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.5.env b/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.5.env index a81e9e8fa679..02a71e74d888 100644 --- a/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.5.env +++ b/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.5.env @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.5.env,v 1.2 2007/12/12 15:14:10 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.5.env,v 1.3 2007/12/16 13:47:25 caster Exp $ VERSION="IBM JRE @PV@" JAVA_HOME=/opt/@P@ @@ -12,4 +12,4 @@ PROVIDES_TYPE="JRE" PROVIDES_VERSION="1.5" BOOTCLASSPATH="${JAVA_HOME}/lib/vm.jar:${JAVA_HOME}/lib/core.jar:${JAVA_HOME}/lib/charsets.jar:${JAVA_HOME}/lib/graphics.jar:${JAVA_HOME}/lib/security.jar:${JAVA_HOME}/lib/ibmpkcs.jar:${JAVA_HOME}/lib/ibmorb.jar:${JAVA_HOME}/lib/ibmcfw.jar:${JAVA_HOME}/lib/ibmorbapi.jar:${JAVA_HOME}/lib/ibmjcefw.jar:${JAVA_HOME}/lib/ibmjgssprovider.jar:${JAVA_HOME}/lib/ibmjsseprovider2.jar:${JAVA_HOME}/lib/ibmjaaslm.jar:${JAVA_HOME}/lib/ibmcertpathprovider.jar:${JAVA_HOME}/lib/server.jar:${JAVA_HOME}/lib/xml.jar" GENERATION="2" -ENV_VARS="JAVA_HOME JRE_HOME JAVAC PATH ROOTPATH LDPATH" +ENV_VARS="JAVA_HOME JRE_HOME PATH ROOTPATH LDPATH" diff --git a/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.6.env b/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.6.env new file mode 100644 index 000000000000..befe6481297a --- /dev/null +++ b/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.6.env @@ -0,0 +1,15 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.6.env,v 1.1 2007/12/16 13:47:25 caster Exp $ + +VERSION="IBM JRE @PV@" +JAVA_HOME=/opt/@P@ +JRE_HOME=/opt/@P@ +PATH="${JAVA_HOME}/bin" +ROOTPATH="${JAVA_HOME}/bin" +LDPATH="/opt/@P@/lib/@PLATFORM@:/usr/lib" +PROVIDES_TYPE="JRE" +PROVIDES_VERSION="1.6" +BOOTCLASSPATH="${JAVA_HOME}/lib/vm.jar:/opt/ibm-jre-bin-1.6.0.0/lib/facilitators.jar:/opt/ibm-jre-bin-1.6.0.0/lib/annotation.jar:/opt/ibm-jre-bin-1.6.0.0/lib/beans.jar:/opt/ibm-jre-bin-1.6.0.0/lib/java.util.jar:/opt/ibm-jre-bin-1.6.0.0/lib/jndi.jar:/opt/ibm-jre-bin-1.6.0.0/lib/logging.jar:/opt/ibm-jre-bin-1.6.0.0/lib/security.jar:/opt/ibm-jre-bin-1.6.0.0/lib/sql.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmorb.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmorbapi.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmcfw.jar:/opt/ibm-jre-bin-1.6.0.0/lib/rt.jar:/opt/ibm-jre-bin-1.6.0.0/lib/charsets.jar:/opt/ibm-jre-bin-1.6.0.0/lib/resources.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmpkcs.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmcertpathfw.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmjgssfw.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmjssefw.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmsaslfw.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmjcefw.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmjgssprovider.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmjsseprovider2.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmcertpathprovider.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmxmlcrypto.jar:/opt/ibm-jre-bin-1.6.0.0/lib/management-agent.jar:/opt/ibm-jre-bin-1.6.0.0/lib/xml.jar:/opt/ibm-jre-bin-1.6.0.0/lib/jlm.jar:/opt/ibm-jre-bin-1.6.0.0/lib/javascript.jar:/opt/ibm-jre-bin-1.6.0.0/lib/RACF.jar" +GENERATION="2" +ENV_VARS="JAVA_HOME JRE_HOME PATH ROOTPATH LDPATH" diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.0.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.0.ebuild new file mode 100644 index 000000000000..df58a3b5a7ba --- /dev/null +++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.0.ebuild @@ -0,0 +1,178 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.0.ebuild,v 1.1 2007/12/16 13:47:25 caster Exp $ + +inherit java-vm-2 versionator eutils + +JDK_RELEASE=$(get_version_component_range 2-3) +SERVICE_RELEASE=$(get_version_component_range 4) +SERVICE_RELEASE_LINK="${SERVICE_RELEASE}" +TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0" + +JRE_DIST_PREFIX="ibm-java-jre-${TGZ_PV}-linux" + +X86_JRE_DIST="${JRE_DIST_PREFIX}-i386.tgz" +AMD64_JRE_DIST="${JRE_DIST_PREFIX}-x86_64.tgz" +PPC_JRE_DIST="${JRE_DIST_PREFIX}-ppc.tgz" +PPC64_JRE_DIST="${JRE_DIST_PREFIX}-ppc64.tgz" + +if use x86; then + JRE_DIST=${X86_JRE_DIST} + S="${WORKDIR}/ibm-java-i386-60" + LINK_ARCH="intel" +elif use amd64; then + JRE_DIST=${AMD64_JRE_DIST} + S="${WORKDIR}/ibm-java-x86_64-60" + LINK_ARCH="amd64" +elif use ppc; then + JRE_DIST=${PPC_JRE_DIST} + S="${WORKDIR}/ibm-java-ppc-60" + LINK_ARCH="ipseries32" +elif use ppc64; then + JRE_DIST=${PPC64_JRE_DIST} + S="${WORKDIR}/ibm-java-ppc64-60" + LINK_ARCH="ipseries64" +fi + +DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=swg-sdk6&S_PKG=${LINK_ARCH}&S_TACT=105AGX05&S_CMP=JDK" + +SLOT="1.6" +DESCRIPTION="IBM Java Runtime Environment ${SLOT}" +HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/" +DOWNLOADPAGE="${HOMEPAGE}linux/download.html" +# bug #125178 +ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html" + +SRC_URI="x86? ( ${X86_JRE_DIST} ) + amd64? ( ${AMD64_JRE_DIST} ) + ppc? ( ${PPC_JRE_DIST} ) + ppc64? ( ${PPC64_JRE_DIST} )" +LICENSE="IBM-J1.6" +KEYWORDS="-* ~amd64 ~x86" +RESTRICT="fetch" +IUSE="X alsa nsplugin" + +RDEPEND="x86? ( net-libs/libnet ) + X? ( + x11-libs/libXext + x11-libs/libXft + x11-libs/libXi + x11-libs/libXp + x11-libs/libXtst + x11-libs/libX11 + amd64? ( x11-libs/libXt ) + ) + alsa? ( media-libs/alsa-lib )" +DEPEND="" + +QA_TEXTRELS_x86="opt/${P}/lib/i386/libj9jvmti24.so +opt/${P}/lib/i386/libj9vm24.so +opt/${P}/lib/i386/libjclscar_24.so +opt/${P}/lib/i386/motif21/libmawt.so +opt/${P}/lib/i386/libj9thr24.so +opt/${P}/lib/i386/libj9jit24.so +opt/${P}/lib/i386/libj9dbg24.so +opt/${P}/lib/i386/libj9gc24.so" + +QA_EXECSTACK_x86="opt/${P}/bin/classic/libjvm.so +opt/${P}/lib/i386/j9vm/libjvm.so +opt/${P}/lib/i386/libj9jvmti24.so +opt/${P}/lib/i386/libj9hookable24.so +opt/${P}/lib/i386/libj9vm24.so +opt/${P}/lib/i386/libjclscar_24.so +opt/${P}/lib/i386/libj9thr24.so +opt/${P}/lib/i386/libj9dmp24.so +opt/${P}/lib/i386/libj9prt24.so +opt/${P}/lib/i386/libj9jit24.so +opt/${P}/lib/i386/libiverel24.so +opt/${P}/lib/i386/libj9trc24.so +opt/${P}/lib/i386/libj9dbg24.so +opt/${P}/lib/i386/libj9shr24.so +opt/${P}/lib/i386/libj9gc24.so +opt/${P}/lib/i386/libj9bcv24.so +opt/${P}/lib/i386/classic/libjvm.so" + +QA_TEXTRELS_amd64="opt/${P}/lib/amd64/libjclscar_24.so +opt/${P}/lib/amd64/libj9jit24.so" + +QA_EXECSTACK_amd64="opt/${P}/bin/classic/libjvm.so +opt/${P}/lib/amd64/j9vm/libjvm.so +opt/${P}/lib/amd64/libj9jvmti24.so +opt/${P}/lib/amd64/libj9hookable24.so +opt/${P}/lib/amd64/libj9vm24.so +opt/${P}/lib/amd64/libjclscar_24.so +opt/${P}/lib/amd64/libj9thr24.so +opt/${P}/lib/amd64/libj9dmp24.so +opt/${P}/lib/amd64/libj9prt24.so +opt/${P}/lib/amd64/libj9jit24.so +opt/${P}/lib/amd64/libiverel24.so +opt/${P}/lib/amd64/libj9trc24.so +opt/${P}/lib/amd64/libj9dbg24.so +opt/${P}/lib/amd64/libj9shr24.so +opt/${P}/lib/amd64/libj9gc24.so +opt/${P}/lib/amd64/libj9bcv24.so +opt/${P}/lib/amd64/classic/libjvm.so" + +pkg_nofetch() { + einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles" + einfo "Please visit: ${DOWNLOADPAGE}" + + einfo "Under Java SE 6, download GA for your arch:" #SR${SERVICE_RELEASE} + einfo "${JRE_DIST}" + + einfo "You can use direct link to your arch download page:" + einfo "${DIRECT_DOWNLOAD}" + einfo "Place the file(s) in: ${DISTDIR}" + einfo "Then restart emerge: 'emerge --resume'" + + einfo "Note: if GA is not available at ${DOWNLOADPAGE}" + einfo "it may have been moved to ${ALT_DOWNLOADPAGE}. Lately that page" + einfo "isn't updated, but the files should still available through the" + einfo "direct link to arch download page. If it doesn't work, file a bug." +} + +src_compile() { :; } + +src_install() { + # Copy all the files to the designated directory + dodir /opt/${P} + cp -pR "${S}"/jre/* "${D}/opt/${P}/" + + if use x86 || use ppc; then + if use nsplugin; then + local plugin="/opt/${P}/plugin/$(get_system_arch)/ns7/libjavaplugin_oji.so" + install_mozilla_plugin "${plugin}" + fi + fi + + local desktop_in="${D}/opt/${P}/plugin/desktop/sun_java.desktop" + if [[ -f "${desktop_in}" ]]; then + local desktop_out="${T}/ibm_jre-${SLOT}.desktop" + # install control panel for Gnome/KDE + # The jdk also installs these so make sure that they do not have the same + # Name + sed -e "s/\(Name=\)Java/\1 Java Control Panel for IBM JRE ${SLOT}/" \ + -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \ + -e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \ + "${desktop_in}" > \ + "${desktop_out}" || die + + domenu "${desktop_out}" || die + fi + + dohtml -a html,htm,HTML -r docs || die + dodoc "${S}"/{copyright,notices.txt,readmefirst.lnx.txt} || die + + set_java_env +} + +pkg_postinst() { + java-vm-2_pkg_postinst + if ! use X; then + echo + ewarn "You're not using X so its possible that you dont have" + ewarn "a X server installed, please read the following warning: " + ewarn "Some parts of IBM JDK require XFree86 to be installed." + ewarn "Be careful which Java libraries you attempt to use." + fi +} -- cgit v1.2.3-65-gdbad