7 files changed, 4 insertions, 60 deletions
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index cf65c14aa993..816055ddcaba 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/nmzmail/Manifest b/net-mail/nmzmail/Manifest
index c2efc49e9bde..b16eafd89ae9 100644
--- a/net-mail/nmzmail/Manifest
+++ b/net-mail/nmzmail/Manifest
@@ -1,4 +1,3 @@
 DIST nmzmail-1.1.tar.gz 94326 BLAKE2B 3a3125c21c67411f1608f7137becdac7b908c2f42e215bbed4897aa5815d8cc3825cbf5109f670caf1a9c8a8b4e82e0463a4acd68473b1664367c9c874398f32 SHA512 c5b689c587fc0d0359c59a02a2a1f519753e7c8a10aecd2c519f0e788b95ed1023a18bf0d2ee39292f36aae71eebf43d2463ceef7857d01358e56c8f0bd70249
-EBUILD nmzmail-1.1-r1.ebuild 428 BLAKE2B 9f28aef8719a8ea99287d190d2a54311e4f553570c1d617034e77a6c76eb807385346d0103f55aaf26a8d3eb1755cc70212e749fe4c9ec563361750519bfb29f SHA512 c592e38cd64fe67751b410466ea20cade482eb55f4c5620f5812ba006c731756e7145e6dd46e1ea44d0650e6cb8b347993974419f90bbe0f38692bf400e6b11d
-EBUILD nmzmail-1.1-r2.ebuild 378 BLAKE2B 3f2ee778cf75af60d00e9f80d2f90b07d68892eddc5da25b3e91eb924db5283ffdf9d4e566264fcbf58ee56438ca55c5a1f363281714291791eb442385468955 SHA512 967abe3d4e3daf9d3f1728b03df6b2bee2619dc90965c1e1c6c6d0250fc46b53cfcfe5d43a4d11d22e612df4abacb797f91555a46fa181adb157c708c7a017a1
+EBUILD nmzmail-1.1-r2.ebuild 376 BLAKE2B 3e93efd51d91344dab0a74d77bb50c4ac57049c77e423dbefccfa4ad4b3c6140e95c79857482c9f35d972b17187a8079d34746ee80a9c29cbfc082bbc48e0430 SHA512 586c29093a53ec57e8df4afba31b103362c03b17d59a5460f666c66ba88ab424f4d7f83003e4862b4587b17218203adcbe04aa471903567a16f842f48834cf8f
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-mail/nmzmail/nmzmail-1.1-r1.ebuild b/net-mail/nmzmail/nmzmail-1.1-r1.ebuild
deleted file mode 100644
index c936ce4ed467..000000000000
--- a/net-mail/nmzmail/nmzmail-1.1-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Fast mail searching for mutt using namazu"
-HOMEPAGE="https://www.ecademix.com/JohannesHofmann/nmzmail.html"
-SRC_URI="https://www.ecademix.com/JohannesHofmann/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="sys-libs/readline:="
-RDEPEND="${DEPEND}
-	>=app-text/namazu-2"
diff --git a/net-mail/nmzmail/nmzmail-1.1-r2.ebuild b/net-mail/nmzmail/nmzmail-1.1-r2.ebuild
index 4ffa3c76d017..07de9f3e92be 100644
--- a/net-mail/nmzmail/nmzmail-1.1-r2.ebuild
+++ b/net-mail/nmzmail/nmzmail-1.1-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://flpsed.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 DEPEND="sys-libs/readline:="
 RDEPEND="${DEPEND}
diff --git a/net-mail/randomsig/Manifest b/net-mail/randomsig/Manifest
index f5a3c90f5c13..d95c108c31c9 100644
--- a/net-mail/randomsig/Manifest
+++ b/net-mail/randomsig/Manifest
@@ -1,4 +1,3 @@
 DIST randomsig-v1.10.0.tar.gz 24910 BLAKE2B 13bfbf39cea7c7d348f5a91dd5700a2e91a93e574e6f1c12afd86d72c7868fd1a89123f52c897d9fff0b765e968980bee69927435a1b24f7f15e81b5f6a025ab SHA512 eb47bd017dee819e7b7151a47f5aca03e688e3aa9a4b9bf4882a4df51c6fcc1880e382b02d68d0c1d3a773b1179d5abb0782ec4d6a7649be226151e9e2579408
-EBUILD randomsig-1.10.0-r1.ebuild 788 BLAKE2B 6a893c357fc754727eed06072465a053c292393cf2d51b085a978c8abdcc9e28a5f6d667e223c0d14fb0c65d1ea15765b88b448caf636df31834afc9e27ce697 SHA512 8b73cacf45edf562d3deb7aea504c0044685246ea024611cfb49c5502a86b16a535b43af83cd59f09ed2c9861fb26b0858540871fcb747d4d14bda13212d4a31
-EBUILD randomsig-1.10.0.ebuild 797 BLAKE2B f47fb72877d166aba12d501fdf547159eaa9f381661e0c40e648eab939fbc9a6d25d380982f6a50a55b441b51b9a578d27322c661c3c93b17e73f92159a05c65 SHA512 47c0bacb3be8ad2a5a2c53bf68b49218dc86f30b29773566fc403df23eed3f779c289687be06a1ae5fdcc441a2be0bec04decf6268c3bfd94dc5013509e2966d
+EBUILD randomsig-1.10.0-r1.ebuild 786 BLAKE2B cb38315b7a9e8b4c9dac8a20fabfdc4bc6a36236adb41e4b27ec7367cad19dfba1b4bd18b22802a660fedbadcf0427a055a5442c8795f1622ad8d58867515ef7 SHA512 f8f220fa0cbbee24ffb524f6965965e5ea77836359c8c0b21fa72e9f8426262d6112270c4e897bec7cf3902c7a6b27c363561dbd050fbc4d93ab5dfa6d8a9961
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-mail/randomsig/randomsig-1.10.0-r1.ebuild b/net-mail/randomsig/randomsig-1.10.0-r1.ebuild
index 433e05933e0f..40298dfff0d9 100644
--- a/net-mail/randomsig/randomsig-1.10.0-r1.ebuild
+++ b/net-mail/randomsig/randomsig-1.10.0-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~s390 sparc x86"
 
 RDEPEND="dev-lang/perl"
 DEPEND="${RDEPEND}"
diff --git a/net-mail/randomsig/randomsig-1.10.0.ebuild b/net-mail/randomsig/randomsig-1.10.0.ebuild
deleted file mode 100644
index f850d7cfcf8f..000000000000
--- a/net-mail/randomsig/randomsig-1.10.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${PN}-v${PV}
-
-DESCRIPTION="randomsig - perl script for generating random .signature files"
-HOMEPAGE="http://suso.suso.org/programs/randomsig/"
-SRC_URI="http://suso.suso.org/programs/randomsig/downloads/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~s390 sparc x86"
-
-RDEPEND="dev-lang/perl"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-
-	sed -e "s:/usr/local/bin:${EPREFIX}/usr/bin:" \
-		-e "s:/usr/local/etc:${EPREFIX}/etc:" \
-		-i Makefile || die
-	sed -e "s:/usr/local/etc:${EPREFIX}/etc:" \
-		-i randomsig || die
-}
-
-src_install() {
-	dobin randomsig
-	einstalldocs
-
-	insinto /etc/randomsig
-	doins .randomsigrc .sigquotes .sigcancel .sigread
-}