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

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x957A8463

4 files changed, 172 insertions, 8 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/Manifest b/app-dicts/opendict/Manifest
index a2daf73ee7a1..cb40589145a1 100644
--- a/app-dicts/opendict/Manifest
+++ b/app-dicts/opendict/Manifest
@@ -1,4 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX opendict-0.6.3-pyxml.patch 4271 SHA256 57133ff36d363efbd999f19e66fd9ce85e00553132bad18f9b3d5a5a5fea5116 SHA512 f214ae06130f768811c74b5eadd51d6caa7b182d44d9423bf694b7a04e06a45fc1ffa3cb8f9551312cb75195184a8291a3dd55e12404e5a691814b97484c13e1 WHIRLPOOL b070e809110de43a0867dfbb4f0dbb113ec1338bef98f95dfb4bac630d137a76395ba98127b4800359702cae3c958cd0d11b9a1183d61674da3906a6407f0548
 DIST opendict-0.6.3.tar.gz 132515 SHA256 dad7723512768aeae65fead0f06a3c973b161a86658b94a66c4945beb12f45dc SHA512 687afba45f9fd271acee9f72fd3971fbc624588fe0f4194ad4499e2e64259a59c516854a7b0b1c02b3e214bf6e77e52b5b0713430e3cd5e0127c5b3c8fc02f5c WHIRLPOOL 06a48141bb1da7557d616deda3c4c18500171d4c158cb5f5cc83ca9f1f8037584ade85a742c88a4b6ab667bd6586492fed075e6a4e69fa51c8e37ece75880a62
-EBUILD opendict-0.6.3.ebuild 2158 SHA256 a5d31935163125029c9e6096250c19892e456e439bc7bbc374c99567a943e7d5 SHA512 13c23d3a0a7fb31f000e0145cbffe4327fe406b518e29048ef11bc8870b48c949da0a9a0f9e578ad5b2be3a2a0e19ffd6af85923ce383e02a23c69a461aba74f WHIRLPOOL e3e91ec89736d1f49df95070f2e2b4e2d0ac192a589bf7c53b4e5a543e1a859d7226f1ff81c78327adbaae5925d08206cba4bce463b0596c06b00ccd6ef4bfbd
-MISC ChangeLog 3595 SHA256 2d58c66d3457e13e800a8dada338d46db60ec198646044593303b88eac241ac2 SHA512 19ee2853b26a99fb9a425c22a7d3f9c4ac1c0bcaae57f1cdfa434da04f5bb03dea49b09858bd47f080c39ce5422bf01d064704e680e4c95cce05be9d57f02b26 WHIRLPOOL 384c1470c9114d90474c42afb9410bd4c5efb6337f635dbcc65cc5f2cae563fc780756feda37235029adea0b9565f6e691df79c5a037a6dc3e4ca0e19d08e08a
+EBUILD opendict-0.6.3.ebuild 2180 SHA256 742d9e443129ea318f12afc4277db83e1770a10a43c10af8b61316ecf85a44ed SHA512 ed211647257776b87b71e92942f002450eb69d8b26c31abd21bef2dd645ff36ccf252b06e3aca460ba77125018b092677d4674bb87cef4c3da3b5f7595a5b761 WHIRLPOOL 3f4ec35a71a1e8fc98d51bc395b8bb0330884746b68d9364664c40c554d69f498148b7f8d5c9c70800d0e9ab0566f3c0157de3d0dc9cfea1b1a07964d836941a
+MISC ChangeLog 3768 SHA256 dbba87b97797382b66f1adb22276ec3e1002872407c827cf2bc24d267c285ca9 SHA512 194c3a8a4790fe3d9535025c6364938a7f3fa6dd36196b71849b40e5f14d141d85ac652f70d40fc2e1d89674c422d554f40e02bc46fa9fe0b42aa0f547a49c65 WHIRLPOOL b361b643e55be9ddfb83c2dce7422d6b99c7f8dc6f48d592415f2665851218d5fda47f69c885d6ad168bc8ce33d0bd1236d10411d6a637d5dd21db7006a738cc
 MISC metadata.xml 162 SHA256 fab42f6a31209847529447a2bea2b9dd746521fe5d59d967470736120712f093 SHA512 54458e1e306dfb7f1018129fa314d3e5d17219807a0a210d78ccf98034eba020115e2aeca7ea4922074e52dcb748fe06fa616bd083f30ed905f4c2f323afedf0 WHIRLPOOL 70cdb6ff3e6e6a6c01049ca93d1ddd2e9976516c3de0e8dbc1ae76a133e01a715658fdb7dabeefa1c1d9f7388b059710d5174375b32d23d44424abc7f8dd277f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJREG1jAAoJEO04vUmVeoRji1sH/0s+zfl3XPZgnR0iPSTDAGFC
+5/VVomTcTO1sOHcu1JhrtQJ5ww3G8i+YbtvgsyI383OrfBolmLPtHfBx7LBapG9S
+77PUY++jnLkOpIVKhcW7MgTcl+6Ufe9OKoOLumtU04cYKhs+rc58Ypp2IfUrCSnq
++U5syeTwSJmK9S33z1uMOlGnZPFSipJ39bhlPnr0Uzixh7Bm8MPras//TTU+SIJ0
+NyAOnF5dohKMMioQGMLZqkO9Vq9c0FrbOKAGhdMCydLQeGNADQOh1FT64xi+4AQ4
+bq8ZEORTU4sL+5TZmyJKWjVF1yfJJ26XWOyXddNnV1eL3ieohAzV5sRYi4jEM2s=
+=mLUt
+-----END PGP SIGNATURE-----
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"
 }