From 65befe2879a6862cc075229f8f572401cfea2323 Mon Sep 17 00:00:00 2001 From: Karl Trygve Kalleberg Date: Tue, 9 Apr 2002 22:13:41 +0000 Subject: Fixed #1577 --- dev-java/ibm-jdk/ChangeLog | 10 +++- dev-java/ibm-jdk/files/digest-ibm-jdk-1.3.0-r2 | 0 dev-java/ibm-jdk/files/digest-ibm-jdk-1.3.0-r3 | 0 dev-java/ibm-jdk/files/ibm-jdk-1.3.0 | 5 +- dev-java/ibm-jdk/ibm-jdk-1.3.0-r2.ebuild | 70 -------------------------- dev-java/ibm-jdk/ibm-jdk-1.3.0-r3.ebuild | 70 ++++++++++++++++++++++++++ 6 files changed, 81 insertions(+), 74 deletions(-) delete mode 100644 dev-java/ibm-jdk/files/digest-ibm-jdk-1.3.0-r2 create mode 100644 dev-java/ibm-jdk/files/digest-ibm-jdk-1.3.0-r3 delete mode 100644 dev-java/ibm-jdk/ibm-jdk-1.3.0-r2.ebuild create mode 100644 dev-java/ibm-jdk/ibm-jdk-1.3.0-r3.ebuild (limited to 'dev-java/ibm-jdk') diff --git a/dev-java/ibm-jdk/ChangeLog b/dev-java/ibm-jdk/ChangeLog index 7dd977defb15..4d24e9c4fd7c 100644 --- a/dev-java/ibm-jdk/ChangeLog +++ b/dev-java/ibm-jdk/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-java/ibm-jdk # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ChangeLog,v 1.3 2002/03/18 21:45:38 karltk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ChangeLog,v 1.4 2002/04/09 22:08:45 karltk Exp $ + +*ibm-jdk-1.3.0-r3 (09 Apr 2002) + + 09 Apr 2002; Karl Trygve Kalleberg ibm-jdk-1.3.0-r3.ebuild files/digest-ibm-jdk-1.3.0-r3: + + Now sets proper ROOTPATH. + + Removed ibm-jdk-1.3.0-r2.ebuild files/digest-ibm-jdk-1.3.0-r2 *ibm-jdk-1.3.0-r2 (18 Mar 2002) diff --git a/dev-java/ibm-jdk/files/digest-ibm-jdk-1.3.0-r2 b/dev-java/ibm-jdk/files/digest-ibm-jdk-1.3.0-r2 deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/dev-java/ibm-jdk/files/digest-ibm-jdk-1.3.0-r3 b/dev-java/ibm-jdk/files/digest-ibm-jdk-1.3.0-r3 new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/dev-java/ibm-jdk/files/ibm-jdk-1.3.0 b/dev-java/ibm-jdk/files/ibm-jdk-1.3.0 index 741abf4549c3..32afbf4eda3e 100644 --- a/dev-java/ibm-jdk/files/ibm-jdk-1.3.0 +++ b/dev-java/ibm-jdk/files/ibm-jdk-1.3.0 @@ -2,15 +2,14 @@ # Distributed under the terms of the GNU General Public License, v2 or later # Author: Karl Trygve Kalleberg # Maintainer: Tools Team -# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/files/ibm-jdk-1.3.0,v 1.2 2002/03/20 21:50:04 karltk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/files/ibm-jdk-1.3.0,v 1.3 2002/04/09 22:08:45 karltk Exp $ VERSION="IBM JDK @PV@" JAVA_HOME=/opt/@P@ CLASSPATH=/opt/@P@/lib/rt.jar JDK_HOME=/opt/@P@ JAVAC=${JAVA_HOME}/bin/javac -ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" ADDLDPATH="/opt/@P@/jre/lib/" -ENV_VARS="JAVA_HOME CLASSPATH JDK_HOME JAVAC ADDPATH ADDLDPATH ROOTPATH" +ENV_VARS="JAVA_HOME CLASSPATH JDK_HOME JAVAC ADDPATH ADDLDPATH" diff --git a/dev-java/ibm-jdk/ibm-jdk-1.3.0-r2.ebuild b/dev-java/ibm-jdk/ibm-jdk-1.3.0-r2.ebuild deleted file mode 100644 index dfc412b69bbf..000000000000 --- a/dev-java/ibm-jdk/ibm-jdk-1.3.0-r2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2001 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Maintainer: Tools Team -# Author: Karl Trygve Kalleberg -# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ibm-jdk-1.3.0-r2.ebuild,v 1.2 2002/03/23 19:20:10 karltk Exp $ - -At=IBMJava2-SDK-13.tgz -S=${WORKDIR}/IBMJava2-13 -DESCRIPTION="IBM JDK 1.3.0" -SRC_URI="" -HOMEPAGE="http://www6.software.ibm.com/dl/dklx130/dklx130-p" - -DEPEND="virtual/glibc - >=dev-java/java-config-0.2.0" -RDEPEND="$DEPEND" -PROVIDE="virtual/jre-1.3 - virtual/jdk-1.3 - virtual/java-scheme-2" - -src_unpack() { - if [ ! -f ${DISTDIR}/${At} ] ; then - die "Please download ${At} from ${HOMEPAGE}" - fi - unpack ${At} || die -} - - -src_install () { - - dodir /opt/${P} - for i in bin include jre lib ; do - cp -dpR $i ${D}/opt/${P}/ - done - - dodir /usr/${P}/share - for i in demo javasrc.jar ; do - cp -dpR $i ${D}/opt/${P}/share/ - done - - dohtml -a html,htm,HTML -r docs - dodoc docs/COPYRIGHT - - if [ "`use mozilla`" ] ; then - dodir /usr/lib/mozilla/plugins - dosym /opt/${P}/jre/bin/libjavaplugin_oji.so /usr/lib/mozilla/plugins/ - fi - - dodir /etc/env.d/java - sed \ - -e "s/@P@/${P}/g" \ - -e "s/@PV@/${PV}/g" \ - -e "s/@PF@/${PF}/g" \ - < ${FILESDIR}/ibm-jdk-${PV} \ - > ${D}/etc/env.d/java/20ibm-jdk-${PV} -} - -src_postinst() { - - if [ -e /opt/netscape/plugins ] ; then - ln -sf /opt/${P}/jre/bin/javaplugin.so /opt/netscape/plugins/ - einfo "Netscape 4.x Java plugin installed" - fi - - if [ "`use mozilla`" ] ; then - einfo "The Mozilla browser plugin has been installed as /usr/lib/mozilla/plugins" - else - einfo "To install the browser plugin manually, do:" - einfo "ln -sf /opt/${P}/jre/bin/libjavaplugin_oji.so /usr/lib/mozilla/plugins/" - fi -} diff --git a/dev-java/ibm-jdk/ibm-jdk-1.3.0-r3.ebuild b/dev-java/ibm-jdk/ibm-jdk-1.3.0-r3.ebuild new file mode 100644 index 000000000000..d4c3825736c1 --- /dev/null +++ b/dev-java/ibm-jdk/ibm-jdk-1.3.0-r3.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2001 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License, v2 or later +# Maintainer: Tools Team +# Author: Karl Trygve Kalleberg +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ibm-jdk-1.3.0-r3.ebuild,v 1.1 2002/04/09 22:08:45 karltk Exp $ + +At=IBMJava2-SDK-13.tgz +S=${WORKDIR}/IBMJava2-13 +DESCRIPTION="IBM JDK 1.3.0" +SRC_URI="" +HOMEPAGE="http://www6.software.ibm.com/dl/dklx130/dklx130-p" + +DEPEND="virtual/glibc + >=dev-java/java-config-0.2.1" +RDEPEND="$DEPEND" +PROVIDE="virtual/jre-1.3 + virtual/jdk-1.3 + virtual/java-scheme-2" + +src_unpack() { + if [ ! -f ${DISTDIR}/${At} ] ; then + die "Please download ${At} from ${HOMEPAGE}" + fi + unpack ${At} || die +} + + +src_install () { + + dodir /opt/${P} + for i in bin include jre lib ; do + cp -dpR $i ${D}/opt/${P}/ + done + + dodir /usr/${P}/share + for i in demo javasrc.jar ; do + cp -dpR $i ${D}/opt/${P}/share/ + done + + dohtml -a html,htm,HTML -r docs + dodoc docs/COPYRIGHT + + if [ "`use mozilla`" ] ; then + dodir /usr/lib/mozilla/plugins + dosym /opt/${P}/jre/bin/libjavaplugin_oji.so /usr/lib/mozilla/plugins/ + fi + + dodir /etc/env.d/java + sed \ + -e "s/@P@/${P}/g" \ + -e "s/@PV@/${PV}/g" \ + -e "s/@PF@/${PF}/g" \ + < ${FILESDIR}/ibm-jdk-${PV} \ + > ${D}/etc/env.d/java/20ibm-jdk-${PV} +} + +src_postinst() { + + if [ -e /opt/netscape/plugins ] ; then + ln -sf /opt/${P}/jre/bin/javaplugin.so /opt/netscape/plugins/ + einfo "Netscape 4.x Java plugin installed" + fi + + if [ "`use mozilla`" ] ; then + einfo "The Mozilla browser plugin has been installed as /usr/lib/mozilla/plugins" + else + einfo "To install the browser plugin manually, do:" + einfo "ln -sf /opt/${P}/jre/bin/libjavaplugin_oji.so /usr/lib/mozilla/plugins/" + fi +} -- cgit v1.2.3-65-gdbad