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

(Portage version: 2.2.0_alpha33_p36/cvs/Linux x86_64)

3 files changed, 108 insertions, 2 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/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')