5 files changed, 29 insertions, 79 deletions
diff --git a/dev-python/flake8/ChangeLog b/dev-python/flake8/ChangeLog
index 30e84ce3a167..79f59f0f21ba 100644
--- a/dev-python/flake8/ChangeLog
+++ b/dev-python/flake8/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/flake8
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flake8/ChangeLog,v 1.27 2015/03/09 00:05:23 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flake8/ChangeLog,v 1.28 2015/03/09 18:53:13 xarthisius Exp $
+
+*flake8-2.4.0 (09 Mar 2015)
+
+  09 Mar 2015; Kacper Kowalik <xarthisius@gentoo.org> +flake8-2.4.0.ebuild,
+  -flake8-2.0-r1.ebuild, -flake8-2.0.ebuild, -flake8-2.1.0.ebuild:
+  Version bump, drop old
 
   09 Mar 2015; Pacho Ramos <pacho@gentoo.org> flake8-2.0-r1.ebuild:
   x86 stable, bug 540290
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index 1ba3b9f8897a..fc64d1c8f47a 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -1,19 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST flake8-2.0.tar.gz 10511 SHA256 8dce4f7e64cc202cc6da93eab84b2ce660110ff684b6738bba64a0a431b3bc69 SHA512 6e3d8030562c4489dce8d4b17464ea8c0239b7c28fcefb7c67bff645e18628bc3074ff0ff197ab54228544d0ff85c2ff9509502c8f98371d8dc5df6f1e3ec047 WHIRLPOOL 46dabf0120b97cf20b58d76745dd0c23aec69f4eeb25b8605944c7ca4f8a05580c6c9df3ce7ec4e507f2402ddb53da2a6730cf6b246eec8472562ec33fcbb9e2
-DIST flake8-2.1.0.tar.gz 25010 SHA256 098ab7991067c08cfaa4716de20066d90f66dbc71502114ea8cad9a9fd5c9512 SHA512 bf961d76ed08dafe7c2a9b767594577a57a2276166e515f1d84654223aa50879c5ee1e20919b3a4c7576c7d549037c8cfe67c11ab1f6648a0205200f5060950b WHIRLPOOL 48982d33cd32f557796ef103da441f46d3a6ddbf1d1cace66f3ceac8b31bf78389c72df4a717881fe3735f6301b8ce0831908d32010f94ce72fc5414404261d4
 DIST flake8-2.2.5.tar.gz 28333 SHA256 285e8bd730c0b6fdfbe23c32d2936bffba401f23cab132e8722c68be80d6f182 SHA512 fe5e06d3a7699e3f348181108f1ab3ee9eb1f2b0422de582a172d3a4aed42a5cf839ef8a5b5b113da1e0c3c2b53ed7b43af1ca24314ea842d0d3d3735eba1dee WHIRLPOOL 6c1e737a760876d410fd116bf2b8104f932b6751b5970096ddadcead5937fba21772fb28c1addf8026eda5ec573eb07cd920e46fb711d79f46de559d229c8705
