Fix building with jython. #428586

Migrate to python-distutils-ng.eclass

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

3 files changed, 61 insertions, 2 deletions

diff --git a/dev-java/javatoolkit/ChangeLog b/dev-java/javatoolkit/ChangeLog
index 699e01a07fb7..e17322902b84 100644
--- a/dev-java/javatoolkit/ChangeLog
+++ b/dev-java/javatoolkit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/javatoolkit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javatoolkit/ChangeLog,v 1.66 2012/05/12 03:11:09 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javatoolkit/ChangeLog,v 1.67 2012/07/31 14:46:27 sera Exp $
+
+*javatoolkit-0.3.0-r7 (31 Jul 2012)
+
+  31 Jul 2012; Ralph Sennhauser <sera@gentoo.org> +javatoolkit-0.3.0-r7.ebuild:
+  Fix building with jython. #428586
+  Migrate to python-distutils-ng.eclass
 
   12 May 2012; Alexis Ballier <aballier@gentoo.org>
   javatoolkit-0.3.0-r6.ebuild:
diff --git a/dev-java/javatoolkit/Manifest b/dev-java/javatoolkit/Manifest
index 9bb8542175a2..4f17eaeef4fa 100644
--- a/dev-java/javatoolkit/Manifest
+++ b/dev-java/javatoolkit/Manifest
@@ -1,7 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX javatoolkit-0.3.0-no-pyxml.patch 1128 SHA256 9f0e285c15a1a477606c61fabc391a8f56656525c7d92f91ae59e289eee7d8a9 SHA512 edb135c6008a24d22bf5116bc73944fddf5a8c44354b80800425457c9c9ee8ef4f55413ca88507c991ed835945bc7d162f6b1b3a30c57fc5f41f278e0c5afe16 WHIRLPOOL b0cc84debd5be1e5abf4daf338b21ca55e6e84be7d59a39beff65c7b1dfc2442eeb5e7a0e28313606981f18e83f5ef38344887a15ce8ecc7a03bbe3bd2ecb62a
 AUX javatoolkit-0.3.0-python2.6.patch 413 SHA256 4128e060d2c3693717c64e443527380f548d663496bb982fe45463e6370d920d SHA512 54df3c263a4b8f42457eb848f3fd79ef83953cfc1069c9229e339a178d2363bdaa636ec11ea49dbf5693c5eafe4d123942bf06f3b77b80b0cd8de2177045952c WHIRLPOOL 6c15e4fff8d0b841ff13dd9d1e38a5e77c41f80db6d0460eb3735f4632953b5ae23030e31da02cde361972468ab939fa2b9aa333f09a5b17c25b8ab5b97eadbd
 DIST javatoolkit-0.3.0.tar.bz2 16823 SHA256 47bf8aad2ec58b2d850e8cbe57fe2707859d800b215b24387c7652a50353677c SHA512 e7bbe04e39ab277d0aab89f0eea963c4b0341a336660dab08bfad0510ad1b2b49ce7410a2363bcf9ebad5f8757ee254ddc27af642b4bfb374db52d82cf02c3b1 WHIRLPOOL a9b1034939a0e22c49620bb29d3652e8f5e6a8e71645556fe00463aabc0c1ff2ac2b666f59fd0ceea8ea5dc18579d90cc11a07ba341028831e3b8dd1e8a0e9ce
 EBUILD javatoolkit-0.3.0-r4.ebuild 816 SHA256 f0b8fceacc3545e6540d27aed9128690f4647a9f9edb6a553e4560a8ab19a6f5 SHA512 2a3f5a5337b031d80a4c523f6a6c0c9dd204b5f3b4fe4d75270c7319e27c8a341109cb36a4991e9db3c4c841ca3c8e2213d8d8fd82c4913216207ff8517fe7cd WHIRLPOOL 6b9d5a7b445c2730eaf8a72db9725b74b78a6e9b1ba550620f27a7dc7a45ab6c141bd2777a287fbed6408926465c3e135c9b67cf071060ab37693cd3a77648b4
 EBUILD javatoolkit-0.3.0-r6.ebuild 950 SHA256 3d7ce917c13c26cb1c82c9c0fb086f0647e5bae27a6f6bb32d04c2f69201c77a SHA512 ecc31f3e7b82e78e55a46e7a5774a9e59f720bc7bd0b3143724b0106dfc30f849bb5bd2d44716568808f007e5716308c96afaf00fe0b1de8f11da5bbc7553c03 WHIRLPOOL be9ee98bc28240f3cee12c9c6bd9a458c5513e8ef014f568876a1b187c69097df31fc891e9950f05b77817982605a04251b0506acb5f632a9f46702fdc332cab
