removed old version wiht old distutils inherit and EAPI

and added dev-python/setuptools dep to fix bug #515178

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x3E59FAEF53F400D2

5 files changed, 27 insertions, 75 deletions

diff --git a/mail-filter/spambayes/ChangeLog b/mail-filter/spambayes/ChangeLog
index ea95775b3f3c..2748eed2d12f 100644
--- a/mail-filter/spambayes/ChangeLog
+++ b/mail-filter/spambayes/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/spambayes
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spambayes/ChangeLog,v 1.24 2014/07/24 14:54:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spambayes/ChangeLog,v 1.25 2014/12/31 13:57:59 lordvan Exp $
+
+  31 Dec 2014; Thomas Raschbacher <lordvan@gentoo.org>
+  -spambayes-1.1_alpha6-r1.ebuild, spambayes-1.1_alpha6-r2.ebuild,
+  spambayes-1.1_beta1.ebuild:
+  added dev-python/setuptools dep - fixes bug #515178
+  removed 1.1_alpha6-r1 with old distutils and EAPI
 
 *spambayes-1.1_beta1 (24 Jul 2014)
 
diff --git a/mail-filter/spambayes/Manifest b/mail-filter/spambayes/Manifest
index e534407003d1..f087e3edab55 100644
--- a/mail-filter/spambayes/Manifest
+++ b/mail-filter/spambayes/Manifest
@@ -1,31 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX bayescustomize.ini 3968 SHA256 5a6b4067f7ec65850f4b6df4e26445171f9594906f76641636c416ea22e5974b SHA512 a9608e96fb50fb42f5d0ee746b0e242e465ad072f5c449ab3298b438f314806a24610f56b7dc33473ac6bae14f0c6ad7481699b12a7fc8cc4069fc7736689441 WHIRLPOOL 6a3fb5c100926ed045f285171278745e95af30c1ad9559f92007d6d84df4c39b35157b3ce7d17a7df579224b694ce700fc5b2db35ad2637ab8ffea22782da659
 AUX spambayespop3proxy.rc 705 SHA256 9fd8bc8a8b4eb1be5de86b328caed9c650d5de55d82fcaca7d17a2f3cbfd037a SHA512 b11120e8cc7090b70dc6794cf81e40746dd57d200d9980f3ca4b0f0a364c4fd694041dfa067507bfc987bc6c62c1f2418a3ce9bc1b58ab0619a6263fb4450612 WHIRLPOOL bfb01062a4a007fec8dcc709c81313913c7faf8345c3a90e0fdfc397254a8066081d8a373deb32c26a3b5ab03558095fba7ea95dfc7763efdcccb1151f5a294b
 DIST spambayes-1.1a6.tar.gz 1007785 SHA256 14752d9930a4f103789918a26eaed0348d27329f34e14666edfc6d05b6b01053 SHA512 7b8a6c54e986666064871298e70a04781ff33bddc3274734596ea577860707d61f95408caefd5511f586e285f8d7620d18fe3e6efcbdd0b26a39808abe44e189 WHIRLPOOL f7d67447c72882f7612d93f68ad9ab2aa200b618bcda02eeb9b93e0bd288725f4bdf4b3a9ac30a66362f011f2b7c05dbb791b56dd8086b13203bcf58f5c795ff
 DIST spambayes-1.1b1.tar.gz 1008891 SHA256 9680db176e31366178662f863ed569488778b56b1e147303b95c8095d0921b4f SHA512 988acd799e9f4530099891f1d8582b29a4c156ddb5cf280623d2e9ac3566c1c9b9cbfa5f85d32161d7f1954364320f3795d500ac51e8944d140fcd3b626c3124 WHIRLPOOL a0d1048fab1ab07e0fbf49b51ee5af28c818d9368e49b9cdfc316d36f9204f181cbd960ae132d9c42da568c91cdb0771ab06e3ed0433e504a12cc3841daadb1d
