Added patch to fix python-2.6 warnings. Bug #239479.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.27-gentoo-r7 i686

4 files changed, 63 insertions, 6 deletions

diff --git a/dev-java/javatoolkit/ChangeLog b/dev-java/javatoolkit/ChangeLog
index e7e610f5daf2..44fa3846959b 100644
--- a/dev-java/javatoolkit/ChangeLog
+++ b/dev-java/javatoolkit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/javatoolkit
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javatoolkit/ChangeLog,v 1.43 2009/03/04 20:40:54 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javatoolkit/ChangeLog,v 1.44 2009/03/07 17:21:12 neurogeek Exp $
+
+*javatoolkit-0.3.0-r3 (07 Mar 2009)
+
+  07 Mar 2009; Jesus Rivero <neurogeek@gentoo.org>
+  +files/javatoolkit-0.3.0-python2.6.patch, +javatoolkit-0.3.0-r3.ebuild:
+  Added patch to fix python-2.6 warnings. Bug #239479.
 
   04 Mar 2009; Petteri Räty <betelgeuse@gentoo.org>
   javatoolkit-0.3.0-r2.ebuild:
diff --git a/dev-java/javatoolkit/Manifest b/dev-java/javatoolkit/Manifest
index 120eb6e40585..692336229bfa 100644
--- a/dev-java/javatoolkit/Manifest
+++ b/dev-java/javatoolkit/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+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 829 RMD160 b32adadf0a184a687b656894305d6a7da061d296 SHA1 f0c2a2cab5786da9914814bd96fca4e766c663fa SHA256 833e30a13adb05344b697486a754d2972cb977421d3b9934a2520b087670d602
-MISC ChangeLog 6168 RMD160 c5c8a5c7ffca19ad48b46df04f175301e8327e4f SHA1 be86872853abfa169d86444e4ffe817516d8c057 SHA256 02346d3d2abeeb34cbc95454be6b67d887777cdaa94b29ac6af2a2371f19db9c
+EBUILD javatoolkit-0.3.0-r3.ebuild 879 RMD160 5b64b0c7b97eaec5d208b65902a472db61c8396c SHA1 e7a09a6a5b0e7aa1b37f1722cc8212c5422539bf SHA256 44e88117ef8c8066f1d2bbdf33889ac627d4e1b976503d851f931f998b621e4a
+MISC ChangeLog 6385 RMD160 8476c415fc92aa8382c8be20fff459971b957363 SHA1 8c8e734ef5af0fa521c72bce8332833195ed559f SHA256 9237cd73f1cd51fd8557a6ee12a60bbf00f547f677ccf97acd2366f611d778ae
 MISC metadata.xml 159 RMD160 8da0afd0f687b8985b7f0432fec737950271e354 SHA1 1d089c3afbfafd09e371d7806cc0c72a5c76e5a1 SHA256 da2aaa3223c5418688dfbba6f899648c5bcb2e4610126519a1a862913c4f8fa6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkmu56QACgkQcxLzpIGCsLRrEACcDCnCwOcjZpcw2YcPAXqkWmZp
-kGsAn1x2gfN9Qw7gqPlCJ/aolccpXl7Z
-=huhd
+iEYEARECAAYFAkmyrTYACgkQdIssYB9vBoPuOQCfUaYeEOueevORkYhJxbyv0N1b
+ypMAn2EJ02OPBoqHVxxxQMBep29bWnn/
+=Ialm
 -----END PGP SIGNATURE-----
diff --git a/dev-java/javatoolkit/files/javatoolkit-0.3.0-python2.6.patch b/dev-java/javatoolkit/files/javatoolkit-0.3.0-python2.6.patch
new file mode 100644
index 000000000000..d73c94bb6683
--- /dev/null
+++ b/dev-java/javatoolkit/files/javatoolkit-0.3.0-python2.6.patch
@@ -0,0 +1,12 @@
+diff -uNr py.orig/maven-helper.py py/maven-helper.py
+--- src/py.orig/maven-helper.py	2009-03-07 10:36:10.000000000 -0430
++++ src/py/maven-helper.py	2009-03-07 10:35:25.000000000 -0430
+@@ -21,7 +21,7 @@
+ import sys
+ import StringIO
+ from optparse import OptionParser, make_option
+-from javatoolkit.maven import MavenPom
++from javatoolkit.maven.MavenPom import MavenPom
+ 
+ __version__ = "$Revision: 1.1 $"[11:-2]
+ 
diff --git a/dev-java/javatoolkit/javatoolkit-0.3.0-r3.ebuild b/dev-java/javatoolkit/javatoolkit-0.3.0-r3.ebuild
new file mode 100644
index 000000000000..24df854eb770
--- /dev/null
+++ b/dev-java/javatoolkit/javatoolkit-0.3.0-r3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2009 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-r3.ebuild,v 1.1 2009/03/07 17:21:12 neurogeek Exp $
+
+EAPI="2"
+
+inherit distutils
+
+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"
+IUSE=""
+
+RDEPEND="dev-python/pyxml
+		|| ( >=dev-lang/python-2.5[xml] dev-python/celementtree )"
+
+PYTHON_MODNAME="javatoolkit"
+
+src_prepare(){
+	epatch "${FILESDIR}/${P}-python2.6.patch"
+}
+
+src_install() {
+	distutils_src_install --install-scripts="/usr/$(get_libdir)/${PN}/bin"
+}
+
+pkg_postrm() {
+	distutils_python_version
+	distutils_pkg_postrm
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+}