gentoo resync : 16.09.2020

5 files changed, 13 insertions, 94 deletions

diff --git a/mail-filter/afew/Manifest b/mail-filter/afew/Manifest
index 75b869f43abb..94e693c0374b 100644
--- a/mail-filter/afew/Manifest
+++ b/mail-filter/afew/Manifest
@@ -1,9 +1,5 @@
-DIST afew-1.2.0.tar.gz 31831 BLAKE2B 7976dfc1e56461afbd6244220c5d548c7de5e95649bd7ac0c986457c99cfc4574e6f5d6b90bc8985ef37e84f55f52b8417fcc1644c9aadf0a37123e0ea0ecba2 SHA512 98184808ae37e169bdbda9ac43db00e3e0712aaadc9b75e07c8d483c8024aa0cafb0a3424bda5703dfe77a09f5efd9812b80b3468009cfb4562eb5d0069558e4
-DIST afew-1.3.0.tar.gz 33361 BLAKE2B 2553c04fce7e1c9f0a6551a8a01ed85735320bea95fe723050bdbde97aea80b93631c3621ec6cb0687753cbd88ac26725b1c608f7b8a6bcb4fc5bce6d3fce411 SHA512 2e15dc2aa6032b14c3fed57cb5912e3c3471592586f5fa40991b2a007d8a9579c0e1f69e455e1405923b93de64b9b8c126b5ccf8da72144528c57108beea7370
-DIST afew-2.0.0.tar.gz 33116 BLAKE2B 59f2686a6495ee9e4a0afaf3180a83667bc65aaee453fe73cb2813401778d63fbb67adb45ed5f98c5c593d07d53411042096d44d85e652157d6705eb2e236152 SHA512 09eaca6fd387b76f310879f6e04c21f3247e703300d9995d40c420a06a5884cb08ebd51e5d1caee6d8c5be29844f6d562838104445e7b7efd372690c1856f97d
 DIST afew-3.0.0.tar.gz 36525 BLAKE2B fd9b676ad00d9f6d989d8901f8885a7861d753ab96e4a768f2a1118b72893517fc3a8122a7a63d2e26659bf1afc2467bc7503f279b8037c65da9c250c18b152b SHA512 8d1947d547bde7fdc9ec2fc8fb212165fecc1cd4bc37c2dda60133e5ffe31dee1393ad0a92e4f0e2c85863a01f7ae252555e88868fa8ba5dece8380080f0e36c
-EBUILD afew-1.2.0.ebuild 815 BLAKE2B 4073b92aa56297b14c39ed1d954dc69cb2284526a08dca2ef9f1809c63a5b1ec03e4e110fc097e4fa5bccc49a21751379f9a9c2d0a0d9fa7bea967031deb8137 SHA512 bc0a703814c7813d217fecd568ee71ba04bbbefe348733bee0e8b0d9f7b83149fd6d8cc3710b79885cabbc64af4c865b6d96be4b2cdef1a5eccb37d7d108aafd
-EBUILD afew-1.3.0-r1.ebuild 865 BLAKE2B 9b17cdb5481927f3d5dcaa3b19b0305238331e47fc84337bc47edf041021c82c4229a8a9d65b516f81ce92706d991a2cd057dfc53efa313520e76cd361e2dc35 SHA512 03de0950dd23a2fc7d5424d1b17ac1472576cbcc8764fc98ae1bba5cd75c0758b44bccbacca9ceb0b38a15f515a7860d1cc77c124690ab4c96ece5061f2aae99
-EBUILD afew-2.0.0.ebuild 1166 BLAKE2B 460e123ac14cbb91eeb5173e006379052e8175b55e216738b450a41fc9902d1c32daa247c913fdfad2e30e4e5d8f077f9fa350232731abb0ad9e86084cb62d04 SHA512 dc1a65b85308cc7daea5dc770301515d0a7221abfe0ca84ba281f158705bc41ce4defc2095bced5831ee1b6211bce5cfbda35a4154cbc7717d940084069916d5
-EBUILD afew-3.0.0.ebuild 1165 BLAKE2B b0ace2eebed48bf98c09b5ee1cc6ccffd4e10fd23cced0a59376d35c34bf6f421d4038521e8383c9e697e1d1c7526d912b425178e786be5d9e788e22bc93e778 SHA512 c8f2561321ea850e6de1005291ef5073a47d1bc6687691524624bbb6a673ffbf0ccf18222b6ef12290682418a93537844dc58535c278e0fa86fdb87d68c24a9b
+DIST afew-3.0.1.tar.gz 40092 BLAKE2B 9ce125ec2359f7cf4630b9602b3068327adc06a699d325c90bc9b545df9ce7f3a62623cc733dfec55ee3e51523e4512ebec04e7186470fc56bb1589a7141cbc9 SHA512 1a76ecc78ed9fb8598be74c48a1d51c78db20df08b27c04c24779aaba01aa457c776457a647c54a5e92f0fda364a86810957a95c0d3f686e77e083d2103b1bf1
+EBUILD afew-3.0.0.ebuild 1164 BLAKE2B 233267562dfa67077beebe764f976ade4629b35ed0dade646447ed3b5d2621fa37643a37704a2e9dc4a5229559d1189872d05bcc40ff84657c2051ffb59305c3 SHA512 7912869b7b7fa2bda7b3389af1f9a5ed85deb0a386ee2079a004f6c0a9d328b3b65e89d2502e827e2da74955189b24899910c4d399fb9ebe9afa94dcd66e1135
+EBUILD afew-3.0.1.ebuild 1184 BLAKE2B cd13530f831fcb95c619c33c970a9a6d0b8f7712d0f1b28a439f082ce0934831c471c43edd6499e90ac4ee93a1deedfb4dcb8a6b379324d258781a33b11ddb18 SHA512 b5661f088706ff3b0ee80f6a323d647601dc567714fec3be251030ff25cf90920f6efafde4eaf469f1c26f54a5708c1da7aec9d052ba45e9d2d9160f70936a80
 MISC metadata.xml 1001 BLAKE2B 33e569aa1f5f64926dfb7a74743d1cd40d16177ef814cb25e16904c20b8ba7b1ef1b12562bd437353254af73abf0759ab90da818a0aaf5acc4cae089bd21451a SHA512 44016d8a87273ede7b9fd52871095894725584202b17c69feb7b599859cbdd6202c2e41296744e63fcc918b95daf1962f64af9ea87b627bd4bf8d318b2703feb
