bump; virtual re-write, keywords (reluctantly) dropped subsequent to new deps

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 73 insertions, 16 deletions

diff --git a/dev-python/pyzor/ChangeLog b/dev-python/pyzor/ChangeLog
index 19bf6d006198..18b50b2ee4b9 100644
--- a/dev-python/pyzor/ChangeLog
+++ b/dev-python/pyzor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pyzor
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzor/ChangeLog,v 1.67 2014/03/19 13:56:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzor/ChangeLog,v 1.68 2014/05/20 09:39:50 idella4 Exp $
+
+*pyzor-0.7.0 (20 May 2014)
+
+  20 May 2014; Ian Delaney <idella4@gentoo.org> +pyzor-0.7.0.ebuild,
+  metadata.xml:
+  bump; virtual re-write, keywords (reluctantly) dropped subsequent to new deps
 
   19 Mar 2014; Agostino Sarubbo <ago@gentoo.org> pyzor-0.5.0-r2.ebuild:
   Stable for alpha, wrt bug #498050
diff --git a/dev-python/pyzor/Manifest b/dev-python/pyzor/Manifest
index 2527cb0debba..0bfa52ed6979 100644
--- a/dev-python/pyzor/Manifest
+++ b/dev-python/pyzor/Manifest
@@ -4,24 +4,16 @@ Hash: SHA256
 AUX pyzor-0.5.0-python26_warnings.patch 2680 SHA256 f1b9f51295788ac40c6396ea12a846f0b01d45fa8d87448d764900b3b167b9ff SHA512 e7a8826dc2b02ff24301b116247344ca221008333fbaf1fb4037ed1eef7e317235070fd6f6b70e4ffec0a44de675b1c6ae09da555d6a23295fd4c81301a13c80 WHIRLPOOL c3bdaeb5e2b312434164ec24b83fb067961cbaf164dc568da138ea397deee75c411edbc0b510ca2bd904c76caec079e46251dee5b8af8ca659c689e181b203f7
 AUX pyzord_getopt.patch 640 SHA256 6cc675c7caf935342c3728ef399c2ebdb57029d146903aa36593fa3a34f270a9 SHA512 8c405266251f61b0d4b54d3811512067d90521dc04fb0a2df60fc19d27d818fb00849af0c0469187d60fe2d3c6bdde71fbf8320e22b2d5db5e6226c06cde93db WHIRLPOOL 2fef82cb54b2cd03baf29536e121c84b9f1823c9593278c362624cceb180cbd562d57e8147cb6218ba1ceeffb7d4137d0ec64f94cc1d66e9d93effe4bf29ce95
 DIST pyzor-0.5.0.tar.bz2 40654 SHA256 2bf3df9e916861063a73f7b46cb8b27bac6f661fce1362803de9e7921fc155ba SHA512 048c81e373be217808f4e4e8f6adbc1b464891b725b3004031dfa7a82abe234b080c3a87bc9ad61ee1df2bfb78ed0ee78565b49843f09243f72b6315df6877a1 WHIRLPOOL 966090015bfe93d4ef059a1186e97705807769f9341e94a2f5d9c223540effac04209a32cad850c6f405225c00aea55bdf7ac5a6a98e0927824d641ee61e5c80
+DIST pyzor-0.7.0.tar.bz2 78555 SHA256 6d9ca62bd4aa9a0210adb9d4c8ff2b38bb2cd051f1517ce29e88d7fbe4b1026d SHA512 40026fc0276b4cf60fe7dfe30e2d4d4d1f220cf860b8aaef9d983e632a7d87bc8deb3430ded7520a69269ef56550117735a6e3c8d046d4cad7066f8597ead3cd WHIRLPOOL dd8466477e38362fa0a64ec66822ae3820c22f8ae13b40002145b1e688d17c17edfb800eb44679ff961e74b667daa43ef09d8eadb92f683c9e73c9b00fad23b9
 EBUILD pyzor-0.5.0-r1.ebuild 1420 SHA256 dea4abaec1dfc420dc3cf3ab8211b4ac4512353840c2053ca1bd12a2cdebe0cf SHA512 bb65e8b7bf2da756d3f8baf98b99def7f8680d71f3185c228fa6547a5ffefb70f02f773eb643dac4e04f10ec3f2b7474c5892228c5354197f1211fcb9467ef9d WHIRLPOOL a3a2b0e1cc2666cf4680a9b26ae37f294010698be6dc58d561a81d71a3c8216976da18f48d7845a63feaf21c014a9d61e0595dd04b225feb40de8d42b0caffe1
 EBUILD pyzor-0.5.0-r2.ebuild 1466 SHA256 314181bd1a7ef716a9d020276791f9ac7b7d4b82c58b98b944c810431667b8a3 SHA512 200a79f63694c264c778e41e0215c93a3de8bcfef4502151a53e09969511e62114c8fb28e7208a98f33326d51596bb17970aece01e40be4014fe9709cd9937b1 WHIRLPOOL d426d6994fd58bd3d46e89f8be6991ccdd00a5a74d41b8e9461371d479ef4eb8dd1326e0b3a6eeb5a87afd878a4313b3e2edbe8df8502df2e25b4c1eee34aa32
