diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2011-02-13 10:34:51 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2011-02-13 10:34:51 +0000 |
| commit | 5590690f44f97e7d5a2f79734e3f737d01593892 (patch) | |
| tree | bbfa3ecfea1e159cdfbe395f9448e71281f16d7e /dev-java/javatoolkit | |
| parent | Fix building with x11-libs/libnotify wrt #354131 (imported Fedora patch) by D... (diff) | |
| download | gentoo-2-5590690f44f97e7d5a2f79734e3f737d01593892.tar.gz gentoo-2-5590690f44f97e7d5a2f79734e3f737d01593892.tar.bz2 gentoo-2-5590690f44f97e7d5a2f79734e3f737d01593892.zip | |
Patch to remove usage of pyxml, bug #354421, thanks to Rafał Mużyło <galtgendo@o2.pl>.
(Portage version: 2.2.0_alpha23/cvs/Linux x86_64)
Diffstat (limited to 'dev-java/javatoolkit')
| -rw-r--r-- | dev-java/javatoolkit/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-java/javatoolkit/files/javatoolkit-0.3.0-no-pyxml.patch | 29 | ||||
| -rw-r--r-- | dev-java/javatoolkit/javatoolkit-0.3.0-r6.ebuild (renamed from dev-java/javatoolkit/javatoolkit-0.3.0-r5.ebuild) | 3 |
3 files changed, 40 insertions, 2 deletions
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 <caster@gentoo.org> + -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 + <galtgendo@o2.pl>. *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-r6.ebuild index be677d41ed94..27c1305fc5e5 100644 --- a/dev-java/javatoolkit/javatoolkit-0.3.0-r5.ebuild +++ b/dev-java/javatoolkit/javatoolkit-0.3.0-r6.ebuild @@ -1,6 +1,6 @@ # 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 $ +# $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" @@ -28,6 +28,7 @@ PYTHON_MODNAME="javatoolkit" src_prepare(){ distutils_src_prepare epatch "${FILESDIR}/${P}-python2.6.patch" + epatch "${FILESDIR}/${P}-no-pyxml.patch" } src_install() { |