diff --git a/mail-filter/afew/afew-1.2.0.ebuild b/mail-filter/afew/afew-1.2.0.ebuild
deleted file mode 100644
index 839aa0f2d51e..000000000000
--- a/mail-filter/afew/afew-1.2.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Initial tagging script for Notmuch"
-HOMEPAGE="https://github.com/afewmail/afew"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		net-mail/notmuch[python,${PYTHON_MULTI_USEDEP}]
-	')"
-
-DOCS=( "README.rst" )
-
-src_prepare() {
-	sed -r \
-		-e "s/^([[:space:]]+)use_scm_version=.*,$/\1version='${PV}',/" \
-		-e "/^([[:space:]]+)setup_requires=.*,$/d" \
-		-i setup.py || die
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	dodoc afew/defaults/afew.config
-}
diff --git a/mail-filter/afew/afew-1.3.0-r1.ebuild b/mail-filter/afew/afew-1.3.0-r1.ebuild
deleted file mode 100644
index 3f9be50612f1..000000000000
--- a/mail-filter/afew/afew-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Initial tagging script for Notmuch"
-HOMEPAGE="https://github.com/afewmail/afew"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/dkimpy[${PYTHON_MULTI_USEDEP}]
-		net-mail/notmuch[python,${PYTHON_MULTI_USEDEP}]
-	')"
-
-DOCS=( "README.rst" )
-
-src_prepare() {
-	sed -r \
-		-e "s/^([[:space:]]+)use_scm_version=.*,$/\1version='${PV}',/" \
-		-e "/^([[:space:]]+)setup_requires=.*,$/d" \
-		-i setup.py || die
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	dodoc afew/defaults/afew.config
-}
diff --git a/mail-filter/afew/afew-3.0.0.ebuild b/mail-filter/afew/afew-3.0.0.ebuild
index 799d25c1b5ff..8f216a8027dd 100644
--- a/mail-filter/afew/afew-3.0.0.ebuild
+++ b/mail-filter/afew/afew-3.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/mail-filter/afew/afew-2.0.0.ebuild b/mail-filter/afew/afew-3.0.1.ebuild
index b9e74273e201..a2ee5e08bf39 100644
--- a/mail-filter/afew/afew-2.0.0.ebuild
+++ b/mail-filter/afew/afew-3.0.1.ebuild
@@ -4,7 +4,8 @@
 EAPI=7
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python{3_6,3_7} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -19,13 +20,13 @@ IUSE="doc"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/dkimpy[${PYTHON_MULTI_USEDEP}]
-		net-mail/notmuch[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/dkimpy[${PYTHON_USEDEP}]
+		net-mail/notmuch[python,${PYTHON_USEDEP}]
 	')"
-DEPEND="
+BDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
 	')"
 
 DOCS=( "README.rst" )
@@ -46,5 +47,6 @@ python_compile_all() {
 python_install_all() {
 	doman docs/build/man/*
 	dodoc afew/defaults/afew.config
-	use doc && local HTML_DOCS=( docs/build/html/. )
+	use doc && HTML_DOCS=( docs/build/html/. )
+	einstalldocs
 }