8 files changed, 47 insertions, 110 deletions
diff --git a/mail-filter/maildrop/maildrop-3.1.8.ebuild b/mail-filter/maildrop/maildrop-3.1.8.ebuild
index ad7fb0658c25..bf8c3b29ee87 100644
--- a/mail-filter/maildrop/maildrop-3.1.8.ebuild
+++ b/mail-filter/maildrop/maildrop-3.1.8.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${P%%_pre}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ppc ppc64 ~s390 sparc x86"
 IUSE="berkdb debug dovecot gdbm ldap mysql postgres static-libs authlib +tools trashquota"
 
 RESTRICT="test" # No more working
diff --git a/mail-filter/postforward/files/postforward_apply-sendmail-path.patch b/mail-filter/postforward/files/postforward-1.1.1-apply-sendmail-path.patch
index c64b76368a39..c64b76368a39 100644
--- a/mail-filter/postforward/files/postforward_apply-sendmail-path.patch
+++ b/mail-filter/postforward/files/postforward-1.1.1-apply-sendmail-path.patch
diff --git a/mail-filter/postforward/postforward-1.1.1-r1.ebuild b/mail-filter/postforward/postforward-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..12417c94def0
--- /dev/null
+++ b/mail-filter/postforward/postforward-1.1.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Postfix Sender Rewriting Scheme forwarding agent"
+HOMEPAGE="https://github.com/zoni/postforward"
+SRC_URI="https://github.com/zoni/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="mail-filter/postsrsd"
+
+PATCHES=(
+	"${FILESDIR}/${P}-apply-sendmail-path.patch"
+)
+
+src_unpack() {
+	# This package has no dependencies, but go-module_src_unpack requires this directory
+	mkdir -p "${S}/vendor" || die
+
+	go-module_src_unpack
+}
+
+src_prepare() {
+	default
+
+	# Dynamically fix EPREFIX lines made by ${PN}_apply-sendmail-path.patch
+	sed -e "s/@GENTOO_PORTAGE_EPREFIX@/${EPREFIX}/" -i ${PN}.go || die
+}
+
+src_compile() {
+	ego build -o ${PN} ${PN}.go
+}
+
+src_install() {
+	einstalldocs
+	dosbin "${PN}"
+}
diff --git a/mail-filter/postforward/postforward-1.1.1.ebuild b/mail-filter/postforward/postforward-1.1.1.ebuild
deleted file mode 100644
index 13e50547a484..000000000000
--- a/mail-filter/postforward/postforward-1.1.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit golang-build
-
-DESCRIPTION="Postfix Sender Rewriting Scheme forwarding agent"
-EGO_PN="${PN}"
-SRC_URI="https://github.com/zoni/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/zoni/postforward"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	dev-lang/go:0"
-RDEPEND="
-	mail-filter/postsrsd"
-
-PATCHES=( "${FILESDIR}/${PN}_apply-sendmail-path.patch" )
-
-src_prepare() {
-	default
-
-	# Dynamically fix EPREFIX lines made by ${PN}_apply-sendmail-path.patch
-	sed -i -e "s/@GENTOO_PORTAGE_EPREFIX@/${EPREFIX}/" *.go || die
-
-	# go build assumes files will be in src dir, but
-	# source files are in root in this package, so move
-	# them.
-	local new_src_dir="${S}/src/${EGO_PN}"
-	# Freak out if there's already something there because
-	# it means the package has changed and we'll need to
-	# adjust to it.
-	[[ -e "${new_src_dir}" ]] && die "${new_src_dir} already exists"
-	mkdir -p "${new_src_dir}" || die
-	mv *.go "${new_src_dir}" || die
-}
-
-# Standard golang-build src_install complains about pkg not
-# existing, so we go custom.
-src_install() {
-	einstalldocs
-	dosbin "${PN}"
-}
diff --git a/mail-filter/pyzor/Manifest b/mail-filter/pyzor/Manifest
index a571fc5fcc3d..ea6a69659dde 100644
--- a/mail-filter/pyzor/Manifest
+++ b/mail-filter/pyzor/Manifest
@@ -1,2 +1 @@
-DIST pyzor-1.0.0_p20211223.tar.gz 138500 BLAKE2B 242a7b2df3451f659d820771454e685868792bd2275b6d69d4c4adfd6044c781abe2d72fe1500a6074851faf8e88e95d6578c546d4d95fda03e11609d1a0b436 SHA512 218bea40515a21b1e08b2bad5b7ba339ba84fff2da425dc58df72a967730ebe10e319944e1604ff56bb37f6a8ae7bc0cd974b54b18a4878ba103131b8ea47b67
 DIST pyzor-release-1-1-2.gh.tar.gz 138970 BLAKE2B 07fafe1eee577094525e1c888374c646eb6d56b1f4306669915f926235b8f433b5a5fb64680d6f7744bd835fa4eefc88805302bb312515bc7ccfed5d1f9643f8 SHA512 17cefeeb9a4befde16b3a68e219599d4a85319968b16f8c7352696cdfca9db8e0c18acc83bc0b7a6873be020e91f7dee09389ea9cbde8cdad000c87d5941b702
diff --git a/mail-filter/pyzor/metadata.xml b/mail-filter/pyzor/metadata.xml
index 77c2f9becde8..de2277bb1b6e 100644
--- a/mail-filter/pyzor/metadata.xml
+++ b/mail-filter/pyzor/metadata.xml
@@ -21,6 +21,7 @@
   </use>
   <upstream>
     <remote-id type="github">SpamExperts/pyzor</remote-id>
+    <remote-id type="pypi">pyzor</remote-id>
     <remote-id type="sourceforge">pyzor</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/mail-filter/pyzor/pyzor-1.0.0_p20211223.ebuild b/mail-filter/pyzor/pyzor-1.0.0_p20211223.ebuild
deleted file mode 100644
index 9abdf06b3ddd..000000000000
--- a/mail-filter/pyzor/pyzor-1.0.0_p20211223.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-MY_COMMIT="2dbe627c1ec245db206cdc73bf1f9d785f1512d8"
-DESCRIPTION="A distributed, collaborative spam detection and filtering network"
-HOMEPAGE="https://github.com/SpamExperts/pyzor"
-SRC_URI="https://github.com/SpamExperts/pyzor/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc gdbm mysql pyzord redis selinux test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	pyzord? (
-		gdbm? ( $(python_gen_impl_dep 'gdbm') )
-		mysql? ( dev-python/mysqlclient[${PYTHON_USEDEP}] )
-		redis? ( dev-python/redis[${PYTHON_USEDEP}] )
-	)
-	selinux? ( sec-policy/selinux-pyzor )
-"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep 'gdbm')
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/redis[${PYTHON_USEDEP}]
-	)
-"
-
-REQUIRED_USE="
-	pyzord? ( || ( gdbm redis ) )
-"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	epytest -vv tests/unit
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	if use pyzord; then
-		dodir /usr/sbin
-		mv "${ED}"/usr/bin/pyzord* "${ED}/usr/sbin" \
-		   || die "failed to relocate pyzord"
-	else
-		rm "${ED}"/usr/bin/pyzord* || die "failed to remove pyzord"
-	fi
-}
diff --git a/mail-filter/pyzor/pyzor-1.1.2.ebuild b/mail-filter/pyzor/pyzor-1.1.2.ebuild
index d3a1c7d72dd2..907a21b80f9e 100644
--- a/mail-filter/pyzor/pyzor-1.1.2.ebuild
+++ b/mail-filter/pyzor/pyzor-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc gdbm mysql pyzord redis selinux test"
 RESTRICT="!test? ( test )"