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.

Package-Manager: portage-2.2_rc99/cvs/Linux i686

3 files changed, 75 insertions, 2 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/Manifest b/dev-java/java-config/Manifest
index 80d0437ac44f..90bc9c04f6f8 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST java-config-2.1.10.tar.bz2 45507 RMD160 55fc34441a1553035c3e4ae674756df494a1705a SHA1 e78a8032a436a63a583960fe85bd5396144f8a97 SHA256 d0afa1279a2bf91a307e54a78227fe413aad12c1a1beaac4ee90b39cc1485ba5
 DIST java-config-2.1.11.tar.bz2 60763 RMD160 35f62025fe9843769fe164d9bb50419fd2fc7e34 SHA1 df62f76957343108d1b27687132958853434982c SHA256 ffc90aac716f6edc2f99f70e4947eab606e3a70dadb90328dedda16345796bbe
 EBUILD java-config-2.1.10.ebuild 1373 RMD160 7c8bfacf3cde458b5875a4197a7817033913d054 SHA1 f17a29c9d2bf227cdf1bdf16d86d1b61f8fca809 SHA256 09e3ca9de826901e967094cbbc7ef50b100fa820da2eff52d5908f1050c0b0b4
+EBUILD java-config-2.1.11-r1.ebuild 1346 RMD160 367b5a67eda4165adfd1811afec7383d4ecf0099 SHA1 475c83f4e601a7ec47fea5edf83dd411a471f950 SHA256 5b442c7c315b57d5436ff2faac39f0addc89e8f615d94902896896025964ef20
 EBUILD java-config-2.1.11.ebuild 1270 RMD160 44999d13faabdce732d566fbae6a29aebd981339 SHA1 5a6b90ce597fac188107e59979a4e4a4fcca068a SHA256 b0fa765b7ff751e17dda0636462aaef175eeba01dd56decd16bd230e12a3c7d2
-MISC ChangeLog 42416 RMD160 5638850b4e56efcbe756673dbb29402e0baeb0fc SHA1 cf8613090269af91fc1c5492fd3a2c6a74477b7e SHA256 c06a48431c960829fa62cdb4bec339ce98ec0f4551aeff4e768e4d0f7df725e9
+MISC ChangeLog 42764 RMD160 90379402e4fd6c07ab9c46183d7d4daaceb0049c SHA1 b235d0a9cedc728393b1a7cea094eeb27c0de987 SHA256 874e2b10cabc1dde7584a91bf7501d419c901cd55bfedec63424e2117fdde673
 MISC metadata.xml 482 RMD160 b060f8a2492170d8513e1b2d03512d8b565b5045 SHA1 b154d3e425be12942f183a7ad1a37fecc215e4b4 SHA256 f80d3cd5afabd0dc4d177925c3715c464288e5ec3ed1ca809a7f7a66ee3907a5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzEeZcACgkQcxLzpIGCsLSReACgluLGhuJwOakdPFgvRuV4IYF8
+uS4AnjeN1eNa92KjAeRzJdi8abf48etk
+=lbEB
+-----END PGP SIGNATURE-----
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
+}