bug 455798: Use recorded VM dependency for launcher

bug 402315: Don't lock on active VM in presence of virtuals.
bug 464608: Make Portage dependency explicit.
ROOT support.
Gentoo Prefix support.
Install man page.
Eselect modules and run-java-tool are split-out into separate package
eselect-java.
Desktop files, icons, env.d and profile.d files as well as revdep-rebuild
control file now part of baselayout-java.
Fix running tests.

Package-Manager: portage-2.1.11.60/cvs/Linux x86_64
Manifest-Sign-Key: 0x3C5CF75A

3 files changed, 56 insertions, 6 deletions

diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog
index bc5e72bc0b70..e3758ac54316 100644
--- a/dev-java/java-config/ChangeLog
+++ b/dev-java/java-config/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for dev-java/java-config
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.278 2013/04/06 10:21:50 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.279 2013/04/08 16:45:48 sera Exp $
+
+*java-config-2.2.0 (08 Apr 2013)
+
+  08 Apr 2013; Ralph Sennhauser <sera@gentoo.org> +java-config-2.2.0.ebuild:
+  bug 455798: Use recorded VM dependency for launcher
+  bug 402315: Don't lock on active VM in presence of virtuals.
+  bug 464608: Make Portage dependency explicit.
+  ROOT support.
+  Gentoo Prefix support.
+  Install man page.
+  Eselect modules and run-java-tool are split-out into separate package
+  eselect-java.
+  Desktop files, icons, env.d and profile.d files as well as revdep-rebuild
+  control file now part of baselayout-java.
+  Fix running tests.
 
   06 Apr 2013; Vlastimil Babka <caster@gentoo.org> -java-config-2.1.10.ebuild,
   java-config-2.1.11.ebuild, -java-config-2.1.11-r1.ebuild,
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 838170a92ada..252ce24e9333 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,18 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX java-config-2.1.11-python3.patch 525 SHA256 fbcc731ea0bca626855212f9e1af5fcda538743e5f23e0229a5bbfbd56c619a8 SHA512 b132777b6be083d49eeb1c20f0884a3f85378c49ba71b0556f197367a300200ffa6cf02cd70712e3c527b208593b7e5c04c2ade69ff38ab53379d5c10387ec7c WHIRLPOOL 59823c6a434a09727819f60088140b7bba6b171c131840d2eeb368a94d77e3ff67ee92351d005492f1c8d06378e698976a0819643bd4c8b89c8b841e205ff205
 AUX python-abi-support.patch 1558 SHA256 790b68ae41fa48587bbf29ae8e8466305b8f29d4d122d3a6551cf9a627d6163b SHA512 54398414b8aa115d1d282f39b243af6a82af7128513a9db9dc360d32c465365f0ab1babd55af5e20a34f65ae83d217287351cd2563573a36e0e530f8254d0b0d WHIRLPOOL bc7da2cb42ddbf62949c68aa3ee8886c854b5ad217e2adfd7eeccc4cbde60d56c3d771a8f566a9765af034cd568bf113ad24e2c5a71e0ef68c2b4dc2e09ec2c7
 DIST java-config-2.1.11.tar.bz2 60763 SHA256 ffc90aac716f6edc2f99f70e4947eab606e3a70dadb90328dedda16345796bbe SHA512 7a68e515f6cf15deac26c19589f9a7556084c5c29a8a65783a804f222da917f047118d2e80da93d045339549b21541a88ba9e4e97e7c9afb2238ade1c1c2d496 WHIRLPOOL 9be6a6fe87a95e4310a86d45f4798f89823fad9dd5ea35fe02c892f5400c4ba69bc6a3204dc1711f01f16166065855721c26f7eb71ebeef8243eb6f001a17305
 DIST java-config-2.1.12.tar.bz2 48925 SHA256 2bace29c276a9507260df505d27bdb9eeaac79e46a8ba615496ae91072b35460 SHA512 f694002baa5d4db3712b8ed9e8b15ba5f867159ea9d605ddaed93e7beb91fc98211c1431f6fcd4c3f10da88a396d73f2d85db0a5e4dca76f465b3a35a18f2a9d WHIRLPOOL fe117e36d5c1afb510f1ab696690ffcf4a5c601de8309c3b96e3e13ea72f9309bde371bd4a7c5b2d30464675557b5da33d7f73c5a391baaae41d342be24dcdc7
+DIST java-config-2.2.0.tar.bz2 51851 SHA256 2cc47541714975099886156838f1f2c584b65e0cbc75ba2348cb18d9dec85fb7 SHA512 a491cfe86bde8afadfc5b875740d79f9077526d8650ffb034fdad67a7ffa1b02646f67b1ef0eab7b0fe3ae57b5d767fa6a0d5593fe07416993d60588a8ed595a WHIRLPOOL 1ded227dcdd7f248f9a8335b07bf006ebfefc8368dd400558d3ed7ca14e22da83ee052fc33d65bb784c61d573fa7fae6295be4d023ad7652ed4704997260316e
 EBUILD java-config-2.1.11.ebuild 1321 SHA256 2188067a57f7f438e037a170187562b4ddc77397288f08be1fe361818d5d2bc6 SHA512 88d5450c30b27fe2ce62591f4b85051019952768414ceb1e84aa5420beb3a3c12dbfd5efe9e18eb276f21c16d3e3199f41fedbe4255ab4182f36e1359d719e0a WHIRLPOOL 522ac72707660851fe4693ba2dc184397874b7c6e4bf7e2f561e71cacf9f6439a53a94a8cebd1d525cee6b5b5a5b005c438a3396c61d2109df1031be62ebd19b
 EBUILD java-config-2.1.12-r1.ebuild 1340 SHA256 0415c2764501dfc0574fc4788462d34779d4eac8870ab42991c04b6d5a7dc996 SHA512 eb12077140aad157d56572dad74ac1f5061b3550a5be6c6f5ee3e78ed23862f284f432bfa5b4f00c2cfad2948945b5eef926b5ca486449c29bcf2a572ee57e62 WHIRLPOOL 0522a06cd75738a12a1c9ccc6dbb61b6fb0acc8c4e9792d72c91bd6e9341b72d9f5c7a4148a95ff5346f82441572a4935e30020f435aa49e8a0b342bb8ecc598
