Version bump, remove older unstables, fixes bug #484548

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)

4 files changed, 17 insertions, 86 deletions

diff --git a/dev-python/whoosh/ChangeLog b/dev-python/whoosh/ChangeLog
index 65dd5316ec45..26db8483043d 100644
--- a/dev-python/whoosh/ChangeLog
+++ b/dev-python/whoosh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/whoosh
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/whoosh/ChangeLog,v 1.15 2013/09/11 02:29:11 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/whoosh/ChangeLog,v 1.16 2013/09/12 18:36:17 blueness Exp $
+
+*whoosh-2.5.3 (12 Sep 2013)
+
+  12 Sep 2013; Anthony G. Basile <blueness@gentoo.org> +whoosh-2.5.3.ebuild,
+  -whoosh-2.4.0.ebuild, -whoosh-2.4.1-r1.ebuild, -whoosh-2.5.0.ebuild:
+  Version bump, remove older unstables, fixes bug #484548
 
   11 Sep 2013; Patrick Lauer <patrick@gentoo.org> metadata.xml:
   Python herd added as maintainer
diff --git a/dev-python/whoosh/whoosh-2.4.0.ebuild b/dev-python/whoosh/whoosh-2.4.0.ebuild
deleted file mode 100644
index 28e54580199e..000000000000
--- a/dev-python/whoosh/whoosh-2.4.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/whoosh/whoosh-2.4.0.ebuild,v 1.3 2012/09/13 16:35:49 blueness Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5 3:3.1"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4"
-DISTUTILS_SRC_TEST="setup.py"
-#PYTHON_TESTS_RESTRICTED_ABIS="3.*"
-PYTHON_MODNAME="whoosh"
-
-MY_PN="Whoosh"
-
-inherit distutils
-
-DESCRIPTION="Fast, pure-Python full text indexing, search and spell checking library"
-HOMEPAGE="http://bitbucket.org/mchaput/whoosh/wiki/Home/ http://pypi.python.org/pypi/Whoosh/"
-SRC_URI="mirror://pypi/W/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		insinto "/usr/share/doc/${PF}/"
-		doins -r docs/build/html/_sources/* || die
-	fi
-}
diff --git a/dev-python/whoosh/whoosh-2.4.1-r1.ebuild b/dev-python/whoosh/whoosh-2.4.1-r1.ebuild
deleted file mode 100644
index df065dabf766..000000000000
--- a/dev-python/whoosh/whoosh-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,40 +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/whoosh/whoosh-2.4.1-r1.ebuild,v 1.5 2013/09/05 18:46:41 mgorny Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
-
-MY_PN="Whoosh"
-
-inherit distutils-r1
-
-DESCRIPTION="Fast, pure-Python full text indexing, search and spell checking library"
-HOMEPAGE="http://bitbucket.org/mchaput/whoosh/wiki/Home/ http://pypi.python.org/pypi/Whoosh/"
-SRC_URI="mirror://pypi/W/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	dev-python/nose[${PYTHON_USEDEP}] )"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_install_all() {
-	local DOCS=( README.txt )
-	distutils-r1_python_install_all
-
-	if use doc; then
-		insinto "/usr/share/doc/${PF}/"
-		doins -r docs/build/html/_sources/* || die
-	fi
-}
-
-python_test() {
-	${EPYTHON} setup.py test || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/whoosh/whoosh-2.5.0.ebuild b/dev-python/whoosh/whoosh-2.5.3.ebuild
index af66647153b2..3768fd7ff4e8 100644
--- a/dev-python/whoosh/whoosh-2.5.0.ebuild
+++ b/dev-python/whoosh/whoosh-2.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/whoosh/whoosh-2.5.0.ebuild,v 1.1 2013/09/11 02:26:33 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/whoosh/whoosh-2.5.3.ebuild,v 1.1 2013/09/12 18:36:17 blueness Exp $
 
 EAPI="5"
 
@@ -15,26 +15,27 @@ HOMEPAGE="http://bitbucket.org/mchaput/whoosh/wiki/Home/ http://pypi.python.org/
 SRC_URI="mirror://pypi/W/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	dev-python/nose[${PYTHON_USEDEP}] )"
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
-DISTUTILS_IN_SOURCE_BUILD=1
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
+python_prepare_all() {
+	# (backport from upstream)
+	sed -i -e '/cmdclass/s:pytest:PyTest:' setup.py || die
+	distutils-r1_python_prepare_all
+}
+
 python_install_all() {
 	local DOCS=( README.txt )
+	use doc && local HTML_DOCS=( docs/build/html/_sources/. )
 	distutils-r1_python_install_all
-
-	if use doc; then
-		insinto "/usr/share/doc/${PF}/"
-		doins -r docs/build/html/_sources/* || die
-	fi
 }
 
 python_test() {
-	${EPYTHON} setup.py test || die "Tests fail with ${EPYTHON}"
+	esetup.py test
 }