-EBUILD flake8-2.0-r1.ebuild 871 SHA256 1beb2b028f03773b7e8efadb898db1cb46858440dc3ee641acc59a6e87580d1e SHA512 3ce1ca4d43dbed1b9c8370a8ae066d755a219df814b9a7589ff0fffb699e0b3b52aa6688a819592976cd00f8447d95f128103d717afe18dabe2c2a3ed89858f9 WHIRLPOOL f930b63a2c7d1809d5885ee8f4e45ebee7063d47ce98e8820d8227bc58145ee0b02720a2890ef6d7b778b8cfee05a2bb14c03fe8e926f554abd160142cd58c42
-EBUILD flake8-2.0.ebuild 888 SHA256 547e6ec8e5c3315a87b25b4e380a30e52ef338ab6f9336afb11e9eec59fc6468 SHA512 4ba7877e476c6a72a522a8fb389361d952a7b66e5eb3c679c30a1291a736661e339203e2048bb4c4301ec6a865ba1138ad828e2b07b61412df9d739726fcbb4a WHIRLPOOL a0cb69081638465fadded56fe0596b387e21152659050a7c2ba9e8c5728e680a553512a1d7ca7fe7cf526497d78d17222f2b6809368b53a9da28169c5d3ff4cf
-EBUILD flake8-2.1.0.ebuild 1173 SHA256 6217135b9d09d6f768db0cb24f0f982ca6c9ca7caa64d3f7d9e670fefddc020a SHA512 2231332508a94a3a5cde1e5967473e59a26c8db5282dfa35acf28fe2a48cf0d977420dae0786ddd6c1ce48487901ad5d9dde8a3227b42c2326ff48b1c9bbad27 WHIRLPOOL 9f96c4c5cb8ce60391093c57477512d1ba206dcf6f62841e846baaed7f46d3cb83a5c28fe54b308b1674718cb2c6cc31105a180ca31e848917dbd259093bf6e7
+DIST flake8-2.4.0.tar.gz 67257 SHA256 d26a9d0252da9f831b8277b824961bb10b1f9d79f4752d32e4814b7bcd1e089b SHA512 fda9b8478550cc1b3cb05a0de0c8a008a41e8842c8d27268baa3114abb7358445267bb114942a155b089582314fe952f0714e34d738c054ab8bf46869a2c1b98 WHIRLPOOL f8a516f0d6cabe67484afd0393f0ca13b9cb9e89f28304ea1ea01aaab4b7ccf5d332cdefcf209eb7847e0616c72fe3d152f6f280029d45dbacd7f4d067d92b0f
 EBUILD flake8-2.2.5.ebuild 1203 SHA256 5b70911c8e524902bb7d27f855178bb0c5a2067973b7c7c0df4d722d2e76f5d8 SHA512 6fd0215aad1867259352be893cbecf7dff9201542358ed99ba9bbb09924a27aed9240af1e78fd5074a0ea9032096a899d6120cc3aba128662b0fc4de4f27c972 WHIRLPOOL b7c8102a2e47da41a74d550572df1577906fbe1e70dfeaefc9196275a560f5ea2ebb228cd7a9108081ea99bbd03e7a70f2dcd3f4f77df52dd657e79b40434694
-MISC ChangeLog 3261 SHA256 e258033b5f542ade03b95185cd47a9dde5a50bf2f98b1c2369e361dff5d17378 SHA512 deb8ee9d23aa2dcc98da70f9da63eb76a8ee9916a24ffb703772190dc363204105752d01d601d25c9e4358cd91e71a7bb0412728ebe4ad37df91a969bc9a4df7 WHIRLPOOL c8facf85f5948e82e2299804b982b9f697740d053a461fa021230bb269ab487a55384efdec1067732d96a4931054b7c16bccdf52324bcfc2b1f2599ad59068ae
+EBUILD flake8-2.4.0.ebuild 1212 SHA256 a0106e2e312be7711f824d8f5c10b768fed81d2d9116c8bd9cff8b8985985df7 SHA512 4bbff33192525ceeb9693c415f1454afbdbbb8ba0f486f2c7eb7dff1678bac4353511d7bb8d61fb2da241468461e670077ae213ad3579bc43fa1f1c73e57ed62 WHIRLPOOL 99e23ae4d1814e120b009a9befb50ba5cb7c9ac913013ebaeb8de233861436f86493c7ab9bf29314b11080f78dda026f841abaeff721abb0fb3ac88265e3fd6e
+MISC ChangeLog 3464 SHA256 5b4322a3e1379806b1e67aae53df434b8a2a26c129e2e09fe3d4eafab20ade81 SHA512 9b8ac48e5a78fb57f8a136dad1931ffe466ef2b76848c0789cbfcd9c281bd7b1fa0633648b1242d723568b6c6b13ff2e3dec6f335a4d72b6113753b42a2551da WHIRLPOOL e3ae2f2ff65cf95322dedcab67c598265241db2c7d43424ac3f022a1b90e2640d1b5dec2e94efbddc718c0fd1ab368d2990476b8c3cf5cc85f98753197d1a9a2
 MISC metadata.xml 161 SHA256 6f41e9b782499f6bac80760066dc5ebb307e73d31d2080f2eaa383b8a236c68e SHA512 9d77a0cf6ef95d95fe0e41852a1ddedc8bc4a82d39fa75e8bbf760ba835deebe6ac3beddc83b9b70e381cee31936f54bb2db7cb88357ed2228c9e972cf2cac47 WHIRLPOOL 1f1ee9aa1b4b8747fb5f6c9234263952071a1a90100df893eb7fed974ea7c63639796521cfa1fde8929fc2f1bf0cc65e88ef6d703a2dff633816ff87cbf21411
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlT848EACgkQCaWpQKGI+9Qt0wCfR0MVby3sD/Uu7EPSBLMKmtmm
-XLIAn1MgZZsdOWWbcfauPLJPR6wEPQQw
-=Ky0a
+iQIcBAEBCAAGBQJU/eweAAoJEF0huFKJUZL5vWQP/ROyyBGpHF3m3bxso9AHYte6
+RJ6x/JbxctdXuDLg8w1xgf1Fn0cZ3LeXFW9XYpzOuPxNP/XrBnDEZm7sMjACkxn4
+PCECnMdIZ3k23GaZuOOLH8WN/EKr3rrUqoG9tDVhe45coSEQxDE0WkJFtZUG2ZAI
+XzaCzczCuHQOlCHOHt+dhgYULIURdhnVI2UQ5hR4PSMSTxiL1xgHDbkR7deVoJsr
+Eji/BQlO4/LhzDeZ+RBxF+bei3RcqOPvzUf0UVBmqkmCGc0MsXO1RNytdGFThknw
+s4VPTHlFGosVMIPfvtXOokMycWBubwMfidfkYu2VoMF3VOdo7IRT3P4SZ2k+9aoQ
+8D/Jfpkk8xoiw1t9QlYRMsntayedQoQfrn8BA017RwlOCqAZ6vLpxIVsbGYnwrVa
+McuRVYzvvyAMgMjUdRiDw0bUc1SSP6swSw8vkJ7VO7hCIb2QhxMHZ7T0eAuYh213
+GIGlsHNDOocOGSYiMH/scvas5lt2WXE8zuDGzcRvqOiO3KAyhCRbTK7kUBf8Dmdg
+MB0oF1bVUfv8g8FLG69qfwaLnoUO6jKU+Y+6Tz81Kt5zvh5FAM0DadPHddMOmqgE
+oZuAMLufV9+r1q8eEp8Nl6YDVCxWKvmUFV0yYN5+Aw83dKARBQ3B6EludFLIEmia
+j5y7DtI/HtccpdN4Lv/7
+=SmR5
 -----END PGP SIGNATURE-----
