Make /etc/profile.d/java-config-2.sh POSIX compliant. Fixes bug #169925. Thanks to Karl Schulz <g59y7jb02@sneakemail.com>.

(Portage version: 2.1.2.2)

4 files changed, 104 insertions, 1 deletions

diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog
index e68024e4e499..cc3ed0413b5f 100644
--- a/dev-java/java-config/ChangeLog
+++ b/dev-java/java-config/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/java-config
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.146 2007/03/09 14:01:43 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.147 2007/03/16 11:13:16 betelgeuse Exp $
+
+*java-config-2.0.31-r5 (16 Mar 2007)
+
+  16 Mar 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +files/java-config-2.profiled.sh-r1, +java-config-2.0.31-r5.ebuild:
+  Make /etc/profile.d/java-config-2.sh POSIX compliant. Fixes bug #169925.
+  Thanks to Karl Schulz <g59y7jb02@sneakemail.com>.
 
   09 Mar 2007; Petteri Räty <betelgeuse@gentoo.org>
   java-config-1.3.7.ebuild, java-config-2.0.31.ebuild,
diff --git a/dev-java/java-config/files/digest-java-config-2.0.31-r5 b/dev-java/java-config/files/digest-java-config-2.0.31-r5
new file mode 100644
index 000000000000..393d9dbec4ef
--- /dev/null
+++ b/dev-java/java-config/files/digest-java-config-2.0.31-r5
@@ -0,0 +1,3 @@
+MD5 36b7893b20b9f4b6f0af6dd632703745 java-config-2.0.31.tar.bz2 17001
+RMD160 4b3d8362538b435a642312ee7289824d6662e309 java-config-2.0.31.tar.bz2 17001
+SHA256 314ec1783da8190d60e757aaef2af8eae7281c3c9754024e3e59643ce7a30752 java-config-2.0.31.tar.bz2 17001
diff --git a/dev-java/java-config/files/java-config-2.profiled.sh-r1 b/dev-java/java-config/files/java-config-2.profiled.sh-r1
new file mode 100644
index 000000000000..df823272f82a
--- /dev/null
+++ b/dev-java/java-config/files/java-config-2.profiled.sh-r1
@@ -0,0 +1,32 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/files/java-config-2.profiled.sh-r1,v 1.1 2007/03/16 11:13:16 betelgeuse Exp $
+
+# If we have a current-user-vm (and aren't root)... set it to JAVA_HOME
+gentoo_user_vm="${HOME}/.gentoo/java-config-2/current-user-vm"
+gentoo_system_vm="/etc/java-config-2/current-system-vm"
+
+# Please make sure that this script is POSIX compliant
+# See https://bugs.gentoo.org/show_bug.cgi?id=169925
+# for more details"
+
+if [ -z "${UID}" ] ; then
+	# id lives in /usr/bin which might not be mounted
+	if type id >/dev/null 2>/dev/null ; then
+		user_id=$(id -u)
+	else
+		[ "${USER}" = "root" ] && user_id=0
+	fi
+fi
+
+# The root user uses the system vm
+if [ "${user_id}" != 0 -a -L "${gentoo_user_vm}" ]; then
+	export JAVA_HOME=${gentoo_user_vm}
+# Otherwise set to the current system vm
+elif [ -L /etc/java-config-2/current-system-vm ]; then
+	export JAVA_HOME=${gentoo_system_vm}
+fi
+
+export JDK_HOME=${JAVA_HOME}
+export JAVAC=${JDK_HOME}/bin/javac
+unset gentoo_user_vm gentoo_system_vm user_id
diff --git a/dev-java/java-config/java-config-2.0.31-r5.ebuild b/dev-java/java-config/java-config-2.0.31-r5.ebuild
new file mode 100644
index 000000000000..a129fe12be88
--- /dev/null
+++ b/dev-java/java-config/java-config-2.0.31-r5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-2.0.31-r5.ebuild,v 1.1 2007/03/16 11:13:16 betelgeuse Exp $
+
+inherit base distutils eutils
+
+DESCRIPTION="Java environment configuration tool"
+HOMEPAGE="http://www.gentoo.org/proj/en/java/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-lang/python"
+RDEPEND="${DEPEND}
+	dev-java/java-config-wrapper"
+
+src_install() {
+	distutils_src_install
+
+	insinto /usr/share/java-config-2/config/
+	for i in alpha amd64 hppa ia64 ppc ppc64 sparc x86 x86-fbsd; do
+		if use ${i}; then
+			newins config/jdk-defaults-${i}.conf jdk-defaults.conf || die "arch	config not found"
+		fi
+	done
+
+	for tool in $(< config/symlink-tools); do
+		dosym /usr/bin/run-java-tool /usr/bin/${tool}
+	done
+
+	# Install profile.d for setting JAVA_HOME
+	dodir /etc/profile.d
+	exeinto /etc/profile.d
+	newexe ${FILESDIR}/${PN}-${SLOT}.profiled.sh-r1 ${PN}-${SLOT}.sh || die "newexe failed"
+	newexe ${FILESDIR}/${PN}-${SLOT}.profiled.csh ${PN}-${SLOT}.csh || die "newexe failed"
+
+	insinto /etc/revdep-rebuild/
+	doins "${FILESDIR}/60-java" || die
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/share/java-config-2/pym/java_config
+}
+
+pkg_postinst() {
+	python_mod_optimize /usr/share/java-config-2/pym/java_config
+
+	elog "The way Java is handled on Gentoo has been recently updated."
+	elog "If you have not done so already, you should follow the"
+	elog "instructions available at:"
+	elog "\thttp://www.gentoo.org/proj/en/java/java-upgrade.xml"
+	elog
+	elog "While we are moving towards the new Java system, we only allow"
+	elog "1.3 or 1.4 JDKs to be used with java-config-1 to ensure"
+	elog "backwards compatibility with the old system."
+	elog "For more details about this, please see:"
+	elog "\thttp://www.gentoo.org/proj/en/java/why-we-need-java-14.xml"
+}