gentoo resync : 29.12.2022

3 files changed, 4 insertions, 84 deletions

diff --git a/mail-filter/spf-engine/Manifest b/mail-filter/spf-engine/Manifest
index 03ff7680d20c..a9014349c2f6 100644
--- a/mail-filter/spf-engine/Manifest
+++ b/mail-filter/spf-engine/Manifest
@@ -1,4 +1,3 @@
-DIST spf-engine-2.9.2.tar.gz 52737 BLAKE2B 39d6c9831ef3ea489f2910fcbcaec9b2bed627f02459e20826166f04a2fe895aecf83768a3446a037e4231cc317ee277f6ff8e9030c72d8819739f6af889d632 SHA512 fe1fe82411ed4d6fcfadccd6ccc9fbd36372b4676051aafa5984740cba862336b00567576b3e32451cd24b0cfcd992d7dfdee33f0cf65a35f4009837e99b8f98
-EBUILD spf-engine-2.9.2-r3.ebuild 2783 BLAKE2B 6cb7071aada85cd6c41aa2285404dc86d130dec6a4082ea5c26369f6b47431cbbd3f9ef05c54bc8c9d6bd8977cf6c8b04cc9d2e9a4527d8b06e6eb4f9df03ff7 SHA512 f6b78f1ca2bb3c33b2477719f8f6d8c3645444afa51ec58fce86504ade28ff830b38bb7b00cf70c616a9834080f468e24a2d215188e753c284927a06b3207aec
-EBUILD spf-engine-2.9.2-r4.ebuild 2721 BLAKE2B e895e288e1bea3877167d237c54d18b0a0968b04eee8118bb998f68e50565600231256ce28976ee3f4c26a857e0118b29e66e71a9edf6471cff7d61a4aed87ea SHA512 125c1895b5e8584c38bee6470f899a3cf0be7ab7acd18bc3f0416100ac41546e33510549ad9a4392d69a12ea0d5ef3549dd2d6afdfaabbaaa0190e3cb891f99c
+DIST spf-engine-2.9.3.tar.gz 52974 BLAKE2B 9e6c47af7d523e1486d9bbfee2b0e53a4a97dbfc93e1cd14f70d4676542defaf6fede397d33e21c00e9bb2cdd1016c98981b6c0e735bdfd225b226920b9470b1 SHA512 adde80eca38f372ad00ed7355951007b9c02ef8a52a5a4edcbf2fa9959220f1083e3e313668e9c7ad2c26144148ae8ff62ec468d79936d96b43897598254f528
+EBUILD spf-engine-2.9.3.ebuild 2719 BLAKE2B 3f1a223431077cc57b3f01e6abb7efb6ccf1d3674f3c38a07b460f661f083abdf9ffb2cfa043f42291f0dee4b301c8d5022591d0b7ae775f1924aee771e3bd0a SHA512 632955f3af1f693a10a7687d7278eae241237fdfc4c3b1f637e9f232a4819b390f73a8ba2ac8b28698f3a99a908e356776063435054543c2847e4b62af5fd9e5
 MISC metadata.xml 351 BLAKE2B 896ff35eb02fb2dc7a81f61d7698c72566061e15a43773b24655f12840e47b9f84ab98778498da1418b74007309fff3257de8b5ea06f60b4d358633ebfec12cd SHA512 e592b10d44514d4f5ac34295b727a58659d82d41e100c97c96f7881d0e189311e30aa2527a32d92ae1cbefea55aa722d39c7c36c3d3b259fc3b1df04bd9b075f
diff --git a/mail-filter/spf-engine/spf-engine-2.9.2-r3.ebuild b/mail-filter/spf-engine/spf-engine-2.9.2-r3.ebuild
deleted file mode 100644
index 4936a62e0edb..000000000000
--- a/mail-filter/spf-engine/spf-engine-2.9.2-r3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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
-# addresses, and the daemon will crash if it sees an ipv6 SPF record. In
-# other words, it's completely broken.
-PYTHON_REQ_USE="ipv6(+)"
-
-# setup.py defines entry_points
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Policy daemon and milter for Postfix SPF verification"
-HOMEPAGE="https://launchpad.net/spf-engine"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${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}]"
-
-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/${PF}/${oldconf}"
-
-	sed -e "1 s~ ${oldconf}~,\n#  ${newconf}~" -i policyd-spf.conf \
-		|| die 'failed to update commented config file path'
-
-	distutils-r1_python_prepare_all
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# Remove the milter files that are installed by default. The milter
-	# isn't quite ready:
-	#
-	#   * The README says it's experimental not well-tested.
-	#   * There's no documentation for its configuration parameters
-	#     (expecially the UserID).
-	#   * The configuration file is hard-coded to /usr/local.
-	#   * The paths in the systemd service file are hard-coded to /usr/local.
-	#   * We need to write an OpenRC service script for it.
-	#
-	# These are all eventually doable, but I'm not willing to commit to
-	# making the milter work before upstream is.
-	#
-	rm "${ED}/usr/bin/pyspf-milter" \
-		|| die "failed to remove ${ED}/usr/bin/pyspf-milter"
-	rm -r "${ED}/usr/lib/systemd" \
-		|| die "failed to remove ${ED}/usr/lib/systemd"
-	rm -r "${ED}/usr/etc/init.d" \
-		|| die "failed to remove ${ED}/usr/etc/init.d"
-	einfo "The milter component of spf-engine is still deemed experimental"
-	einfo "and not well-tested by upstream. It's missing configuration"
-	einfo "files, service scripts, and documentation. In other words, it"
-	einfo "doesn't work yet."
-
-	# The setuptools installation routing always works relative to
-	# python's prefix, so that when installing locally you wind up
-	# with paths like /usr/local/etc. However for system installs
-	# that does the wrong thing and puts the sysconfdir at /usr/etc.
-	# Here we move it to the right place.
-	mv -v "${ED}/usr/etc" "${ED}/" || die 'failed to relocate sysconfdir'
-}
diff --git a/mail-filter/spf-engine/spf-engine-2.9.2-r4.ebuild b/mail-filter/spf-engine/spf-engine-2.9.3.ebuild
index 250e794e33cd..bfccc6c22a96 100644
--- a/mail-filter/spf-engine/spf-engine-2.9.2-r4.ebuild
+++ b/mail-filter/spf-engine/spf-engine-2.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,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}]"