gentoo resync : 31.05.2021

3 files changed, 4 insertions, 54 deletions

diff --git a/mail-filter/spf-engine/Manifest b/mail-filter/spf-engine/Manifest
index 12356c4d5f5f..91108167f4ed 100644
--- a/mail-filter/spf-engine/Manifest
+++ b/mail-filter/spf-engine/Manifest
@@ -1,5 +1,3 @@
-DIST pypolicyd-spf-2.0.2.tar.gz 38546 BLAKE2B 691cd5db37592be0ef0cda41223280e764e83802e37563f4e6c08505731118199c03d27b0bf51cec0556aa946fc6c7465fe09d3c9100c8e2582a4d85ad828495 SHA512 adcc7b30c6922894f9407edd0637b02a138623f4480ec37635475396826b457c835b3ffb599d1985e306770fe5f72404552ed705bd957e63b5c54ca3d8991673
 DIST spf-engine-2.9.2.tar.gz 52737 BLAKE2B 39d6c9831ef3ea489f2910fcbcaec9b2bed627f02459e20826166f04a2fe895aecf83768a3446a037e4231cc317ee277f6ff8e9030c72d8819739f6af889d632 SHA512 fe1fe82411ed4d6fcfadccd6ccc9fbd36372b4676051aafa5984740cba862336b00567576b3e32451cd24b0cfcd992d7dfdee33f0cf65a35f4009837e99b8f98
-EBUILD spf-engine-2.0.2-r1.ebuild 1364 BLAKE2B d35993d9110aa712f5c79e5980eb3a2878674618a8cfda349016f9f31fffaa290bb6254217ba0f6158dcbb5aea353eda8a3b51cc2c7386d2d7de4080932d7bda SHA512 c0e2d8d78460cff1546b7936c386aa21adddfac807c262553885d942587efd97f1c48eca1af70c3f9290ddbeed7ce6fe2296e8cee5d7d9b49393acd23548f082
-EBUILD spf-engine-2.9.2.ebuild 2772 BLAKE2B 28a630201fb96bf94d99fbcfcc2780380ebc8196acf9b0562ae9842e2174f9640c67335b6219039ef2c7d30519fd4503172a471fb432566dd12c18ab85481644 SHA512 74c26fce08ce0f661cb73901d745facbaa1e3a33e4875e30b3ac0f99a824f9180ad138479ea2d2b2fad07a8a4af24e6386c13fdf238fa66321018b169ed1dc47
+EBUILD spf-engine-2.9.2-r1.ebuild 2780 BLAKE2B 1aa8a6f0389dbe7ad85ee40787463b39124ab404cd2cff9618d38b53ddfde8e5574cc14029e9de39d6ac8aa0dc5cbc6503e3c09d39c2a41fde780d6dea79713b SHA512 d4fc689d17d28f49d7dcafb34ca884fb7c6eacaa165dba8bf88673000f426b5f4a062d25c43e2204d79c351b3691047ad0e063709b1b6d3c1b60fb68b3b0f99e
 MISC metadata.xml 350 BLAKE2B 979a5608d2877fdfe350a7f58ca1d0da721f3d2742b89bab11b6eae5d7ebfcf1f0b8cbda8b81c904aefcbbb908b325d732a6928093dfed57a13d407e91a769ca SHA512 434b6b307bfb636ed69cb2fa9a95daa7c5208501054df048346973a16ebb14786fdf4eda749eea6006c529f9d5a9c78b6ff32d7e85f76644250944e5d8f7b3a8
diff --git a/mail-filter/spf-engine/spf-engine-2.0.2-r1.ebuild b/mail-filter/spf-engine/spf-engine-2.0.2-r1.ebuild
deleted file mode 100644
index 14de72aa96c2..000000000000
--- a/mail-filter/spf-engine/spf-engine-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 python3_8 )
-
-# The built-in ipaddress module handles the parsing of IP addresses. If
-# python is built without ipv6 support, then ipaddress can't parse ipv6
-# addresses, and the daemon will crash if it sees an ipv6 SPF record. In
-# other words, it's completely broken.
-PYTHON_REQ_USE="ipv6"
-
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
-
-OLD_PN="pypolicyd-spf"
-OLD_P="${OLD_PN}-${PV}"
-OLD_PF="${PN}-${PVR}"
-DESCRIPTION="Python-based policy daemon for Postfix SPF verification"
-HOMEPAGE="https://launchpad.net/pypolicyd-spf"
-SRC_URI="mirror://pypi/p/${OLD_PN}/${OLD_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/pyspf[${PYTHON_USEDEP}]"
-
-RDEPEND="${DEPEND}
-	dev-python/authres[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${OLD_P}"
-
-DOCS=( CHANGES policyd-spf.conf.commented README README.per_user_whitelisting )
-
-python_prepare_all() {
-	# The "real" config file mentions the commented one, so we point
-	# users in the right direction.
-	local oldconf="policyd-spf.conf.commented"
-	local newconf="/usr/share/doc/${OLD_PF}/${oldconf}"
-
-	sed -i "1 s~ ${oldconf}~,\n#  ${newconf}~" policyd-spf.conf \
-		|| die 'failed to update commented config file path'
-
-	distutils-r1_python_prepare_all
-}
diff --git a/mail-filter/spf-engine/spf-engine-2.9.2.ebuild b/mail-filter/spf-engine/spf-engine-2.9.2-r1.ebuild
index 8ce61a814053..25381a867142 100644
--- a/mail-filter/spf-engine/spf-engine-2.9.2.ebuild
+++ b/mail-filter/spf-engine/spf-engine-2.9.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 python3_8 )
+PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
 
 # The built-in ipaddress module handles the parsing of IP addresses. If
 # python is built without ipv6 support, then ipaddress can't parse ipv6
@@ -21,7 +21,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/pyspf[${PYTHON_USEDEP}]"