Please see the ChangeLog.

10 files changed, 10 insertions, 536 deletions

diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog
index a52cb83e8709..16af30143bec 100644
--- a/dev-java/java-config/ChangeLog
+++ b/dev-java/java-config/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/java-config
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.33 2003/11/17 02:09:18 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.34 2003/12/07 18:08:45 strider Exp $
+
+*java-config-1.1.7 (07 Dec 2003)
+
+  07 Dec 2003; Adrian Almenar <strider@gentoo.org> java-config-1.1.7.ebuild:
+  After a month without problems, moving to stable.
 
   16 Nov 2003; Adrian Almenar <strider@gentoo.org> java-config-1.1.5.ebuild:
   java-config 1.1.5 moved to stable.
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 95c76f46cdd5..dfac70feac1d 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,18 +1,11 @@
 MD5 5b29bd485d8533329abe653db05a1220 java-config-1.1.5.ebuild 665
-MD5 b58e7f8fbad0f99daf6e249faf664b83 java-config-1.1.7.ebuild 669
+MD5 454f531472ba05f1ee5af431250213ac java-config-1.1.7.ebuild 665
 MD5 76a8f841a160a467eb7f4cd342907bad java-config-0.2.8-r2.ebuild 637
-MD5 75386a8c4a28663202a4bef06df85c8b java-config-0.2.7.ebuild 609
-MD5 fee752fa717706cdba83f891d5300243 ChangeLog 6658
+MD5 a871930d0101a79416620e986ca9ff46 ChangeLog 6822
 MD5 f5edf1fc3825acc2025f959d8b0a1036 metadata.xml 914
-MD5 8ec5f854ccc670f86e446febd4a99541 java-config-0.2.8-r1.ebuild 629
-MD5 1d29f10fe97368050d96259c565f70ef files/digest-java-config-0.2.7 489
 MD5 aba83541547f68873ac391359b455646 files/digest-java-config-1.1.5 68
 MD5 eb687d10f2dd2dd19763963682437177 files/digest-java-config-1.1.7 68
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-java-config-0.2.8-r1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-java-config-0.2.8-r2 0
-MD5 ef44d82252644dde2d143335820e30d9 files/0.2.7/java-config 8416
-MD5 0579db32710d3de43ed15450680fe891 files/0.2.7/java-config.1 2164
-MD5 9a4212aa54844344b19beba357540ab9 files/0.2.7/30java-finalclasspath 12
 MD5 3a77bc67f71c1ac943bfb64bd761d7b5 files/0.2.8/java-config 9230
 MD5 2843d5f083c95b88f4fd794846e99c75 files/0.2.8/java-config.1 2479
 MD5 9a4212aa54844344b19beba357540ab9 files/0.2.8/30java-finalclasspath 12
