Use xml.use_pyxml() (bug #367745).

Package-Manager: portage-2.2.0_alpha33_p36/cvs/Linux x86_64

4 files changed, 131 insertions, 3 deletions

diff --git a/dev-python/4suite/4suite-1.0.2-r2.ebuild b/dev-python/4suite/4suite-1.0.2-r2.ebuild
new file mode 100644
index 000000000000..51f3c09060cc
--- /dev/null
+++ b/dev-python/4suite/4suite-1.0.2-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/4suite/4suite-1.0.2-r2.ebuild,v 1.1 2011/05/17 18:28:17 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+
+inherit distutils eutils
+
+MY_P="4Suite-XML-${PV}"
+
+DESCRIPTION="Python tools for XML processing and object-databases."
+HOMEPAGE="http://www.4suite.org/ http://pypi.python.org/pypi/4Suite"
+SRC_URI="mirror://sourceforge/foursuite/${MY_P}.tar.bz2"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+IUSE="doc"
+
+DEPEND=">=dev-python/pyxml-0.8.4"
+RDEPEND="${DEPEND}"
+
+PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+
+DOCS="docs/*.txt"
+PYTHON_MODNAME="Ft"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-amd64_python2.5.patch"
+	epatch "${FILESDIR}/${P}-config.patch"
+	epatch "${FILESDIR}/${P}-version_parsing.patch"
+	epatch "${FILESDIR}/${P}-pyxml.patch"
+
+	if ! use doc; then
+		sed -e "/'build_docs'/d" -i Ft/Lib/DistExt/Build.py || die "sed failed"
+	fi
+	distutils_src_prepare
+}
+
+src_configure() {
+	configuration() {
+		"$(PYTHON)" setup.py config \
+			--prefix=/usr \
+			--docdir=/usr/share/doc/${PF} \
+			--datadir=/usr/share/${PN} \
+			--libdir="$(python_get_sitedir)" || die "setup.py config failed with Python ${PYTHON_ABI}"
+	}
+	python_execute_function configuration
+}
+
+src_install() {
+	distutils_src_install $(use_with doc docs)
+
+	delete_profiles_and_tests() {
+		rm -fr "${ED}$(python_get_sitedir)/"{profiles,tests}
+	}
+	python_execute_function -q delete_profiles_and_tests
+}
diff --git a/dev-python/4suite/ChangeLog b/dev-python/4suite/ChangeLog
index f5b80b2fd7ca..c611de53dbc6 100644
--- a/dev-python/4suite/ChangeLog
+++ b/dev-python/4suite/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/4suite
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/4suite/ChangeLog,v 1.45 2010/09/20 19:32:43 arfrever Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/4suite/ChangeLog,v 1.46 2011/05/17 18:28:17 arfrever Exp $
+
+*4suite-1.0.2-r2 (17 May 2011)
+
+  17 May 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +4suite-1.0.2-r2.ebuild, +files/4suite-1.0.2-pyxml.patch:
+  Use xml.use_pyxml() (bug #367745).
 
   20 Sep 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   4suite-1.0.2-r1.ebuild, +files/4suite-1.0.2-version_parsing.patch:
diff --git a/dev-python/4suite/Manifest b/dev-python/4suite/Manifest
index 293a2d2c9ea0..3cd65d066d4a 100644
--- a/dev-python/4suite/Manifest
+++ b/dev-python/4suite/Manifest
@@ -1,7 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 4suite-1.0.2-amd64_python2.5.patch 659 RMD160 0edb4506c5152b6c13c24885bc9a5f0a8e0c68bb SHA1 3d1bf97de8986f405fa4059c9439b239929c9815 SHA256 a6b5120f36cd3d533e29f3460a9809f2d9cdf97b8b03bdad99c53ee936e9eb64
 AUX 4suite-1.0.2-config.patch 653 RMD160 e90ab21bbcdd208250a69e1fc36f04d2c58f5c30 SHA1 390a883802c16e431890b767ec16b1351308d8c7 SHA256 8969a49f94f961f0692f33d49d432c03ac8351fa46cd7bb8c98adb252069c349
+AUX 4suite-1.0.2-pyxml.patch 924 RMD160 c44fc03ace019d8653e21399bf2b20c503d4f46b SHA1 7fdd9b4a63d6532120c607546955488b81756491 SHA256 f8aeb10325c7054d64475c7223cbce85d461a58ec623e03647608f9803c1b999
 AUX 4suite-1.0.2-version_parsing.patch 1652 RMD160 00ab511e0a0d3a914ebc838537bafa9e4c3c1b74 SHA1 7753e9f72ef6dd52ec07ee62c6e791870c2137ce SHA256 46d009b68018bcc6c1b1fb6cf8b1e0c0388181840d4a5f97daec1ed0e3992a65
 DIST 4Suite-XML-1.0.2.tar.bz2 1286713 RMD160 710de215ac110745a36ab4fec7d718cbcab45bd6 SHA1 d8799b093c4853860c8d7cb9ffccd28adf17b928 SHA256 5a4546dc1fad9b240a46c1b967fae317857cd2d2689e4226de1647083bf6ac3c
 EBUILD 4suite-1.0.2-r1.ebuild 1582 RMD160 39c723a2ce9ee4854969ec69b94eddfdc70125ac SHA1 299595cd2af2552f549f389e5979d1f11898552c SHA256 98e0776bbce3d6e16176fb1ed237c14d1b37439bd5cf3a949ac34537c77b90ba
-MISC ChangeLog 6975 RMD160 d914f6bad86968c86da2fd43cb003e74322b37ec SHA1 f250f572745b162b79ee3612c377db31571004c3 SHA256 3341c01777cd7c7cea433e81412ec8fe4b88f2785961bab43ade5ff3381f85b1
+EBUILD 4suite-1.0.2-r2.ebuild 1629 RMD160 ba0d05e465cde9d5153a823ebd13da522506fbaa SHA1 143297bd036ca6c4773ffc1901e54f4c3f86fbd6 SHA256 7ca888ed3586ade1329ffaf09992ecbcebb8557bbe555250a4d26d09385ae852
+MISC ChangeLog 7178 RMD160 891518ffeaf6398c1ae32151e60448cc629c7700 SHA1 7dff05d4859c07d6c52302048c5b4a4a63a28f8c SHA256 0d93d8fa8f6311279dc564b20313fb4356719b7550619b2b4b360ffaf9fdcbe5
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJN0r5ZAAoJEE70JXb4HvNViKQP/02uKzwBO9NEvBuhbYc4dp2a
+2dhGFk7xtwrRelXKiTomxh89kq6PDntDT5x49zc1152Q3y5Hle4uN/cHFr82TjGn
+turJnhuBuuOuhDHNY36p/OnvNtI4I3DydJPptluchIMOXKhkmA/C6PG+Qj+Kk9se
+xPWUbu/6422ZdjTcT/LdPo2bRw/gkjUC59w68WlYTpmVAZUDlLNsUO2gShJGplcJ
+7hGKPqCy5A8mqnhrNDwHcT12IdnVDKVPLTw36Z6JMPH1aa5W1+wWyzaGlTRtDmmz
+Jj8yl8uEUlujrw3zSMWeX9Fx/4L1xno1kcuQh1WCDvlZ8D3mkQjSgSfkjEUl4o9R
+wqrQcerCwSwyIHM7PGROPioeBY0O1HUHADWou+1xkEV1RgpCWaJ+crLotgRxwCzx
+Tr3XUfw8/glgqtPgbVhmRjIu4luhXgyql9BzL6+wRiHDUxL211h/srTECyRh2Yj0
+xPdol8J0T+wlGO2lNOLx6rg1jvpuaz5mUNtsBkfcx6IDepCdnqRbc0sF/xzBeVNX
+bwH3KZ1dnifai2L8E8+KFS/GXQCbKSMwDpqYuYhZnqBD6qF7olH3Kb+jEBmW/xb9
+CqPPv3x7cYLur30oOqvt1VObKsRdquDpGdy1xc4V7GgFf70hhVPUJUo0h+KM+NUW
+WYUONCLMqDGNA6wZ+r3W
+=2koE
+-----END PGP SIGNATURE-----
diff --git a/dev-python/4suite/files/4suite-1.0.2-pyxml.patch b/dev-python/4suite/files/4suite-1.0.2-pyxml.patch
new file mode 100644
index 000000000000..bedf5d3a0fe0
--- /dev/null
+++ b/dev-python/4suite/files/4suite-1.0.2-pyxml.patch
@@ -0,0 +1,37 @@
+--- Ft/Lib/DistExt/BuildDocs.py
++++ Ft/Lib/DistExt/BuildDocs.py
+@@ -18,6 +18,10 @@
+ from distutils.core import Command, DEBUG
+ from distutils.errors import *
+ 
++import xml
++if hasattr(xml, "use_pyxml"):
++    xml.use_pyxml()
++
+ from Ft import GetConfigVar
+ from Ft.Lib import Uri, ImportUtil
+ from Ft.Lib.DistExt import Structures
+--- Ft/Lib/DistExt/Util.py
++++ Ft/Lib/DistExt/Util.py
+@@ -4,6 +4,9 @@
+ import sys
+ from distutils import sysconfig, util
+ from distutils.errors import DistutilsPlatformError
++import xml
++if hasattr(xml, "use_pyxml"):
++    xml.use_pyxml()
+ from xml.dom import pulldom
+ from xml.sax import make_parser
+ 
+--- Ft/Xml/__init__.py
++++ Ft/Xml/__init__.py
+@@ -170,6 +170,9 @@
+     import Ft.Xml.XUpdate
+     return XUpdate.ApplyXupdate(*args, **kw_args)
+ 
++import xml
++if hasattr(xml, "use_pyxml"):
++    xml.use_pyxml()
+ 
+ from distutils import version
+ pyxml_required = version.StrictVersion('0.8.0')