-EBUILD spambayes-1.1_alpha6-r1.ebuild 1146 SHA256 d3ed44a4744ae47dab1fa21a65e6766e2d19e155e20ed16aae88e2747c5fa1fc SHA512 d39a4936a5dd2f57b15f2f722351bd66a05657fbb9d8d708ecbfe9f587bbe8cbe20a89adcfea6cc35a620544f749469e0b0728bdad2329caf6c4837143a241fb WHIRLPOOL abf00cb85121252d23bd0e64cff63cc3acacec9842d44f79781ec1f53e2ae75ce042c5998685e2bf898cdaf3ed5fd9562df220135205b89a5399932de93643a7
-EBUILD spambayes-1.1_alpha6-r2.ebuild 927 SHA256 9bca29c5c3239e11182627249b0d766cbff28594ff4a5af68ecb8fbdcdeeb66f SHA512 cfd6b03628d8d2e44a60880fdb447c6b567223af53da2b4841b094ce9631eaf798e10c7fc53bd35a64f5fc433e04ccb9a3eed9d66d2dee73025c74e688b7d0cc WHIRLPOOL f04baec335a7dc35e18688df22ad2c93fc0d80a58badcb3cd550cb7c53bbdd76edac9376e1cb1c2a61530e522bc3ae3ebdd3b4b7ad92ef86abe852e23e3d6133
-EBUILD spambayes-1.1_beta1.ebuild 922 SHA256 020390bc9a15e80cc662733a1fea0685ef7b66ba9ad451998c279ba161e2b0a0 SHA512 9b38eb86ca565204e1ce8d8dd799018a70729e5015578b63ad4419127d2f90b3acf808e382f31dc5d23318713df4471474c9f87217eb015b9b74c6d0cccaba27 WHIRLPOOL 7bce078dade81cf09c6d28f190fa80bceba66ab7d48663a67985e91d86c1de6c08cfc73666deafbafe6e882fd34031fcf008ee4ebef167ca7198a9feb0e37f74
-MISC ChangeLog 4345 SHA256 0dd301fb11f319352161501503a38df9f604926b4ca47c9357b3712d553bd673 SHA512 9265c101f6f12bcff62ea8e71a62fa69929c7ff484d8741ced0af5ea452469c22a361ee51801edaeebe9456a02a1411cdcf9e6287dfb99cd6763681a3162642f WHIRLPOOL 8fbd25d1d19948139c6be7ba202d97d43c965564c0426c3672963417408a90fb6d1238bbb297536d5b1f2a2d0aa6f6cec958fb1360f0edaae80ed17eeef5a3c5
+EBUILD spambayes-1.1_alpha6-r2.ebuild 953 SHA256 41e156e48ff9cc252948fcb02993dea433a8320c98f2d9dba764adb5c17125ea SHA512 8292452744c8574fb995056a857fe5a0e526942ef1789660a17ac0efee9265223e19bb235001931f4d152219894762e8c754bb5e15b46c7a32c93e12c9ec6d90 WHIRLPOOL e3e4e97a9a61669c28061f3809b36b753bc6f27fa5f92eb613bcee4fe014a3777f87dfabcbbc241962765756a74527b90767ed6ebe325d8d7b9cdc559f2c5703
+EBUILD spambayes-1.1_beta1.ebuild 948 SHA256 305d62c855e7a5cfbbbab63f22ef68f99503ccea0ec54065807581d55079b600 SHA512 85de9f5089118ce263f7e08e203bcc3177edae9836376a4f92b0f74160dcc9a1a113d9feb07800504c032f8828ee6b0da88b2a5791cdc9d42669ec10d807a910 WHIRLPOOL a66c35fe07497af490dbb03eb1c8f98aab74223521868feb9f24120b051a1d14a17da5d5ca87b3c63747b49eb209676b44859d11d04d0b89e24f1a574b65b588
+MISC ChangeLog 4607 SHA256 8f70afabd3a392c0b6bf1c1599d1b9a215fda25521d04aed6d1f78a97bed44bd SHA512 ad0cdfabcd57998dbebcfca4ca189a885d43ac1ec5fbf667f5246640a9cb5f159ec062cec155dba4b3217472867763266d704619179522c7f1a42014d2fe99d7 WHIRLPOOL 256187f5cb591c6830443468f6a40d4f2faec8d3cb935ca6a21d7af8ddb175efd0d7dd01486ab4edd99cca241f56313944c9b00a57d35aa5c04a6398945fb771
 MISC metadata.xml 230 SHA256 1a462e8249d39ad0fe94ab43f668017e60818fa944fb486de61f3dd8c2c27aa5 SHA512 508285cc3fa12039e9ffbbd945c297b89c1f964c5cf05203b2e889bdbed2d2dcc9bb957a5aef87297723b20fe9b80cbd19ba09dadf86c0f03228311945eb24e8 WHIRLPOOL 32d832d5a012d4642ae57c55494e27ee4b1f623e5c78920ec78264a2734d76fabb68fe49553507e51939a09526ee77ab2c0af9f3fafaced07f7485b45149a9eb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJT0R4rXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVire/wP/jqPOrFM7l3lDwu1IMlA+H2e
