Cleanup

2021-03-24 10:43:18 +01:00 · 2021-03-24 10:43:18 +01:00 · c5c8954dc6
parent cb71574f2a
commit c5c8954dc6
32 changed files with 19 additions and 1736 deletions
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@ -1,3 +0,0 @@
-DIST certbot-0.36.0.tar.gz 1322339 BLAKE2B 69fbf68b5dd95d6d3ac6c868d583da8c66dfcd01e3471c511d0d9d95de08ac096479733e9fca12ca99abf43484835fa7184dcccb1c11a41ee7948174364f2894 SHA512 f7fa8c6200a76b4fc4830865bf11fbba8bd73ea55e1236680181073952505c83b4650b43ccfc8e9b96caf47b85c43e47acf8db6d92134f7c279ebd954ab0ac92
-EBUILD certbot-apache-0.36.0.ebuild 1080 BLAKE2B d619b7b78385f52863109318365b53a5787e5c2c64bbd26cbbd735f81971b6703fd8c0367bae1d55d44f9f6782157ade26aa19d5643f078b1146d0c0f67576d7 SHA512 b158899197ccc0e9c145f90f92fa4f48ca71c2781fece4185ae1dbd01f943dd75ab3a05ef58f83558c3da7108364af094eed6d008945f9c011b80357d2d8b741
-MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
--- a/app-crypt/certbot-apache/certbot-apache-0.36.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.36.0.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-0.36.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/python-augeas[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-	dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests || die
-}
--- a/app-crypt/certbot-apache/metadata.xml
+++ b/app-crypt/certbot-apache/metadata.xml
@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">certbot/certbot</remote-id>
-	</upstream>
-</pkgmetadata>
--- a/app-crypt/certbot-dns-rfc2136/Manifest
+++ b/app-crypt/certbot-dns-rfc2136/Manifest
@ -8,4 +8,4 @@ EBUILD certbot-dns-rfc2136-1.11.0.ebuild 1172 BLAKE2B 34fe0922f2540692493232e49f
 EBUILD certbot-dns-rfc2136-1.13.0.ebuild 1168 BLAKE2B dc81d001f898be52daa3fd9aeefb99abacfb84b8d5632f496ab0df5bce588caa6ff0a4e32fa0205719b03376f055e6512f0c00a95464fb3cfe07e2fe00a901ef SHA512 7b8e35497134fa356ae200ee6b800dac57fa945fb741e0f558304c0298d37590330f498b0d8d9ce1228a953a17b040bb9eda9c2183e75f4b3698743d7a4651b8
 EBUILD certbot-dns-rfc2136-1.5.0.ebuild 1129 BLAKE2B cfc5451a6453a8af0fcf06aaacc231660aa3a21753ad24e5220bfbf3997bf8aea46fb270970dd4f81d3ee09b6a311301fab5c508b3ce0155b2271ee8ee7c2b88 SHA512 b452bfa9db5c1a49923dadeaaa51e993b9a0f6153c8b91c6e459886ac1e41815452818f4082987f100aeeb2a477d9cf7c43b25cb5e4178b55b11004562f1ee85
 EBUILD certbot-dns-rfc2136-1.7.0.ebuild 1129 BLAKE2B 40e805e5c505b681e87d50f156884cf2885f6e0ac4094ea78eef3c5c5e17226728cd58b91d0857f90da363eed8c0daf81b3bed20fe27853b98b1f07d7df60f02 SHA512 fa16ce41d5769e9e07c65172d74d8beeae04ec922b66db5997026c4cb461d6a7a86318d5ee054d0f9d56c498585452b1f885570ad67ee3e9c1533e3b023e8f7c