-MISC ChangeLog 7781 SHA256 5e3fab9cd1e900873be1ab18132e2ccc2ad4d8ab35f6b62712182b809a67e954 SHA512 b87e65a17d22de2499ab1f469dd4fe6b288df17de33714d249f4bc2c30f9c40fa27b41778a50a6695112ccc77a7e8da662dc63450bd4a7116dbf15d78cd4b137 WHIRLPOOL 47af99235ba9375803aa983f10bb4d2a81ab8cb2e39494aaed71620027c2a1dc34030c04455d77c172aca24fcfe46fb134adf6e081b8927b43c0bcf516b13950
-MISC metadata.xml 226 SHA256 68c2b94a7055bb8f9fa53e636ebe8ae4f3713233181b75335efadaf903e5c400 SHA512 e0fecccc6c06a362a34ec256e406b7ab51f44d1754a5749fe675a0bdf63a79cfef8106ee52853aa9807fd8e16b145c1d60476b26b6dd57f818d3e80aa1b841a4 WHIRLPOOL 175b3e320432b3ce354f204a7a572d4d6388f01e54b139d7d6147521e913258aba03474179a1b09146dbc1cfb7b73284f06b68e417937bc4aa93a9a58ec265c4
+EBUILD pyzor-0.7.0.ebuild 1659 SHA256 7df045fc08f1573794e8927e5e3efe886a087ea40d3a83afb9262ecf1f22d3fc SHA512 d7872c84defdab6f37d51fd159e41d9cfbb2d5451d93819640756977b88d36ae12ad4335652c642db302e1e6c4dbd890093361f03fc2ce85ac8bebc6bb93db24 WHIRLPOOL c0a331b9f9fe8e3a34c517f5ef13d9d569561cb90335fd84487de7892e268b1d40bdd24a4f0cec1b103f7c7b7432088af4f6d6921576725d70dfa07619bc8ae0
+MISC ChangeLog 7979 SHA256 150b157154e07eb09ed946b24c06463d7ed3f0d37f305e715d15062bbc7a3cb7 SHA512 39655ed33a7b33a49b95393807b466b920c43d621009cf698ff265e7084cdb99f39673ddbea8dbc4f1a1ec8edcf3e32dbb9fe5e6e3f97a5715772b0f63f07b03 WHIRLPOOL 2258f362b15903e35ac72b054bed41d51529ae5e41e1917ee9ed5daff35e7751474524f90ce341bc6e456e84e121bdac56ae6971d800a597c2d477210ce85a49
+MISC metadata.xml 324 SHA256 8de313086918b6dc70288dc229a81c3f483407260411eb8914840a715d38d4a7 SHA512 9eb74e02826abb39ba4b40b2a382a852687159df86d1ee5a66976a7fe508edc7ba435164790cb71d3b001c3e5a41df0134fb0d9cfa6823685525a6d637f5ee5d WHIRLPOOL f7c0102cf5ac00d832e6d7af1a70b17494b35611b1717c08851571a5068fe58d6ba4deba0341d73870622ed8fd6d2228b1aac5a7aa2ea3ecb20edf27387d87aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTKaH5AAoJELp701BxlEWfbewP/0vxxsJ/Bh9xy9IzrijnubZ/
-J8fX8OiiJEEx4qvDyzy9gZmsDEwmb4bB8eOB3FB7qb4UojEMvwBjk8tWVIvMSOfk
-7cBHhfUAW0mjZgdg2flNYXQooR9F1zpRbsFUBPfMeeQvrYdUdCHS4SecMLkdw5js
-mOpHk7KuzHNDYC+VphSE+GfaiGe78GSArshhWCZ+e5acJzS6NbhKbg6OeYmpBS+2
-cum+jkG9OCW3IaQN3WObNFGJR/5+oS0ZOdTo+53mfaynVgzTIcg78gWcwW2rwY/C
-JD5dMIJ+5nxqtawwbQbz/YSzqky8jHGh5p/WC3js64U//lfK66LAsbvxoSUdeFXK
-B57bDvbyBbDdK+f4154o7t9VQ82zmg3UpIxEwbTo1Kmuxim1TOBNws5oVbNQG4b1
-a5aScq0NjRcLwR+SeFDvnP7xUvtk0hQn5Tt3f0A2v/G8FZE6PpClyHkAnfQ3VSfX
-hMzGmfta3wk7WQbZvKXuWGTYoVXGz9XbAPirJn6jTCkMtdctsP6ZJcCdtQKm8uoC
-dNWdm/H2jVbYyLhx6hn9UhG2IzdpvMXPzREQqVXH3T3nykZ+wbdP8he/vmBiMOoT
-SP/SpJijFbg3VPJIEtxgunJ8D2hL4nRz894jhNfZfKdGkS9qUoTRYwI6gNeF3Mq6
-lWdshfrK6mLF8OCg7ZXI
-=bye6
+iEYEAREIAAYFAlN7IRgACgkQso7CE7gHKw3G5QCghO1TwNcSQtcKG4flg1zRltne
+1/4An3DPu75lhfv+gacb3Tn4Qzhid5p6
+=zR2y
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pyzor/metadata.xml b/dev-python/pyzor/metadata.xml
index 658d488fc455..74cf7e268ac3 100644
--- a/dev-python/pyzor/metadata.xml
+++ b/dev-python/pyzor/metadata.xml
@@ -4,5 +4,7 @@
 <herd>python</herd>
 <use>
 	<flag name='pyzord'>enable support for pyzord</flag>
