Fixes 4861.

5 files changed, 34 insertions, 158 deletions

diff --git a/dev-java/blackdown-jdk/ChangeLog b/dev-java/blackdown-jdk/ChangeLog
index d1368711d0ca..24ff36abae6c 100644
--- a/dev-java/blackdown-jdk/ChangeLog
+++ b/dev-java/blackdown-jdk/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for dev-java/blackdown-jdk
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.9 2002/06/25 01:35:16 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.10 2002/07/16 21:52:28 karltk Exp $
 
-*blackdown-jdk-1.3.1-r7 (25 Jun 2002)
+*blackdown-jdk-1.3.1-r7 (16 Jul 2002)
 
+  16 Jul 2002; Karl Trygve Kalleberg <karltk@gentoo.org> files/blackdown-jdk-1.3.1 :
+
+  Added MANPATH to the environment file.
+  
   25 Jun 2002; Karl Trygve Kalleberg <karltk@gentoo.org> blackdown-jdk-1.3.1-r7.ebuild files/digest-blackdown-jdk-1.3.1-r7:
  
   Now Blackdown JDK is set to be the default VM if none are set on install.
diff --git a/dev-java/blackdown-jdk/files/blackdown-jdk-1.3.1 b/dev-java/blackdown-jdk/files/blackdown-jdk-1.3.1
index fca6c6074980..440a2e6bf706 100644
--- a/dev-java/blackdown-jdk/files/blackdown-jdk-1.3.1
+++ b/dev-java/blackdown-jdk/files/blackdown-jdk-1.3.1
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author: Karl Trygve Kalleberg
 # Maintainer: Tools Team <tools@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/files/blackdown-jdk-1.3.1,v 1.6 2002/05/26 20:04:17 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/files/blackdown-jdk-1.3.1,v 1.7 2002/07/16 21:52:28 karltk Exp $
 
 VERSION="Blackdown JDK @PV@"
 JAVA_HOME=/opt/@P@
@@ -11,4 +11,5 @@ JDK_HOME=/opt/@P@
 JAVAC=${JAVA_HOME}/bin/javac
 ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
 ADDLDPATH="/opt/@P@/jre/lib/i386/:/opt/@P@/jre/lib/i386/native_threads/"
-ENV_VARS="JAVA_HOME CLASSPATH JDK_HOME JAVAC ADDPATH ADDLDPATH"
+MANPATH=/opt/@P@/man
+ENV_VARS="JAVA_HOME CLASSPATH JDK_HOME JAVAC ADDPATH ADDLDPATH MANPATH"
diff --git a/dev-java/blackdown-jre/ChangeLog b/dev-java/blackdown-jre/ChangeLog
index 57a0843f05d5..8aede9103273 100644
--- a/dev-java/blackdown-jre/ChangeLog
+++ b/dev-java/blackdown-jre/ChangeLog
@@ -1,8 +1,12 @@
 # ChangeLog for dev-java/blackdown-jre
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.4 2002/04/27 12:22:42 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.5 2002/07/16 21:52:28 karltk Exp $
 
-*blackdown-jre-1.3.1-r7 (27 Apr 2002) 
+*blackdown-jre-1.3.1-r7 (16 Jul 2002) 
+
+  16 Jul 2002; Karl Trygve Kalleberg <karltk@gentoo.org> files/blackdown-jre-1.3.1 :
+
+  Added MANPATH to the the environment file.
 
   27 Apr 2002; pvdabeel <pvdabeel@gentoo.org>
 
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r7.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r7.ebuild
index 7305913af201..8ad6b9f29a9d 100644
--- a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r7.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r7.ebuild
@@ -1,23 +1,11 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# /space/gentoo/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r7.ebuild,v 1.2 2002/04/28 04:12:40 seemant Exp
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r7.ebuild,v 1.5 2002/07/16 21:52:28 karltk Exp $
 
-SYSTEM_ARCH=`echo $ARCH |\
-  sed -e s/[i]*.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/`
-if [ -z "$SYSTEM_ARCH" ]
-then
-	SYSTEM_ARCH=`uname -m |\
-     sed -e s/[i]*.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/`
-fi 
+. /usr/portage/eclass/inherit.eclass
+inherit java
 
-#Change FCS if you want to use a beta version
-PLATFORM="i386"
-FCS="FCS"
-MY_P="j2re-1.3.1-FCS-linux-i386.tar.bz2"
-
-#Adapt for multi-arch:
-
-case $SYSTEM_ARCH in
+case `system_arch` in
 	ppc)
 		PLATFORM="ppc"
 		FCS="FCS-02b"