-EBUILD certbot-dns-rfc2136-9999.ebuild 1119 BLAKE2B aed6c595e1e434b18801fd47ab9492c721947d98dc6d235ff915685abb62f3827a05b9529f3cd8aeee73ce6aba0696fc6465ec9af1fc61edbed1be6570c6b826 SHA512 020a5ff00f101325dfc052fc1542b7ca8e619aa73df651a3e9a7610cad1cceea7114297a7f084f7295e36065b8ccf8bd85fc74af6ac6ab4acbe70bb21e0b2442
+EBUILD certbot-dns-rfc2136-9999.ebuild 1168 BLAKE2B dc81d001f898be52daa3fd9aeefb99abacfb84b8d5632f496ab0df5bce588caa6ff0a4e32fa0205719b03376f055e6512f0c00a95464fb3cfe07e2fe00a901ef SHA512 7b8e35497134fa356ae200ee6b800dac57fa945fb741e0f558304c0298d37590330f498b0d8d9ce1228a953a17b040bb9eda9c2183e75f4b3698743d7a4651b8
--- a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-9999.ebuild
+++ b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-9999.ebuild
@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
-PYTHON_COMPAT=(python3_{7,8,9})
+PYTHON_COMPAT=(python{3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS=rdepend

 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@ -10,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-dns-rfc2136}/${PN%-dns-rfc2136}/archive/v${PV}.tar.gz -> ${PN%-dns-rfc2136}-${PV}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	S=${WORKDIR}/${PN%-dns-rfc2136}-${PV}/${PN}
 fi

@ -23,8 +24,8 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="test"

-RDEPEND="~app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	~app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+RDEPEND=">=app-crypt/acme-1.8.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-1.13.0[${PYTHON_USEDEP}]
 	dev-python/dnspython[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/python-augeas[${PYTHON_USEDEP}]
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@ -1,3 +0,0 @@
-DIST certbot-0.36.0.tar.gz 1322339 BLAKE2B 69fbf68b5dd95d6d3ac6c868d583da8c66dfcd01e3471c511d0d9d95de08ac096479733e9fca12ca99abf43484835fa7184dcccb1c11a41ee7948174364f2894 SHA512 f7fa8c6200a76b4fc4830865bf11fbba8bd73ea55e1236680181073952505c83b4650b43ccfc8e9b96caf47b85c43e47acf8db6d92134f7c279ebd954ab0ac92
-EBUILD certbot-nginx-0.36.0.ebuild 1014 BLAKE2B c424ab9e7f11ad23e128e0a9876359ebdea32746a810380e17acd108bec3920b3ed8b48992446b0a1a4bf704f8dd07e20006fcdb7ca26338bdee85b0ac1676b2 SHA512 ebeb6165a82c28105a65032c47ef92999df3aae3aa75bb9374405f58918743f983802ac8b62945eb2c93b3183a7065f36bdebd1d50ebbb94ef4a7ebca9ea1e63
-MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
--- a/app-crypt/certbot-nginx/certbot-nginx-0.36.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.36.0.ebuild
@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	>=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-0.35.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
--- a/app-crypt/certbot-nginx/metadata.xml
+++ b/app-crypt/certbot-nginx/metadata.xml
@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">certbot/certbot</remote-id>
-	</upstream>
-</pkgmetadata>
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@ -1,3 +0,0 @@
-DIST certbot-0.36.0.tar.gz 1322339 BLAKE2B 69fbf68b5dd95d6d3ac6c868d583da8c66dfcd01e3471c511d0d9d95de08ac096479733e9fca12ca99abf43484835fa7184dcccb1c11a41ee7948174364f2894 SHA512 f7fa8c6200a76b4fc4830865bf11fbba8bd73ea55e1236680181073952505c83b4650b43ccfc8e9b96caf47b85c43e47acf8db6d92134f7c279ebd954ab0ac92
-EBUILD certbot-0.36.0.ebuild 1366 BLAKE2B 81a7df13ee1e1abcb0dfff63995fb752a5e0a3d6bebebf45ea11f476715ed96e5417fd667dd5f4faf0ad446649ad03e4c45be33b035cfecbe023aa2a1044e1d2 SHA512 2bac9490ac0be45fd39696c5befc5f63436a6d8f6238fba0ba1ec07a1a892f3887f49ed23499df4e07bd712666bd579d9d035358bbd70465a7ff2fb4231dea0d
-MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
--- a/app-crypt/certbot/certbot-0.36.0.ebuild
+++ b/app-crypt/certbot/certbot-0.36.0.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	>=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	# acme is not installed, removing it here is fine, the dir just confuses tests
-	rm -R acme
-	pytest -vv ${PN} || die
-}
--- a/app-crypt/certbot/metadata.xml
+++ b/app-crypt/certbot/metadata.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">certbot/certbot</remote-id>
-	</upstream>
-</pkgmetadata>
--- a/dev-python/flask-cors/Manifest
+++ b/dev-python/flask-cors/Manifest
@ -1,5 +1,3 @@
-DIST flask-cors-2.1.2.tar.gz 27712 BLAKE2B 5132975b6f839390ce4c567581de0e780aa4894a69e42f965db5bea91622241101b164ec9cf498b9dbca5fb5c02c37c065065e79bbc997c9f3f4f5296e59d708 SHA512 61b0c32b63ea3f63350b69946411a2f370507aedf8898e0129c6fec9069d171489e853a57009815ff9b4c0ae7398b018200fb72d9478349b32fa24c243940604
 DIST flask-cors-3.0.2.tar.gz 28353 BLAKE2B f8581392ef20855816282282574a1bb29f6f2c7b1a6b7e7c316ea33e243d6a03eb0472e5c0a91b7eb52482000f0e9df21184c872da831d8e49f88f0566ee5662 SHA512 8e78a7038663e20ddb250a798907bfb93ac37dce9471f4eb157ea7333ec5697c0b3f4dc1abe4d794ee13ac9d43c635515ea8a03c3da864f5acd8eea3c41ee915
-EBUILD flask-cors-2.1.2.ebuild 1696 BLAKE2B fee763ead6e3a93aed60fb9262f7a5567d7f6422624dfab907b213bfbcb1fc4490fbd2272467949afcfe5e9f6d61f51d70e74230ffa069def7f0f6ac4ec7dfaf SHA512 476a9c13d55b4f2b297d5227de71a3e061f69008d753512c46ea14afefe4bf243f943761d13f0c636dd90e3be5cd54f6ee3d1f04fc7d57dca3c4a3c386430f45
-EBUILD flask-cors-3.0.2.ebuild 1691 BLAKE2B f209c783683fa2eda72078de1dda3ebba8cd92cd3535097fde065629b9ebaba35d757a7914d57bd9651d789e33d4c212e8448e1f30ed920de8323d6010fa6d25 SHA512 6866b82af486eb6ea75649bbca2032349ea6c667bf2614f7f449e107d60ac5d6b963306c7caba0a1003cc04d196feddf4b857b0b301ebff39ffaea033cf84c20
+EBUILD flask-cors-3.0.2.ebuild 1722 BLAKE2B ae8826ed0ae46886e73a1a0d07e3ee629d4638edf4725ca7f58e006b9e0f87a25c45817ada001c221c219f15a7e3a1efc68624472126a16a3fe99df95fb8fe9c SHA512 6979723777f57e3a76d2d2e077b2010ccabe10383f8b25a47c77e1c53b216b4a0ce242ea48d6b93a02e397c09e263bd8be45af0a40c5f194521fc414723f1f7e
 MISC metadata.xml 562 BLAKE2B bb9019ab1ab3d32edbd6a489d48d153d1e61951b424eaad1dddbee85e65a220acc6b1e5cb2e8373d9b9c6b6de63f719574a45de675a3123ac142dc75f92adc29 SHA512 0f7aeff494625337815930c46d69e05f5a34c880761c1de16bb8006477aab1208c2991b9388b31fc4ef42fb3adc9921494e92aae832ab774999953700940204d
--- a/dev-python/flask-cors/flask-cors-2.1.2.ebuild
+++ b/dev-python/flask-cors/flask-cors-2.1.2.ebuild
@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
-
-inherit distutils-r1
-
-MY_PN="Flask-Cors"
-MY_P="${MY_PN}-${PV}"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://github.com/wcdolphin/${PN}.git"
-	SRC_URI=""
-else
-	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="A Flask extension for Cross Origin Resource Sharing (CORS)"
-HOMEPAGE="https://github.com/wcdolphin/flask-cors https://pypi.python.org/pypi/Flask-Cors"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		${RDEPEND}
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/python-docs-2.7.6-r1:2.7
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	if use doc; then
-		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
-		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
-		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
-		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
-		sed -i "s|'http://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" docs/conf.py || die
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
--- a/dev-python/flask-cors/flask-cors-3.0.2.ebuild
+++ b/dev-python/flask-cors/flask-cors-3.0.2.ebuild
@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
-PYTHON_COMPAT=( python3_{6,7} pypy3 )
+EAPI=7
+PYTHON_COMPAT=(python{3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS=rdepend

 inherit distutils-r1

--- a/dev-python/guessit/Manifest
+++ b/dev-python/guessit/Manifest
@ -1,7 +1,3 @@
-DIST guessit-2.0.4.tar.gz 73497 BLAKE2B d1910fe754dee4aabb6b3bead5ddac38013c40a9bddb317989719fa1fc1082cd6953154258ed313e762094e57bffc4b82a0a9080341583ae13feea9470c7fd9d SHA512 ed44267881df208743900b4977d9e9bd555e9bb246b7de78e205c9038c6d8e395db05ba9d982dce830b1ac0c4d002f08b24e1cd7194d67aed942d60986fafd04
-DIST guessit-3.0.3.tar.gz 137804 BLAKE2B bcf79a896d02826ab154f671e6854898ded179d8babafa0ed7625553bfbde3b401540679311c19c72a494da61ce3193dfb5c8ac95487fa72e86db7f3e2047129 SHA512 c8743ee7e93e425c129c659afa0446d37a0e621e48659e283780c33659179e1b2d047a5656d6064afab8fc06711b76c073f131d1b6afbb7d663f3505ab25bf8b
 DIST guessit-3.1.0.tar.gz 144079 BLAKE2B 6294b380d236b881c963c9ae160a9b2f36a95e0bbbad8ece9dd8b81a566480e8299cddd4db68fd0af7ade96ba1b77fb5409ad94b4cc0c6a9cb66153a3f9a57c2 SHA512 cd5557ec7c5de2b95905d412dc30efc077ce39efbfdb4c3a7f73e2062343d2b17ca479a8c8164cfc863afe7bb5ceee2eff9289226bfede3df030e12d5ff86282
-EBUILD guessit-2.0.4.ebuild 1271 BLAKE2B d03ff5470466c8b5cc8a31af2b676c69e090d109d71d5ec042608c6133fe602813924e74a5040bd62435c3e8db4b1bd3598abdbb31275843e29a49eb4ef25c5b SHA512 4ad541493a6935377a13e8eb317092b581014f043e7c52455fd530308fcd516fc11b0031f4a19c786542283797c1fc9b8570e77185fee8db3765096a45d797db
-EBUILD guessit-3.0.3.ebuild 1214 BLAKE2B f479ea14b41b37c039a8437fbfd92b890a7362034b13cbdcae20e868a91b1c844c265e977657920b5a6193a698c160aeac5664949ed9deca9c0ad498e566ec91 SHA512 cd8257edc6278823930110618136fcf0a7e8305c0bcd6ec3bb4bb3f54decc8a8a300bd5943ff9650cfece5c82b43d52ac7e0cdfd54700b419de53e6c897cec49
-EBUILD guessit-3.1.0.ebuild 1232 BLAKE2B f17ee2f942e96c2f4fdd36cf1bd4ccfdecb0ddcb802124974c579caf1acf7c77932415732368ed31fe09a76f77e69d75373cfa9281da5bc7f962863bc888c898 SHA512 b6fe4b6d46da314c27cc402db3dddfc85270ec2af5dbc972e27f57f84d90f7c060c056fdc36066a28810e11d23573c8b0c284d64feff7d3150043cd245a5a46d
+EBUILD guessit-3.1.0.ebuild 1262 BLAKE2B 144d82bb4e3f8ddb1e2fbfbb540fa75a0098cc5c9f4791a36b93a87558c68d09ce7e5c1ec0572bfc8f4c4665eb8f52e855e05cbf14080eb382da113ead167220 SHA512 c0833d616d31efe10e7764b9cab6a40f650231e327725d8cebbf3f3b71bf5b4f3f2e0ecf5403ac725db379e9cc6544f20cffcfc0d5bc70f0032ddeaeaf5c69c7
 MISC metadata.xml 494 BLAKE2B 1263ff6357d817ed0e3fa8939860c0c2718f0f9d6d15dfcc0a7980d6040a56075c79c4e580c92a59a10a9f26fb0e0579592fb3e94272751b4f071e3d738eccbf SHA512 7a9448f171bf023c39ca5bdeb3f3c079ad64ecfb07a15d8d3708e00365ed9cb9dd547e404197fca308fab1e52f8c7f3669bb952b370c8ca707ff24d6067a1c32
--- a/dev-python/guessit/guessit-2.0.4.ebuild
+++ b/dev-python/guessit/guessit-2.0.4.ebuild
@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for guessing information from video filenames"
-HOMEPAGE="https://github.com/guessit-io/guessit https://pypi.python.org/pypi/guessit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
-	>=dev-python/rebulk-0.8.2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/pytest-2.7.3[${PYTHON_USEDEP}]
-		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	# Disable benchmarks as they require unavailable pytest-benchmark.
-	rm guessit/test/test_benchmark.py || die
-	sed -i -e "s|'pytest-benchmark',||g" setup.py || die
-
-	# Disable unconditional dependency on dev-python/pytest-runner.
-	sed -i -e "s|'pytest-runner'||g" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
-
--- a/dev-python/guessit/guessit-3.0.3.ebuild
+++ b/dev-python/guessit/guessit-3.0.3.ebuild
@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for guessing information from video filenames"
-HOMEPAGE="https://github.com/guessit-io/guessit https://pypi.org/project/guessit/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
-	>=dev-python/rebulk-0.9.0[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/pytest-3.4[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	# Disable benchmarks as they require unavailable pytest-benchmark.
-	rm guessit/test/test_benchmark.py || die
-	sed -i -e "s|'pytest-benchmark',||g" setup.py || die
-
-	# Disable unconditional dependency on dev-python/pytest-runner.
-	sed -i -e "s|'pytest-runner'||g" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
--- a/dev-python/guessit/guessit-3.1.0.ebuild
+++ b/dev-python/guessit/guessit-3.1.0.ebuild
@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} pypy3 )
+EAPI=7
+PYTHON_COMPAT=(python{3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS=rdepend

 inherit distutils-r1

--- a/dev-python/tzlocal/Manifest
+++ b/dev-python/tzlocal/Manifest
@ -1,3 +1,3 @@
 DIST tzlocal-1.4.tar.gz 15279 BLAKE2B 2d1814c2a4fd2ed5b4b345c94e1cad05c850ab02764fc76e33940aa5f2c4c593c376e9252ca9524a0fc5732b201c222e7d4c1374c2842de6686e277dd537468f SHA512 e846f00cb0571da0c891ca8576d614ebfed622431201c713ef38a80fc990fa19298873bad74e5020648ec4b8307ce8362412e0e05d260121e9d70691814a321b
-EBUILD tzlocal-1.4.ebuild 575 BLAKE2B 736e515d5c640638f1dabaf7eedca7c2695ed4251b2e0b8008e2009064c0b477b654686c6045041c05f0e34456dd70c02a661ced6393f30a0c1c1f1a94bf675b SHA512 ef19fb06419aacb21af45de7314cd6253e1f0a20477afbe6bd4b14edd7e5729746f0b137ff2c79e214fa025c4e53b555f61cdba032389e286285f557c1bce585
+EBUILD tzlocal-1.4.ebuild 601 BLAKE2B 63710804f086a91928f3f3bf495276694c20b353cf7802554e1cc2b594260a786dcdb3964ce66fc8a8d6c67bd40fb5eab009a74937c559409f35d08bc82f39e5 SHA512 15d132045786963f50eb7b380a9db764c3e573163aa76be48336b8ca648c2c7fb105fbc2b715dd957ae58bb932649c764210357e338bb046e48ddf74d3fbb3e8
 MISC metadata.xml 377 BLAKE2B c85be3067a235a5d7546bcf7c3eb05857986a371bca6743e222e9016ab6d6d5a212f3f65d7e9db523ef9ddb8091b62c1cfbd2d5c5d6d8560fcf881aaa3ffad80 SHA512 3ada56c5037a2a59fb53408483f03bc3ae72c9d7f676dd046125b035b34d4195e653662b67529453d63556dedda4471a9c77daaa1137af1245e49174fef1fd87
--- a/dev-python/tzlocal/tzlocal-1.4.ebuild
+++ b/dev-python/tzlocal/tzlocal-1.4.ebuild
@ -1,9 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+EAPI=7
+PYTHON_COMPAT=(python{3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS=rdepend

 inherit distutils-r1

--- a/net-misc/flexget/flexget-2.10.35.ebuild
+++ b/net-misc/flexget/flexget-2.10.35.ebuild
@ -1,83 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils
-
-if [[ ${PV} != 9999 ]]; then
-	MY_P="FlexGet-${PV}"
-	SRC_URI="mirror://pypi/F/FlexGet/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="git://github.com/Flexget/Flexget.git
-		https://github.com/Flexget/Flexget.git"
-fi
-
-DESCRIPTION="Multipurpose automation tool for content like torrents, nzbs, podcasts, comics"
-HOMEPAGE="http://flexget.com/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test transmission"
-
-RESTRICT="nomirror"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.0.9[${PYTHON_USEDEP}]
-	<dev-python/sqlalchemy-1.999[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-4.5:4[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-0.11[${PYTHON_USEDEP}]
-	dev-python/PyRSS2Gen[${PYTHON_USEDEP}]
-	dev-python/pynzb[${PYTHON_USEDEP}]
-	dev-python/progressbar[${PYTHON_USEDEP}]
-	dev-python/rpyc[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.8.0[${PYTHON_USEDEP}]
-	<dev-python/requests-3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0[${PYTHON_USEDEP}]
-	>=dev-python/colorclass-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/terminaltables-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/path-py-8.1.1[${PYTHON_USEDEP}]
-	>=dev-python/guessit-2.1.2[${PYTHON_USEDEP}]
-	>=dev-python/cherrypy-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.7[${PYTHON_USEDEP}]
-	>=dev-python/flask-restful-0.3.3[${PYTHON_USEDEP}]
-	=dev-python/flask-restplus-0.8.6[${PYTHON_USEDEP}]
-	>=dev-python/flask-compress-1.2.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-login-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-cors-2.1.2[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.0.3[${PYTHON_USEDEP}]
-	dev-python/zxcvbn-python[${PYTHON_USEDEP}]
-	>=dev-python/future-0.15.2[${PYTHON_USEDEP}]
-	>=dev-python/APScheduler-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pathlib-1.0[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	transmission? ( dev-python/transmissionrpc[${PYTHON_USEDEP}] )
-"
-DEPEND+=" test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-python/paver[${PYTHON_USEDEP}]"
-else
-	S="${WORKDIR}/${MY_P}"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/"${P}"-guessit.patch
-)
-
-python_test() {
-	cp -lr tests setup.cfg "${BUILD_DIR}" || die
-	run_in_build_dir nosetests -v --attr=!online > "${T}/tests-${EPYTHON}.log" \
-		|| die "Tests fail with ${EPYTHON}"
-}
--- a/net-misc/flexget/flexget-2.10.84.ebuild
+++ b/net-misc/flexget/flexget-2.10.84.ebuild
@ -1,78 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils
-
-if [[ ${PV} != 9999 ]]; then
-	MY_P="FlexGet-${PV}"
-	SRC_URI="mirror://pypi/F/FlexGet/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="git://github.com/Flexget/Flexget.git
-		https://github.com/Flexget/Flexget.git"
-fi
-
-DESCRIPTION="Multipurpose automation tool for content like torrents, nzbs, podcasts, comics"
-HOMEPAGE="http://flexget.com/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test transmission"
-
-RESTRICT="nomirror"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/rebulk-0.8.2[${PYTHON_USEDEP}]
-	>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.1.10[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-4.6.0:4[${PYTHON_USEDEP}]
-	=dev-python/html5lib-0.999999999[${PYTHON_USEDEP}]
-	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
-	>=dev-python/pynzb-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/rpyc-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.9.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.8.0[${PYTHON_USEDEP}]
-	<dev-python/requests-3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.6.1[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/colorclass-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/terminaltables-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/path-py-10.3.1[${PYTHON_USEDEP}]
-	=dev-python/guessit-2.0.4[${PYTHON_USEDEP}]
-	>=dev-python/cherrypy-10.2.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.12.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-restful-0.3.6[${PYTHON_USEDEP}]
-	=dev-python/flask-restplus-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-compress-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-login-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-cors-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/zxcvbn-python-4.4.15[${PYTHON_USEDEP}]
-	>=dev-python/future-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/APScheduler-3.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pathlib-1.0.1[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	transmission? ( dev-python/transmissionrpc[${PYTHON_USEDEP}] )
-"
-DEPEND+=" test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-python/paver[${PYTHON_USEDEP}]"
-else
-	S="${WORKDIR}/${MY_P}"
-fi
-
-python_test() {
-	cp -lr tests setup.cfg "${BUILD_DIR}" || die
-	run_in_build_dir nosetests -v --attr=!online > "${T}/tests-${EPYTHON}.log" \
-		|| die "Tests fail with ${EPYTHON}"
-}
--- a/net-misc/flexget/flexget-2.11.24.ebuild
+++ b/net-misc/flexget/flexget-2.11.24.ebuild
@ -1,109 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils systemd user
-
-if [[ ${PV} != 9999 ]]; then
-	MY_P="FlexGet-${PV}"
-	SRC_URI="mirror://pypi/F/FlexGet/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="git://github.com/Flexget/Flexget.git
-		https://github.com/Flexget/Flexget.git"
-fi
-
-DESCRIPTION="Multipurpose automation tool for content like torrents, nzbs, podcasts, comics"
-HOMEPAGE="http://flexget.com/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="systemd test transmission"
-
-RESTRICT="nomirror"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	=dev-python/APScheduler-3.5.0[${PYTHON_USEDEP}]
-	=dev-python/beautifulsoup-4.6.0:4[${PYTHON_USEDEP}]
-	>=dev-python/cherrypy-10.2.2[${PYTHON_USEDEP}]
-	=dev-python/colorclass-2.2.0[${PYTHON_USEDEP}]
-	=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
-	=dev-python/flask-0.12.2[${PYTHON_USEDEP}]
-	=dev-python/flask-compress-1.4.0[${PYTHON_USEDEP}]
-	=dev-python/flask-cors-3.0.2[${PYTHON_USEDEP}]
-	=dev-python/flask-login-0.4.0[${PYTHON_USEDEP}]
-	=dev-python/flask-restful-0.3.6[${PYTHON_USEDEP}]
-	=dev-python/flask-restplus-0.10.1[${PYTHON_USEDEP}]
-	=dev-python/future-0.16.0[${PYTHON_USEDEP}]
-	=dev-python/html5lib-0.999999999[${PYTHON_USEDEP}]
-	=dev-python/jinja-2.9.6[${PYTHON_USEDEP}]
-	=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	=dev-python/guessit-2.0.4[${PYTHON_USEDEP}]
-	=dev-python/path-py-10.3.1[${PYTHON_USEDEP}]
-	~dev-python/pathlib-1.0.1[${PYTHON_USEDEP}]
-	~dev-python/pynzb-0.1.0[${PYTHON_USEDEP}]
-	=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
-	=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
-	=dev-python/python-dateutil-2.6.1[${PYTHON_USEDEP}]
-	=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-	=dev-python/rebulk-0.8.2[${PYTHON_USEDEP}]
-	=dev-python/requests-2.16.5[${PYTHON_USEDEP}]
-	=dev-python/rpyc-3.3.0[${PYTHON_USEDEP}]
-	=dev-python/sqlalchemy-1.1.10[${PYTHON_USEDEP}]
-	=dev-python/tempora-1.8[${PYTHON_USEDEP}]
-	=dev-python/terminaltables-3.1.0[${PYTHON_USEDEP}]
-	=dev-python/tzlocal-1.4[${PYTHON_USEDEP}]
-	=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
-	=dev-python/zxcvbn-python-4.4.15[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	transmission? ( dev-python/transmissionrpc[${PYTHON_USEDEP}] )
-"
-DEPEND+=" test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-python/paver[${PYTHON_USEDEP}]"
-else
-	S="${WORKDIR}/${MY_P}"
-fi
-
-python_test() {
-	cp -lr tests setup.cfg "${BUILD_DIR}" || die
-	run_in_build_dir nosetests -v --attr=!online > "${T}/tests-${EPYTHON}.log" \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 ${PN}
-}
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	sed -i -e "s/^chardet==3.0.3/chardet==3.0.4/" ${S}/requirements.txt || die
-	sed -i -e "s/^cheroot==5.5.0/cheroot==6.0.0/" ${S}/requirements.txt || die
-	sed -i -e "s/^cherrypy==10.2.2/cherrypy==13.1.0/" ${S}/requirements.txt || die
-	sed -i -e "s/^markupsafe==1.0/markupsafe==0.23/" ${S}/requirements.txt || die
-	sed -i -e "s/^portend==1.8/portend==2.2/" ${S}/requirements.txt || die
-	sed -i -e "s/^plumbum==1.6.3/plumbum==1.6.4/" ${S}/requirements.txt || die
-	sed -i -e "s/^six==1.10.0/six==1.11.0/" ${S}/requirements.txt || die
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-        fperms 755 /var/log/${PN}
-
-	if use systemd; then
-		systemd_dounit "${FILESDIR}"/flexget.service
-	fi
-}
-
--- a/net-misc/flexget/flexget-2.13.15.ebuild
+++ b/net-misc/flexget/flexget-2.13.15.ebuild
@ -1,110 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils systemd user
-
-if [[ ${PV} != 9999 ]]; then
-	MY_P="FlexGet-${PV}"
-	SRC_URI="mirror://pypi/F/FlexGet/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="git://github.com/Flexget/Flexget.git
-		https://github.com/Flexget/Flexget.git"
-fi
-
-DESCRIPTION="Multipurpose automation tool for content like torrents, nzbs, podcasts, comics"
-HOMEPAGE="http://flexget.com/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="systemd test transmission"
-
-RESTRICT="nomirror"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	=dev-python/APScheduler-3.5.0[${PYTHON_USEDEP}]
-	=dev-python/beautifulsoup-4.6.0:4[${PYTHON_USEDEP}]
-	>=dev-python/cherrypy-10.2.2[${PYTHON_USEDEP}]
-	=dev-python/colorclass-2.2.0[${PYTHON_USEDEP}]
-	=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
-	=dev-python/flask-0.12.2[${PYTHON_USEDEP}]
-	=dev-python/flask-compress-1.4.0[${PYTHON_USEDEP}]
-	=dev-python/flask-cors-3.0.2[${PYTHON_USEDEP}]
-	=dev-python/flask-login-0.4.0[${PYTHON_USEDEP}]
-	=dev-python/flask-restful-0.3.6[${PYTHON_USEDEP}]
-	=dev-python/flask-restplus-0.10.1[${PYTHON_USEDEP}]
-	=dev-python/future-0.16.0[${PYTHON_USEDEP}]
-	=dev-python/guessit-2.1.4[${PYTHON_USEDEP}]
-	=dev-python/html5lib-0.999999999[${PYTHON_USEDEP}]
-	=dev-python/jinja-2.9.6[${PYTHON_USEDEP}]
-	=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	=dev-python/path-py-10.3.1[${PYTHON_USEDEP}]
-	~dev-python/pathlib-1.0.1[${PYTHON_USEDEP}]
-	~dev-python/pynzb-0.1.0[${PYTHON_USEDEP}]
-	=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
-	=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
-	=dev-python/python-dateutil-2.6.1[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2017.2[${PYTHON_USEDEP}]
-	=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-	=dev-python/rebulk-0.9.0[${PYTHON_USEDEP}]
-	=dev-python/requests-2.16.5[${PYTHON_USEDEP}]
-	=dev-python/rpyc-3.3.0[${PYTHON_USEDEP}]
-	=dev-python/sqlalchemy-1.2.6[${PYTHON_USEDEP}]
-	=dev-python/tempora-1.8[${PYTHON_USEDEP}]
-	=dev-python/terminaltables-3.1.0[${PYTHON_USEDEP}]
-	=dev-python/tzlocal-1.4[${PYTHON_USEDEP}]
-	=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
-	=dev-python/zxcvbn-python-4.4.15[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	transmission? ( dev-python/transmissionrpc[${PYTHON_USEDEP}] )
-"
-DEPEND+=" test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-python/paver[${PYTHON_USEDEP}]"
-else
-	S="${WORKDIR}/${MY_P}"
-fi
-
-python_test() {
-	cp -lr tests setup.cfg "${BUILD_DIR}" || die
-	run_in_build_dir nosetests -v --attr=!online > "${T}/tests-${EPYTHON}.log" \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 ${PN}
-}
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	sed -i -e "s/^chardet==3.0.3/chardet==3.0.4/" ${S}/requirements.txt || die
-	sed -i -e "s/^cheroot==5.5.0/cheroot==6.0.0/" ${S}/requirements.txt || die
-	sed -i -e "s/^cherrypy==10.2.2/cherrypy==13.1.0/" ${S}/requirements.txt || die
-	sed -i -e "s/^portend==1.8/portend==2.2/" ${S}/requirements.txt || die
-	sed -i -e "s/^plumbum==1.6.3/plumbum==1.6.4/" ${S}/requirements.txt || die
-	sed -i -e "s/^pytz==2017.2/pytz>=2017.2/" ${S}/requirements.txt || die
-	sed -i -e "s/^six==1.10.0/six==1.11.0/" ${S}/requirements.txt || die
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-        fperms 755 /var/log/${PN}
-
-	if use systemd; then
-		systemd_dounit "${FILESDIR}"/flexget.service
-	fi
-}
-
--- a/net-misc/flexget/flexget-2.14.15.ebuild
+++ b/net-misc/flexget/flexget-2.14.15.ebuild
@ -1,122 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils systemd user
-
-if [[ ${PV} != 9999 ]]; then
-	MY_P="FlexGet-${PV}"
-	SRC_URI="mirror://pypi/F/FlexGet/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="git://github.com/Flexget/Flexget.git
-		https://github.com/Flexget/Flexget.git"
-fi
-
-DESCRIPTION="Multipurpose automation tool for content like torrents, nzbs, podcasts, comics"
-HOMEPAGE="http://flexget.com/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="systemd test transmission"
-
-RESTRICT="nomirror"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	=dev-python/APScheduler-3.5.0[${PYTHON_USEDEP}]
-	=dev-python/beautifulsoup-4.6.0:4[${PYTHON_USEDEP}]
-	>=dev-python/cherrypy-10.2.2[${PYTHON_USEDEP}]
-	=dev-python/colorclass-2.2.0[${PYTHON_USEDEP}]
-	=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
-	=dev-python/flask-0.12.2[${PYTHON_USEDEP}]
-	=dev-python/flask-compress-1.4.0[${PYTHON_USEDEP}]
-	=dev-python/flask-cors-3.0.2[${PYTHON_USEDEP}]
-	=dev-python/flask-login-0.4.1[${PYTHON_USEDEP}]
-	=dev-python/flask-restful-0.3.6[${PYTHON_USEDEP}]
-	=dev-python/flask-restplus-0.10.1[${PYTHON_USEDEP}]
-	=dev-python/future-0.16.0[${PYTHON_USEDEP}]
-	=dev-python/guessit-2.1.4[${PYTHON_USEDEP}]
-	=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
-	=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	=dev-python/path-py-10.3.1[${PYTHON_USEDEP}]
-	~dev-python/pathlib-1.0.1[${PYTHON_USEDEP}]
-	~dev-python/pynzb-0.1.0[${PYTHON_USEDEP}]
-	=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
-	=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
-	~dev-python/python-dateutil-2.7.2[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2017.2[${PYTHON_USEDEP}]
-	=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-	=dev-python/rebulk-0.9.0[${PYTHON_USEDEP}]
-	~dev-python/requests-2.19.1[${PYTHON_USEDEP}]
-	=dev-python/rpyc-3.3.0[${PYTHON_USEDEP}]
-	=dev-python/sqlalchemy-1.2.9[${PYTHON_USEDEP}]
-	=dev-python/tempora-1.8[${PYTHON_USEDEP}]
-	=dev-python/terminaltables-3.1.0[${PYTHON_USEDEP}]
-	=dev-python/tzlocal-1.4[${PYTHON_USEDEP}]
-	=dev-python/urllib3-1.23[${PYTHON_USEDEP}]
-	=dev-python/zxcvbn-python-4.4.15[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	transmission? ( dev-python/transmissionrpc[${PYTHON_USEDEP}] )
-"
-DEPEND+=" test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-python/paver[${PYTHON_USEDEP}]"
-else
-	S="${WORKDIR}/${MY_P}"
-fi
-
-python_test() {
-	cp -lr tests setup.cfg "${BUILD_DIR}" || die
-	run_in_build_dir nosetests -v --attr=!online > "${T}/tests-${EPYTHON}.log" \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 ${PN}
-}
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	sed -i -e "s/^aniso8601==1.2.1/aniso8601==3.0.2/" ${S}/requirements.txt || die
-	sed -i -e "s/^certifi==2017.4.17/certifi==2018.4.16/" ${S}/requirements.txt || die
-	sed -i -e "s/^chardet==3.0.3/chardet==3.0.4/" ${S}/requirements.txt || die
-	sed -i -e "s/^cheroot==5.5.0/cheroot==6.0.0/" ${S}/requirements.txt || die
-	sed -i -e "s/^cherrypy==10.2.2/cherrypy==13.1.0/" ${S}/requirements.txt || die
-	sed -i -e "s/^flask-login==0.4.0/flask-login==0.4.1/" ${S}/requirements.txt || die
-	sed -i -e "s/^html5lib==0.999999999/html5lib==1.0.1/" ${S}/requirements.txt || die
-	sed -i -e "s/^idna==2.5/idna==2.7/" ${S}/requirements.txt || die
-	sed -i -e "s/^jinja2==2.9.6/jinja2==2.10/" ${S}/requirements.txt || die
-	sed -i -e "s/^portend==1.8/portend==2.2/" ${S}/requirements.txt || die
-	sed -i -e "s/^plumbum==1.6.3/plumbum==1.6.4/" ${S}/requirements.txt || die
-	sed -i -e "s/^python-dateutil==2.6.1/python-dateutil==2.7.2/" ${S}/requirements.txt || die
-	sed -i -e "s/^pytz==2017.2/pytz>=2017.2/" ${S}/requirements.txt || die
-	sed -i -e "s/^pyyaml==3.12/pyyaml==3.13/" ${S}/requirements.txt || die
-	sed -i -e "s/^requests==2.16.5/requests==2.19.1/" ${S}/requirements.txt || die
-	sed -i -e "s/^six==1.10.0/six==1.11.0/" ${S}/requirements.txt || die
-	sed -i -e "s/^sqlalchemy==1.2.6/sqlalchemy==1.2.9/" ${S}/requirements.txt || die
-	sed -i -e "s/^urllib3==1.21.1/urllib3==1.23/" ${S}/requirements.txt || die
-	sed -i -e "s/^werkzeug==0.12.2/werkzeug==0.14.1/" ${S}/requirements.txt || die
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-        fperms 755 /var/log/${PN}
-
-	if use systemd; then
-		systemd_dounit "${FILESDIR}"/flexget.service
-	fi
-}
-
--- a/net-misc/flexget/flexget-2.14.25.ebuild
+++ b/net-misc/flexget/flexget-2.14.25.ebuild
@ -1,125 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils systemd user
-
-if [[ ${PV} != 9999 ]]; then
-	MY_P="FlexGet-${PV}"
-	SRC_URI="mirror://pypi/F/FlexGet/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="git://github.com/Flexget/Flexget.git
-		https://github.com/Flexget/Flexget.git"
-fi
-
-DESCRIPTION="Multipurpose automation tool for content like torrents, nzbs, podcasts, comics"
-HOMEPAGE="http://flexget.com/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="systemd test transmission"
-
-RESTRICT="nomirror"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	=dev-python/APScheduler-3.5.0[${PYTHON_USEDEP}]
-	=dev-python/beautifulsoup-4.6.3:4[${PYTHON_USEDEP}]
-	=dev-python/certifi-2018.8.24[${PYTHON_USEDEP}]
-	>=dev-python/cherrypy-10.2.2[${PYTHON_USEDEP}]
-	=dev-python/colorclass-2.2.0[${PYTHON_USEDEP}]
-	=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
-	=dev-python/flask-1.0.2[${PYTHON_USEDEP}]
-	=dev-python/flask-compress-1.4.0[${PYTHON_USEDEP}]
-	=dev-python/flask-cors-3.0.2[${PYTHON_USEDEP}]
-	=dev-python/flask-login-0.4.1[${PYTHON_USEDEP}]
-	=dev-python/flask-restful-0.3.6[${PYTHON_USEDEP}]
-	=dev-python/flask-restplus-0.10.1[${PYTHON_USEDEP}]
-	~dev-python/future-0.16.0[${PYTHON_USEDEP}]
-	=dev-python/guessit-2.1.4[${PYTHON_USEDEP}]
-	=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
-	=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	=dev-python/path-py-10.3.1[${PYTHON_USEDEP}]
-	~dev-python/pathlib-1.0.1[${PYTHON_USEDEP}]
-	~dev-python/pynzb-0.1.0[${PYTHON_USEDEP}]
-	=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
-	=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
-	~dev-python/python-dateutil-2.7.3[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2017.2[${PYTHON_USEDEP}]
-	=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-	=dev-python/rebulk-0.9.0[${PYTHON_USEDEP}]
-	~dev-python/requests-2.19.1[${PYTHON_USEDEP}]
-	=dev-python/rpyc-3.3.0[${PYTHON_USEDEP}]
-	=dev-python/sqlalchemy-1.2.9[${PYTHON_USEDEP}]
-	=dev-python/tempora-1.8[${PYTHON_USEDEP}]
-	=dev-python/terminaltables-3.1.0[${PYTHON_USEDEP}]
-	=dev-python/tzlocal-1.4[${PYTHON_USEDEP}]
-	=dev-python/urllib3-1.23[${PYTHON_USEDEP}]
-	=dev-python/zxcvbn-python-4.4.15[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	transmission? ( dev-python/transmissionrpc[${PYTHON_USEDEP}] )
-"
-DEPEND+=" test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-python/paver[${PYTHON_USEDEP}]"
-else
-	S="${WORKDIR}/${MY_P}"
-fi
-
-python_test() {
-	cp -lr tests setup.cfg "${BUILD_DIR}" || die
-	run_in_build_dir nosetests -v --attr=!online > "${T}/tests-${EPYTHON}.log" \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 ${PN}
-}
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	sed -i -e "s/^aniso8601==1.2.1/aniso8601==3.0.2/" ${S}/requirements.txt || die
-	sed -i -e "s/^beautifulsoup4==4.6.0/beautifulsoup4==4.6.3/" ${S}/requirements.txt || die
-	sed -i -e "s/^certifi==2017.4.17/certifi==2018.8.24/" ${S}/requirements.txt || die
-	sed -i -e "s/^chardet==3.0.3/chardet==3.0.4/" ${S}/requirements.txt || die
-	sed -i -e "s/^cheroot==5.5.0/cheroot==6.0.0/" ${S}/requirements.txt || die
-	sed -i -e "s/^cherrypy==10.2.2/cherrypy==13.1.0/" ${S}/requirements.txt || die
-	sed -i -e "s/^flask==0.12.2/flask==1.0.2/" ${S}/requirements.txt || die
-	sed -i -e "s/^flask-login==0.4.0/flask-login==0.4.1/" ${S}/requirements.txt || die
-	sed -i -e "s/^html5lib==0.999999999/html5lib==1.0.1/" ${S}/requirements.txt || die
-	sed -i -e "s/^idna==2.5/idna==2.7/" ${S}/requirements.txt || die
-	sed -i -e "s/^jinja2==2.9.6/jinja2==2.10/" ${S}/requirements.txt || die
-	sed -i -e "s/^portend==1.8/portend==2.2/" ${S}/requirements.txt || die
-	sed -i -e "s/^plumbum==1.6.3/plumbum==1.6.4/" ${S}/requirements.txt || die
-	sed -i -e "s/^python-dateutil==2.6.1/python-dateutil==2.7.3/" ${S}/requirements.txt || die
-	sed -i -e "s/^pytz==2017.2/pytz>=2017.2/" ${S}/requirements.txt || die
-	sed -i -e "s/^pyyaml==3.12/pyyaml==3.13/" ${S}/requirements.txt || die
-	sed -i -e "s/^requests==2.16.5/requests==2.19.1/" ${S}/requirements.txt || die
-	sed -i -e "s/^six==1.10.0/six==1.11.0/" ${S}/requirements.txt || die
-	sed -i -e "s/^sqlalchemy==1.2.6/sqlalchemy==1.2.9/" ${S}/requirements.txt || die
-	sed -i -e "s/^urllib3==1.21.1/urllib3==1.23/" ${S}/requirements.txt || die
-	sed -i -e "s/^werkzeug==0.12.2/werkzeug==0.14.1/" ${S}/requirements.txt || die
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-        fperms 755 /var/log/${PN}
-
-	if use systemd; then
-		systemd_dounit "${FILESDIR}"/flexget.service
-	fi
-}
-
--- a/net-misc/flexget/flexget-2.14.9.ebuild
+++ b/net-misc/flexget/flexget-2.14.9.ebuild
@ -1,110 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils systemd user
-
-if [[ ${PV} != 9999 ]]; then
-	MY_P="FlexGet-${PV}"
-	SRC_URI="mirror://pypi/F/FlexGet/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="git://github.com/Flexget/Flexget.git
-		https://github.com/Flexget/Flexget.git"
-fi
-
-DESCRIPTION="Multipurpose automation tool for content like torrents, nzbs, podcasts, comics"
-HOMEPAGE="http://flexget.com/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="systemd test transmission"
-
-RESTRICT="nomirror"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	=dev-python/APScheduler-3.5.0[${PYTHON_USEDEP}]
-	=dev-python/beautifulsoup-4.6.0:4[${PYTHON_USEDEP}]
-	>=dev-python/cherrypy-10.2.2[${PYTHON_USEDEP}]
-	=dev-python/colorclass-2.2.0[${PYTHON_USEDEP}]
-	=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
-	=dev-python/flask-0.12.2[${PYTHON_USEDEP}]
-	=dev-python/flask-compress-1.4.0[${PYTHON_USEDEP}]
-	=dev-python/flask-cors-3.0.2[${PYTHON_USEDEP}]
-	=dev-python/flask-login-0.4.1[${PYTHON_USEDEP}]
-	=dev-python/flask-restful-0.3.6[${PYTHON_USEDEP}]
-	=dev-python/flask-restplus-0.10.1[${PYTHON_USEDEP}]
-	=dev-python/future-0.16.0[${PYTHON_USEDEP}]
-	=dev-python/guessit-2.1.4[${PYTHON_USEDEP}]
-	=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
-	=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	=dev-python/path-py-10.3.1[${PYTHON_USEDEP}]
-	~dev-python/pathlib-1.0.1[${PYTHON_USEDEP}]
-	~dev-python/pynzb-0.1.0[${PYTHON_USEDEP}]
-	=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
-	=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
-	~dev-python/python-dateutil-2.7.2[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2017.2[${PYTHON_USEDEP}]
-	=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-	=dev-python/rebulk-0.9.0[${PYTHON_USEDEP}]
-	~dev-python/requests-2.19.1[${PYTHON_USEDEP}]
-	=dev-python/rpyc-3.3.0[${PYTHON_USEDEP}]
-	=dev-python/sqlalchemy-1.2.9[${PYTHON_USEDEP}]
-	=dev-python/tempora-1.8[${PYTHON_USEDEP}]
-	=dev-python/terminaltables-3.1.0[${PYTHON_USEDEP}]
-	=dev-python/tzlocal-1.4[${PYTHON_USEDEP}]
-	=dev-python/urllib3-1.23[${PYTHON_USEDEP}]
-	=dev-python/zxcvbn-python-4.4.15[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	transmission? ( dev-python/transmissionrpc[${PYTHON_USEDEP}] )
-"
-DEPEND+=" test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-python/paver[${PYTHON_USEDEP}]"
-else
-	S="${WORKDIR}/${MY_P}"
-fi
-
-python_test() {
-	cp -lr tests setup.cfg "${BUILD_DIR}" || die
-	run_in_build_dir nosetests -v --attr=!online > "${T}/tests-${EPYTHON}.log" \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 ${PN}
-}
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	sed -i -e "s/^chardet==3.0.3/chardet==3.0.4/" ${S}/requirements.txt || die
-	sed -i -e "s/^cheroot==5.5.0/cheroot==6.0.0/" ${S}/requirements.txt || die
-	sed -i -e "s/^cherrypy==10.2.2/cherrypy==13.1.0/" ${S}/requirements.txt || die
-	sed -i -e "s/^portend==1.8/portend==2.2/" ${S}/requirements.txt || die
-	sed -i -e "s/^plumbum==1.6.3/plumbum==1.6.4/" ${S}/requirements.txt || die
-	sed -i -e "s/^pytz==2017.2/pytz>=2017.2/" ${S}/requirements.txt || die
-	sed -i -e "s/^six==1.10.0/six==1.11.0/" ${S}/requirements.txt || die
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-        fperms 755 /var/log/${PN}
-
-	if use systemd; then
-		systemd_dounit "${FILESDIR}"/flexget.service
-	fi
-}
-
--- a/net-misc/flexget/flexget-2.17.11.ebuild
+++ b/net-misc/flexget/flexget-2.17.11.ebuild
@ -1,127 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils systemd user
-
-if [[ ${PV} != 9999 ]]; then
-	MY_P="FlexGet-${PV}"
-	SRC_URI="mirror://pypi/F/FlexGet/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="git://github.com/Flexget/Flexget.git
-		https://github.com/Flexget/Flexget.git"
-fi
-
-DESCRIPTION="Multipurpose automation tool for content like torrents, nzbs, podcasts, comics"
-HOMEPAGE="http://flexget.com/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="systemd test transmission"
-
-RESTRICT="nomirror"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	=dev-python/APScheduler-3.5.0[${PYTHON_USEDEP}]
-	=dev-python/beautifulsoup-4.6.3:4[${PYTHON_USEDEP}]
-	=dev-python/certifi-2018.8.24[${PYTHON_USEDEP}]
-	~dev-python/cherrypy-13.1.0[${PYTHON_USEDEP}]
-	~dev-python/click-6.7[${PYTHON_USEDEP}]
-	=dev-python/colorclass-2.2.0[${PYTHON_USEDEP}]
-	=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
-	=dev-python/flask-1.0.2[${PYTHON_USEDEP}]
-	=dev-python/flask-compress-1.4.0[${PYTHON_USEDEP}]
-	=dev-python/flask-cors-3.0.2[${PYTHON_USEDEP}]
-	=dev-python/flask-login-0.4.1[${PYTHON_USEDEP}]
-	=dev-python/flask-restful-0.3.6[${PYTHON_USEDEP}]
-	=dev-python/flask-restplus-0.10.1[${PYTHON_USEDEP}]
-	~dev-python/future-0.16.0[${PYTHON_USEDEP}]
-	=dev-python/guessit-3.0.3[${PYTHON_USEDEP}]
-	=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
-	=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	=dev-python/path-py-10.3.1[${PYTHON_USEDEP}]
-	~dev-python/pathlib-1.0.1[${PYTHON_USEDEP}]
-	=dev-python/plumbum-1.6.4[${PYTHON_USEDEP}]
-	~dev-python/pynzb-0.1.0[${PYTHON_USEDEP}]
-	=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
-	=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
-	~dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
-	=dev-python/pytz-2018.4[${PYTHON_USEDEP}]
-	=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-	=dev-python/rebulk-0.9.0[${PYTHON_USEDEP}]
-	~dev-python/requests-2.20.1[${PYTHON_USEDEP}]
-	=dev-python/rpyc-3.3.0[${PYTHON_USEDEP}]
-	=dev-python/sqlalchemy-1.2.9[${PYTHON_USEDEP}]
-	=dev-python/tempora-1.8[${PYTHON_USEDEP}]
-	=dev-python/terminaltables-3.1.0[${PYTHON_USEDEP}]
-	=dev-python/tzlocal-1.4[${PYTHON_USEDEP}]
-	=dev-python/urllib3-1.23[${PYTHON_USEDEP}]
-	=dev-python/zxcvbn-python-4.4.15[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	transmission? ( dev-python/transmissionrpc[${PYTHON_USEDEP}] )
-"
-DEPEND+=" test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-python/paver[${PYTHON_USEDEP}]"
-else
-	S="${WORKDIR}/${MY_P}"
-fi
-
-python_test() {
-	cp -lr tests setup.cfg "${BUILD_DIR}" || die
-	run_in_build_dir nosetests -v --attr=!online > "${T}/tests-${EPYTHON}.log" \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 ${PN}
-}
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	sed -i -e "s/^aniso8601==1.2.1/aniso8601==3.0.2/" ${S}/requirements.txt || die
-	sed -i -e "s/^beautifulsoup4==4.6.0/beautifulsoup4==4.6.3/" ${S}/requirements.txt || die
-	sed -i -e "s/^certifi==2017.4.17/certifi==2018.8.24/" ${S}/requirements.txt || die
-	sed -i -e "s/^chardet==3.0.3/chardet==3.0.4/" ${S}/requirements.txt || die
-	sed -i -e "s/^cheroot==5.5.0/cheroot==6.0.0/" ${S}/requirements.txt || die
-	sed -i -e "s/^cherrypy==10.2.2/cherrypy==13.1.0/" ${S}/requirements.txt || die
-	sed -i -e "s/^flask==0.12.2/flask==1.0.2/" ${S}/requirements.txt || die
-	sed -i -e "s/^flask-login==0.4.0/flask-login==0.4.1/" ${S}/requirements.txt || die
-	sed -i -e "s/^html5lib==0.999999999/html5lib==1.0.1/" ${S}/requirements.txt || die
-	sed -i -e "s/^idna==2.5/idna==2.7/" ${S}/requirements.txt || die
-	sed -i -e "s/^jinja2==2.9.6/jinja2==2.10/" ${S}/requirements.txt || die
-	sed -i -e "s/^portend==1.8/portend==2.2/" ${S}/requirements.txt || die
-	sed -i -e "s/^plumbum==1.6.3/plumbum==1.6.4/" ${S}/requirements.txt || die
-	sed -i -e "s/^python-dateutil==2.6.1/python-dateutil==2.7.5/" ${S}/requirements.txt || die
-	sed -i -e "s/^pytz==2017.2/pytz==2018.4/" ${S}/requirements.txt || die
-	sed -i -e "s/^pyyaml==3.12/pyyaml==3.13/" ${S}/requirements.txt || die
-	#sed -i -e "s/^requests==2.16.5/requests==2.19.1/" ${S}/requirements.txt || die
-	sed -i -e "s/^six==1.10.0/six==1.11.0/" ${S}/requirements.txt || die
-	sed -i -e "s/^sqlalchemy==1.2.6/sqlalchemy==1.2.9/" ${S}/requirements.txt || die
-	sed -i -e "s/^urllib3==1.21.1/urllib3==1.23/" ${S}/requirements.txt || die
-	sed -i -e "s/^werkzeug==0.12.2/werkzeug==0.14.1/" ${S}/requirements.txt || die
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-        fperms 755 /var/log/${PN}
-
-	if use systemd; then
-		systemd_dounit "${FILESDIR}"/flexget.service
-	fi
-}
-
--- a/net-misc/flexget/flexget-2.20.21.ebuild
+++ b/net-misc/flexget/flexget-2.20.21.ebuild
@ -1,141 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils systemd user
-
-if [[ ${PV} != 9999 ]]; then
-	MY_P="FlexGet-${PV}"
-	SRC_URI="mirror://pypi/F/FlexGet/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="git://github.com/Flexget/Flexget.git
-		https://github.com/Flexget/Flexget.git"
-fi
-
-DESCRIPTION="Multipurpose automation tool for content like torrents, nzbs, podcasts, comics"
-HOMEPAGE="http://flexget.com/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="systemd test transmission"
-
-RESTRICT="nomirror"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	=dev-python/APScheduler-3.5.0[${PYTHON_USEDEP}]
-	=dev-python/beautifulsoup-4.6.3:4[${PYTHON_USEDEP}]
-	=dev-python/certifi-2018.11.29[${PYTHON_USEDEP}]
-	~dev-python/cheroot-6.5.4[${PYTHON_USEDEP}]
-	~dev-python/cherrypy-13.1.0[${PYTHON_USEDEP}]
-	~dev-python/click-7.0[${PYTHON_USEDEP}]
-	=dev-python/colorclass-2.2.0[${PYTHON_USEDEP}]
-	=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
-	=dev-python/flask-1.0.2[${PYTHON_USEDEP}]
-	=dev-python/flask-compress-1.4.0[${PYTHON_USEDEP}]
-	=dev-python/flask-cors-3.0.2[${PYTHON_USEDEP}]
-	=dev-python/flask-login-0.4.1[${PYTHON_USEDEP}]
-	=dev-python/flask-restful-0.3.6[${PYTHON_USEDEP}]
-	=dev-python/flask-restplus-0.10.1[${PYTHON_USEDEP}]
-	=dev-python/functools32-3.2.3[${PYTHON_USEDEP}]
-	~dev-python/future-0.17.0[${PYTHON_USEDEP}]
-	=dev-python/guessit-3.0.3[${PYTHON_USEDEP}]
-	=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
-	=dev-python/idna-2.8[${PYTHON_USEDEP}]
-	=dev-python/importlib_metadata-0.9[${PYTHON_USEDEP}]
-	=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	=dev-python/path-py-11.0.1[${PYTHON_USEDEP}]
-	~dev-python/pathlib-1.0.1[${PYTHON_USEDEP}]
-	=dev-python/plumbum-1.6.4[${PYTHON_USEDEP}]
-	~dev-python/progressbar-2.3[${PYTHON_USEDEP}]
-	~dev-python/pynzb-0.1.0[${PYTHON_USEDEP}]
-	=dev-python/pyparsing-2.3.1[${PYTHON_USEDEP}]
-	=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
-	~dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
-	=dev-python/pytz-2018.9[${PYTHON_USEDEP}]
-	=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	=dev-python/rebulk-0.9.0[${PYTHON_USEDEP}]
-	~dev-python/requests-2.21.0[${PYTHON_USEDEP}]
-	=dev-python/rpyc-4.0.2[${PYTHON_USEDEP}]
-	=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-	=dev-python/sqlalchemy-1.2.18[${PYTHON_USEDEP}]
-	=dev-python/tempora-1.8[${PYTHON_USEDEP}]
-	=dev-python/terminaltables-3.1.0[${PYTHON_USEDEP}]
-	=dev-python/tzlocal-1.4[${PYTHON_USEDEP}]
-	=dev-python/urllib3-1.24.1[${PYTHON_USEDEP}]
-	=dev-python/zipp-0.3.3[${PYTHON_USEDEP}]
-	=dev-python/zxcvbn-python-4.4.15[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	transmission? ( dev-python/transmissionrpc[${PYTHON_USEDEP}] )
-"
-DEPEND+=" test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-python/paver[${PYTHON_USEDEP}]"
-else
-	S="${WORKDIR}/${MY_P}"
-fi
-
-python_test() {
-	cp -lr tests setup.cfg "${BUILD_DIR}" || die
-	run_in_build_dir nosetests -v --attr=!online > "${T}/tests-${EPYTHON}.log" \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 ${PN}
-}
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	sed -i -e "s/^aniso8601==1.2.1/aniso8601==3.0.2/" ${S}/requirements.txt || die
-	sed -i -e "s/^beautifulsoup4==4.6.0/beautifulsoup4==4.6.3/" ${S}/requirements.txt || die
-	sed -i -e "s/^certifi==2017.4.17/certifi==2018.11.29/" ${S}/requirements.txt || die
-	sed -i -e "s/^chardet==3.0.3/chardet==3.0.4/" ${S}/requirements.txt || die
-	sed -i -e "s/^cheroot==5.5.0/cheroot==6.5.4/" ${S}/requirements.txt || die
-	sed -i -e "s/^cherrypy==10.2.2/cherrypy==13.1.0/" ${S}/requirements.txt || die
-	sed -i -e "s/^click==6.7/click==7.0/" ${S}/requirements.txt || die
-	sed -i -e "s/^flask==0.12.2/flask==1.0.2/" ${S}/requirements.txt || die
-	sed -i -e "s/^flask-login==0.4.0/flask-login==0.4.1/" ${S}/requirements.txt || die
-	sed -i -e "s/^future==0.16.0/future==0.17.0/" ${S}/requirements.txt || die
-	sed -i -e "s/^html5lib==0.999999999/html5lib==1.0.1/" ${S}/requirements.txt || die
-	sed -i -e "s/^idna==2.5/idna==2.8/" ${S}/requirements.txt || die
-	sed -i -e "s/^importlib-metadata==0.8/importlib-metadata==0.9/" ${S}/requirements.txt || die
-	sed -i -e "s/^jinja2==2.10.1/jinja2==2.10/" ${S}/requirements.txt || die
-	sed -i -e "s/^path.py==11.5.0/path.py==11.0.1/" ${S}/requirements.txt || die
-	sed -i -e "s/^portend==1.8/portend==2.2/" ${S}/requirements.txt || die
-	sed -i -e "s/^plumbum==1.6.3/plumbum==1.6.4/" ${S}/requirements.txt || die
-	sed -i -e "s/^progressbar==2.5/progressbar==2.3/" ${S}/requirements.txt || die
-	sed -i -e "s/^python-dateutil==2.6.1/python-dateutil==2.7.5/" ${S}/requirements.txt || die
-	sed -i -e "s/^pytz==2017.2/pytz==2018.9/" ${S}/requirements.txt || die
-	sed -i -e "s/^pyparsing==2.2.0/pyparsing==2.3.1/" ${S}/requirements.txt || die
-	sed -i -e "s/^pyyaml==3.13/pyyaml==5.1/" ${S}/requirements.txt || die
-	sed -i -e "s/^requests==2.20.1/requests==2.21.0/" ${S}/requirements.txt || die
-	sed -i -e "s/^rpyc==4.0.1/rpyc==4.0.2/" ${S}/requirements.txt || die
-	sed -i -e "s/^six==1.10.0/six==1.12.0/" ${S}/requirements.txt || die
-	sed -i -e "s/^sqlalchemy==1.3.3/sqlalchemy==1.2.18/" ${S}/requirements.txt || die
-	sed -i -e "s/^urllib3==1.24.2/urllib3==1.24.1/" ${S}/requirements.txt || die
-	sed -i -e "s/^werkzeug==0.12.2/werkzeug==0.14.1/" ${S}/requirements.txt || die
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-        fperms 755 /var/log/${PN}
-
-	if use systemd; then
-		systemd_dounit "${FILESDIR}"/flexget.service
-	fi
-}
-
--- a/net-misc/flexget/flexget-2.21.14.ebuild
+++ b/net-misc/flexget/flexget-2.21.14.ebuild
@ -1,148 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils systemd user
-
-if [[ ${PV} != 9999 ]]; then
-	MY_P="FlexGet-${PV}"
-	SRC_URI="mirror://pypi/F/FlexGet/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="git://github.com/Flexget/Flexget.git
-		https://github.com/Flexget/Flexget.git"
-fi
-
-DESCRIPTION="Multipurpose automation tool for content like torrents, nzbs, podcasts, comics"
-HOMEPAGE="http://flexget.com/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="systemd test transmission"
-
-RESTRICT="nomirror"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	~dev-python/aniso8601-4.0.1[${PYTHON_USEDEP}]
-	=dev-python/APScheduler-3.5.3[${PYTHON_USEDEP}]
-	~dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
-	=dev-python/beautifulsoup-4.6.3:4[${PYTHON_USEDEP}]
-	=dev-python/certifi-2018.11.29[${PYTHON_USEDEP}]
-	~dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	~dev-python/cheroot-5.5.0[${PYTHON_USEDEP}]
-	~dev-python/cherrypy-10.2.2[${PYTHON_USEDEP}]
-	~dev-python/click-6.7[${PYTHON_USEDEP}]
-	=dev-python/colorclass-2.2.0[${PYTHON_USEDEP}]
-	~dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
-	~dev-python/flask-1.0.2[${PYTHON_USEDEP}]
-	=dev-python/flask-compress-1.4.0[${PYTHON_USEDEP}]
-	=dev-python/flask-cors-3.0.2[${PYTHON_USEDEP}]
-	=dev-python/flask-login-0.4.1[${PYTHON_USEDEP}]
-	=dev-python/flask-restful-0.3.7[${PYTHON_USEDEP}]
-	=dev-python/flask-restplus-0.10.1[${PYTHON_USEDEP}]
-	~dev-python/future-0.17.0[${PYTHON_USEDEP}]
-	=dev-python/guessit-3.0.3[${PYTHON_USEDEP}]
-	=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
-	=dev-python/idna-2.8[${PYTHON_USEDEP}]
-	=dev-python/importlib_metadata-0.9[${PYTHON_USEDEP}]
-	~dev-python/itsdangerous-0.24[${PYTHON_USEDEP}]
-	~dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	~dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	~dev-python/path-py-11.0.1[${PYTHON_USEDEP}]
-	=dev-python/plumbum-1.6.4[${PYTHON_USEDEP}]
-	~dev-python/portend-2.2[${PYTHON_USEDEP}]
-	~dev-python/progressbar-2.5[${PYTHON_USEDEP}]
-	~dev-python/pynzb-0.1.0[${PYTHON_USEDEP}]
-	~dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
-	=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
-	~dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
-	=dev-python/pytz-2018.9[${PYTHON_USEDEP}]
-	=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-	=dev-python/rebulk-0.9.0[${PYTHON_USEDEP}]
-	~dev-python/requests-2.21.0[${PYTHON_USEDEP}]
-	=dev-python/rpyc-4.0.2[${PYTHON_USEDEP}]
-	=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-	=dev-python/sqlalchemy-1.3.4[${PYTHON_USEDEP}]
-	=dev-python/tempora-1.8[${PYTHON_USEDEP}]
-	=dev-python/terminaltables-3.1.0[${PYTHON_USEDEP}]
-	=dev-python/tzlocal-1.4[${PYTHON_USEDEP}]
-	=dev-python/urllib3-1.24.2[${PYTHON_USEDEP}]
-	~dev-python/webencodings-0.5.1[${PYTHON_USEDEP}]
-	~dev-python/werkzeug-0.14.1[${PYTHON_USEDEP}]
-	=dev-python/zipp-0.3.3[${PYTHON_USEDEP}]
-	=dev-python/zxcvbn-python-4.4.15[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	transmission? ( dev-python/transmissionrpc[${PYTHON_USEDEP}] )
-"
-DEPEND+=" test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-python/paver[${PYTHON_USEDEP}]"
-else
-	S="${WORKDIR}/${MY_P}"
-fi
-
-python_test() {
-	cp -lr tests setup.cfg "${BUILD_DIR}" || die
-	run_in_build_dir nosetests -v --attr=!online > "${T}/tests-${EPYTHON}.log" \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 ${PN}
-}
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	sed -i -e "s/^aniso8601==1.2.1/aniso8601==4.0.1/" ${S}/requirements.txt || die
-	sed -i -e "s/^apscheduler==3.5.0/apscheduler==3.5.3/" ${S}/requirements.txt || die
-	sed -i -e "s/^beautifulsoup4==4.6.0/beautifulsoup4==4.6.3/" ${S}/requirements.txt || die
-	sed -i -e "s/^certifi==2017.4.17/certifi==2018.11.29/" ${S}/requirements.txt || die
-	sed -i -e "s/^chardet==3.0.3/chardet==3.0.4/" ${S}/requirements.txt || die
-	#sed -i -e "s/^cheroot==5.5.0/cheroot==6.0.0/" ${S}/requirements.txt || die
-	#sed -i -e "s/^cherrypy==10.2.2/cherrypy==13.1.0/" ${S}/requirements.txt || die
-	#sed -i -e "s/^click==6.7/click==7.0/" ${S}/requirements.txt || die
-	sed -i -e "s/^flask==0.12.2/flask==1.0.2/" ${S}/requirements.txt || die
-	sed -i -e "s/^flask-login==0.4.0/flask-login==0.4.1/" ${S}/requirements.txt || die
-	sed -i -e "s/^flask-restful==0.3.6/flask-restful==0.3.7/" ${S}/requirements.txt || die
-	sed -i -e "s/^future==0.16.0/future==0.17.0/" ${S}/requirements.txt || die
-	sed -i -e "s/^html5lib==0.999999999/html5lib==1.0.1/" ${S}/requirements.txt || die
-	sed -i -e "s/^idna==2.5/idna==2.8/" ${S}/requirements.txt || die
-	sed -i -e "s/^importlib-metadata==0.8/importlib-metadata==0.9/" ${S}/requirements.txt || die
-	#sed -i -e "s/^jinja2==2.10.1/jinja2==2.10/" ${S}/requirements.txt || die
-	sed -i -e "s/^path.py==11.5.0/path.py==11.0.1/" ${S}/requirements.txt || die
-	sed -i -e "s/^portend==1.8/portend==2.2/" ${S}/requirements.txt || die
-	sed -i -e "s/^plumbum==1.6.3/plumbum==1.6.4/" ${S}/requirements.txt || die
-	#sed -i -e "s/^progressbar==2.5/progressbar==2.3/" ${S}/requirements.txt || die
-	sed -i -e "s/^python-dateutil==2.6.1/python-dateutil==2.7.5/" ${S}/requirements.txt || die
-	sed -i -e "s/^pytz==2017.2/pytz==2018.9/" ${S}/requirements.txt || die
-	#sed -i -e "s/^pyparsing==2.2.0/pyparsing==2.3.1/" ${S}/requirements.txt || die
-	#sed -i -e "s/^pyyaml==3.13/pyyaml==5.1/" ${S}/requirements.txt || die
-	sed -i -e "s/^requests==2.20.1/requests==2.21.0/" ${S}/requirements.txt || die
-	sed -i -e "s/^rpyc==4.0.1/rpyc==4.0.2/" ${S}/requirements.txt || die
-	sed -i -e "s/^six==1.10.0/six==1.12.0/" ${S}/requirements.txt || die
-	sed -i -e "s/^sqlalchemy==1.3.3/sqlalchemy==1.3.4/" ${S}/requirements.txt || die
-	#sed -i -e "s/^urllib3==1.24.2/urllib3==1.24.1/" ${S}/requirements.txt || die
-	sed -i -e "s/^werkzeug==0.12.2/werkzeug==0.14.1/" ${S}/requirements.txt || die
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-        fperms 755 /var/log/${PN}
-
-	if use systemd; then
-		systemd_dounit "${FILESDIR}"/flexget.service
-	fi
-}
-
--- a/net-misc/flexget/flexget-2.21.21.ebuild
+++ b/net-misc/flexget/flexget-2.21.21.ebuild
@ -1,147 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils systemd user
-
-if [[ ${PV} != 9999 ]]; then
-	MY_P="FlexGet-${PV}"
-	SRC_URI="mirror://pypi/F/FlexGet/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="git://github.com/Flexget/Flexget.git
-		https://github.com/Flexget/Flexget.git"
-fi
-
-DESCRIPTION="Multipurpose automation tool for content like torrents, nzbs, podcasts, comics"
-HOMEPAGE="http://flexget.com/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="systemd test transmission"
-
-RESTRICT="nomirror"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	~dev-python/aniso8601-4.0.1[${PYTHON_USEDEP}]
-	=dev-python/APScheduler-3.5.3[${PYTHON_USEDEP}]
-	~dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
-	=dev-python/beautifulsoup-4.6.3:4[${PYTHON_USEDEP}]
-	=dev-python/certifi-2019.9.11[${PYTHON_USEDEP}]
-	~dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	~dev-python/cheroot-5.5.0[${PYTHON_USEDEP}]
-	~dev-python/cherrypy-10.2.2[${PYTHON_USEDEP}]
-	~dev-python/click-6.7[${PYTHON_USEDEP}]
-	=dev-python/colorclass-2.2.0[${PYTHON_USEDEP}]
-	~dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
-	~dev-python/flask-1.1.1[${PYTHON_USEDEP}]
-	=dev-python/flask-compress-1.4.0[${PYTHON_USEDEP}]
-	=dev-python/flask-cors-3.0.2[${PYTHON_USEDEP}]
-	=dev-python/flask-login-0.4.1[${PYTHON_USEDEP}]
-	=dev-python/flask-restful-0.3.7[${PYTHON_USEDEP}]
-	=dev-python/flask-restplus-0.10.1[${PYTHON_USEDEP}]
-	~dev-python/future-0.17.1[${PYTHON_USEDEP}]
-	=dev-python/guessit-3.0.3[${PYTHON_USEDEP}]
-	=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
-	=dev-python/idna-2.8[${PYTHON_USEDEP}]
-	=dev-python/importlib_metadata-0.23[${PYTHON_USEDEP}]
-	~dev-python/itsdangerous-0.24[${PYTHON_USEDEP}]
-	~dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	~dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	~dev-python/path-py-11.0.1[${PYTHON_USEDEP}]
-	=dev-python/plumbum-1.6.4[${PYTHON_USEDEP}]
-	~dev-python/portend-2.2[${PYTHON_USEDEP}]
-	~dev-python/progressbar-2.5[${PYTHON_USEDEP}]
-	~dev-python/pynzb-0.1.0[${PYTHON_USEDEP}]
-	~dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
-	=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
-	~dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
-	=dev-python/pytz-2018.9[${PYTHON_USEDEP}]
-	=dev-python/pyyaml-5.1.2[${PYTHON_USEDEP}]
-	=dev-python/rebulk-0.9.0[${PYTHON_USEDEP}]
-	~dev-python/requests-2.21.0[${PYTHON_USEDEP}]
-	=dev-python/rpyc-4.0.2[${PYTHON_USEDEP}]
-	=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-	=dev-python/sqlalchemy-1.3.4[${PYTHON_USEDEP}]
-	=dev-python/tempora-1.8[${PYTHON_USEDEP}]
-	=dev-python/terminaltables-3.1.0[${PYTHON_USEDEP}]
-	=dev-python/tzlocal-1.4[${PYTHON_USEDEP}]
-	=dev-python/urllib3-1.24.2[${PYTHON_USEDEP}]
-	~dev-python/webencodings-0.5.1[${PYTHON_USEDEP}]
-	~dev-python/werkzeug-0.15.6[${PYTHON_USEDEP}]
-	=dev-python/zipp-0.6.0[${PYTHON_USEDEP}]
-	=dev-python/zxcvbn-python-4.4.15[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	transmission? ( dev-python/transmissionrpc[${PYTHON_USEDEP}] )
-"
-DEPEND+=" test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-python/paver[${PYTHON_USEDEP}]"
-else
-	S="${WORKDIR}/${MY_P}"
-fi
-
-python_test() {
-	cp -lr tests setup.cfg "${BUILD_DIR}" || die
-	run_in_build_dir nosetests -v --attr=!online > "${T}/tests-${EPYTHON}.log" \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 ${PN}
-}
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	sed -i -e "s/^aniso8601==1.2.1/aniso8601==4.0.1/" ${S}/requirements.txt || die
-	sed -i -e "s/^apscheduler==3.5.0/apscheduler==3.5.3/" ${S}/requirements.txt || die
-	sed -i -e "s/^beautifulsoup4==4.6.0/beautifulsoup4==4.6.3/" ${S}/requirements.txt || die
-	sed -i -e "s/^certifi==2017.4.17/certifi==2019.9.11/" ${S}/requirements.txt || die
-	sed -i -e "s/^chardet==3.0.3/chardet==3.0.4/" ${S}/requirements.txt || die
-	#sed -i -e "s/^cheroot==5.5.0/cheroot==6.0.0/" ${S}/requirements.txt || die
-	#sed -i -e "s/^cherrypy==10.2.2/cherrypy==13.1.0/" ${S}/requirements.txt || die
-	#sed -i -e "s/^click==6.7/click==7.0/" ${S}/requirements.txt || die
-	sed -i -e "s/^flask==1.0.2/flask==1.1.1/" ${S}/requirements.txt || die
-	sed -i -e "s/^flask-login==0.4.0/flask-login==0.4.1/" ${S}/requirements.txt || die
-	sed -i -e "s/^flask-restful==0.3.6/flask-restful==0.3.7/" ${S}/requirements.txt || die
-	sed -i -e "s/^future==0.16.0/future==0.17.1/" ${S}/requirements.txt || die
-	sed -i -e "s/^html5lib==0.999999999/html5lib==1.0.1/" ${S}/requirements.txt || die
-	sed -i -e "s/^idna==2.5/idna==2.8/" ${S}/requirements.txt || die
-	sed -i -e "s/^importlib-metadata==0.8/importlib-metadata==0.23/" ${S}/requirements.txt || die
-	#sed -i -e "s/^jinja2==2.10.1/jinja2==2.10/" ${S}/requirements.txt || die
-	sed -i -e "s/^path.py==11.5.0/path.py==11.0.1/" ${S}/requirements.txt || die
-	sed -i -e "s/^portend==1.8/portend==2.2/" ${S}/requirements.txt || die
-	sed -i -e "s/^plumbum==1.6.3/plumbum==1.6.4/" ${S}/requirements.txt || die
-	#sed -i -e "s/^progressbar==2.5/progressbar==2.3/" ${S}/requirements.txt || die
-	sed -i -e "s/^python-dateutil==2.6.1/python-dateutil==2.7.5/" ${S}/requirements.txt || die
-	sed -i -e "s/^pytz==2017.2/pytz==2018.9/" ${S}/requirements.txt || die
-	#sed -i -e "s/^pyparsing==2.2.0/pyparsing==2.3.1/" ${S}/requirements.txt || die
-	sed -i -e "s/^requests==2.20.1/requests==2.21.0/" ${S}/requirements.txt || die
-	sed -i -e "s/^rpyc==4.0.1/rpyc==4.0.2/" ${S}/requirements.txt || die
-	sed -i -e "s/^six==1.10.0/six==1.12.0/" ${S}/requirements.txt || die
-	sed -i -e "s/^sqlalchemy==1.3.3/sqlalchemy==1.3.4/" ${S}/requirements.txt || die
-	#sed -i -e "s/^urllib3==1.24.2/urllib3==1.24.1/" ${S}/requirements.txt || die
-	sed -i -e "s/^zipp==0.3.3/zipp==0.6.0/" ${S}/requirements.txt || die
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-        fperms 755 /var/log/${PN}
-
-	if use systemd; then
-		systemd_dounit "${FILESDIR}"/flexget.service
-	fi
-}
-
--- a/net-misc/flexget/flexget-2.9.18.ebuild
+++ b/net-misc/flexget/flexget-2.9.18.ebuild
@ -1,85 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils
-
-if [[ ${PV} != 9999 ]]; then
-	MY_P="FlexGet-${PV}"
-	SRC_URI="mirror://pypi/F/FlexGet/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="git://github.com/Flexget/Flexget.git
-		https://github.com/Flexget/Flexget.git"
-fi
-
-DESCRIPTION="Multipurpose automation tool for content like torrents, nzbs, podcasts, comics"
-HOMEPAGE="http://flexget.com/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test transmission"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.0.9[${PYTHON_USEDEP}]
-	<dev-python/sqlalchemy-1.999[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-4.5:4[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-0.11[${PYTHON_USEDEP}]
-	dev-python/PyRSS2Gen[${PYTHON_USEDEP}]
-	dev-python/pynzb[${PYTHON_USEDEP}]
-	dev-python/progressbar[${PYTHON_USEDEP}]
-	dev-python/rpyc[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.8.0[${PYTHON_USEDEP}]
-	<dev-python/requests-3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0[${PYTHON_USEDEP}]
-	>=dev-python/colorclass-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/terminaltables-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/path-py-8.1.1[${PYTHON_USEDEP}]
-	>=dev-python/guessit-2.0.0[${PYTHON_USEDEP}]
-	<=dev-python/guessit-2.0.4[${PYTHON_USEDEP}]
-	>=dev-python/cherrypy-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.7[${PYTHON_USEDEP}]
-	>=dev-python/flask-restful-0.3.3[${PYTHON_USEDEP}]
-	=dev-python/flask-restplus-0.8.6[${PYTHON_USEDEP}]
-	>=dev-python/flask-compress-1.2.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-login-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-cors-2.1.2[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.0.3[${PYTHON_USEDEP}]
-	dev-python/zxcvbn-python[${PYTHON_USEDEP}]
-	>=dev-python/future-0.15.2[${PYTHON_USEDEP}]
-	>=dev-python/APScheduler-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pathlib-1.0[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	transmission? ( dev-python/transmissionrpc[${PYTHON_USEDEP}] )
-"
-DEPEND+=" test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-python/paver[${PYTHON_USEDEP}]"
-else
-	S="${WORKDIR}/${MY_P}"
-fi
-
-#python_prepare_all() {
-#	# Prevent setup from grabbing nose from pypi
-#	sed -e /setup_requires/d -i pavement.py || die
-#
-#	distutils-r1_python_prepare_all
-#}
-
-python_test() {
-	cp -lr tests setup.cfg "${BUILD_DIR}" || die
-	run_in_build_dir nosetests -v --attr=!online > "${T}/tests-${EPYTHON}.log" \
-		|| die "Tests fail with ${EPYTHON}"
-}