Properly depend on setuptools wrt #528740 by Toralf Förster <toralf.foerster@gmx.de>

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x5D21B852895192F9

diff --git a/dev-python/meld3/ChangeLog b/dev-python/meld3/ChangeLog
index e80b6f4f25f5b586401097a00292d2c9052bb3e9..042a07271cba267c6a2c352659f35d49ff7d1552 100644 (file)
--- a/dev-python/meld3/ChangeLog
+++ b/dev-python/meld3/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/meld3
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/meld3/ChangeLog,v 1.15 2014/08/10 21:13:49 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/meld3/ChangeLog,v 1.16 2014/12/04 17:24:24 xarthisius Exp $
+
+  04 Dec 2014; Kacper Kowalik <xarthisius@gentoo.org> -files/meld3_tests.patch,
+  -meld3-0.6.10-r1.ebuild, -meld3-0.6.10.ebuild, -meld3-0.6.7.ebuild,
+  -meld3-0.6.8.ebuild, -meld3-0.6.9-r1.ebuild, meld3-1.0.0.ebuild:
+  Properly depend on setuptools wrt #528740 by Toralf Förster
+  <toralf.foerster@gmx.de>
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> meld3-0.6.10-r1.ebuild,
   meld3-0.6.10.ebuild, meld3-0.6.7.ebuild, meld3-0.6.8.ebuild,

diff --git a/dev-python/meld3/Manifest b/dev-python/meld3/Manifest
index 4d1bede2acaf25a723f38509b64e5000bb75cc8c..7a66c2cfcbcc2388d630c06cfdac9e3a3a99afa0 100644 (file)
--- a/dev-python/meld3/Manifest
+++ b/dev-python/meld3/Manifest
@@ -1,24 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX meld3_tests.patch 883 SHA256 fd6e1021be83bbccc5c728a2144f23b0c4836a4a3ec05eb433d6a995fe16b14b SHA512 2abe0615a6072f9f8b889ce03d3aa8f1e749f9c1b2a409f3b00599616f6fc13910005d782d759da8fab8594e2ef8c70bc83cee12d1d10aa52fff20c115c34bf2 WHIRLPOOL 9ecd730d11772c5e5c1eb508fdd418e0946e4bed241e56d5e19d11a0ec2af185a5873df41a81f1afae5a4270b1d1ac588f7f3c08e1ebfe4e6053f5f9438f3bb8
-DIST meld3-0.6.10.tar.gz 41408 SHA256 6642f2444f3527a9338104edc2d1b420ba5a770b578063f729530d1f2f01a271 SHA512 b439a383892b39b4e5e5c8ece4f8cae338277c74a6f4f06c154748ca10c58d4ff0f78cf6af7af74fc3b78867a8d37438d2993adb739003eaa0c5c90659c73fd0 WHIRLPOOL 7920a2a2385b3866bf591c66a5bc14ce3e9665c8f624009768e97db62873c5128b28513f00a8af975276eac9a1fc05a220ffb4afe545f730a2ce10b456526ae8
-DIST meld3-0.6.7.tar.gz 36765 SHA256 851de91432341ca6434b04977a9b8c61e3450541e2906bf9bf22478328f9a24a SHA512 adf0ef0dce7dbac696a0bbc9d9670ed7f45cb1ec5796e568bef51dba12c7deb498fadce8efbb709fedf3dc5e747be6a2eb9ba89a10bda4b98942004ce1787ed1 WHIRLPOOL 0c65f7cde8d19efef06782a929cf894d6363042c3974bb9619fdbb1074dbb0e4ec156318a37b7893719f043881775156ab0f796b4e5d60d953a75fb6b9e6303a
-DIST meld3-0.6.8.tar.gz 40612 SHA256 a425e9a9e0d9e3d69a2f5c1451d582f1222a7be94a957ca1e5301fd4045b5dbe SHA512 79800d4b718d98edb881f291bc13347c3a3e4fa0df037c5deafc729824080bca059ff314e7e0685ac6e30d52b6bdced574dc93b4d0c36c4fa432ecaf0be66636 WHIRLPOOL 0ff160dc95b412b37d8e1ce9e40ce5a43ea3cf7aa218accea067dfc6a0b5ccbd9374a574323aa1203a59d88a87d9e30dac9de8e7593224e1a6ac7f7a30c473ed
-DIST meld3-0.6.9.tar.gz 40945 SHA256 79aea88005ecfc03e6e46d3e5548c81e985560863a982264b0d51bd5b493893e SHA512 e4382e47ab32059337eb128d22b00d061be048d383f93fe57785196e87ded4c028a9f68e479a20ef8371a8a3c43d32baafb3086305b937d6f3a367b39ca076a3 WHIRLPOOL 1f7f860d09737ecd5e95b00940dfca8decbcbd351840e4a43cd3ac59c1c8500326b8f5d2fed59dbc94e790321528f3b5c4b7928680ad9448ff733c70dd3df942
 DIST meld3-1.0.0.tar.gz 36232 SHA256 57b41eebbb5a82d4a928608962616442e239ec6d611fe6f46343e765e36f0b2b SHA512 17d90620b34ddecebcf1d08698149a598f1ac74f3a9c8c5fadcc2ea70d3d94c19ac3d662904f29a5093b3326131a2875940f3fa63a05f288de8e703cfee6e243 WHIRLPOOL f2b23c652757df094d3dc1e5b75b2f1e398c569201559e89cee098d1021b45227326667e510a442e2016d3c3651ce5c78e7e075720f58342f34df0bec6182565
