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.

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 3C5CF75A)

2 files changed, 55 insertions, 1 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/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
+}