-MISC ChangeLog 47175 SHA256 62644fd5cb4977e7431ab021ea9fa8093dfc93824bbe52c44b7830bc8dae9a37 SHA512 7ab5581eda58211bd9e502c243d4f18a93e3fb35e04dcaeec6721b1a89fbdf3bb30be94d64d3d9428f317b5e9163669559c442cc286b43b2d77813c5f8acf534 WHIRLPOOL cef31af5d45e0248d2d5dec38349919f8ec1ccb6f7076db4e519124237865650bb4edc3a943f2c0ca6723adae641cbe3e39dab059d6b42832ed67258613bbf77
+EBUILD java-config-2.2.0.ebuild 808 SHA256 42af306c6aac157e0d1bf102d174d5c0d71bd4122830a80682ecd247f86f4de9 SHA512 005a8993be444f1aeeed8b9664e8f90f94547ff1c679feeaf7a8f28418b95ff0e81bf5e45af93f7e0589a35134ca2289a225739fab625c17b2b00f5576d85e75 WHIRLPOOL 009088ccfb6d2742813fff68e64040e232e0b820ad148977e1f2ac00f962897301071091e900f5c5a50ba9ce728005bea991eaf267b51b2330056cb03ddaf588
+MISC ChangeLog 47740 SHA256 9be0088669f76b3874a53151e04fd2e7e2c6632b9aec7cabe2fc2515d6f2aed7 SHA512 0b4dbd0ba20f01f662ddb3a5f51b7174c1bc841cd08834a7301a7e943ab63eab5cb2c4cbd6ca7d57dd6862adb99f40a685c0506a4e4e45ee6e384c812a921d6d WHIRLPOOL 8ffd4f6c4c7922cc0c7f554f68a6ddf20d72b410cb37b088e39a554e4c65716e33d6e44ad79e21d633325e5e4ce208785a887da4c576962ce871959e95a47dcf
 MISC metadata.xml 482 SHA256 f80d3cd5afabd0dc4d177925c3715c464288e5ec3ed1ca809a7f7a66ee3907a5 SHA512 ae132875688e119f1b77d375fb14e3eccf55cd79c88e5df6ef4d42b4b28aea71d4ee42caffcf74fa9b5b5107c11b2c1edeea9ec60cd99f4ecf9ef2934051b78f WHIRLPOOL 9f97fb664298451dbeed1c5a2a923a9a8d8c82d1d3aa9854a2f0c6fed868d5470a45b24200c514a3aafff24c869f36a7cba9c98c8b13bfc99c5d7911820f5210
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAlFf90QACgkQtbrAj05h3oRLkQCggzPEr7ABfBwd/p6DTPcR7CmU
-Ub8AoJQTGxw7ieXjTAU79KvI38bBr1J7
-=QcWu
+iQEcBAEBCAAGBQJRYvRJAAoJELjwI6Q8XPdaRzcH/ja/EWq9rucXqkZk/Qfyr60n
++EQDy4v4k052VReHNwWfJmDo0diUCKZ8m5e3DARsCYUu4zHn/rHjngX3iYIReCU/
+CGdyayQ5SHqqN+0bJTv1DFqsDqWzKc2AtHe4XNQ5Z1OnYhx4naWYGsOGIT/Kk/BP
+rZSKPx7QIKl4jlLsUBgfjWqqIcG+LYOuvbQbS7galksM/b+P4lqpTGTikMwN3WRG
+OKQWFwcjNAVHAaNSh0mY9Jn3qJoU/xekLsb8xx3GTxvKjPN4gKU1Ru4pDIYZZmYd
+g6N47WfGzJS2hHLhRAtNCS/MIIdoBwp/CFQ5SyvduECVvutQhpGHo3Wsiarrwp4=
+=kSaq
 -----END PGP SIGNATURE-----
diff --git a/dev-java/java-config/java-config-2.2.0.ebuild b/dev-java/java-config/java-config-2.2.0.ebuild
new file mode 100644
index 000000000000..26e773eae176
--- /dev/null
+++ b/dev-java/java-config/java-config-2.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 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.2.0.ebuild,v 1.1 2013/04/08 16:45:48 sera Exp $
+
+EAPI="5"
+
+# jython depends on java-config, so don't add it or things will break
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Java environment configuration query tool"
+HOMEPAGE="http://www.gentoo.org/proj/en/java/"
+SRC_URI="http://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE=""
+
+# baselayout-java is added as a dep till it can be added to eclass.
+RDEPEND="
+	>=dev-java/java-config-wrapper-0.15
+	sys-apps/baselayout-java
+	sys-apps/portage"
+
+python_test() {
+	esetup.py test || die
+}