Migrate to distutils-r1, thanks to mgorny for an initial patch. #440920

Drop hotfixes for #415397, #305773, #350459 as they were fixed in 2.1.12.

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

3 files changed, 71 insertions, 2 deletions

diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog
index ca2967b7d275..bae67bf3a8bd 100644
--- a/dev-java/java-config/ChangeLog
+++ b/dev-java/java-config/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/java-config
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.271 2012/09/18 15:39:29 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.272 2012/12/05 19:05:48 sera Exp $
+
+*java-config-2.1.12-r1 (05 Dec 2012)
+
+  05 Dec 2012; <sera@gentoo.org> +java-config-2.1.12-r1.ebuild:
+  Migrate to distutils-r1, thanks to mgorny for an initial patch. #440920
+  Drop hotfixes for #415397, #305773, #350459 as they were fixed in 2.1.12.
 
   18 Sep 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   java-config-2.1.10.ebuild, java-config-2.1.11.ebuild:
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index d1ddff39a64e..f9cd7d5e5c99 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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.10.tar.bz2 45507 SHA256 d0afa1279a2bf91a307e54a78227fe413aad12c1a1beaac4ee90b39cc1485ba5 SHA512 893a768db3d0fd7745c1623b7b4330ce6db00c64bee3ba127c53b6c61904ac3a17ab2a8ce51095ef57f0b29645cd96a22bbdb4cf15e3e603c6dc2e9a8d84f8de WHIRLPOOL f2b1cfa560e405af927b5b0161f4d41a51469d161a73644fbd3350b0bfc9bbdbfb2c87359a6d47c63de8ea6c23c60088addaa2b034adaaedb36fe84f0d495742
@@ -8,6 +11,18 @@ EBUILD java-config-2.1.11-r1.ebuild 1341 SHA256 25713fe9936ac1e2901521a768bc2f0b
 EBUILD java-config-2.1.11-r2.ebuild 1426 SHA256 05c8ffb8543c203d8e59162b6b4db0de187ecb258524ff6f97c37f484b9c0f98 SHA512 deaeee5b546ad78c000bcc0f27551656f66653701690161d3cd4fc049af32cec8393b3d88f85e01666fcbe0eedaa31a54adf339d5c05831db39b556b8148b9b6 WHIRLPOOL de98636d06ca1561f68c5199b9e9d1170047cb9ad99e0ebf6076d2d2e1c7cdb7b6c63f699f0175adacd6489a69cd043876e12564c582a75756744a4814ed1334
 EBUILD java-config-2.1.11-r3.ebuild 1704 SHA256 f60ba263b39922db33bdeee1724f06e1189415e82a4d802408248996f341a7d3 SHA512 e1facf774a4f4dfb2d973a8e637fad74f1b1d48acca1ff589d6c78632cdf39b227abb9fe1a61334846853d74bc41575840a170d87afeb1afc2972c4e4295fbf0 WHIRLPOOL 6ce7ca88b6e884563bf757059ca68cf020210b76c3b331329648a1c527b82217dae8472e56207580737fb4bafc9f9d8cce2a05031c79f85c82268cda35dd1785
 EBUILD java-config-2.1.11.ebuild 1271 SHA256 00f228d1ed63ec92823b44841c5f6288e46c23ff21ce2bfafd7d2ed01b0ebc61 SHA512 2ef658533119e0e78a222c00d92c4a73ccad4e49e1ac8665a2dce4b3b45f8d8391baa428a9f5226841708c2fb85c50c33367734bad0b867ffe5594bbae05ccb6 WHIRLPOOL 66a512ba7a2b99a66bfdbc3725790fdff29d9f776fb219a533b9a301778aca5057b19e5b09cf49c0fac9f48469c60a44385dde2964a3cf6c5a51d86f09215708