diff --git a/dev-python/flake8/flake8-2.0-r1.ebuild b/dev-python/flake8/flake8-2.0-r1.ebuild
deleted file mode 100644
index faa8b1794541..000000000000
--- a/dev-python/flake8/flake8-2.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flake8/flake8-2.0-r1.ebuild,v 1.5 2015/03/09 00:05:23 pacho Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="the modular source code checker: pep8, pyflakes and co"
-HOMEPAGE="http://bitbucket.org/tarek/flake8"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 x86"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-RDEPEND="
-	>=dev-python/pyflakes-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/pep8-1.4.3[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.2[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	esetup.py test || die "Tests failed for ${EPYTHON}"
-}
diff --git a/dev-python/flake8/flake8-2.0.ebuild b/dev-python/flake8/flake8-2.0.ebuild
deleted file mode 100644
index bb6407923de9..000000000000
--- a/dev-python/flake8/flake8-2.0.ebuild
+++ /dev/null
@@ -1,30 +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/flake8/flake8-2.0.ebuild,v 1.11 2014/08/20 20:30:48 blueness Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="http://bitbucket.org/tarek/flake8"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86"
-IUSE="test"
-LICENSE="MIT"
-SLOT="0"
-
-# requires.txt inc. mccabe however that creates a circular dep
-RDEPEND=">=dev-python/pyflakes-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/pep8-1.4.3[${PYTHON_USEDEP}]"
-PDEPEND="dev-python/mccabe[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${PDEPEND} )"
-
-python_test() {
-	esetup.py test || die "tests failed"
-}
diff --git a/dev-python/flake8/flake8-2.1.0.ebuild b/dev-python/flake8/flake8-2.4.0.ebuild
index 8ec7c3bcf041..c166ffb9b195 100644
--- a/dev-python/flake8/flake8-2.1.0.ebuild
+++ b/dev-python/flake8/flake8-2.4.0.ebuild
@@ -1,25 +1,24 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flake8/flake8-2.1.0.ebuild,v 1.10 2014/11/03 11:20:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flake8/flake8-2.4.0.ebuild,v 1.1 2015/03/09 18:53:13 xarthisius Exp $
 
 EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
 inherit distutils-r1
 
 DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="http://bitbucket.org/tarek/flake8"
+HOMEPAGE="http://bitbucket.org/tarek/flake8 https://pypi.python.org/pypi/flake8"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 LICENSE="MIT"
 SLOT="0"
 
 # requires.txt inc. mccabe however that creates a circular dep
 RDEPEND=">=dev-python/pyflakes-0.7.3[${PYTHON_USEDEP}]
-	>=dev-python/pep8-1.4.6[${PYTHON_USEDEP}]"
+	>=dev-python/pep8-1.5.7[${PYTHON_USEDEP}]"
 PDEPEND=">=dev-python/mccabe-0.2.1[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]