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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-java/javatoolkit/ChangeLog b/dev-java/javatoolkit/ChangeLog
index d73964a8148f6042301d1ca8c57c02cf2ffa5c05..1fc04b1777c9c879c95ba15b6a5256f344836889 100644 (file)
--- 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/Manifest b/dev-java/javatoolkit/Manifest
index abaeb6c1e38f413892a7c9904d7da8e23f9c8314..7cd581c39c7aa5762b0b824d276140bd6d863e9e 100644 (file)
--- a/dev-java/javatoolkit/Manifest
+++ b/dev-java/javatoolkit/Manifest
@@ -1,6 +1,6 @@
 AUX javatoolkit-0.3.0-python2.6.patch 413 RMD160 3f881cc51eb9d5358ea14ec6e70b952bb7c15639 SHA1 7f2961e0c6c0ca1fb855a951d05e41eba2e51b50 SHA256 4128e060d2c3693717c64e443527380f548d663496bb982fe45463e6370d920d
 DIST javatoolkit-0.3.0.tar.bz2 16823 RMD160 14638e42599a469b3fb878a45dac2de69f6c6280 SHA1 6be5b4583920e9122cd1f295174b4deca0b853a9 SHA256 47bf8aad2ec58b2d850e8cbe57fe2707859d800b215b24387c7652a50353677c
-EBUILD javatoolkit-0.3.0-r2.ebuild 801 RMD160 1ed97695586757ea6e1011ac69d1c3fa17c70008 SHA1 b4ddf72e0cb3815331d7113154085956f472768c SHA256 9c86ed22ebf114caed015290953c3766e4e90b5177babd5bc87485d089eee7db
 EBUILD javatoolkit-0.3.0-r3.ebuild 853 RMD160 66436a4b425b4cd2d11ecc2453678b42fb2c82a4 SHA1 9209c559ae16dac3a38145f012be7c7fdd04b174 SHA256 9b7cfc9ed168d5eec3c64bf3eecafbe629396f6b97b6c9f7d3f3f371827aa2b6
-MISC ChangeLog 7264 RMD160 d8fb8c66c23c87a9befd816dc1e4bc505f1239f0 SHA1 bed1c9297c2614f1778f84a7888500c13efccf7c SHA256 8dd3ca998c75dd089b40c498435bf04148b2bc02f0ab98205597e870272cecce
+EBUILD javatoolkit-0.3.0-r4.ebuild 812 RMD160 674e98b780e896a6ce2b45171c69c1d68d7a9091 SHA1 fbbacd47be4fc66b15fccae30a76ad78724c18fd SHA256 064b841a855009467b988488930b0bbd3e44285ecb10401516f411f4f08937b7
+MISC ChangeLog 7500 RMD160 dd2236b7d31acfc961931235d6ff791375aca82c SHA1 bad0eef040fd10abfadf45ba0a8592a70cc7ad04 SHA256 93a2ef6f5e345b126e85120647a0a0712005e323c5099350d23bdf834710ed59
 MISC metadata.xml 159 RMD160 8da0afd0f687b8985b7f0432fec737950271e354 SHA1 1d089c3afbfafd09e371d7806cc0c72a5c76e5a1 SHA256 da2aaa3223c5418688dfbba6f899648c5bcb2e4610126519a1a862913c4f8fa6

diff --git a/dev-java/javatoolkit/javatoolkit-0.3.0-r2.ebuild b/dev-java/javatoolkit/javatoolkit-0.3.0-r4.ebuild
similarity index 59%
rename from dev-java/javatoolkit/javatoolkit-0.3.0-r2.ebuild
rename to dev-java/javatoolkit/javatoolkit-0.3.0-r4.ebuild
index 3b11922786a42e107195cf338d27efa129108304..0f050ae7300bad8c72e60af08931a76a0b8031cd 100644 (file)
--- 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"
 }