Add patch from Debian to drop pyxml dependency (bug #367733).

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 957A8463)

3 files changed, 155 insertions, 6 deletions

diff --git a/app-dicts/opendict/ChangeLog b/app-dicts/opendict/ChangeLog
index 1e0f1cd68930..2cc2605758f0 100644
--- a/app-dicts/opendict/ChangeLog
+++ b/app-dicts/opendict/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-dicts/opendict
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/opendict/ChangeLog,v 1.27 2011/10/19 16:17:13 ssuominen Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/opendict/ChangeLog,v 1.28 2013/02/05 02:13:49 dirtyepic Exp $
+
+  05 Feb 2013; Ryan Hill <dirtyepic@gentoo.org> opendict-0.6.3.ebuild,
+  +files/opendict-0.6.3-pyxml.patch:
+  Add patch from Debian to drop pyxml dependency (bug #367733).
 
   19 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -opendict-0.6.1.ebuild,
   -files/opendict-0.6.1-desktop.patch:
diff --git a/app-dicts/opendict/files/opendict-0.6.3-pyxml.patch b/app-dicts/opendict/files/opendict-0.6.3-pyxml.patch
new file mode 100644
index 000000000000..902e4f822158
--- /dev/null
+++ b/app-dicts/opendict/files/opendict-0.6.3-pyxml.patch
@@ -0,0 +1,144 @@
+Use native python instead of external pyxml dependency.  Patch from Debian.
+
+https://bugs.gentoo.org/367733
+
+
+--- a/README.txt
++++ b/README.txt
+@@ -15,9 +15,8 @@ universal and easy to use for desktop users and developers.
+ Requirements
+ ~~~~~~~~~~~~
+ 
+-   - Python >= 2.3
+-   - wxPython 2.6
+-   - python-xml (PyXML)
++   - Python >= 2.4
++   - wxPython >= 2.6
+    - gettext >= 0.14
+ 
+ 
+--- a/lib/xmltools.py
++++ b/lib/xmltools.py
+@@ -20,7 +20,6 @@
+ #
+ 
+ import xml.dom.minidom
+-import xml.dom.ext
+ 
+ from lib import meta
+ 
+@@ -30,7 +29,7 @@ def _textData(element):
+ 
+     text = ''
+     for node in element.childNodes:
+-        text = node.data
++        text = node.data.strip()
+ 
+     return text
+ 
+@@ -99,7 +98,7 @@ class RegisterConfigGenerator:
+                                                    or ''))
+ 
+         return doc
+-    
++
+ 
+ def generatePlainDictConfig(**args):
+     """Generate configuration and return DOM object"""
+@@ -113,10 +112,11 @@ def generatePlainDictConfig(**args):
+ def writePlainDictConfig(doc, path):
+     """Write XML file"""
+ 
+-    fd = open(path, 'w')
+-    xml.dom.ext.PrettyPrint(doc, fd)
++    import codecs
++    fd = codecs.open(path, 'w', 'utf-8')
++    doc.writexml(fd, addindent = "  ", newl = "\n", encoding = "UTF-8")
+     fd.close()
+-    
++
+ 
+ 
+ class RegisterConfigParser:
+@@ -144,32 +144,32 @@ class RegisterConfigParser:
+         
+         for nameElement in registerElement.getElementsByTagName('name'):
+             for node in nameElement.childNodes:
+-                name = node.data
++                name = node.data.strip()
+ 
+         for formatElement in registerElement.getElementsByTagName('format'):
+             for node in formatElement.childNodes:
+-                format = node.data
++                format = node.data.strip()
+ 
+         for pathElement in registerElement.getElementsByTagName('path'):
+             for node in pathElement.childNodes:
+-                path = node.data
++                path = node.data.strip()
+ 
+         for versionElement in registerElement.getElementsByTagName('version'):
+             for node in versionElement.childNodes:
+                 version = node.data.strip()
+ 
+         for authorElement in registerElement.getElementsByTagName('author'):
+-            authors.append({'name': authorElement.getAttribute('name'),
+-                            'email': authorElement.getAttribute('email')})
++            authors.append({'name': authorElement.getAttribute('name').strip(),
++                            'email': authorElement.getAttribute('email').strip()})
+ 
+         for md5Element in registerElement.getElementsByTagName('md5'):
+             for node in md5Element.childNodes:
+-                md5 = node.data
++                md5 = node.data.strip()
+ 
+         for encodingElement in \
+                 registerElement.getElementsByTagName('encoding'):
+             for node in encodingElement.childNodes:
+-                encoding = node.data
++                encoding = node.data.strip()
+ 
+         for licenceElement in \
+                 registerElement.getElementsByTagName('licence'):
+@@ -241,8 +241,9 @@ def generateIndexFile(index):
+ def writeIndexFile(doc, path):
+     """Write XML file"""
+ 
+-    fd = open(path, 'wb')
+-    xml.dom.ext.PrettyPrint(doc, fd)
++    import codecs
++    fd = codecs.open(path, 'wb', 'utf-8')
++    doc.writexml(fd, addindent = "  ", newl = "\n", encoding = "UTF-8")
+     fd.close()
+ 
+ 
+@@ -511,7 +512,8 @@ def generateMainConfig(props):
+ def writeConfig(doc, path):
+     """Write XML file"""
+ 
+-    fd = open(path, 'w')
+-    xml.dom.ext.PrettyPrint(doc, fd)
++    import codecs
++    fd = codecs.open(path, 'w', 'utf-8')
++    doc.writexml(fd, addindent = "  ", newl = "\n", encoding = "UTF-8")
+     fd.close()
+ 
+--- a/opendict.py
++++ b/opendict.py
+@@ -53,16 +53,6 @@ except ImportError:
+     print >> sys.stderr, "**"
+     sys.exit(1)
+ 
+-
+-try:
+-    import xml.dom.ext
+-except ImportError:
+-    print >> sys.stderr, "**"
+-    print >> sys.stderr, "** Error: Python/XML library not found"
+-    print >> sys.stderr, "** Please install python-xml (PyXML) to run OpenDict"
+-    print >> sys.stderr, "**"
+-    sys.exit(1)
+-
+ # get_main_dir() returns the directory name of the script or the
+ # directory name of the exe
+ def get_main_dir():
diff --git a/app-dicts/opendict/opendict-0.6.3.ebuild b/app-dicts/opendict/opendict-0.6.3.ebuild
index 7ef4ee9499e0..9329cc5d4ea1 100644
--- a/app-dicts/opendict/opendict-0.6.3.ebuild
+++ b/app-dicts/opendict/opendict-0.6.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/opendict/opendict-0.6.3.ebuild,v 1.8 2011/10/19 16:15:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/opendict/opendict-0.6.3.ebuild,v 1.9 2013/02/05 02:13:49 dirtyepic Exp $
 
 EAPI=3
 PYTHON_DEPEND=2
@@ -15,8 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-RDEPEND="dev-python/wxpython:2.8
-	dev-python/pyxml"
+RDEPEND="dev-python/wxpython:2.8"
 
 pkg_setup() {
 	python_set_active_version 2
@@ -24,6 +23,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-pyxml.patch
+
 	sed -e "s:), '..')):), '../../../../..', 'share', 'opendict')):g" \
 		-i "${S}/lib/info.py"
 }