Version bump, remove older unstables, fixes bug #484548

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

5 files changed, 40 insertions, 92 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/Manifest b/dev-python/whoosh/Manifest
index d0a4d52550b8..572cdb53e433 100644
--- a/dev-python/whoosh/Manifest
+++ b/dev-python/whoosh/Manifest
@@ -1,9 +1,26 @@
-DIST Whoosh-2.4.0.tar.gz 923742 SHA256 12d55e0a844dce25a5764b1b0dedcc12fe91d2f5082ee1015fcc693acdba9198 SHA512 cf2fc18c6a1e99a2615ba60055f77afbb3530f50503328bd4e9be328f6a09059c8fd4ef9e0b956a32b1f059f85344240d3c455a5b4676fa1d539a03b01ba1b82 WHIRLPOOL 93ed51102130dc85ad5e9a948476c91134ce4ea65af9aefa33be870004e9198fe533f7441c094df769bf3b773ce82b51aa725014c9be93fab12df3d8c49a52c4
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST Whoosh-2.4.1.tar.gz 938446 SHA256 466c377ae8567aed86abef401774ddb27e80055ac34a33bd0e12d6b7db69a40e SHA512 ecb03388784929dddb5dac0eb2dadaba352f6dbb8422c163299645c723ac56545ffd3e68ecc512789c3549a67bbf994c0b8d92c2a46536e39f42d75287688832 WHIRLPOOL 91e096b36cf306f681959a0ee49f570afa1c379aade8f0dab74523350883bf27376b84dec88426f6de337e32998904e96b494fb992387b69d93f2c10de336fc6
-DIST Whoosh-2.5.0.tar.gz 957020 SHA256 7f551f39056a8b754f204171b80e708723f8bd939caaa478f6babfea62428472 SHA512 92a4931a64f535575ab984cdd4c6eb1f6cc88a66b66f374ceb23fa689fc6381e551c11bc660f34c58d642e70a8d54d7d1d572b61047bed7f4436917ba995d6fc WHIRLPOOL f694dc6d911ce1d03e31320901368bc8ebb7cde2e84d7f5f9ca5f11bef95e5bd7dde72aa6d940c2219d5825219b2d7d23cda722f9ddaa2cf0de4212bb9a3fe67
-EBUILD whoosh-2.4.0.ebuild 909 SHA256 c75de1c3e3a788fe7897cf5bcb8fe0dc948c69f8aafbbc22d783bf2007aff3bb SHA512 6b297478db0b328b6c98ce620cfa2bf0e23581fd58f59f9ae84c2ffb40a030bac0121ad6aca863f4b372c14c68aeb1c54e36d071fcfa74d8be1e24fa8cd34280 WHIRLPOOL 6fa907b3ab8088e81b5ad072f5358283ecc7ca8254886c81c456d0630551a7f6bd8f4159fde73613577c2824ac49035e5bfd9a1260a8ff399ea8d8b98c7c3ee5
-EBUILD whoosh-2.4.1-r1.ebuild 1047 SHA256 0d3f071c0e2037f5668e166f187d41db37eaa1a6d4f1d984b52eb0442d571bd6 SHA512 7e1a2e25dd410a7261360dfb41f14aa250e085de36301adfd75d309851c7f3355cfa08deb1aa64da98b7ccc510073410140c55afa3e637943b12db185c5f9513 WHIRLPOOL 3b11af685af016ecb366a607fc13d2183f1ae6399999b801e007112a0f798c43f79de6bb7c826cb061e9398b0e45b7a81e5c842dc5c5a23d93de27962b7b6ee3
+DIST Whoosh-2.5.3.tar.gz 1036792 SHA256 b95cb28a3a415adfbc4bbc5f27c1449da28571a718e2710bdd2c4a9d5882623b SHA512 d7b8053e3590e632707b76e4505d5838ee0eae727c78d18c1125b9ad3f43e516b7467bceff0a5ba45df1b66722f20d2292e60aafc8b5a0beae67d8f81e2ea262 WHIRLPOOL 2c0223fde4703d4b3007fe4277ee1facc24db77852acaca22e579b60507ead7ead7e0d5054c296f25e59ef0270769bcfc0b8d622a54c4937a34d1aa53433d832
 EBUILD whoosh-2.4.1.ebuild 871 SHA256 61806cad05611f0a59862eae7a9fc729397e5d39d708e1dd7da21b866d15ec1a SHA512 406533bdb3f715a9378fae927e8c8f14c5311ca0034a640d0e79c5117b02e82ff1e00a86738bdb0c3641a98ed6e6c1b48dec7a7dea951ead8b0e6df6921eaddd WHIRLPOOL 18e9ba42eeea70f61698a4798f7518d23ff652a52406078bd84dea76f9ad066becefb7e262a390364836e87fb883a282e302c7a1c47b5b32df4bb56cffaf45cf
