Added missing files and fixed bugs

4 files changed, 75 insertions, 61 deletions

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index ebafee703bb6..d547f6b3ff70 100644
--- a/dev-java/ibm-jdk-bin/ChangeLog
+++ b/dev-java/ibm-jdk-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ibm-jdk-bin
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.1 2004/04/28 20:35:21 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.2 2004/04/28 23:13:55 dholm Exp $
+
+*ibm-jdk-bin-1.4.1 (29 Apr 2004)
+
+  29 Apr 2004; David Holm <dholm@gentoo.org> +files/cpuinfo,
+  +files/ibm-jdk-bin-1.4.1, ibm-jdk-bin-1.4.1.ebuild:
+  Added missing files and fixed some bugs in the ebuild.
 
   28 Apr 2004; <SeJo@gentoo.org> +metadata.xml:
   new package same bin
diff --git a/dev-java/ibm-jdk-bin/files/cpuinfo b/dev-java/ibm-jdk-bin/files/cpuinfo
new file mode 100644
index 000000000000..f83be9638014
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/files/cpuinfo
@@ -0,0 +1 @@
+cpu		: 604e
diff --git a/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.4.1 b/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.4.1
new file mode 100644
index 000000000000..5d15b33fe24c
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.4.1
@@ -0,0 +1,12 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.4.1,v 1.1 2004/04/28 23:13:55 dholm Exp $
+
+VERSION="IBM JDK @PV@"
+JAVA_HOME=/opt/@P@
+JDK_HOME=/opt/@P@
+JAVAC=${JAVA_HOME}/bin/javac
+ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+ADDLDPATH="/opt/@P@/jre/lib/"
+
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC ADDPATH ADDLDPATH"
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1.ebuild
index dffda71bef19..0f487c1d231f 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1.ebuild
@@ -1,15 +1,20 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1.ebuild,v 1.1 2004/04/28 19:51:43 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1.ebuild,v 1.2 2004/04/28 23:13:55 dholm Exp $
 
 IUSE="doc"
 
 inherit java nsplugins
 
-S="${WORKDIR}/j2sdk${PV}"
+if [ `use ppc` ]; then
+	S="${WORKDIR}/IBMJava2-ppc-141"
+else
+	S="${WORKDIR}/IBMJava2-141"
+fi
+
 DESCRIPTION="IBM Java Development Kit ${PV}"
