Version Bump, bug #545438

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

diff --git a/dev-python/django-haystack/ChangeLog b/dev-python/django-haystack/ChangeLog
index a0ddf801e0c6af2b7d8002520c7270c8e96f4efa..47ee54b12e53a1bc44009eb9efc06118ce12c774 100644 (file)
--- a/dev-python/django-haystack/ChangeLog
+++ b/dev-python/django-haystack/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/django-haystack
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-haystack/ChangeLog,v 1.4 2015/03/08 23:44:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-haystack/ChangeLog,v 1.5 2015/04/08 07:37:50 jlec Exp $
+
+*django-haystack-2.3.1 (08 Apr 2015)
+
+  08 Apr 2015; Justin Lecher <jlec@gentoo.org> +django-haystack-2.3.1.ebuild,
+  -django-haystack-2.1.0.ebuild, metadata.xml:
+  Version Bump, bug #545438
 
   08 Mar 2015; Pacho Ramos <pacho@gentoo.org> django-haystack-2.2.0.ebuild:
   x86 stable, bug 540290

diff --git a/dev-python/django-haystack/Manifest b/dev-python/django-haystack/Manifest
index 687341029c075b1b1271b000de9c5933d00e4f98..65b4d9188dbfb415b2bb447181a3ecbe6be98f70 100644 (file)
--- a/dev-python/django-haystack/Manifest
+++ b/dev-python/django-haystack/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-DIST django-haystack-2.1.0.tar.gz 821749 SHA256 b8b9aa47cbb1a845ac5ef44d3ce02fcaf148f453c76f93d987b95a78d3698230 SHA512 2241ebcea9d42733af486f80508d3ba47231f5881e60156dfedb9e7a604ee8ff59fe97213c007d684484f9eb21f182dd9c9106fc35e03510070e529a1bb5ce3f WHIRLPOOL 9ebc208180b3aefd6870f05fe17856832f1bea2abfd5cc131d6bdc5c4601794e205c2fb6fd7138fed7433aa7dfa453c4a9b8b08686e7198e4b41633d8ead5ce9
 DIST django-haystack-2.2.0.tar.gz 155409 SHA256 31f5f08524dc46927a5ae1d4024d6496b5f990b0ed1012ad338293636d38fb78 SHA512 7bc27965650a759874c7e90b332994930a9318a4ca01245b04ade97559a6a125655c8a4fc182a3bcac63dbcd4bce76e71950218dff3116d3092d96f94e63e137 WHIRLPOOL 9869f57717a48edb3e27c7f7993ea03372620d81a71ee7f0dcbbd6a7e9bf09acda670b6d142f393ff242cb20af311962f99ca2f3821b161d92fe004dfc7d8d72
-EBUILD django-haystack-2.1.0.ebuild 767 SHA256 b0071926fbe6a02677d493081099bc9770eb39ed62f2cf9845da19a1c544862d SHA512 8563b35e4f1721bc5b287de841aaec73ffef4b1f485ff1533bfa297462dec9b79e40a3c634fea82206f28a4c9c47efc59c31ac00a0a02a21f07e9322eaa67b33 WHIRLPOOL 22a569b67e0e2b0a2253d8dd4d5eb814927cb16089cd8cd6d8054f2a5a885b06bbe7a915f5958eba90e7acd90710855b79c89263ea6c2a1ce58d725d6adf669a
+DIST django-haystack-2.3.1.tar.gz 973789 SHA256 a30df888ee0da32c4837c328ecf859e992edb6d185efa7d49341cc1949dbb24d SHA512 c051523a63f32e066e3d8c83ef5cc9eec77a969801f57a0826073317c4d80bb24a67b4487638d38028ae288d9698d32483b2755f171a1b3cbb66f13b2b28a623 WHIRLPOOL 8752bf5c6197ef921447520b7da2a1ed3ae9da641c6cdecedfba41749a14f7a69b0ada343fd0aafc40726de9e6706c200caa1e68ad03018285be9e62f5140145
 EBUILD django-haystack-2.2.0.ebuild 763 SHA256 d1e2b9fc17d40e840541b6e1eea6b387f6d9f2503ad617fde48f22e361734207 SHA512 9db1e2fc62802bb33a0c693344d33ca97570a58a7c44fd50ecb13a8acf3cfc4c1c0ee1384df844f89cf8cc61362bfe7a18e47f0100010ca0f4d4e65d7392be50 WHIRLPOOL fc99e64f9169bd55c3785c8643960addd99a5c9a95a893e8a0e7a177ccf250880c8ed3debbf743ba2f96c33e15dfeec4036d7e3507371b2b03be87b2ede19f01
