Python improvements including multiple ABI support thanks to arfever, bug #312149.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

2 files changed, 20 insertions, 14 deletions

diff --git a/dev-java/javatoolkit/ChangeLog b/dev-java/javatoolkit/ChangeLog
index d73964a8148f..1fc04b1777c9 100644
--- a/dev-java/javatoolkit/ChangeLog
+++ b/dev-java/javatoolkit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/javatoolkit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javatoolkit/ChangeLog,v 1.50 2010/04/04 18:34:21 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javatoolkit/ChangeLog,v 1.51 2010/04/15 18:39:36 caster Exp $
+
+*javatoolkit-0.3.0-r4 (15 Apr 2010)
+
+  15 Apr 2010; Vlastimil Babka <caster@gentoo.org>
+  -javatoolkit-0.3.0-r2.ebuild, +javatoolkit-0.3.0-r4.ebuild:
+  Python improvements including multiple ABI support thanks to arfever, bug
+  #312149.
 
   04 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   javatoolkit-0.3.0-r2.ebuild, javatoolkit-0.3.0-r3.ebuild:
diff --git a/dev-java/javatoolkit/javatoolkit-0.3.0-r2.ebuild b/dev-java/javatoolkit/javatoolkit-0.3.0-r4.ebuild
index 3b11922786a4..0f050ae7300b 100644
--- a/dev-java/javatoolkit/javatoolkit-0.3.0-r2.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.3.0-r4.ebuild
@@ -1,32 +1,31 @@
 # Copyright 1999-2010 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-r2.ebuild,v 1.9 2010/04/04 18:34:21 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javatoolkit/javatoolkit-0.3.0-r4.ebuild,v 1.1 2010/04/15 18:39:36 caster Exp $
 
 EAPI="2"
+PYTHON_DEPEND="2:2.5"
+PYTHON_USE_WITH="xml"
+SUPPORT_PYTHON_ABIS="1"
 
-inherit distutils eutils multilib
+inherit distutils eutils
 
 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 ~x86-fbsd"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND="dev-python/pyxml
-		|| ( >=dev-lang/python-2.5[xml] dev-python/celementtree )"
+RDEPEND="dev-python/pyxml"
+RESTRICT_PYTHON_ABIS="2.4 3.*"
 
 PYTHON_MODNAME="javatoolkit"
 
-src_install() {
-	distutils_src_install --install-scripts="/usr/$(get_libdir)/${PN}/bin"
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
+src_prepare(){
+	epatch "${FILESDIR}/${P}-python2.6.patch"
 }
 
-pkg_postinst() {
-	distutils_pkg_postinst
+src_install() {
+	distutils_src_install --install-scripts="/usr/$(get_libdir)/${PN}/bin"
 }