-SRC_URI="ppc?(mirror://IBMJava2-SDK-141.ppc.tgz)
-	x86?(mirror://IBMJava2-SDK-141.tgz)"
+SRC_URI="ppc? ( mirror://IBMJava2-SDK-141.ppc.tgz )
+	x86? ( mirror://IBMJava2-SDK-141.tgz )"
 PROVIDE="virtual/jdk-1.4.1
 	virtual/jre-1.4.1
 	virtual/java-scheme-2"
@@ -17,84 +22,74 @@ SLOT="1.4"
 LICENSE="IBM-J1.4"
 KEYWORDS="~ppc ppc"
 
-
 DEPEND="virtual/glibc
 	>=dev-java/java-config-0.2.5
-	doc? (=dev-java/java-sdk-docs-1.4.1*)
-	X? (virtual/x11)"
+	doc? ( =dev-java/java-sdk-docs-1.4.1* )
+	X? ( virtual/x11 )"
 RDEPEND="sys-libs/lib-compat"
 
-
-if [ `use ppc` ]; then
-	S=${WORKDIR}/IBMjava2-ppc-141
-else
-	S=${WORKDIR}/IBMJava2-141
-fi;
-
 # No compilation needed!
 src_compile() { :; }
 
 src_install() {
-	# Copy all the files to the designated directory 
-	dodir ${D}opt
-	dodir ${D}opt/${P}
+	# Copy all the files to the designated directory
+	mkdir -p ${D}opt/${P}
 	cp -dpR ${S}/{bin,jre,lib,include} ${D}opt/${P}/
 
-	dodir ${D}/opt/${P}/share
+	mkdir -p ${D}/opt/${P}/share
 	cp -a ${S}/{demo,src.jar} ${D}opt/${P}/share/
-	
+
 	# setting the ppc stuff
 	if [ `use ppc` ]; then
-		dosed s:/proc/cpuinfo:/etc//cpuinfo:g ${D}opt/${P}/jre/bin/libjitc.so
-		dosed s:/proc/cpuinfo:/etc//cpuinfo:g ${D}opt/${P}/jre/bin/libjitc_g.so
+		dosed s:/proc/cpuinfo:/etc/cpuinfo:g ${D}opt/${P}/jre/bin/libjitc.so
+		dosed s:/proc/cpuinfo:/etc/cpuinfo:g ${D}opt/${P}/jre/bin/libjitc_g.so
 		insinto ${D}/etc
 		doins ${FILESDIR}/cpuinfo
+	else
+		# No java-plugin on ppc
+		inst_plugin /opt/${P}/jre/bin/libjavaplugin_oji.so
 	fi
 
 	dohtml -a html,htm,HTML -r docs
 	dodoc ${S}/docs/COPYRIGHT
 
-	inst_plugin /opt/${P}/jre/bin/libjavaplugin_oji.so
+	set_java_env ${FILESDIR}/${VMHANDLE}
 
-	set_java_env ${FILESDIR}/${VMHANDLE} 
-	
 }
 
 pkg_postinst() {
-
-        #Thanks to Douglas Pollock <douglas.pollock@magma.ca> for this
-        #comment found on the sun-jdk 1.2.2 ebuild that he sent.
-        if [ !`use X` ] ; then
-                einfo "********************************************************"
-                eerror "You're not using X so its possible that you dont have"
-                eerror "a X server installed, please read the following warning: "
-                eerror "Some parts of IBM JDK require XFree86 to be installed."
-                eerror "Be careful which Java libraries you attempt to use."
-                einfo "********************************************************"
-                echo 
-        fi
-        einfo "******************************************************"
-        einfo " After installing ${P} this"
-        einfo " was set as the default JVM to run."
-        einfo " When finished please run the following so your"
-        einfo " enviroment gets updated."
-        eerror "    /usr/sbin/env-update && source /etc/profile"
-        einfo " Or use java-config program to set your preferred VM"
-        einfo "******************************************************"
-
-        echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-        einfo " After installing ${P} this"
-        einfo " was set as the default JVM to run."
-        einfo " When finished please run the following so your"
-        einfo " enviroment gets updated."
-        eerror "    /usr/sbin/env-update && source /etc/profile"
-        einfo " Or use java-config program to set your preferred VM"
-        einfo "******************************************************"
-
-        echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-        echo -ne "\a" ; sleep 1
-        echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-        echo -ne "\a" ; sleep 1
-        sleep 8
+	#Thanks to Douglas Pollock <douglas.pollock@magma.ca> for this
+	#comment found on the sun-jdk 1.2.2 ebuild that he sent.
+	if [ !`use X` ] ; then
+		einfo "********************************************************"
+		eerror "You're not using X so its possible that you dont have"
+		eerror "a X server installed, please read the following warning: "
+		eerror "Some parts of IBM JDK require XFree86 to be installed."
+		eerror "Be careful which Java libraries you attempt to use."
+		einfo "********************************************************"
+		echo
+	fi
+	einfo "******************************************************"
+	einfo " After installing ${P} this"
+	einfo " was set as the default JVM to run."
+	einfo " When finished please run the following so your"
+	einfo " enviroment gets updated."
+	eerror "    /usr/sbin/env-update && source /etc/profile"
+	einfo " Or use java-config program to set your preferred VM"
+	einfo "******************************************************"
+
+	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
+	einfo " After installing ${P} this"
+	einfo " was set as the default JVM to run."
+	einfo " When finished please run the following so your"
+	einfo " enviroment gets updated."
+	eerror "    /usr/sbin/env-update && source /etc/profile"
+	einfo " Or use java-config program to set your preferred VM"
+	einfo "******************************************************"
+
+	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
+	echo -ne "\a" ; sleep 1
+	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
+	echo -ne "\a" ; sleep 1
+	sleep 8
 }
-