Version bump (bug #481470). Drop old versions.

(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 0x1E0CA85F!)

12 files changed, 32 insertions, 728 deletions

diff --git a/dev-python/mwlib/ChangeLog b/dev-python/mwlib/ChangeLog
index 3266c9a1f757..ae96e2a9d1d8 100644
--- a/dev-python/mwlib/ChangeLog
+++ b/dev-python/mwlib/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-python/mwlib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mwlib/ChangeLog,v 1.29 2013/09/12 22:29:21 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mwlib/ChangeLog,v 1.30 2013/11/27 17:21:30 dev-zero Exp $
+
+*mwlib-0.15.12 (27 Nov 2013)
+
+  27 Nov 2013; Tiziano Müller <dev-zero@gentoo.org> +mwlib-0.15.12.ebuild,
+  -files/0.15.8-fix-tests.patch,
+  -files/0.15.8-nslave-add-address-parameter.patch, -mwlib-0.14.0.ebuild,
+  -mwlib-0.14.1.ebuild, -mwlib-0.14.3.ebuild, -mwlib-0.15.3.ebuild,
+  -mwlib-0.15.6.ebuild, -mwlib-0.15.7.ebuild, -mwlib-0.15.8-r1.ebuild,
+  -mwlib-0.15.8-r3.ebuild, -mwlib-0.15.8.ebuild:
+  Version bump (bug #481470). Drop old versions.
 
   12 Sep 2013; Michał Górny <mgorny@gentoo.org> mwlib-0.14.0.ebuild,
   mwlib-0.14.1.ebuild, mwlib-0.14.3.ebuild, mwlib-0.15.3.ebuild,
diff --git a/dev-python/mwlib/files/0.15.8-fix-tests.patch b/dev-python/mwlib/files/0.15.8-fix-tests.patch
deleted file mode 100644
index 3c5d4e2aee82..000000000000
--- a/dev-python/mwlib/files/0.15.8-fix-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/sandbox/test_nserve.py b/sandbox/test_nserve.py
-index 5ea5908..9f769a1 100755
---- a/sandbox/test_nserve.py
-+++ b/sandbox/test_nserve.py
-@@ -1,7 +1,8 @@
- #! /usr/bin/env py.test
- # -*- coding: utf-8 -*-
- 
--import pytest, gevent, nserve, urllib, urllib2, bottle
-+import pytest, gevent, urllib, urllib2, bottle
-+from mwlib import nserve
- import wsgi_intercept.urllib2_intercept
- 
- try:
diff --git a/dev-python/mwlib/files/0.15.8-nslave-add-address-parameter.patch b/dev-python/mwlib/files/0.15.8-nslave-add-address-parameter.patch
deleted file mode 100644
index 1e878feeb4fb..000000000000
--- a/dev-python/mwlib/files/0.15.8-nslave-add-address-parameter.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/mwlib/nslave.py b/mwlib/nslave.py
-index d3f8fc0..cccfc7a 100755
---- a/mwlib/nslave.py
-+++ b/mwlib/nslave.py
-@@ -184,7 +184,7 @@ class commands(object):
-         return doit(**params)
- 
- 
--def start_serving_files(cachedir, port):
-+def start_serving_files(cachedir, address, port):
-     from gevent.pywsgi import WSGIServer
-     from bottle import route, static_file, default_app
-     cachedir = os.path.abspath(cachedir)
-@@ -195,7 +195,7 @@ def start_serving_files(cachedir, port):
-         if filename.endswith(".rl"):
-             response.headers["Content-Disposition"] = "inline; filename=collection.pdf"
-         return response
--    s = WSGIServer(("", port), default_app())
-+    s = WSGIServer((address, port), default_app())
-     s.start()
-     return s
- 
-@@ -212,10 +212,11 @@ def make_cachedir(cachedir):
- def main():
-     global cachedir, cacheurl
-     numgreenlets = 10
-+    http_address = 'localhost'
-     http_port = 8898
-     serve_files = True
-     from mwlib import argv
--    opts, args = argv.parse(sys.argv[1:], "--no-serve-files --serve-files-port= --serve-files --cachedir= --url= --numprocs=")
-+    opts, args = argv.parse(sys.argv[1:], "--no-serve-files --serve-files-port= --serve-files-address= --serve-files --cachedir= --url= --numprocs=")
-     for o, a in opts:
-         if o == "--cachedir":
-             cachedir = a
-@@ -227,12 +228,14 @@ def main():
-             serve_files = False
-         elif o == "--serve-files-port":
-             http_port = int(a)
-+        elif o == "--serve-files-address":
-+            http_address = str(a)
- 
-     if cachedir is None:
-         sys.exit("nslave: missing --cachedir argument")
- 
-     if serve_files:
--        wsgi_server = start_serving_files(cachedir, http_port)
-+        wsgi_server = start_serving_files(cachedir, http_address, http_port)
-         port = wsgi_server.socket.getsockname()[1]
-         if not cacheurl:
-             cacheurl = "http://%s:%s/cache" % (find_ip(), port)
diff --git a/dev-python/mwlib/mwlib-0.14.0.ebuild b/dev-python/mwlib/mwlib-0.14.0.ebuild
deleted file mode 100644
index 2b9cdba4e245..000000000000
--- a/dev-python/mwlib/mwlib-0.14.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mwlib/mwlib-0.14.0.ebuild,v 1.3 2013/09/12 22:29:21 mgorny Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-pypy-* *-jython"
-DISTUTILS_SRC_TEST=py.test
-
-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"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="dev-python/lxml
-	=dev-python/odfpy-0.9*
-	dev-python/pyPdf
-	dev-python/pyparsing
-	dev-python/timelib
-	virtual/latex-base
-	>=dev-python/simplejson-2.5
-	dev-python/gevent
-	dev-python/bottle
-	dev-python/apipkg
-	dev-python/qserve
-	dev-python/roman
-	dev-python/py
-	dev-python/sqlite3dbm"
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	app-arch/unzip
-	doc? ( dev-python/sphinx )"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-DOCS="changelog.rst"
-
-src_prepare() {
-	# mwlib.apipkg is actually used.
-	sed -e 's/, "apipkg"//' -i setup.py || die
-
-	# Execute odflint script.
-	sed \
-		-e "/def _get_odflint_module():/,/odflint =	_get_odflint_module()/d" \
-		-e "s/odflint.lint(path)/os.system('odflint %s' % path)/" \
-		-i tests/test_odfwriter.py || die
-
-	distutils_src_prepare
-
-	# Disable test which requires installed mw-zip script.
-	rm -f tests/test_{nuwiki,redirect,zipwiki}.py
-	# Disable render test that fails for no apparent reason
-	rm -f tests/test_render.py
-}
-
-src_compile() {
-	distutils_src_compile
-	if use doc; then
-		emake -C docs html
-	fi
-}
-
-src_test() {
-	distutils_src_test tests
-}
-
-src_install() {
-	distutils_src_install
-	if use doc; then
-		dohtml -r docs/_build/html/
-	fi
-}
diff --git a/dev-python/mwlib/mwlib-0.14.1.ebuild b/dev-python/mwlib/mwlib-0.14.1.ebuild
deleted file mode 100644
index ae41f6b004a1..000000000000
--- a/dev-python/mwlib/mwlib-0.14.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mwlib/mwlib-0.14.1.ebuild,v 1.3 2013/09/12 22:29:21 mgorny Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-pypy-* *-jython"
-DISTUTILS_SRC_TEST=py.test
-
-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"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="dev-python/lxml
-	=dev-python/odfpy-0.9*
-	dev-python/pyPdf
-	dev-python/pyparsing
-	dev-python/timelib
-	virtual/latex-base
-	>=dev-python/simplejson-2.5
-	dev-python/gevent
-	dev-python/bottle
-	dev-python/apipkg
-	dev-python/qserve
-	dev-python/roman
-	dev-python/py
-	dev-python/sqlite3dbm"
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	app-arch/unzip
-	doc? ( dev-python/sphinx )"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-DOCS="changelog.rst"
-
-src_prepare() {
-	# mwlib.apipkg is actually used.
-	sed -e 's/, "apipkg"//' -i setup.py || die
-
-	# Execute odflint script.
-	sed \
-		-e "/def _get_odflint_module():/,/odflint =	_get_odflint_module()/d" \
-		-e "s/odflint.lint(path)/os.system('odflint %s' % path)/" \
-		-i tests/test_odfwriter.py || die
-
-	distutils_src_prepare
-
-	# Disable test which requires installed mw-zip script.
-	rm -f tests/test_{nuwiki,redirect,zipwiki}.py
-	# Disable render test that fails for no apparent reason
-	rm -f tests/test_render.py
-}
-
-src_compile() {
-	distutils_src_compile
-	if use doc; then
-		emake -C docs html
-	fi
-}
-
-src_test() {
-	distutils_src_test tests
-}
-
-src_install() {
-	distutils_src_install
-	if use doc; then
-		dohtml -r docs/_build/html/
-	fi
-}
diff --git a/dev-python/mwlib/mwlib-0.14.3.ebuild b/dev-python/mwlib/mwlib-0.14.3.ebuild
deleted file mode 100644
index 0fd491b8b32c..000000000000
--- a/dev-python/mwlib/mwlib-0.14.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mwlib/mwlib-0.14.3.ebuild,v 1.2 2013/09/12 22:29:21 mgorny Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-pypy-* *-jython"
-DISTUTILS_SRC_TEST=py.test
-
-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"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="dev-python/lxml
-	=dev-python/odfpy-0.9*
-	dev-python/pyPdf
-	dev-python/pyparsing
-	dev-python/timelib
-	virtual/latex-base
-	>=dev-python/simplejson-2.5
-	dev-python/gevent
-	dev-python/bottle
-	dev-python/apipkg
-	dev-python/qserve
-	dev-python/roman
-	dev-python/py
-	dev-python/sqlite3dbm"
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	app-arch/unzip
-	doc? ( dev-python/sphinx )"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-DOCS="changelog.rst"
-
-src_prepare() {
-	# mwlib.apipkg is actually used.
-	sed -e 's/, "apipkg"//' -i setup.py || die
-
-	# Execute odflint script.
-	sed \
-		-e "/def _get_odflint_module():/,/odflint =	_get_odflint_module()/d" \
-		-e "s/odflint.lint(path)/os.system('odflint %s' % path)/" \
-		-i tests/test_odfwriter.py || die
-
-	distutils_src_prepare
-
-	# Disable test which requires installed mw-zip script.
-	rm -f tests/test_{nuwiki,redirect,zipwiki}.py
-	# Disable render test that fails for no apparent reason
-	rm -f tests/test_render.py
-}
-
-src_compile() {
-	distutils_src_compile
-	if use doc; then
-		emake -C docs html
-	fi
-}
-
-src_test() {
-	distutils_src_test tests
-}
-
-src_install() {
-	distutils_src_install
-	if use doc; then
-		dohtml -r docs/_build/html/
-	fi
-}
diff --git a/dev-python/mwlib/mwlib-0.15.8-r3.ebuild b/dev-python/mwlib/mwlib-0.15.12.ebuild
index ba376e2f6b80..e04ddcdf9b3d 100644
--- a/dev-python/mwlib/mwlib-0.15.8-r3.ebuild
+++ b/dev-python/mwlib/mwlib-0.15.12.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mwlib/mwlib-0.15.8-r3.ebuild,v 1.2 2013/09/12 22:29:21 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mwlib/mwlib-0.15.12.ebuild,v 1.1 2013/11/27 17:21:30 dev-zero Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit distutils-r1 user eutils
+inherit distutils-r1 user
 
 DESCRIPTION="Tools for parsing Mediawiki content to other formats"
 HOMEPAGE="http://code.pediapress.com/wiki/wiki http://pypi.python.org/pypi/mwlib"
@@ -15,33 +15,34 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc server"
+IUSE="doc server test"
 
 RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]
-	=dev-python/odfpy-0.9*[${PYTHON_USEDEP}]
-	dev-python/pyPdf[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/timelib[${PYTHON_USEDEP}]
+	>=dev-python/odfpy-0.9[${PYTHON_USEDEP}]
+	<dev-python/odfpy-0.10[${PYTHON_USEDEP}]
+	>=dev-python/pyPdf-1.12[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
+	<dev-python/pyparsing-1.6[${PYTHON_USEDEP}]
+	>=dev-python/timelib-0.2[${PYTHON_USEDEP}]
 	virtual/latex-base
-	>=dev-python/simplejson-2.5[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.3[${PYTHON_USEDEP}]
 	dev-python/gevent[${PYTHON_USEDEP}]
-	>=dev-python/bottle-0.11.6[${PYTHON_USEDEP}]
-	dev-python/apipkg[${PYTHON_USEDEP}]
-	dev-python/qserve[${PYTHON_USEDEP}]
+	>=dev-python/bottle-0.10[${PYTHON_USEDEP}]
+	>=dev-python/apipkg-1.2[${PYTHON_USEDEP}]
+	>=dev-python/qserve-0.2.7[${PYTHON_USEDEP}]
 	dev-python/roman[${PYTHON_USEDEP}]
-	dev-python/py[${PYTHON_USEDEP}]
+	>=dev-python/py-1.4[${PYTHON_USEDEP}]
 	dev-python/sqlite3dbm[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
 	server? ( app-admin/sudo )"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	app-arch/unzip
-	doc? ( dev-python/sphinx )"
+	doc? ( dev-python/sphinx )
+	test? ( >=dev-python/wsgiintercept-0.6 )"
 
 # TODO: requires ploticus to generate timelines
 
-PATCHES=( "${FILESDIR}/${PV}-fix-tests.patch" "${FILESDIR}/${PV}-nslave-add-address-parameter.patch" )
-
 DOCS=(changelog.rst)
 
 pkg_setup() {
@@ -61,10 +62,9 @@ python_prepare_all() {
 		-e "s/odflint.lint(path)/os.system('odflint %s' % path)/" \
 		-i tests/test_odfwriter.py || die
 
-	# Disable test which requires installed mw-zip script.
-	rm -f tests/test_{nuwiki,redirect,zipwiki}.py
-	# Disable render test that fails for no apparent reason
-	rm -f tests/test_render.py
+	# Disable test which requires installed mw-zip or mw-render script
+	# which don't get generated in distutils_install_for_testing for some reason
+	rm -f tests/test_{nuwiki,redirect,render,zipwiki}.py || die
 
 	distutils-r1_python_prepare_all
 }
@@ -83,7 +83,8 @@ python_compile_all() {
 }
 
 python_test() {
-	py.test || die
+	distutils_install_for_testing
+	PATH="${TEST_DIR}/scripts:${PATH}" py.test || die
 }
 
 python_install_all() {
diff --git a/dev-python/mwlib/mwlib-0.15.3.ebuild b/dev-python/mwlib/mwlib-0.15.3.ebuild
deleted file mode 100644
index 84f63795a7ad..000000000000
--- a/dev-python/mwlib/mwlib-0.15.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mwlib/mwlib-0.15.3.ebuild,v 1.2 2013/09/12 22:29:21 mgorny Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-pypy-* *-jython"
-DISTUTILS_SRC_TEST=py.test
-
-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"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="dev-python/lxml
-	=dev-python/odfpy-0.9*
-	dev-python/pyPdf
-	dev-python/pyparsing
-	dev-python/timelib
-	virtual/latex-base
-	>=dev-python/simplejson-2.5
-	dev-python/gevent
-	dev-python/bottle
-	dev-python/apipkg
-	dev-python/qserve
-	dev-python/roman
-	dev-python/py
-	dev-python/sqlite3dbm"
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	app-arch/unzip
-	doc? ( dev-python/sphinx )"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-DOCS="changelog.rst"
-
-src_prepare() {
-	# mwlib.apipkg is actually used.
-	sed -e 's/, "apipkg"//' -i setup.py || die
-
-	# Execute odflint script.
-	sed \
-		-e "/def _get_odflint_module():/,/odflint =	_get_odflint_module()/d" \
-		-e "s/odflint.lint(path)/os.system('odflint %s' % path)/" \
-		-i tests/test_odfwriter.py || die
-
-	distutils_src_prepare
-
-	# Disable test which requires installed mw-zip script.
-	rm -f tests/test_{nuwiki,redirect,zipwiki}.py
-	# Disable render test that fails for no apparent reason
-	rm -f tests/test_render.py
-}
-
-src_compile() {
-	distutils_src_compile
-	if use doc; then
-		emake -C docs html
-	fi
-}
-
-src_test() {
-	distutils_src_test tests
-}
-
-src_install() {
-	distutils_src_install
-	if use doc; then
-		dohtml -r docs/_build/html/
-	fi
-}
diff --git a/dev-python/mwlib/mwlib-0.15.6.ebuild b/dev-python/mwlib/mwlib-0.15.6.ebuild
deleted file mode 100644
index 4ed8e74d448b..000000000000
--- a/dev-python/mwlib/mwlib-0.15.6.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mwlib/mwlib-0.15.6.ebuild,v 1.2 2013/09/12 22:29:21 mgorny Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-pypy-* *-jython"
-DISTUTILS_SRC_TEST=py.test
-
-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"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="dev-python/lxml
-	=dev-python/odfpy-0.9*
-	dev-python/pyPdf
-	dev-python/pyparsing
-	dev-python/timelib
-	virtual/latex-base
-	>=dev-python/simplejson-2.5
-	dev-python/gevent
-	dev-python/bottle
-	dev-python/apipkg
-	dev-python/qserve
-	dev-python/roman
-	dev-python/py
-	dev-python/sqlite3dbm"
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	app-arch/unzip
-	doc? ( dev-python/sphinx )"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-DOCS="changelog.rst"
-
-src_prepare() {
-	# mwlib.apipkg is actually used.
-	sed -e 's/, "apipkg"//' -i setup.py || die
-
-	# Execute odflint script.
-	sed \
-		-e "/def _get_odflint_module():/,/odflint =	_get_odflint_module()/d" \
-		-e "s/odflint.lint(path)/os.system('odflint %s' % path)/" \
-		-i tests/test_odfwriter.py || die
-
-	distutils_src_prepare
-
-	# Disable test which requires installed mw-zip script.
-	rm -f tests/test_{nuwiki,redirect,zipwiki}.py
-	# Disable render test that fails for no apparent reason
-	rm -f tests/test_render.py
-}
-
-src_compile() {
-	distutils_src_compile
-	if use doc; then
-		emake -C docs html
-	fi
-}
-
-src_test() {
-	distutils_src_test tests
-}
-
-src_install() {
-	distutils_src_install
-	if use doc; then
-		dohtml -r docs/_build/html/
-	fi
-}
diff --git a/dev-python/mwlib/mwlib-0.15.7.ebuild b/dev-python/mwlib/mwlib-0.15.7.ebuild
deleted file mode 100644
index 4e69fd9b502a..000000000000
--- a/dev-python/mwlib/mwlib-0.15.7.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mwlib/mwlib-0.15.7.ebuild,v 1.2 2013/09/12 22:29:21 mgorny Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-pypy-* *-jython"
-DISTUTILS_SRC_TEST=py.test
-
-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"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="dev-python/lxml
-	=dev-python/odfpy-0.9*
-	dev-python/pyPdf
-	dev-python/pyparsing
-	dev-python/timelib
-	virtual/latex-base
-	>=dev-python/simplejson-2.5
-	dev-python/gevent
-	dev-python/bottle
-	dev-python/apipkg
-	dev-python/qserve
-	dev-python/roman
-	dev-python/py
-	dev-python/sqlite3dbm"
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	app-arch/unzip
-	doc? ( dev-python/sphinx )"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-DOCS="changelog.rst"
-
-src_prepare() {
-	# mwlib.apipkg is actually used.
-	sed -e 's/, "apipkg"//' -i setup.py || die
-
-	# Execute odflint script.
-	sed \
-		-e "/def _get_odflint_module():/,/odflint =	_get_odflint_module()/d" \
-		-e "s/odflint.lint(path)/os.system('odflint %s' % path)/" \
-		-i tests/test_odfwriter.py || die
-
-	distutils_src_prepare
-
-	# Disable test which requires installed mw-zip script.
-	rm -f tests/test_{nuwiki,redirect,zipwiki}.py
-	# Disable render test that fails for no apparent reason
-	rm -f tests/test_render.py
-}
-
-src_compile() {
-	distutils_src_compile
-	if use doc; then
-		emake -C docs html
-	fi
-}
-
-src_test() {
-	distutils_src_test tests
-}
-
-src_install() {
-	distutils_src_install
-	if use doc; then
-		dohtml -r docs/_build/html/
-	fi
-}
diff --git a/dev-python/mwlib/mwlib-0.15.8-r1.ebuild b/dev-python/mwlib/mwlib-0.15.8-r1.ebuild
deleted file mode 100644
index d1353c330dcf..000000000000
--- a/dev-python/mwlib/mwlib-0.15.8-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mwlib/mwlib-0.15.8-r1.ebuild,v 1.2 2013/09/12 22:29:21 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Tools for parsing Mediawiki content to other formats"
-HOMEPAGE="http://code.pediapress.com/wiki/wiki http://pypi.python.org/pypi/mwlib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]
-	=dev-python/odfpy-0.9*[${PYTHON_USEDEP}]
-	dev-python/pyPdf[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/timelib[${PYTHON_USEDEP}]
-	virtual/latex-base
-	>=dev-python/simplejson-2.5[${PYTHON_USEDEP}]
-	dev-python/gevent[${PYTHON_USEDEP}]
-	>=dev-python/bottle-0.11.6[${PYTHON_USEDEP}]
-	dev-python/apipkg[${PYTHON_USEDEP}]
-	dev-python/qserve[${PYTHON_USEDEP}]
-	dev-python/roman[${PYTHON_USEDEP}]
-	dev-python/py[${PYTHON_USEDEP}]
-	dev-python/sqlite3dbm[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	app-arch/unzip
-	doc? ( dev-python/sphinx )"
-
-PATCHES=( "${FILESDIR}/${PV}-fix-tests.patch" )
-
-DOCS=(changelog.rst)
-
-python_prepare_all() {
-	# mwlib.apipkg is actually used.
-	sed -e 's/, "apipkg"//' -i setup.py || die
-
-	# Execute odflint script.
-	sed \
-		-e "/def _get_odflint_module():/,/odflint =	_get_odflint_module()/d" \
-		-e "s/odflint.lint(path)/os.system('odflint %s' % path)/" \
-		-i tests/test_odfwriter.py || die
-
-	# Disable test which requires installed mw-zip script.
-	rm -f tests/test_{nuwiki,redirect,zipwiki}.py
-	# Disable render test that fails for no apparent reason
-	rm -f tests/test_render.py
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if [[ ${EPYTHON} == python2* ]] ; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		export CFLAGS
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mwlib/mwlib-0.15.8.ebuild b/dev-python/mwlib/mwlib-0.15.8.ebuild
deleted file mode 100644
index 3b5570be3e7a..000000000000
--- a/dev-python/mwlib/mwlib-0.15.8.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mwlib/mwlib-0.15.8.ebuild,v 1.2 2013/09/12 22:29:21 mgorny Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-pypy-* *-jython"
-DISTUTILS_SRC_TEST=py.test
-
-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"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="dev-python/lxml
-	=dev-python/odfpy-0.9*
-	dev-python/pyPdf
-	dev-python/pyparsing
-	dev-python/timelib
-	virtual/latex-base
-	>=dev-python/simplejson-2.5
-	dev-python/gevent
-	dev-python/bottle
-	dev-python/apipkg
-	dev-python/qserve
-	dev-python/roman
-	dev-python/py
-	dev-python/sqlite3dbm"
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	app-arch/unzip
-	doc? ( dev-python/sphinx )"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-DOCS="changelog.rst"
-
-src_prepare() {
-	# mwlib.apipkg is actually used.
-	sed -e 's/, "apipkg"//' -i setup.py || die
-
-	# Execute odflint script.
-	sed \
-		-e "/def _get_odflint_module():/,/odflint =	_get_odflint_module()/d" \
-		-e "s/odflint.lint(path)/os.system('odflint %s' % path)/" \
-		-i tests/test_odfwriter.py || die
-
-	distutils_src_prepare
-
-	# Disable test which requires installed mw-zip script.
-	rm -f tests/test_{nuwiki,redirect,zipwiki}.py
-	# Disable render test that fails for no apparent reason
-	rm -f tests/test_render.py
-}
-
-src_compile() {
-	distutils_src_compile
-	if use doc; then
-		emake -C docs html
-	fi
-}
-
-src_test() {
-	distutils_src_test tests
-}
-
-src_install() {
-	distutils_src_install
-	if use doc; then
-		dohtml -r docs/_build/html/
-	fi
-}