Fix jdk-defaults.conf for ia64.

(Portage version: 2.1.2.3)

4 files changed, 83 insertions, 1 deletions

diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog
index cc3ed0413b5f..49dea3301176 100644
--- a/dev-java/java-config/ChangeLog
+++ b/dev-java/java-config/ChangeLog
@@ -1,6 +1,12 @@
 # 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.147 2007/03/16 11:13:16 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.148 2007/03/31 19:36:59 betelgeuse Exp $
+
+*java-config-2.0.31-r6 (31 Mar 2007)
+
+  31 Mar 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +files/jdk-defaults-ia64.conf.patch, +java-config-2.0.31-r6.ebuild:
+  Fix jdk-defaults.conf for ia64.
 
 *java-config-2.0.31-r5 (16 Mar 2007)
 
@@ -346,6 +352,8 @@
   keyworded properly, and results in java-config-wrapper not getting
   installed. Thanks to zlin to tracking this issue down.
 
+*java-config-2.0.26 (30 Jun 2006)
+
   30 Jun 2006; Joshua Nichols <nichoj@gentoo.org>
   -java-config-2.0.25.ebuild, +java-config-2.0.26.ebuild:
   Version bump which adds a new eselect module, java-nsplugin
diff --git a/dev-java/java-config/files/digest-java-config-2.0.31-r6 b/dev-java/java-config/files/digest-java-config-2.0.31-r6
new file mode 100644
index 000000000000..393d9dbec4ef
--- /dev/null
+++ b/dev-java/java-config/files/digest-java-config-2.0.31-r6
@@ -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/jdk-defaults-ia64.conf.patch b/dev-java/java-config/files/jdk-defaults-ia64.conf.patch
new file mode 100644
index 000000000000..2be011bb2f6b
--- /dev/null
+++ b/dev-java/java-config/files/jdk-defaults-ia64.conf.patch
@@ -0,0 +1,8 @@
+Index: config/jdk-defaults-ia64.conf
+===================================================================
+--- config/jdk-defaults-ia64.conf	(revision 3624)
++++ config/jdk-defaults-ia64.conf	(revision 4152)
+@@ -1,2 +1,2 @@
+ # This files contain the default support jdk's
+-*= jrockit-bin-jdk
++*= jrockit-jdk-bin
diff --git a/dev-java/java-config/java-config-2.0.31-r6.ebuild b/dev-java/java-config/java-config-2.0.31-r6.ebuild
new file mode 100644
index 000000000000..ee5a72949f91
--- /dev/null
+++ b/dev-java/java-config/java-config-2.0.31-r6.ebuild
@@ -0,0 +1,63 @@
+# 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-r6.ebuild,v 1.1 2007/03/31 19:36:59 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="~ia64"
+IUSE=""
+
+DEPEND="dev-lang/python"
+RDEPEND="${DEPEND}
+	dev-java/java-config-wrapper"
+
+PATCHES="${FILESDIR}/jdk-defaults-ia64.conf.patch"
+
+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"
+}