-MISC ChangeLog 9097 SHA256 7189c03706bc3face2c1556f95e6679be7ddea420ff33bb4fa10f46cd0a7608d SHA512 fbd8115119ef5b77126bdc76b31ce2ed88e5c235ad6cb08b4c2c01d5e0d461dd72811640dd0cac1930b72cf9a72380966d902245493c7aa23702460cf38ecea2 WHIRLPOOL 7c3497ffcc12b402b53e163f97d9dc714785835ce76b5cf07f308c809c1ee02c02fcf2968f3d331fbeab1fccf60e11ed5c8a2d1560e52650c97e4ebf52006fd4
+EBUILD javatoolkit-0.3.0-r7.ebuild 1230 SHA256 50bce84ef45a48c51ff20bc8d3b1e04262ed0439449d4db8f669343c4d1795cd SHA512 c170f774fc5acc1399257c485fedf29d583c24df8893e8ddd0a9aade25198198846fc7882ed61f7e205d536163ba55e1083601499ec6d7859e0ff82e280c0ab0 WHIRLPOOL 384027e315b671a98929bff5da30ffd7810d5e330258388e784f41ff7dbdcde096cde29756af314759c133194e08280b5f38e4cb97e0846f687d5fa0a37cee76
+MISC ChangeLog 9287 SHA256 03ca0d552da1dc63c6b208c69685e69c986d5c515fe83cb5bcfddb83e62b63f8 SHA512 7b22d83f6f1fc39917c1945604df326ec7acf27896de4e828cb6f8866f70b782655811c9c081a9a3daa8df49eec41f1a05cf73fdbfd936a8235ce9ed3e44e575 WHIRLPOOL 983688b89b3770b6d47d4f99b6f74d28ffbf66bcb65bed0b0099fb9d9d3c7ea64a554fafc384bc8c793d0641de33d4f6ce63ce4dd67592ede9eef8b6dbee474d
 MISC metadata.xml 159 SHA256 da2aaa3223c5418688dfbba6f899648c5bcb2e4610126519a1a862913c4f8fa6 SHA512 f5bc77a4e168cdb5a9f9c347f6f437b16bd28978351ec692d4f7e406ba93479424e2272de70fe85d2e0668172de8ccd3aa096f49d5912ed91d17bea11756865b WHIRLPOOL b0cba2d5917cc20d7409ccfedc345ab38c71df76c5c030df578d6db718f8a60dcfc1927c20e7062fafc62e955a90ec9f21cdcef6d7a566fddf374ce766ca64cc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQF+/VAAoJEIUJ+svaV163ERIH/2bHHbVt4P4F9GFUrI6dc+yK
+3dMKfF7aT1etXn8a29wO2UTeVQSef3cKKABMJ4bSW/kCi3e5BXGN/OfeFPoUEFcW
+6/6y+EoK4TYC29VrTrA1cYfTZ2Bmb6TgWJFVAnYGQS89heRvbPT/oYu2mEsiAsFw
+RlOCZ0rU4kIRVnredKfaWT7uY3RCA8A+/y0DL1gcq94rtNlKtUNOdGBPN+ekVeug
+xUF0lzCVh0I/Q/Ynp8IXV7AeWIPJvV8nvibN/4OQwCJiXSYotlFiZ9IjGv3iw+Xu
+AWB3mOc6QTZUDa/7zH7dzsODY89Wij2Zd4jLU3tfnYs5FMQ3uvIsht5dOhGPR10=
+=lsil
+-----END PGP SIGNATURE-----
diff --git a/dev-java/javatoolkit/javatoolkit-0.3.0-r7.ebuild b/dev-java/javatoolkit/javatoolkit-0.3.0-r7.ebuild
new file mode 100644
index 000000000000..2871d51afb50
--- /dev/null
+++ b/dev-java/javatoolkit/javatoolkit-0.3.0-r7.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javatoolkit/javatoolkit-0.3.0-r7.ebuild,v 1.1 2012/07/31 14:46:27 sera Exp $
+
+EAPI="4"
+
+PYTHON_COMPAT="jython2_5 python2_5 python2_6 python2_7"
+
+inherit eutils multilib python-distutils-ng
+
+DESCRIPTION="Collection of Gentoo-specific tools for Java"
+HOMEPAGE="http://www.gentoo.org/proj/en/java/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+# PYTHON_USE_WITH="xml(+)" not yet available. #426768
+COMMON_DEP="
+	python_targets_jython2_5? ( >=dev-java/jython-2.5.2-r1:2.5 )
+	python_targets_python2_5? ( dev-lang/python:2.5[xml] )
+	python_targets_python2_6? ( dev-lang/python:2.6[xml] )
+	python_targets_python2_7? ( dev-lang/python:2.7[xml] )"
+RDEPEND="${COMMON_DEP}"
+DEPEND="${COMMON_DEP}"
+
+python_prepare_all() {
+	epatch "${FILESDIR}/${P}-python2.6.patch"
+	epatch "${FILESDIR}/${P}-no-pyxml.patch"
+
+	# can't pass --install-scripts to setup.py in python-distutils-ng-src_install
+	cat > setup.cfg <<- EOF
+		[install]
+		install-scripts = "${EPREFIX}"/usr/$(get_libdir)/${PN}/bin
+	EOF
+}