From 5590690f44f97e7d5a2f79734e3f737d01593892 Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Sun, 13 Feb 2011 10:34:51 +0000 Subject: Patch to remove usage of pyxml, bug #354421, thanks to Rafał Mużyło . MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (Portage version: 2.2.0_alpha23/cvs/Linux x86_64) --- dev-java/javatoolkit/ChangeLog | 10 +++++- .../files/javatoolkit-0.3.0-no-pyxml.patch | 29 +++++++++++++++++ dev-java/javatoolkit/javatoolkit-0.3.0-r5.ebuild | 35 --------------------- dev-java/javatoolkit/javatoolkit-0.3.0-r6.ebuild | 36 ++++++++++++++++++++++ 4 files changed, 74 insertions(+), 36 deletions(-) create mode 100644 dev-java/javatoolkit/files/javatoolkit-0.3.0-no-pyxml.patch delete mode 100644 dev-java/javatoolkit/javatoolkit-0.3.0-r5.ebuild create mode 100644 dev-java/javatoolkit/javatoolkit-0.3.0-r6.ebuild (limited to 'dev-java/javatoolkit') diff --git a/dev-java/javatoolkit/ChangeLog b/dev-java/javatoolkit/ChangeLog index 64c0df11b1e6..6eb2d6968688 100644 --- a/dev-java/javatoolkit/ChangeLog +++ b/dev-java/javatoolkit/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-java/javatoolkit # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/javatoolkit/ChangeLog,v 1.58 2011/02/08 17:00:02 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/javatoolkit/ChangeLog,v 1.59 2011/02/13 10:34:51 caster Exp $ + +*javatoolkit-0.3.0-r6 (13 Feb 2011) + + 13 Feb 2011; Vlastimil Babka + -javatoolkit-0.3.0-r5.ebuild, +javatoolkit-0.3.0-r6.ebuild, + +files/javatoolkit-0.3.0-no-pyxml.patch: + Patch to remove usage of pyxml, bug #354421, thanks to Rafał Mużyło + . *javatoolkit-0.3.0-r5 (08 Feb 2011) diff --git a/dev-java/javatoolkit/files/javatoolkit-0.3.0-no-pyxml.patch b/dev-java/javatoolkit/files/javatoolkit-0.3.0-no-pyxml.patch new file mode 100644 index 000000000000..3218d1702033 --- /dev/null +++ b/dev-java/javatoolkit/files/javatoolkit-0.3.0-no-pyxml.patch @@ -0,0 +1,29 @@ +Index: src/py/javatoolkit/xml/DomRewriter.py +=================================================================== +--- src/py/javatoolkit/xml/DomRewriter.py (revision 8310) ++++ src/py/javatoolkit/xml/DomRewriter.py (working copy) +@@ -78,7 +78,6 @@ + + + def write(self,stream): +- from xml.dom.ext import PrettyPrint +- PrettyPrint(self.document,stream) ++ stream.write(self.document.toxml("utf-8")) + + # vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4 nowrap: +Index: src/py/javatoolkit/maven/MavenPom.py +=================================================================== +--- src/py/javatoolkit/maven/MavenPom.py (revision 8310) ++++ src/py/javatoolkit/maven/MavenPom.py (working copy) +@@ -185,10 +185,7 @@ + for build_node in build_nodes: + build_node.appendChild(plugins_node.cloneNode(deep=True)) + +- from xml.dom.ext import PrettyPrint +- self.write = self.__write +- PrettyPrint(xmldoc,self) +- self.write = None ++ self.__write(xmldoc.toxml("utf-8")) + + + def create_element(self,xmldoc,element_name,text_value=None): diff --git a/dev-java/javatoolkit/javatoolkit-0.3.0-r5.ebuild b/dev-java/javatoolkit/javatoolkit-0.3.0-r5.ebuild deleted file mode 100644 index be677d41ed94..000000000000 --- a/dev-java/javatoolkit/javatoolkit-0.3.0-r5.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2011 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-r5.ebuild,v 1.1 2011/02/08 17:00:02 arfrever Exp $ - -EAPI="2" -PYTHON_DEPEND="2:2.5" -PYTHON_USE_WITH="xml" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="2.4 3.*" - -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" -IUSE="" - -DEPEND="" -RDEPEND="" - -PYTHON_VERSIONED_SCRIPTS=("/usr/lib(32|64)?/${PN}/bin/.*") -PYTHON_MODNAME="javatoolkit" - -src_prepare(){ - distutils_src_prepare - epatch "${FILESDIR}/${P}-python2.6.patch" -} - -src_install() { - distutils_src_install --install-scripts="/usr/$(get_libdir)/${PN}/bin" -} diff --git a/dev-java/javatoolkit/javatoolkit-0.3.0-r6.ebuild b/dev-java/javatoolkit/javatoolkit-0.3.0-r6.ebuild new file mode 100644 index 000000000000..27c1305fc5e5 --- /dev/null +++ b/dev-java/javatoolkit/javatoolkit-0.3.0-r6.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2011 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-r6.ebuild,v 1.1 2011/02/13 10:34:51 caster Exp $ + +EAPI="2" +PYTHON_DEPEND="2:2.5" +PYTHON_USE_WITH="xml" +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="2.4 3.*" + +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" +IUSE="" + +DEPEND="" +RDEPEND="" + +PYTHON_VERSIONED_SCRIPTS=("/usr/lib(32|64)?/${PN}/bin/.*") +PYTHON_MODNAME="javatoolkit" + +src_prepare(){ + distutils_src_prepare + epatch "${FILESDIR}/${P}-python2.6.patch" + epatch "${FILESDIR}/${P}-no-pyxml.patch" +} + +src_install() { + distutils_src_install --install-scripts="/usr/$(get_libdir)/${PN}/bin" +} -- cgit v1.2.3-65-gdbad