Add PDEPEND on virtual/jre so that /usr/bin/java can't get installed with a VM. Fixes bug #315229. Alpha and arm keywords dropped as they don't have virtual/jre available. Need to figure out what to do with them.

(Portage version: 2.2_rc99/cvs/Linux i686)

2 files changed, 63 insertions, 1 deletions

diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog
index bcacef92a3b6..5a9c39a0951e 100644
--- a/dev-java/java-config/ChangeLog
+++ b/dev-java/java-config/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/java-config
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.248 2010/10/15 17:44:16 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.249 2010/10/24 18:20:47 betelgeuse Exp $
+
+*java-config-2.1.11-r1 (24 Oct 2010)
+
+  24 Oct 2010; Petteri Räty <betelgeuse@gentoo.org>
+  +java-config-2.1.11-r1.ebuild:
+  Add PDEPEND on virtual/jre so that /usr/bin/java can't get installed with
+  a VM. Fixes bug #315229. Alpha and arm keywords dropped as they don't have
+  virtual/jre available. Need to figure out what to do with them.
 
   15 Oct 2010; Brent Baude <ranger@gentoo.org> java-config-2.1.11.ebuild:
   Marking java-config-2.1.11 ppc for bug 321767
diff --git a/dev-java/java-config/java-config-2.1.11-r1.ebuild b/dev-java/java-config/java-config-2.1.11-r1.ebuild
new file mode 100644
index 000000000000..5e6603637ae9
--- /dev/null
+++ b/dev-java/java-config/java-config-2.1.11-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2010 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.1.11-r1.ebuild,v 1.1 2010/10/24 18:20:47 betelgeuse Exp $
+
+EAPI="2"
+PYTHON_DEPEND="*:2.6"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit fdo-mime gnome2-utils 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=""
+RDEPEND=">=dev-java/java-config-wrapper-0.15"
+# https://bugs.gentoo.org/show_bug.cgi?id=315229
+PDEPEND=">=virtual/jre-1.5"
+# Tests fail when java-config isn't already installed.
+RESTRICT="test"
+RESTRICT_PYTHON_ABIS="2.4 2.5"
+
+PYTHON_MODNAME="java_config_2"
+
+src_test() {
+	testing() {
+		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" src/run-test-suite.py
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+
+	insinto /usr/share/java-config-2/config/
+	newins config/jdk-defaults-${ARCH}.conf jdk-defaults.conf || die "arch config not found"
+}
+
+pkg_postrm() {
+	distutils_pkg_postrm
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}