-EBUILD meld3-0.6.10-r1.ebuild 668 SHA256 c851fc1337e93aad165e0c818b9c2be2b53eb7d4e61da641e96f562a8f4ad5f1 SHA512 506116d0a920995882879289d3385873c93302565314f960f5ff9eaac30e042eebe9d8f757497d1fa551d958c28bdd92108cb0a0efec9573039c901edcdacf51 WHIRLPOOL dda0ab88102fe0752329ad96c9b940b59d67642fcc0873639b5d064ab5eeaad64ae69a8104de5f765e252fea04d282ce95c2a02bbcc88bde8ec42220449fa57f
-EBUILD meld3-0.6.10.ebuild 734 SHA256 b2c6343518ac5adeb92cc40b4354e50de1ff4ac0717153a609a5b8368f2f6fae SHA512 1b09b91b4877919ceb511b4bc9931ae216c9544b18eb42db527f5f3fe75866ecaa4eaba2c7f871dd5c8ef49b266dd59fad2aa23e087eabf498f63139d26babee WHIRLPOOL e7bba013531683df23b8083520a11f2c69c5da476d349efa5fff73311de048d17ec5ffc57a51b7f3adc5224a27b5269fe433cc108a5fec8d2a15c81cc35810aa
-EBUILD meld3-0.6.7.ebuild 748 SHA256 a9e2acc293c4e484e7dbac115bdffa2a5be3c2f37e66c7460c5e77273043658d SHA512 6885ec21e0ec9f2df5ffa8a1f2ce959ac413470aa332184bcf1de1f0b6975689b6a1ae546172ee24581903339c3cd097bf57aa9ef2460dc3a81c70c757d9f0f6 WHIRLPOOL 7c882b1e9259b71c4a8e4b632396c7ac60bc65263aa04236f49b073f3a8914a64b40b02d2226c7f9e0c537ec1dc31aceb39ac0ce07e282c85434d5709320a6f1
-EBUILD meld3-0.6.8.ebuild 837 SHA256 8896c430228741dbdb38d52172ae7137d66aaa36d9df6e241f735cd60831f455 SHA512 e7578c3a38ba6382bc3ee4b81a3e45bbd5c153b1e32069fce5beb9049991c4ccca19b28904a87e4d8bb3713ea213ff40bdf6fdbe338621f86d8739346c001365 WHIRLPOOL 7bcf1ab36a964af8c8354ff3965a0333a24a89c58fb771b03645a8f75544a423cfc3bded54e66068230c986b4c6e51a38ec9645580593b6ff2fe5eb677d35401
-EBUILD meld3-0.6.9-r1.ebuild 630 SHA256 6782f67165bd388663de1ec668ce15026b29f3bb3643b76bd3bc0cd42b8585c6 SHA512 7237a8f8baaaadfdaac96cf353bee1d4242b9e1e10ea80e205fa83b69974d7905567567764d2ed6903e1707807a706883e473386e89e6c20ee3aea6a50270cc1 WHIRLPOOL 2f77d25da3134433d56459b9ff990a67e27ca098d7814574bddbd9cbe7039e7af16fb540bb4e7152e1ca349a898dec11f68a4c2637175ddf10c5e6f50d6d24fd
-EBUILD meld3-1.0.0.ebuild 676 SHA256 962e2cb55b0b5d4dda72e71d176efe568ef651fe62333afbe119cf4630e5b251 SHA512 49c3f8f482af9ffad9163ab9114c628cce4174110f67e5d474ee2142e907f9aeac672275a065d6f2e1d11fe0e0e4a65fa0ab25e041c086af5ccf46468fa45902 WHIRLPOOL 5242486f1ea71431b9696e8f9988f176e02158f8d884d35b14aa433f74b4360af29d60fc2386abbc47eea98b7e49f28c2adbb787e23bddfc3a16632b6ef3f7ed
-MISC ChangeLog 2488 SHA256 f3ba300b6485a4c1be84a2a3dd2b01375ea19414b8e2316ca49c2b0a7dfab971 SHA512 10dfaa72442dd8c2484112059700cfdec697e0544813c522c314aa5f55491d8ab80604b0f2bca5cb0e9463c8cb56e8af50ca6996535425eafb42e65026699fa3 WHIRLPOOL ae68c6dd13c9da882e27e2eb820581fa699ae8eaa41f5d43566bc4600b00d36c6e75d0e645f043c424448a358b128a716624ddcec1c34895623425a89a1f1608
+EBUILD meld3-1.0.0.ebuild 751 SHA256 f5707979de188c2262e65d72766793082a855669b027cd74677ab4def065ddc2 SHA512 762adcb8b0081115111c375f44a6764abda1a0dfae86b75d4e94c7f80c11f5a0355e86575af9b9658b74848d054e61bfb4debe812b02b52901562c0bf1c59a4b WHIRLPOOL d78237266fe59ba457d21e98a8486f5a079102fa44c5b77016953a84b61a7a992b691ae4c9f02837416a02dc0a381966b2bc1ca066cceb3316070d8ab674e29e
+MISC ChangeLog 2800 SHA256 51b8499d2d1dd8887204e600b629ee5e406a23ca8717a238fade52dd5a3b55e4 SHA512 0602e65bca89e1f75d36cc5a300fa4a4f394d9caf66b928e24565313e2f5161c1fd98a9c0108a214d4e79b578e4dd4dd3d33e81e44dbf661c77323b37b96fa53 WHIRLPOOL dac434d12c34f09669ec431df27f562ce125b2d1898909c924ecca9f17d1a1b57a2109278eb20e69f4939419a8c12ed35b45360edd28bf2b3ad2060db037f88b
 MISC metadata.xml 228 SHA256 14d9f849159e27bfd86eaeb9393f7cf8600844cb0b8a17efdecd0a18db86805f SHA512 59a150d08bac2b3c60c5387fbd72bf4d36b1aa52bf4d0498b0340c67a6a8de3f91822188e751e8b12bf63ddb137ba45c844a126df15f765b4a9971b37cb32385 WHIRLPOOL 09c9328089ec670abadd63d295638951ed83a840e5c4c91b5f8e0d3ea07a454e618923a3b8bd49e9b06ee5315db810e883740f43360b86e8b66cdf66c9626612
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn4I0ACgkQcaHudmEf86oAfgCeKeYWUNw44GiSThgM1Gu0Fisz
-RAkAn1/uY+HrvEjPj1rpjPuioO/E6cIq
-=fmED
+iQIcBAEBCAAGBQJUgJjMAAoJEF0huFKJUZL5HG8P/0VVuU3MndY8rHTAF51Q/1Um
+VHboyFb8pNcKFzrLehqoApyNZu+XPrL0S9mJYSmaSNE0cbpclZzFiA973KvMM7RF
+8NTdODczS/1OI5+48iX45s3I7N9q5+bzNUUiDKx0H53/72xF322AsRysP/Dgh0j4
+Bve99tWfcbYhqUNI/NCSTZ/Agyv45OWtdnBnpbeSIPLYEgIn8Wf4LtcobMAVbD/P
+uBj/6Hg0u8Te1iy0ifVPV1zpq383RIxT4xtRyWis3mADwt9QcsxGmytpwsxJqY2e
+EUNAqOCCzeYX+DuRdUcx4c/kyG/IH9M5sXcmnrfjJke6J3j13P7JSAZWw30tIols
+Li2TQ3Dbmp4JUexBIBkw2I/kyBX8aWLas6XC/5Tq8QqXZ3BJGDxFr2N1MvWUFdQU
+Qu3iv4Ld5S4B261aBoXmi3m8Lo+OFyuwPnSiaQxWu/rMsrf79Rf5UoS7W/f4W7v8
+5GxOEmyvGfRYs5oRdnAHJfmwHji9Eymenhq4KTk1IpY/j3RzR394x0Tg3hjGc2Xo
+ENPFcnKXfbSY2Tu+1qGuhMrBGySoHkq08oUMtmc+ZkBb2v3CQMeBIHHoln/wYAs1
+7mtY7RmiZlhqqM1cq0O2fqczdy4oRV/jLmxbxyOm4yhSx5lPtrV6/ieExu50bPEi
+Pc+twBk+9TjZEbJqJZ8m
+=s6oB
 -----END PGP SIGNATURE-----