-MISC ChangeLog 791 SHA256 fe738b1a2b36291d639686f0af2d78671ae3309a56beb4ca2cde324dab8a30c3 SHA512 d576e916edac643a5c78b02a7dc8a6952ce9777ea26d3bba80e0ca525f9258289961a95907147b16f790a690721be5d18da115538ed377afdcc8e45569537060 WHIRLPOOL 3bbf4e65899f2e1c870b1f681ead3522b4aaffa401f3222ad4366fe566a7ffba235dc5fe501dc8fd6c3346ee1d9179ec49e1558d78524722188406080f02f032
-MISC metadata.xml 167 SHA256 a96c7a7081b1a192fc4758c24f63e3f458ce37c90ef5594005e91e01a5daf934 SHA512 05f506754bd3182ba88befefe0609d354f9ee335bea2d866f30719b292ebae30dbe64d6c68ff1a918bfd380bd638146b30754d072229491e8ed6f9d6745510c9 WHIRLPOOL 59ac07478ebcd8bb8b5edba5af0041df85949cf69083c3aae6945e371e6b79c6c92e2bd21189b2d8a87de72c9a4cd299e0773ff73332e247f95b8e850a76d054
+EBUILD django-haystack-2.3.1.ebuild 1314 SHA256 38371891af6a3c938da14043cb50594c41294f4ab4df1ad59d90b6ca52ce5c69 SHA512 47f25d34b1d25fd752be2f4a4552cfa1d02f5425b77d35b79ebe85eeecf715e162dee9a30a3283eaf9d61189257e54da1614209756605a0b0c7b0d19bd40a33e WHIRLPOOL baf7c17e8131e259034be4b30add7d2f8aaef8ce4dcc560c08f22e0962fd89b569b8148e77a1cb45c892ed660a1e22d13e2db1f142254bce8f4ed43b5276da78
+MISC ChangeLog 982 SHA256 2ca988e2828e6ffde7406bab8f97ae61d02ecb90a9ad7d7dcf18f5e2220fb4c2 SHA512 6acfea45713626a2a0da596188045c90a8bcbc830f81c0d8ad6997bf226fea431ab4d58d667ab06e847397387e92874ce0180a9728d7d3851d1f02fa1cf4431e WHIRLPOOL c176c0c0c3b8993422eba905b852cde14801c2cad137d0ce10b9faac24a450a13dcd8beb45622bf237fec6032266f4bd96ce8319c71d4cf6aa388e085936d221
+MISC metadata.xml 161 SHA256 54c4e6d783f2571466c7b03622195c255b95cf06209e59ab6653a6366cdfde6e SHA512 b306d222517e4eae525f6a79634f26eff2068f85911b7904c52c485a004d1d5401300808da67f9a1e3f102d65aebd1e0d21cd18145ea0bfec156f2aa3785b104 WHIRLPOOL f9c8e8d23bde25f4b14031f83dcc09e8437fdbcbb27199c1e9d8109fb2ccc7589cabf8240256dbbe6e080d04d2c444d115c66f82fc9b479e1e70d1ef0fe60fe2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlT83tkACgkQCaWpQKGI+9ROlwCdEe1tcxxhdwnLP1BcPWxpt5rN
-EAIAn1a+2AIFO0rAKILIIbgVT/IWM5TK
-=pH1L
+iQJ8BAEBCgBmBQJVJNrPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirGrYQAJEESKfaeBZGsKsZ8Kwa+nCk
+7VVLZ0dCznd5CXI7RTenWTw+jJhdOhk2A0HUYHPAxWOc3+y22gqRPEDuynFVY0PZ
+V/UU11n6qy64NWOTfvo5+x0MROsVgDkTydZdYDwdQ4Wx3o9Xx5+Lest+3gpTBQlt
+72q9Qiaa+8L4t0/qOrfjnLFZ75kDWGkRq2jbJGNZUi179nRZCRbi53RezIljzGZA
+ISjycuTRrNPpUTf/j2jxAY4XgGzrf2aKnT5VSPA3IT8jcxXqbnf4lFlGz5loHr7V
+3k2876CpIosQae+HIDnR1LEXzgh/tcAJvCzrU7THiLMjAuz5i4RdlT+qLMfD7cOa
+XcDB3lPOJUOLcwpRloDlMNr0LTDwdASd24A3hKe0i34tSasZcJQoD1V/74A8NVgc
+aVsmwtFRCYqKDRd9EhUCYJwKDR8umQSy1BNGGlRetoJRRIy+MVDwgsrx+jcKZZ7j
+ZXN9lhh5C69AqHyiXuwdhGvAVZ0fgv/Lm/VRccOgdAtxMn1TtLbnBBbuLyJNwQ0q
+h24+9bhlMY3nYy7zX7lK04Et/H5g6GcfFgB9twSp0FiEeUUUaYvT6PrwBaEZtySW
+bu97LydG3DWANIDHibjb1nEi1kDIGaSRtVxklA2ceR/PLY21BuTbaSJSMPKLnxM3
+/eGD0Ln60+MFrhU301uA
+=iXuE
 -----END PGP SIGNATURE-----