diff --git a/dev-java/java-config/files/0.2.7/30java-finalclasspath b/dev-java/java-config/files/0.2.7/30java-finalclasspath
deleted file mode 100644
index a35470483e48..000000000000
--- a/dev-java/java-config/files/0.2.7/30java-finalclasspath
+++ /dev/null
@@ -1 +0,0 @@
-CLASSPATH=.
diff --git a/dev-java/java-config/files/0.2.7/java-config b/dev-java/java-config/files/0.2.7/java-config
deleted file mode 100644
index 1da54108068a..000000000000
--- a/dev-java/java-config/files/0.2.7/java-config
+++ /dev/null
@@ -1,376 +0,0 @@
-#! /bin/sh
-# 
-# Copyright 2001-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Tools Team <tools@gentoo.org>
-# Author: Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/files/0.2.7/java-config,v 1.2 2002/12/09 21:04:03 strider Exp $
-
-version=0.2.7
-all_params="$*"
-
-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 
-
-PFORM="i386"
-
-case $SYSTEM_ARCH in
-	ppc)	PFORM="ppc";;
-	i386)	PFORM="i386";;
-	sparc64)PFORM="sparc64";;
-	sparc)  PFORM="arm";;
-	arm)    PFORM="arm";;
-esac
-
-if [ $UID != 0 ] && [ -f $HOME/.gentoo/java-env ] ; then
-	. $HOME/.gentoo/java-env
-elif  [ -f /etc/env.d/20java ] ; then
-	oldpath=$PATH
-	. /etc/env.d/20java
-	PATH=$oldpath:$PATH
-fi
-
-function eerror() {
-	echo "!!! $1" 1>&2
-}
-svm=`echo $1|egrep "\-\-(set-(system|user)-vm|list-available-vms)"`
-if [ -z "$JAVA_HOME" ] && [ -z "$svm" ] && [ "$1" != "--help" ]; then
-	eerror "No Java installation found"
-	eerror "Use --set-system-vm to select default system JVM"
-	eerror "Alternatively, use --set-user-vm to select default system JVM"
-	exit 1
-fi
-
-usage() {
-        cat <<EOF
-Usage: java-config [OPTIONS] [LIBRARIES]
-Options:
-	[--javac]
-	[--java]
-	[--jar]
-	[--jdk-home]
-	[--jre-home]
-	[--java-version]
-	[--classpath[=package1,package2,...]]
-	[--full-classpath=package1,package2,...]
-	[--exec=filename]
-	[--list-available-packages]
-	[--list-available-vms]
-	[--set-system-vm=<vm-id>]
-	[--set-user-vm=<vm-id>]
-	[--set-system-classpath=package1,package2,...]
-	[--set-user-classpath=package1,package2,...]
-	[--clean-system-classpath]
-EOF
-	echo "Using ${JAVA_HOME}"
-	exit $1
-}
-
-find_exec() {
-	if [ -f ${JAVA_HOME}/bin/$1 ] ; then
-		echo ${JAVA_HOME}/bin/$1
-	elif [ -f ${JAVA_HOME}/jre/bin/$1 ] ; then
-		echo ${JAVA_HOME}/jre/bin/$1
-	else
-		eerror "$1 not found" 
-		exit 1
-	fi
-}                                                                       
-
-classpathfor()
-{
-	local pkgs=`echo $1 | sed "s/,/ /g"`
-	local total=""
-	for i in $pkgs ; do
-		if [ -f /usr/share/${i}/classpath.env ] ; then
-			total="${total}`cat /usr/share/${i}/classpath.env`"
-		elif [ -f /usr/share/${i}/package.env ] ; then
-			pf=/usr/share/${i}/package.env
-			addcp=`grep "CLASSPATH=" $pf | sed "s/CLASSPATH=//"`
-			total="${total}:${addcp}"
-		else
-			eerror "Package ${i} not found"
-			exit 1
-		fi
-	done
-	echo $total | sed "s/::/:/g"
-}
-
-normalise_classpath() {
-	local iter=`echo $1|sed "s/::/:/g"|sed "s/^://"`
-	local result
-	oldifs=${IFS}
-	IFS=":"
-	set -f -- ${iter}
-	while [ "$1" != "" ] ; do
-        	found=`false`
-	        for i in ${result} ; do
-        	        if [ "$i" == "$1" ] ; then
-               			found=1
-	                fi
-	        done
-	        if [ ! $found ] && [ $1 != "." ] ; then
-			result="${result}:$1"
-	        fi
-	        shift
-	done
-	IFS="${oldifs}"
-	echo ${result} | sed "s/^://"
-}
-
-findpluginpath() {
-
-	# This covers Sun and Blackdown
-
-	rootpath=${JAVA_HOME}/jre/plugin/${PFORM}
-	
-	if [ $1 == "ns4" ] || [ $1 == "netscape4" ] ; then
-		for i in ${rootpath}/{ns4,netscape4}/javaplugin.so ; do
-			if [ -e $i ] ; then
-				echo $i
-				break
-			fi
-		done
-	elif [ $1 == "ns6" ] || [ $1 == "netscape6" ] || [ $1 == "moz" ] || [ $1 == "mozilla" ] ; then
-		for i in ${rootpath}/{mozilla,ns600,netscape6}/{libjavaplugin_oji,javaplugin_oji}.so ; do
-			if [ -e $i ] ; then
-				echo $i
-				break
-			fi
-		done
-	else
-		eerror "Browser [$1] unknown"
-	fi
-
-	# This covers IBM
-
-	rootpath=${JAVA_HOME}
-	if [ $1 == "ns4" ] || [ $1 == "netscape4" ] ; then
-		for i in ${rootpath}/{,jre}/bin/javaplugin.so ; do
-			if [ -e $i ] ; then
-				echo $i
-				break
-			fi
-		done
-	elif [ $1 == "ns6" ] || [ $1 == "netscape6" ] || [ $1 == "moz" ] || [ $1 == "mozilla" ] ; then
-		for i in ${rootpath}/{,jre}/bin/libjavaplugin_oji.so ; do
-			if [ -e $i ] ; then
-				echo $i
-				break
-			fi
-		done
-	fi
-}
-
-function vm_shortname() {
-	basename $1 | sed -e "s/20//" #-e "s/-[0-9]\..*//"
-}
-
-function vm_version()  {
-	( . $1 ; echo "$VERSION ($i)" )
-}
-
-function vm_exists() {
-	( . $i ; export TMP_JAVA_HOME=$JAVA_HOME 
-	if [ -d $TMP_JAVA_HOME ]; then
-		echo true
-		unset TMP_JAVA_HOME
-	else
-		echo false
-		unset TMP_JAVA_HOME
-	fi )
-}
-
-function vm_envvars() {
-	local file=$1
-	local system="$2"
-
-	( . $file ;
-  	for i in $ENV_VARS ; do
-		if [ $i == "ADDPATH" ] && [ -z "$system" ]; then
-			echo "PATH=\${PATH}:${!i}"
-		elif [ $i == "ADDPATH" ] && [ "$system" ]; then
-			echo "PATH=${!i}"
-			echo "ROOTPATH=${!i}"
-		elif [ $i == "ADDLDPATH" ] ; then
-			if [ "$system" ]; then
-				echo "LDPATH=${!i}"
-			fi
-		elif [ $i == "CLASSPATH" ] ; then
-			echo "${i}=`normalise_classpath ${!i}`"	
-		else
-			echo "${i}=${!i}"
-		fi
-	done
-	)
-}
-
-function source_java_classpath() {
-	echo "if [ -f $HOME/.gentoo/java-env-classpath ] ; then"
-	echo "	. $HOME/.gentoo/java-env-classpath"
-	echo "fi"
-}
-
-function set_vm() {
-	local vm=$1
-	local cfgpath=$2
-	local cfgfile=$3
-	local system=""
-	if [ "$cfgpath" == "/etc/env.d" ] ; then
-		system="yes"
-	fi
-	local found=""
-
-	for i in /etc/env.d/java/20*-* ; do
-		if [ $vm == `vm_shortname $i` ] ; then
-			echo "Now using `vm_version $i`"
-			mkdir -p $cfgpath
-			echo "# Autogenerated by java-config $version" > ${cfgpath}/${cfgfile}
-			echo "# Cmd: $0 $all_params" >> ${cfgpath}/${cfgfile}
-			vm_envvars $i $system >> ${cfgpath}/${cfgfile}
-			if [ -z $system ] ; then
-				source_java_classpath >> $HOME/.gentoo/java-env
-			fi
-			found="yes"
-		fi
-	done
-	if [ -z "$found" ] ; then
-		echo "$vm not found"
-	fi
-}
-
-function calc_full_classpath() {
-	local foo=`classpathfor $1`
-	local bar=`normalise_classpath "${foo}"`
-	echo "${bar}"
-}
-
-if [ $# == 0 ] ; then
-	echo "Usage: java-config [OPTIONS] [LIBRARIES]"
-	exit 1
-fi
-
-while test $# -gt 0; do
-
-	case "$1" in
-	-*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-	*) optarg= ;;
-	esac
-       
-	case $1 in
-		--debug)
-			set -x
-		;;
-		--browser-plugin=*)
-			pluginpath=`findpluginpath $optarg`
-			if [ -n "$pluginpath" ] ; then
-				echo `basename $pluginpath`
-			else
-				eerror "Plugin not found"
-			fi
-		;;
-		--full-browser-plugin-path=*)
-			findpluginpath $optarg
-		;;
-		--classpath)
-			normalise_classpath ${CLASSPATH}
-		;;
-		--classpath=*)
-			normalise_classpath `classpathfor $optarg`
-		;;
-		--full-classpath=*)
-			calc_full_classpath $optarg
-		;;
-		--jdk-home)
-			echo ${JDK_HOME}
-		;;
-		--jre-home)
-			echo ${JRE_HOME}
-		;;
-		--javac)
-			find_exec javac
-		;;
-		--java)
-			find_exec java
-		;;
-		--jar)
-			find_exec jar
-		;;
-		--java-version)
-			`find_exec java` -version
-		;;
-		--exec=*)
-			find_exec $optarg
-		;;
-		--version)
-			echo java-config $version
-		;;
-		--list-available-packages)
-			# Old env var file
-			for i in /usr/share/*/classpath.env ; do
-				if [ ! -f $i ] ; then continue ; fi
-				dn=`dirname $i`
-				echo "[`basename $dn`] No description ($i)"
-			done
-			# New env var file
-			for i in /usr/share/*/package.env ; do
-				if [ ! -f $i ] ; then continue ; fi
-				dn=`dirname $i`
-				id=`basename $dn`
-				desc=`grep DESC $i | sed "s/DESCRIPTION=//"`
-				echo "[${id}] ${desc} ($i)"
-			done
-			
-		;;
-		--list-available-vms)
-			if [ -d /etc/env.d/java ] ; then 
-				for i in `find /etc/env.d/java/ -name "20*-*"` ; do
-					if [ "`vm_exists $i`" == "true" ]; then
-						echo "[`vm_shortname $i`] `vm_version $i` "
-					fi
-				done
-			fi
-		;;
-		--set-system-classpath=*)
-			if [ "$optarg" == "" ] ; then
-				 eerror "If you want to clean the classpath, please use --clean-system-classpath"
-			else
-				echo "CLASSPATH=`calc_full_classpath $optarg`" > \
-					/etc/env.d/21java-classpath
-			fi
-		;;
-		--clean-system-classpath)
-			if [ -f /etc/env.d/21java-classpath ]; then
-				rm -f /etc/env.d/21java-classpath
-			fi
-		;;
-		--set-user-classpath=*)
-			mkdir -p $HOME/.gentoo
-			echo "CLASSPATH=\${CLASSPATH}:`calc_full_classpath $optarg`" > \
-				$HOME/.gentoo/java-env-classpath
-			if [ ! -f $HOME/.gentoo/java-env ] ; then
-				source_java_classpath > $HOME/.gentoo/java-env
-			fi
-		;;
-		--set-system-vm=*)
-			set_vm $optarg /etc/env.d 20java
-		;;
-		--set-user-vm=*)
-			if [ $UID == 0 ] ; then
-				eerror "ERROR: root should _always_ use the system-vm"
-				eerror "NOTE : user-vm for root not set."
-			else 
-				set_vm $optarg $HOME/.gentoo java-env 
-			fi
-		;;
-		*)
-			usage
-		;;
-	esac
-	shift
-done
diff --git a/dev-java/java-config/files/0.2.7/java-config.1 b/dev-java/java-config/files/0.2.7/java-config.1
deleted file mode 100644
index e20e4da2c4a3..000000000000
--- a/dev-java/java-config/files/0.2.7/java-config.1
+++ /dev/null
@@ -1,92 +0,0 @@
-.TH java-config "1" "March 2002" "java-config 0.2.0"
-.SH NAME
-java-config \- manual page for java-config, the Java configuration tool for
-Gentoo
-.SH SYNOPSIS
-.B java-config
-\fI[options]\fB
-
-.SH DESCRIPTION
-.PP
-.I java-config
-is used to query/set properties of your system's Java environment. It can be
-used to list available VMs, java packages, set system default JVM and set user
-default JVM.
-.PP
-In addition, it is used by Portage as a common interface to querying 
-properties about the various JVMs.
-.SH OPTIONS 
-.TP
-\fB--javac\fI
-show full path to currently selected Java compiler.
-.TP
-\fB--jar\fI
-show full path to currently selected
-.I jar 
-command
-.TP
-\fB--jdk-home\fI
-show path to currently selected JDK
-.TP
-\fB--jre-home\fI
-show path to currently selected JRE
-.TP
-\fB--java-version\fI
-query current JVM for version
-.TP
-\fB--classpath[=package1,package2,...]\fI
-calculate classpath for a package.
-.TP
-\fB--full-classpath[=package1,package2,...]\fI
-calculate classpath with absolute paths ready to be assigned to CLASSPATH.
-.TP
-\fB--exec=filename\fI
-figure full path to one of the JDK/JRE utilities, such as 
-.I keytool
-.
-.TP
-\fB--list-available-packages\fI
-list available Java packages. Used for selection by
-.I --classpath
-and
-.I --full-classpath
-.
-.TP
-\fB--list-available-vms\fI
-lists available JVMs. Used with 
-.I --set-system-vm
-and 
-.I --set-user-vm
-.
-.TP
-\fB--set-system-vm=<vm-id>\fI
-sets the system-wide default JVM.
-.TP
-\fB--set-user-vm=<vm-id>\fI
-sets the user-specific JVM by putting all necessary env vars into 
-.I $HOME/.gentoo/java-env
-.TP
-\fB--set-system-classpath=package1,package2,...\fI
-sets the system-wide default CLASSPATH.
-.TP
-\fB--set-user-classpath=package1,package2,...\fI
-sets the user-specific CLASSPATH by putting all necessary env vars into 
-.I $HOME/.gentoo/java-env-classpath
-(sourced from $HOME/.gentoo/java-env).
-.TP
-\fB--clean-system-classpath\fI
-cleans the system-wide default classpath, leaving only vm needed jars
-on it.
-.
-
-.SH AUTHORS
-Karl Trygve Kalleberg <karltk@gentoo.org>
-
-.SH BUGS
-It cannot be used to set default browser plugin yet.
-
-.SH "SEE ALSO"
-env-update(5)
-.TP
-The \fI/usr/bin/java-config\fR script. 
-.TP
diff --git a/dev-java/java-config/files/digest-java-config-0.2.7 b/dev-java/java-config/files/digest-java-config-0.2.7
deleted file mode 100644
index 7c9374e76591..000000000000
--- a/dev-java/java-config/files/digest-java-config-0.2.7
+++ /dev/null
@@ -1,7 +0,0 @@
-MD5 ef44d82252644dde2d143335820e30d9 /files/0.2.7/java-config 8416
-MD5 0579db32710d3de43ed15450680fe891 /files/0.2.7/java-config.1 2164
-MD5 9a4212aa54844344b19beba357540ab9 /files/0.2.7/30java-finalclasspath 12
-MD5 8e695ca4a5e380c25b2f60c5c1603c67 /files/0.2.8/java-config 9092
-MD5 2843d5f083c95b88f4fd794846e99c75 /files/0.2.8/java-config.1 2479
-MD5 9a4212aa54844344b19beba357540ab9 /files/0.2.8/30java-finalclasspath 12
-MD5 eadbc54affd6ef839c1ca0f4aff07b27 /java-config-0.2.7.ebuild 638
diff --git a/dev-java/java-config/files/digest-java-config-0.2.8-r1 b/dev-java/java-config/files/digest-java-config-0.2.8-r1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-java/java-config/files/digest-java-config-0.2.8-r1
+++ /dev/null
diff --git a/dev-java/java-config/java-config-0.2.7.ebuild b/dev-java/java-config/java-config-0.2.7.ebuild
deleted file mode 100644
index 0023ffabc192..000000000000
--- a/dev-java/java-config/java-config-0.2.7.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-0.2.7.ebuild,v 1.7 2003/09/10 01:46:57 msterret Exp $
-
-IUSE=""
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Gentoo-specific configuration for Java"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha"
-
-DEPEND="virtual/glibc"
-
-src_install () {
-	dobin ${FILESDIR}/${PV}/java-config
-	doman ${FILESDIR}/${PV}/java-config.1
-
-	insinto /etc/env.d
-	doins ${FILESDIR}/${PV}/30java-finalclasspath
-}
diff --git a/dev-java/java-config/java-config-0.2.8-r1.ebuild b/dev-java/java-config/java-config-0.2.8-r1.ebuild
deleted file mode 100644
index 4956d6bea31a..000000000000
--- a/dev-java/java-config/java-config-0.2.8-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-0.2.8-r1.ebuild,v 1.2 2003/09/10 01:46:57 msterret Exp $
-
-IUSE=""
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Utility to change the Java Virtual Machine being used"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc sparc ~alpha"
-
-DEPEND="virtual/glibc"
-
-src_install () {
-	dobin ${FILESDIR}/${PV}/java-config
-	doman ${FILESDIR}/${PV}/java-config.1
-
-	insinto /etc/env.d
-	doins ${FILESDIR}/${PV}/30java-finalclasspath
-}
diff --git a/dev-java/java-config/java-config-1.1.7.ebuild b/dev-java/java-config/java-config-1.1.7.ebuild
index 35034bf48db2..8aae54187f94 100644
--- a/dev-java/java-config/java-config-1.1.7.ebuild
+++ b/dev-java/java-config/java-config-1.1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-1.1.7.ebuild,v 1.1 2003/11/19 02:16:34 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-1.1.7.ebuild,v 1.2 2003/12/07 18:08:45 strider Exp $
 
 inherit distutils
 
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 RDEPEND="virtual/python"
 #DEPEND="$DEPEND"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="x86 ppc sparc alpha"
 IUSE=""
 
 src_install() {