diff --git a/dev-python/meld3/files/meld3_tests.patch b/dev-python/meld3/files/meld3_tests.patch
deleted file mode 100644 (file)
index 21fcd17..0000000
--- a/dev-python/meld3/files/meld3_tests.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://github.com/Supervisor/meld3/issues/2
-https://bugs.gentoo.org/show_bug.cgi?id=429412
-
---- a/meld3/test_meld3.py
-+++ b/meld3/test_meld3.py
-@@ -1672,13 +1672,10 @@ class WriterTests(unittest.TestCase):
- </html>"""
-
-     def test_unknown_entity(self):
--        if sys.version_info[:3] >= (2,7,0):
--            self.assertRaises(SyntaxError, self._parse,
--                              '<html><head></head><body>&fleeb;</body></html>')
--        else:
--            from xml.parsers import expat
--            self.assertRaises(expat.error, self._parse,
--                              '<html><head></head><body>&fleeb;</body></html>')
-+        # exception thrown may vary by python or expat version
-+        from xml.parsers import expat
-+        self.assertRaises((expat.error, SyntaxError), self._parse,
-+                          '<html><head></head><body>&fleeb;</body></html>')

diff --git a/dev-python/meld3/meld3-0.6.10-r1.ebuild b/dev-python/meld3/meld3-0.6.10-r1.ebuild
deleted file mode 100644 (file)
index c649dd1..0000000
--- a/dev-python/meld3/meld3-0.6.10-r1.ebuild
+++ /dev/null
@@ -1,24 +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/meld3/meld3-0.6.10-r1.ebuild,v 1.3 2014/08/10 21:13:49 slyfox Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="meld3 is an HTML/XML templating engine"
-HOMEPAGE="https://github.com/supervisor/meld3 http://pypi.python.org/pypi/meld3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DOCS=( CHANGES.txt README.txt TODO.txt )
-
-python_test() {
-       "${PYTHON}" "${S}/meld3/test_${PN}.py" || die "tests failed with ${PYTHON}"
-}

diff --git a/dev-python/meld3/meld3-0.6.10.ebuild b/dev-python/meld3/meld3-0.6.10.ebuild
deleted file mode 100644 (file)
index a301525..0000000
--- a/dev-python/meld3/meld3-0.6.10.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/meld3/meld3-0.6.10.ebuild,v 1.2 2014/08/10 21:13:49 slyfox Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils eutils
-
-DESCRIPTION="meld3 is an HTML/XML templating engine"
-HOMEPAGE="https://github.com/supervisor/meld3 http://pypi.python.org/pypi/meld3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DOCS="CHANGES.txt COPYRIGHT.txt LICENSE.txt README.txt TODO.txt"
-
-src_test() {
-       cd ${PN}
-       testing() {
-               "$(PYTHON)" test_${PN}.py
-       }
-       python_execute_function testing
-}

diff --git a/dev-python/meld3/meld3-0.6.7.ebuild b/dev-python/meld3/meld3-0.6.7.ebuild
deleted file mode 100644 (file)
index 9722eb8..0000000
--- a/dev-python/meld3/meld3-0.6.7.ebuild
+++ /dev/null
@@ -1,32 +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/meld3/meld3-0.6.7.ebuild,v 1.3 2014/08/10 21:13:49 slyfox Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-DESCRIPTION="meld3 is an HTML/XML templating engine"
-HOMEPAGE="https://github.com/supervisor/meld3 http://pypi.python.org/pypi/meld3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-DOCS="CHANGES.txt COPYRIGHT.txt LICENSE.txt README.txt TODO.txt"
-
-src_test() {
-       cd meld3
-       testing() {
-               "$(PYTHON)" test_meld3.py
-       }
-       python_execute_function testing
-}

diff --git a/dev-python/meld3/meld3-0.6.8.ebuild b/dev-python/meld3/meld3-0.6.8.ebuild
deleted file mode 100644 (file)
index 5db4fa5..0000000
--- a/dev-python/meld3/meld3-0.6.8.ebuild
+++ /dev/null
@@ -1,37 +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/meld3/meld3-0.6.8.ebuild,v 1.4 2014/08/10 21:13:49 slyfox Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils eutils
-
-DESCRIPTION="meld3 is an HTML/XML templating engine"
-HOMEPAGE="https://github.com/supervisor/meld3 http://pypi.python.org/pypi/meld3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-DOCS="CHANGES.txt COPYRIGHT.txt LICENSE.txt README.txt TODO.txt"
-
-src_prepare() {
-       epatch "${FILESDIR}"/${PN}_tests.patch
-       distutils_src_prepare
-}
-
-src_test() {
-       cd ${PN}
-       testing() {
-               "$(PYTHON)" test_${PN}.py
-       }
-       python_execute_function testing
-}

diff --git a/dev-python/meld3/meld3-0.6.9-r1.ebuild b/dev-python/meld3/meld3-0.6.9-r1.ebuild
deleted file mode 100644 (file)
index 7203d99..0000000
--- a/dev-python/meld3/meld3-0.6.9-r1.ebuild
+++ /dev/null
@@ -1,21 +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/meld3/meld3-0.6.9-r1.ebuild,v 1.4 2014/08/10 21:13:49 slyfox Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
-
-inherit distutils-r1
-
-DESCRIPTION="meld3 is an HTML/XML templating engine"
-HOMEPAGE="https://github.com/supervisor/meld3 http://pypi.python.org/pypi/meld3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-python_test() {
-       "${PYTHON}" ${PN}/test_${PN}.py || die "Tests failed under ${EPYTHON}"
-}

diff --git a/dev-python/meld3/meld3-1.0.0.ebuild b/dev-python/meld3/meld3-1.0.0.ebuild
index bc383c0432edf466db720af4d6507825c502d214..38ff271b7876a6c5391ffe667e6bcdb75c3d4048 100644 (file)
--- a/dev-python/meld3/meld3-1.0.0.ebuild
+++ b/dev-python/meld3/meld3-1.0.0.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/dev-python/meld3/meld3-1.0.0.ebuild,v 1.2 2014/08/10 21:13:49 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/meld3/meld3-1.0.0.ebuild,v 1.3 2014/12/04 17:24:24 xarthisius Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -15,6 +15,10 @@ LICENSE="ZPL"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
 # tests use a local path.
 RESTRICT=test
 

diff --git a/dev-python/pyClamd/ChangeLog b/dev-python/pyClamd/ChangeLog
index 8808edf0a9ab6c7faee29bae4f7813d6bf537bd0..9132b2b5a1db566e36fa3b41060e3c2857512a47 100644 (file)
--- a/dev-python/pyClamd/ChangeLog
+++ b/dev-python/pyClamd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pyClamd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyClamd/ChangeLog,v 1.1 2014/09/20 13:06:30 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyClamd/ChangeLog,v 1.2 2014/12/04 17:26:26 xarthisius Exp $
+
+  04 Dec 2014; Kacper Kowalik <xarthisius@gentoo.org> pyClamd-0.3.10.ebuild:
+  Properly depend on setuptools wrt #528740 by Toralf Förster
+  <toralf.foerster@gmx.de>
 
 *pyClamd-0.3.10 (20 Sep 2014)
 

diff --git a/dev-python/pyClamd/Manifest b/dev-python/pyClamd/Manifest
index ff7d7ef33e4c2772c5614277c19e7d0dc47bdaed..41175b4dc92d42d4857f45721dd211ebfec80232 100644 (file)
--- a/dev-python/pyClamd/Manifest
+++ b/dev-python/pyClamd/Manifest
@@ -2,15 +2,23 @@
 Hash: SHA256
 
 DIST pyClamd-0.3.10.tar.gz 8929 SHA256 ed77743c32298b151c881cc52a211e188bd24203ae402f2640def858c6a2bca7 SHA512 2c895fbc5897646ad5c23445062fb2e34a2db070471afd8356796f5f458d90b0da824af58b8ba762ce49572acaee6981881169eb33231085dac82ff0169fa2c8 WHIRLPOOL fa9ba64ab721169373572e552450fcee96db0499a9eeb336763ed2ea9e6f24328aece3b46a2c04ba2a6706f8d6a047ea0ef96f1fe53a6ae4663be0980d9e9c43
-EBUILD pyClamd-0.3.10.ebuild 605 SHA256 3466a11b6eda0b869683536f6c3cbd3d9379ab81a136a12647be9b900a91c420 SHA512 7c6e24bcc3ba5a530d295cb8f6b7d1ad61548b8be3955b58b29023516aa1d24136c805fcba790b582b1a5cbf82823f7d18a3ef7fc16403cb204e5cf31fbabd5c WHIRLPOOL 246a24d059e0b7af82abcf8f3d95d428826edd145a4994151080597306ac89cb4112d36bf6bd8f431c5cb1babec5d5268ea69c1e8c999d08bd15f738cb2e24e8
-MISC ChangeLog 341 SHA256 6a1b8a59f93b07a47e8c86bbcdfa9bda99922ef3aef45b292405666fca7d32fd SHA512 ab072b0e38273e33c44713605533ab0813bd0ecf55b4a332492421957b606ff5047f44220cef2c18d808a5bced23eb77bb4f20f979ceb2be28d70d0507e23cae WHIRLPOOL b1520b82069dd810035912a93217b2d6f5e8f525cf13b415561c580cac2eff2bc1f878e2f085a40df7c8840bbbdb53d42c232c3f0db3b014193a70c4e8d40063
+EBUILD pyClamd-0.3.10.ebuild 673 SHA256 b1c9fea74240db58c67def2ce74fd7b0554ca3576a65d4c6d8edd29943f24047 SHA512 df62a88419c52648195f33c40714793af7efc68330e3d1cbbd26fc1e72834e0060ef5d3dbe6edeebf3ba6b3b320a1f5d6741bc93a906cc33348fbf025f6522bb WHIRLPOOL 3b39dbe566fd23395a8afc03cecae5dbc7f2f9ccdcf3c2738176372d895fea8e9f96fafd7cbed2e0f966511a280196465fe5b90ecf567ae51d6c7d30b02a831a
+MISC ChangeLog 516 SHA256 a6d82465feec6bd6f8a2c9dabbaedda4b798142957c9157832a3aaa14fa7e61c SHA512 e9fa0654eca5b833321cdd82171eddfd20b14664a5ebac47a832263402f967390adec0a985a4585684f24f01111c473a2965be82897fd13302b2254d9a0aa3b3 WHIRLPOOL d307cc1f4b4ef2a35d359e9625f7c210b2a4f524c97184f30e5f731f75921f148619cafe1e6bd929fb1ffeb03a26602d6436aa1f4224922a4a6bb12bcf966f03
 MISC metadata.xml 223 SHA256 89097f936927d56068988263e382edb683f359b27293955708e9ade4d256220d SHA512 c9f6a48b2aa05afdf73b8bd824c65480d76e54b659ca39928398c66f764d34faf186255d8aea034737424a962cf35151b610d078a01f8193b027c63e1e3c51b5 WHIRLPOOL 1ce20c98a7e177b8f510ef41f3935b0db5e04b2ecf465a683b2f2515f6a3043c33e6e9efc87f5aaaf59b2ed9be376d9d16bc8beff66b11aaa50ea899bfdc1f62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iL4EAREIAGYFAlQde9pfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky
-N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JAv4AD/RM83RmVEi0DIxVpHpyIPMkrM
-RQyrfRUEbebQYtKr/RYA/3QgFy+vhhCzcvAsExb7G26Tt/RQu+AAOiqj3kqGwwni
-=uMwG
+iQIcBAEBCAAGBQJUgJlDAAoJEF0huFKJUZL5s18P/A2N9p9e3eXl4xfHj68S4kkN
+qEoHBmhvTwSVNV8U/rLlXk4RUUP+SV+dxNFFTC/rBhtgyG7s+wB/vfbVc2vVox5m
+J0nmLfPZ0m0ESkXAHU0nYAm6QDNGXMPVjWstUHzrS77qOFMWz5R3LKYV2fEaQn+L
+K6XJgxl4oOo3M5v1Kehpxle4ojXbINOvbLomeHcHtMWrucUyt4XQth+flBX6zwmV
+IvfGwENXNvhu24u3oqymwbQ8bbbEsS14BLVzcN6ptCmTex+NjbpZmez4sRgybL0S
+kuraf+TcRuMjsPXo4Z7Awb5IWSmvLdg5S6xhcfbpoZMi8wi/ceZRwq8bpIi5mkkg
+kJSgPGV2wM/8npepzZl7GSRoNIaytLX5aIDS1Z+Qm8gSp721FG0IOt3xPfv8xoTN
+N6b9WLFiMMANEuw5aG0+8PLcbzFudhMxI46Ct0xAte639utC4iH198rwq+D6usPl
+Qv3GAAJfmuDmhmmWlZFh3hxIhfCqeNwI0WryV4oye2YriyaNHt3vM8s+quptzLjK
+D6P8lEOsnFVkwE4Ovb5mc12amACwKdTPr1OzqbQcNYFUAodhtUawHeqo19l0jS8J
+nwwp8idSMLyoFJzUv4i3oNXUJk8fWPD0zIuFBmxtL35hkt23VpFEnxfoih1mjhHM
+OsphKknyjrxXC1Y9REH3
+=Io/2
 -----END PGP SIGNATURE-----

diff --git a/dev-python/pyClamd/pyClamd-0.3.10.ebuild b/dev-python/pyClamd/pyClamd-0.3.10.ebuild
index 6bcee3d949b0a7028cea23dcd82b70e2169e64dd..ca4ae354371cc744dcd5aecd784a1993e450054c 100644 (file)
--- a/dev-python/pyClamd/pyClamd-0.3.10.ebuild
+++ b/dev-python/pyClamd/pyClamd-0.3.10.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyClamd/pyClamd-0.3.10.ebuild,v 1.1 2014/09/20 13:06:30 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyClamd/pyClamd-0.3.10.ebuild,v 1.2 2014/12/04 17:26:26 xarthisius Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
 inherit distutils-r1
 
 DESCRIPTION="python interface to Clamd (Clamav daemon)"
@@ -16,6 +17,9 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
 src_prepare() {
        sed -e 's:/etc/clamav/clamd.conf:/etc/clamd.conf:' \
                -i pyclamd/pyclamd.py || die