[patch] revised ebuild patch

mwlib.patch (text/plain), 3.11 KB, created by Ian Delaney (RETIRED) on 2012-05-19 01:12:26 UTC

diff -ur ../mwlib.orig/mwlib-0.13.7.ebuild ../mwlib/mwlib-0.13.7.ebuild
--- ../mwlib.orig/mwlib-0.13.7.ebuild	2012-05-19 09:00:49.128076534 +0800
+++ ../mwlib/mwlib-0.13.7.ebuild	2012-05-19 09:01:51.751074791 +0800
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mwlib/mwlib-0.13.6.ebuild,v 1.1 2012/04/19 09:54:31 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mwlib/mwlib-0.13.7.ebuild,v 1.1 2012/04/19 09:54:31 patrick Exp $
 
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
+EAPI="4"
+PYTHON_DEPEND="2:2.6"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.* 2.7-pypy-* *-jython"
+RESTRICT_PYTHON_ABIS="3.* *-pypy-* *-jython"
 
-inherit distutils
+inherit distutils eutils
 
 DESCRIPTION="Tools for parsing Mediawiki content to other formats"
 HOMEPAGE="http://code.pediapress.com/wiki/wiki http://pypi.python.org/pypi/mwlib"
@@ -16,23 +16,71 @@
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="doc"
 
-RDEPEND="dev-lang/perl
-	>=dev-python/flup-1.0
-	dev-python/imaging
-	>=dev-python/lockfile-0.8
-	dev-python/lxml
+RDEPEND="dev-python/lxml
 	=dev-python/odfpy-0.9*
 	>=dev-python/pyPdf-1.12
 	>=dev-python/pyparsing-1.4.11
 	>=dev-python/timelib-0.2
-	>=dev-python/twisted-9.0.0-r1
-	>=dev-python/twisted-web-9.0.0
-	>=dev-python/webob-0.9
 	virtual/latex-base
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 >=dev-python/simplejson-1.3 )"
+	|| ( dev-lang/python:2.7 dev-lang/python:2.6 >=dev-python/simplejson-2.5 )
+	dev-python/gevent
+	>=dev-python/bottle-0.10
+	dev-python/apipkg
+	>=dev-python/qserve-0.2.7
+	dev-python/roman
+	>=dev-python/py-1.4
+	dev-python/sqlite3dbm"
 DEPEND="${RDEPEND}
+	app-arch/unzip
+	doc? ( dev-python/sphinx )
 	dev-python/setuptools"
 
 PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+
+src_prepare() {
+	# mwlib.apipkg is actually used.
+	sed -e 's/, "apipkg"//' -i setup.py
+
+	distutils_src_prepare
+	# Disable test which requires installed mw-zip script.
+	rm -f tests/test_nuwiki.py
+	rm -f tests/test_redirect.py
+	rm -f tests/test_zipwiki.py
+	epatch "${FILESDIR}"/test.patch
+}
+
+src_compile() {
+	distutils_src_compile
+	use doc && emake -C  docs html
+}
+
+src_test() {
+	# Though DISTUTILS_SRC_TEST=py.test ought work, it errors out. Yet to know why.
+	# XNET=1 is what I was seeking from upstream. It disables xfails, having acquired it 
+	# it now appears to work with and without it.
+	XNET=1 py.test tests
+	# AFter re-emerging one or more of the deps, response has changed. 
+	# I leave this as a 'backup' and a record of what also worked by different means.		
+#	testing() {
+#	PYTHONPATH="$(find build-${PYTHON_ABI} -name mwlib)}/"
+#	local exit_status=0
+#	for test in tests/test_[b-z]*.py
+#	do
+#		PYTHONPATH="$(find build-${PYTHON_ABI} -name mwlib)}/" py.test -x $test || exit_status=1
+#	done
+#	return $exit_status
+#	}
+#	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+	if use doc; then
+		dohtml -r docs/_build/html/
+		docompress -x usr/share/doc/${P}/doctrees/
+		insinto usr/share/doc/${P}/
+		doins -r docs/_build/doctrees
+	fi
+}