-EBUILD whoosh-2.5.0.ebuild 1045 SHA256 4ab4930e831b82785a09fbb40e940076b4eca58422d488329b57210ef35d3435 SHA512 ced890655e5285999ea453bb34b7c9cd082b224e46b6940cb0c8280e8dcad043ce8b1deaa1998341a3114091ae5244ba9e462bbf04e31cc00c97020e2fc9a1b8 WHIRLPOOL 5f62ece6ffc26f8bfa2d16189cd0f63268d00e6d1bb3b57f6ed6863b571d1b9a00c9ba16d4e77f26b6c20e9e9d5ded7eb6bd741bb41087472cc186ee27efec2f
-MISC ChangeLog 4800 SHA256 7627762d8a486bff9608d044f1a0cf087e8da2ad7e89e4ba4e71feafb182635b SHA512 647ceaceb129cf569a86aaedeba088499363fdc48c9715cdbcbee88dc97a6b41b4ce8d97e0ca4816a1327b9a1ac8315cdd007f0e5710aa49535a3c4b2488a009 WHIRLPOOL ba022b8c18123b88d33fba8116a4c3bf1b9d52c23c288cd54437658e3aef8f6724fa666dc89172e86814bbf645a4488fb04e463e08bdf2b621daa2f461b8bc2d
+EBUILD whoosh-2.5.3.ebuild 1074 SHA256 de8ae644e7e25be3bb6e263dafbd2411439c0adfb88a721b1f5420f0477add42 SHA512 6a291472d5cc3b96f5951216034c5094b479b3d38ec405709be91b92411dedcbc4c62cc8895ef3990bc9c601d0c61b7ef2f390191c6707c1cd852f12e2c73f04 WHIRLPOOL 0a4c200aebc3a83840598f279564487cf9c1631fb8656bfa51a37f71e5984bb69d7dc24b91d955a7e2f134f9d3f49b4d6c658c15b9cc53f7a9313bafb6756db1
+MISC ChangeLog 5037 SHA256 a1a77c6c9172898ecdded7bb1cb063d8ff5cdaaaf2bffed69957df6fd60a0b2b SHA512 f8e8f7e4275ca1d9991aaa05ad6e6bfd09fe4e56ffd1ebda8b9ce5587b1546f01318605f96e3cf39f22a12c07b5fe2bbfa1e4c001b53d99aa780c90784409b75 WHIRLPOOL 9ca3144597717971717ee4cf3cc65b7773e36038611d69d8704099324d1ed26b52d4ebdbc3a2dcdbd76c77e19e8840569b405291637845040684ee16b8e4f666
 MISC metadata.xml 726 SHA256 8d921efa970379ff88325e6eb1621d0362031a8e63b41c3263022647774838d2 SHA512 f33d5453ed385fe4ff89eb23e46b840ebee93c9d8cca1eb4d4f818083fa40ae2fd5cf2d317f04c83ea414472699ec628182985029fd362a729bfa4c886cf98df WHIRLPOOL cc8b11eebb75a592d77ee606a6fdf875ea24044f852fe36e951d24ba20bd0d7ff077508ea2c8b7c6a1ef4acad14adcea334243790ed14c0650f0632da84d1416
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQIcBAEBCAAGBQJSMgm+AAoJEJOE+m71LUu6UboP/jaqW0SFP7KVnNh42ndSLFl9
+fXMe1PRUqeqVPofmEG1+zDClg0ytt3d1CtQQ5XdEjzc8LILaADU1h2KMoQDjThJ/
+a4HWJuwUsyAG+JZZaLz0H3z+5f7lXFxBXCcHRU9g2g4by4gh5WXJUgu5k1t2ByHl
+wBFGSKbc7bs/jMS6JWcKd8bnhTb3cIvLi5a1WQHwEKnfqf3I/HvCNxP5wlsyY+Bl
+CqrFcBHLMlJXj6/iROHWYPhlszDvTd87Se/+tCCX0uecyJVlmLZp2EL6Ml7hEzGd
+AYmO0kgm1Te30hhwj3WIcC0AmLx+KL0SuM8N2//2aOJw5DnY4fwCZbUbUKMuGb/B
+t9sp10jNeehiF/LZ0jAdyP6M9wJI5lCmEPN9ab5gL8VYO/xZbPSor/i98BLCg+EB
+dKvckoyqb6fcIXGpqX5K2fRhPIakbajwv7y+IHkp00uaP0AUuK9pPGYWeR/cgKGH
+KNr9DlvtNqU6l47ElCtzk0FaEIx/ImrCd1K7wahOTIznrOwIn0Rdz5+8jZ87aVwB
+heeoW+0+WHuO79gQpoWApOfAzETruN/yi2hJeLWw+WyXU6QV+ivd+ecYQ6rX97jm
+tp2EiNCKm1Bqn17/Bgedq14GBQWRsGlrn/OIjb0+k183woBgCKpje9Q6gszLzmtt
+HeNhEWSmKQ9vkCGumfse
+=fmnh
+-----END PGP SIGNATURE-----
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
 }