diff --git a/dev-python/django-haystack/django-haystack-2.1.0.ebuild b/dev-python/django-haystack/django-haystack-2.1.0.ebuild
deleted file mode 100644 (file)
index 9e17545..0000000
--- a/dev-python/django-haystack/django-haystack-2.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-haystack/django-haystack-2.1.0.ebuild,v 1.1 2014/06/14 02:18:13 idella4 Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Pluggable search for Django"
-HOMEPAGE="http://haystacksearch.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/django-1.5.8[${PYTHON_USEDEP}]"
-
-python_compile_all() {
-       use doc && emake -C docs html
-}
-
-python_install_all() {
-       use doc && HTML_DOCS=( docs/_build/html/. )
-       distutils-r1_python_install_all
-}

diff --git a/dev-python/django-haystack/django-haystack-2.3.1.ebuild b/dev-python/django-haystack/django-haystack-2.3.1.ebuild
new file mode 100644 (file)
index 0000000..34b9b24
--- /dev/null
+++ b/dev-python/django-haystack/django-haystack-2.3.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-haystack/django-haystack-2.3.1.ebuild,v 1.1 2015/04/08 07:37:50 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Pluggable search for Django"
+HOMEPAGE="http://haystacksearch.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/django-1.6[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+       dev-python/setuptools[${PYTHON_USEDEP}]
+       test? (
+               dev-python/coverage[${PYTHON_USEDEP}]
+               dev-python/elasticsearch-py[$(python_gen_usedep 'python*')]
+               dev-python/geopy[$(python_gen_usedep 'python*')]
+               dev-python/lxml[$(python_gen_usedep 'python*')]
+               dev-python/mock[${PYTHON_USEDEP}]
+               dev-python/nose[${PYTHON_USEDEP}]
+               >=dev-python/pysolr-3.2.0[${PYTHON_USEDEP}]
+               dev-python/python-dateutil[${PYTHON_USEDEP}]
+               dev-python/whoosh[${PYTHON_USEDEP}]
+       )
+       "
+
+RESTRICT="test"
+
+python_compile_all() {
+       use doc && emake -C docs html
+}
+
+python_test() {
+       ${EPYTHON} test_haystack/solr_tests/server/wait-for-solr
+       esetup.py test
+}
+
+python_install_all() {
+       use doc && HTML_DOCS=( docs/_build/html/. )
+       distutils-r1_python_install_all
+}

diff --git a/dev-python/django-haystack/metadata.xml b/dev-python/django-haystack/metadata.xml
index 0645cd9ff8f304d5b82f09f4bf6d38b1cf60a46a..ee7e8b2450a80fd0bcb2cb76abc418d60416e767 100644 (file)
--- a/dev-python/django-haystack/metadata.xml
+++ b/dev-python/django-haystack/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>python</herd>
+  <herd>python</herd>
 </pkgmetadata>