+	<flag name='mysql'>Enables mysql support</flag>
+	<flag name='redis'>Enables redis support</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-python/pyzor/pyzor-0.7.0.ebuild b/dev-python/pyzor/pyzor-0.7.0.ebuild
new file mode 100644
index 000000000000..86ae0b95f252
--- /dev/null
+++ b/dev-python/pyzor/pyzor-0.7.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzor/pyzor-0.7.0.ebuild,v 1.1 2014/05/20 09:39:50 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYHON_REQ_USE="gdbm"
+
+inherit distutils-r1
+
+DESCRIPTION="A distributed, collaborative spam detection and filtering network"
+HOMEPAGE="http://pyzor.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="mysql pyzord redis test"
+
+RDEPEND="mysql? ( $(python_gen_cond_dep '>=dev-python/mysql-python-1.2.5[${PYTHON_USEDEP}]' python2_7) )
+		redis? ( ~dev-python/redis-py-2.9.1[${PYTHON_USEDEP}] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# https://sourceforge.net/apps/trac/pyzor/attachment/ticket/196/
+DISTUTILS_IN_SOURCE_BUILD=1
+
+REQUIRED_USE="test? ( mysql redis )"
+
+python_test() {
+	# https://sourceforge.net/apps/trac/pyzor/ticket/196
+	# In this ticket it clearly states the suite is written for py2
+	# While it's feasible to make it into a py3 ready state, nah
+	if ! python_is_python3; then
+		PYTHONPATH=. "${PYTHON}" ./tests/unit/__init__.py
+	fi
+}
+
+src_install () {
+	distutils-r1_src_install
+
+	if use pyzord; then
+		dodir /usr/sbin
+		mv "${ED}"usr/bin/pyzord* "${ED}usr/sbin"
+	else
+		rm "${ED}"usr/bin/pyzord*
+	fi
+}
+
+pkg_postinst() {
+	if use pyzord; then
+		ewarn "/usr/bin/pyzord has been moved to /usr/sbin"
+	fi
+
+	einfo "If you want to run the pyzor server you will need to emerge / re-emerge"
+	einfo "with use flag mysql and or redis. Without either flag provides only the pyzor client"
+}