-1hOIvqPc3rn46K5X8zyHK6Z/2ZIpCcUN9NipV65zIZRM+dp4j5jBOAGVGII4+BbE
-0cVjD423H+KE+IsjmBATEJJwOqenKqXanS5AF8KOkDvteI22s6tUhMraSfsBxffa
-BNy6feJLwB1ncRhOeyHcEW8IjxR2IQbFW48jbkyBVzAwgvZ/FbCtFIRQtHsfGC4l
-TLIellTmNunjCx+E7bfkjDsypNBx3RCc8LoMIXxz705KsflSjPnqhz45MiEfDoAM
-SUit3B4lPL1+rIvjmE1UBWdDhisJLZhxzKVEZMb+m723YEdlJxhrDhWU7eock+AJ
-FDVkL5Smcr9Zt2Uw/eCYy+1PiX6jsGbk+9YEQH1RSrA2hJokvxZcWOod3yNYLVTF
-nV6KbiqWfrEoiAXtCyBFfv/IX3b7dtRj/e9mG58FFe8s2UD2B4BX+qYiawoteBHs
-CNkR5qOc6PFvR0TeIFj+MRvYcj4akArP47hWakZkeyyvjQhEJjECuEfPY/BVeelX
-ryvzkYHSj2q4JSQsXBteSHye3ovtBtbFRxQ3Nez5vEnZ2b4Ldrk+Fh/mIAXpE5qr
-eK+oL1s6MMdad37B8vebwbRMGcAqb7carypwwbvH/Gs+i0i3zTE928BMnfGMGaPu
-DBG4ghsH6edCV8DtdXFT
-=N2LO
+iQF8BAEBCABmBQJUpA8AXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxQkJBODJCMjJCN0YzOTExNEFFQjU4RkUz
+RTU5RkFFRjUzRjQwMEQyAAoJED5Z+u9T9ADSnHsH/iOwx1p3h1MGxuMX2itRvnT2
+00ucf8K1RYZFdZ+su9TFcJxfcn8+4AFGirihcwiUSGF6LhW49PzXxs/4oTNJeTAF
+Ywp4LQ3u1oTVt7saH9wNl/7NJMxx62fHItjAOOdZw7hGHg2iB7JaCYirdCUawYXB
+NDrm0GGnp6l/5y1pr8jWljo4uUR41tIwM7NadsCAb++yeKTU5ktBllx5XwxRAHuG
+D4Q7OnZlQeQVUp25XUAjcI7EAnWTPx9f8kAX2OdxYJFi9XttS0nsTWKbxchFuEYF
+dg0AYAQCEvAvi5+B38O4CO1i529b135lN6ZyauNOoQt51zyo+/NyT89jKnNUO4g=
+=z7tn
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/spambayes/spambayes-1.1_alpha6-r1.ebuild b/mail-filter/spambayes/spambayes-1.1_alpha6-r1.ebuild
deleted file mode 100644
index 63f2d833ee06..000000000000
--- a/mail-filter/spambayes/spambayes-1.1_alpha6-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spambayes/spambayes-1.1_alpha6-r1.ebuild,v 1.5 2012/09/07 12:45:24 lordvan Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils
-
-MY_P="${P/_alpha/a}"
-
-DESCRIPTION="An anti-spam filter using on Bayesian filtering"
-HOMEPAGE="http://spambayes.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="PSF-2.2 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="dev-python/bsddb3
-	dev-python/lockfile"
-RDEPEND="${DEPEND}"
-RESTRICT_PYTHON_ABIS="3.*"
-
-S="${WORKDIR}/${MY_P}"
-
-# Some scripts import objects from other scripts.
-PYTHON_NONVERSIONED_EXECUTABLES=(".*")
-
-src_install() {
-	distutils_src_install
-
-	dodoc *.txt
-	insinto /usr/share/doc/${PF}/contrib
-	doins contrib/*
-	insinto /usr/share/doc/${PF}/utilities
-	doins utilities/*
-	insinto /usr/share/doc/${PF}/testtools
-	doins testtools/*
-
-	newinitd "${FILESDIR}/spambayespop3proxy.rc" spambayespop3proxy
-
-	insinto /etc
-	doins "${FILESDIR}/bayescustomize.ini"
-
-	keepdir /var/lib/spambayes
-}
diff --git a/mail-filter/spambayes/spambayes-1.1_alpha6-r2.ebuild b/mail-filter/spambayes/spambayes-1.1_alpha6-r2.ebuild
index c628b12e0e5f..5fdc24e9934e 100644
--- a/mail-filter/spambayes/spambayes-1.1_alpha6-r2.ebuild
+++ b/mail-filter/spambayes/spambayes-1.1_alpha6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spambayes/spambayes-1.1_alpha6-r2.ebuild,v 1.1 2014/07/24 14:32:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spambayes/spambayes-1.1_alpha6-r2.ebuild,v 1.2 2014/12/31 13:57:59 lordvan Exp $
 
 EAPI=5
 
@@ -21,7 +21,8 @@ IUSE=""
 
 DEPEND="
 	dev-python/bsddb3[${PYTHON_USEDEP}]
-	dev-python/lockfile[${PYTHON_USEDEP}]"
+	dev-python/lockfile[${PYTHON_USEDEP}]
+	dev-python/setuptools"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/mail-filter/spambayes/spambayes-1.1_beta1.ebuild b/mail-filter/spambayes/spambayes-1.1_beta1.ebuild
index 8b1e04d3941a..eaac5f986087 100644
--- a/mail-filter/spambayes/spambayes-1.1_beta1.ebuild
+++ b/mail-filter/spambayes/spambayes-1.1_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spambayes/spambayes-1.1_beta1.ebuild,v 1.1 2014/07/24 14:54:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spambayes/spambayes-1.1_beta1.ebuild,v 1.2 2014/12/31 13:57:59 lordvan Exp $
 
 EAPI=5
 
@@ -21,7 +21,8 @@ IUSE=""
 
 DEPEND="
 	dev-python/bsddb3[${PYTHON_USEDEP}]
-	dev-python/lockfile[${PYTHON_USEDEP}]"
+	dev-python/lockfile[${PYTHON_USEDEP}]
+	dev-python/setuptools"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"