+EBUILD java-config-2.1.12-r1.ebuild 1290 SHA256 51ef2622d774fd40cbcf282133e5c3348f7651e651d582e51708c3630750cce3 SHA512 04b90450bd9449f6b1d3aa6256b6e5f1c4b85e0a614f6c7cd5c79ba44a8a38bb5a30e4d6b941fd130067763cfa32400b7607fb404a404fa7ff954545e581d888 WHIRLPOOL ed2571f96742170667da3685bc3fe2ee6556796515ffeee2eec1a457e235b04727f07bd8967dc408b9d5bcba1d15b94f971e3f21970112e274865ccaae5f5b69
 EBUILD java-config-2.1.12.ebuild 1695 SHA256 88d9d14484908648588dd71b63526f184ef32a0016afbe848296bb526e52afdb SHA512 1ecf78e738babf5982a2c8d6913fa1fe1b9a69db9bffd87010c6330f34288b1622ebea1304089680f852eb2ddef4aacee02de505cb0ef7d992e13cc66ea7cd40 WHIRLPOOL 48f9f9410bc3e43d1e41ac03917c1070d1421840ed8df466efae5693dfc8a635e7df4ae97226100d39525f574f5235c8a6c66f76bc4270b096ff956287b63f09
-MISC ChangeLog 45962 SHA256 75130d1e7b15e50f0c65ef7c953fff574594f6448c055118a2637a0c087a4f1d SHA512 a6928a1daa34a59ffc6a399c450b5b8a86f00ac106e667c12f40fc2e654529e1c36f7a7e406f005c4c92b05ad7569e752b72e7f63022544d1a958385eccb96d3 WHIRLPOOL 09d13dad6eeaf779c5f27bcc8b8f4e90bad061c3bcf64469f64f7136987f99a9187c855283506689c5bee3d851e89e48f2f178aed050ad54607c603174ca4369
+MISC ChangeLog 46211 SHA256 bf73c88b7cf6b9a9346b4709bbd8e4c3365c65904b496a940050144bcc101f09 SHA512 e6f76969ddcbd24e371917c48a7b4eaee1d784cdeebcb3c377a6b37fe49d02a07d60feae13ea8b7e5b50ee86047f9ac3e716d9cf49145067075dd0bc540c81a8 WHIRLPOOL 8319c0efd5b105a317fefe32b9b5eaa2ad10fc742fcec0f35f1431cc775f404c8a29bdfa03c2c75c2418c4bc05c5c32b52f8012f230a583d53c2c2073ba2b4ce
 MISC metadata.xml 482 SHA256 f80d3cd5afabd0dc4d177925c3715c464288e5ec3ed1ca809a7f7a66ee3907a5 SHA512 ae132875688e119f1b77d375fb14e3eccf55cd79c88e5df6ef4d42b4b28aea71d4ee42caffcf74fa9b5b5107c11b2c1edeea9ec60cd99f4ecf9ef2934051b78f WHIRLPOOL 9f97fb664298451dbeed1c5a2a923a9a8d8c82d1d3aa9854a2f0c6fed868d5470a45b24200c514a3aafff24c869f36a7cba9c98c8b13bfc99c5d7911820f5210
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQv5tTAAoJELjwI6Q8XPdaX1YH/3e6GQZmzaar3W2brwmP6odP
+7Ubs+0I6g7e07Xqwha5Pt6s8DMpGgaAukOz1LxJmZHfmvhE5qtOzaeldY9AvX7bm
+jmbUburMpnObCR0RSM0k+vDlwmHgK+7SlJXB28cXzbGPIooFyok7K7B5rvjTMVSS
+so5N84MxOwsxBrHMHIaA3AYbeZlrMS6qHAzMkVSLMR2HK22HMfAaZsj+LB+T1IYs
+FAQ6emQVwdIxax2ADIW0vSEubBXKYAjbfZQZuKt6/PzNph/g17JFcscZrbtTHa27
+AWcS+vjBZVzvcEP47kNApgaOqi5Pgs/BrkwOEGfJVv1J/XJL52rl9on0yxo3t00=
+=7Yqo
+-----END PGP SIGNATURE-----
diff --git a/dev-java/java-config/java-config-2.1.12-r1.ebuild b/dev-java/java-config/java-config-2.1.12-r1.ebuild
new file mode 100644
index 000000000000..671f4a446f44
--- /dev/null
+++ b/dev-java/java-config/java-config-2.1.12-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 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.12-r1.ebuild,v 1.1 2012/12/05 19:05:48 sera Exp $
+
+EAPI="4"
+
+# jython depends on java-config, so don't add it or things will breake.
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9} )
+
+inherit distutils-r1 eutils fdo-mime gnome2-utils
+
+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 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~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"
+
+python_test() {
+	"${PYTHON}" src/run-test-suite.py || die
+	"${PYTHON}" src/run-test-suite2.py || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/java-config-2/config/
+	newins config/jdk-defaults-${ARCH}.conf jdk-defaults.conf
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}