@@ -26,7 +14,6 @@ case $SYSTEM_ARCH in
 
 	i386)
 		PLATFORM="i386"
-		#Change FCS if you want to use a beta version
 		FCS="FCS"
 		MY_P="j2re-1.3.1-FCS-linux-i386.tar.bz2"
 		;;
@@ -43,166 +30,46 @@ S=${WORKDIR}/j2re1.3.1
 DESCRIPTION="Blackdown Java Runtime Environment 1.3.1"
 SRC_URI="ftp://metalab.unc.edu/pub/linux/devel/lang/java/blackdown.org/JDK-1.3.1/${PLATFORM}/${FCS}/${MY_P}"
 HOMEPAGE="http://www.blackdown.org"
-
 DEPEND="virtual/glibc
 	>=dev-java/java-config-0.2.0"
 RDEPEND="$DEPEND"
-
 PROVIDE="virtual/jre-1.3
 	virtual/java-scheme-2"
+SLOT="0"
+LICENSE=""
 
 src_unpack () {
 	if [ $PLATFORM = "ppc" ]; then
 		tail +422 ${DISTDIR}/${MY_P} > j2re-1.3.1-ppc.tar.bz2
 		tar -xjf j2re-1.3.1-ppc.tar.bz2
 	else
-	unpack ${MY_P}
+		unpack ${MY_P}
 	fi
 }
 
 src_install () {
-	insinto /opt/${P}
-	doins JavaPluginControlPanel.html
-
-	exeinto /opt/${P}/bin
-	doexe bin/.java_wrapper bin/awt_robot bin/JavaPluginControlPanel
-	doexe bin/j2sdk-config bin/realpath
-
-	dosym /opt/${P}/bin/.java_wrapper /opt/${P}/bin/java
-	dosym /opt/${P}/bin/.java_wrapper /opt/${P}/bin/keytool
-	dosym /opt/${P}/bin/.java_wrapper /opt/${P}/bin/policytool
-	dosym /opt/${P}/bin/.java_wrapper /opt/${P}/bin/rmid
-	dosym /opt/${P}/bin/.java_wrapper /opt/${P}/bin/rmiregistry
-	dosym /opt/${P}/bin/.java_wrapper /opt/${P}/bin/tnameserv
-
-	exeinto /opt/${P}/bin/${PLATFORM}
-	doexe bin/${PLATFORM}/realpath
-
-	exeinto /opt/${P}/bin/${PLATFORM}/green_threads
-	doexe bin/${PLATFORM}/green_threads/*
-
-	exeinto /opt/${P}/bin/${PLATFORM}/native_threads
-	doexe bin/${PLATFORM}/native_threads/*
-
-	insinto /opt/${P}/lib
-	doins lib/*
-
-	dodir /opt/${P}/lib/applet
-
-	insinto /opt/${P}/lib/audio
-	doins lib/audio/*
-
-	insinto /opt/${P}/lib/cmm
-	doins lib/cmm/*
-
-	dodir /opt/${P}/lib/ext
-
-	insinto /opt/${P}/lib/fonts
-	doins lib/fonts/*
-
-	insinto /opt/${P}/lib/${PLATFORM}
-	doins lib/${PLATFORM}/*
-
-	insinto /opt/${P}/lib/${PLATFORM}/classic
-	doins lib/${PLATFORM}/classic/*
-
-	insinto /opt/${P}/lib/${PLATFORM}/client
-	doins lib/${PLATFORM}/client/*
-
-	insinto /opt/${P}/lib/${PLATFORM}/green_threads
-	doins lib/${PLATFORM}/green_threads/*
-
-	insinto /opt/${P}/lib/${PLATFORM}/native_threads
-	doins lib/${PLATFORM}/native_threads/*
-
-	insinto /opt/${P}/lib/${PLATFORM}/server
-	doins lib/${PLATFORM}/server/*
+	dodir /opt/${P}
 
-	insinto /opt/${P}/lib/images/cursors
-	doins lib/images/cursors/*
+	cp -dpR ${S}/{bin,lib,man,plugin} ${D}/opt/${P}/
+        find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \;
 
-	insinto /opt/${P}/lib/locale/de/LC_MESSAGES
-	doins lib/locale/de/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/locale/es/LC_MESSAGES
-	doins lib/locale/es/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/locale/fr/LC_MESSAGES
-	doins lib/locale/fr/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/locale/it/LC_MESSAGES
-	doins lib/locale/ja/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/locale/ko/LC_MESSAGES
-	doins lib/locale/ko/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/locale/ko.UTF-8/LC_MESSAGES
-	doins lib/locale/ko.UTF-8/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/locale/sv/LC_MESSAGES
-	doins lib/locale/sv/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/locale/zh/LC_MESSAGES
-	doins lib/locale/zh/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/locale/zh.GBK/LC_MESSAGES
-	doins lib/locale/zh.GBK/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/locale/zh_TW/LC_MESSAGES
-	doins lib/locale/zh_TW/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/locale/zh_TW.BIG5/LC_MESSAGES
-	doins lib/locale/zh_TW.BIG5/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/locale/de/LC_MESSAGES
-	doins lib/locale/de/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/security
-	doins lib/security/*
-
-	insinto /opt/${P}/man/ja/man1
-	doins man/ja/man1/*
-
-	insinto /opt/${P}/man/man1
-	doins man/man1/*
-
-	insinto /opt/${P}/plugin/${PLATFORM}/mozilla
-	doins plugin/${PLATFORM}/mozilla/*
-
-	dosym /opt/${P}/plugin/${PLATFORM}/mozilla/ opt/${P}/plugin/${PLATFORM}/netscape6
-
-	insinto /opt/${P}/plugin/${PLATFORM}/netscape4
-	doins plugin/${PLATFORM}/netscape4/*
-	insinto /opt/${P}/plugin/${PLATFORM}/netscape6
-	doins plugin/${PLATFORM}/netscape6/*
-	dodir /usr/share
 	dodoc COPYRIGHT LICENSE README INSTALL
+	dohtml README.html
 
-	if [ "`use mozilla`" ] ; then
-		dodir /usr/lib/mozilla/plugins
-		dosym /opt/${P}/plugin/${PLATFORM}/mozilla/javaplugin_oji.so /usr/lib/mozilla/plugins/javaplugin_oji.so
-	fi
+	install_mozilla_plugin /opt/${P}/plugin/${PLATFORM}/mozilla/javaplugin_oji.so
 
 	mv ${D}/opt/${P}/lib/font.properties ${D}/opt/${P}/lib/font.properties.orig
 	sed "s/standard symbols l/symbol/g" \
 		< ${D}/opt/${P}/lib/font.properties.orig \
 		> ${D}/opt/${P}/lib/font.properties
 	rm ${D}/opt/${P}/lib/font.properties.orig
-	
-        dodir /etc/env.d/java
-        sed \
-		-e "s/@P@/${P}/g" \
-		-e "s/@PV@/${PV}/g" \
-		-e "s/@PF@/${PF}/g" \
-		< ${FILESDIR}/blackdown-jre-${PV} \
-		> ${D}/etc/env.d/java/20blackdown-jre-${PV}
+
+	set_java_env ${FILESDIR}/${VMHANDLE}
 }
 
 pkg_postinst () {
-
-	if [ "`use mozilla`" ] ; then
-		einfo "The Mozilla browser plugin has been installed as /usr/lib/mozilla/plugins/javaplugin_oji.so"
-	else
+	java_pkg_postinst
+	if [ -z "`use mozilla`" ] ; then
 		einfo "For instructions on installing the ${P} browser plugin for"
 		einfo "Netscape and Mozilla, see /usr/share/doc/${P}/INSTALL."
 	fi
diff --git a/dev-java/blackdown-jre/files/blackdown-jre-1.3.1 b/dev-java/blackdown-jre/files/blackdown-jre-1.3.1
index 3a530c238b0e..aa7e07c90922 100644
--- a/dev-java/blackdown-jre/files/blackdown-jre-1.3.1
+++ b/dev-java/blackdown-jre/files/blackdown-jre-1.3.1
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author: Karl Trygve Kalleberg
 # Maintainer: Tools Team <tools@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/files/blackdown-jre-1.3.1,v 1.3 2002/04/09 21:58:31 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/files/blackdown-jre-1.3.1,v 1.4 2002/07/16 21:52:28 karltk Exp $
 
 VERSION="Blackdown JRE @PV@"
 JAVA_HOME=/opt/@P@
@@ -10,5 +10,5 @@ CLASSPATH=/opt/@P@/lib/rt.jar
 JRE_HOME=/opt/@P@
 ADDPATH="${JAVA_HOME}/bin"
 ADDLDPATH="/opt/@P@/lib/"
-
-ENV_VARS="JAVA_HOME CLASSPATH JRE_HOME ADDPATH ADDLDPATH"
+MANPATH=/opt/@P@/man
+ENV_VARS="JAVA_HOME CLASSPATH JRE_HOME ADDPATH ADDLDPATH MANPATH"