Updating liguros repov21.1.3

30 files changed, 417 insertions, 594 deletions

diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index 46eddcf7a2a2..8d47f7766f6a 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -1 +1,2 @@
 DIST dbmail-3.2.3.tar.gz 2444227 BLAKE2B baa812fb3e925e6d896762596426208fc2ac5fcb01cb8100cfbd0464f1342f934c099ca52fd857e05fc82b97227155e9dcfc987d6c9b5c37e7daf21b167c9841 SHA512 29cc89830278f2ff28a4221fc81d4ff13cc371fbca7fb51d5376e9243234220b552cb4b6ec035c150e6cfa178435c4f36b9ce132fc02334bc6cdeb1a41c8ed85
+DIST dbmail-3.2.5.tar.gz 2463966 BLAKE2B f4099c6f869dbb041d7eccdf20f3a34d36918237cc0386c71a1d339da8651b9301e676b25201856038045bb9590f880353c6ccafd57330f9cf48382c1b4c603c SHA512 6b0d7e1f6f7449869db1e094ffce9e1ef315c60784ea5ae5f814f2cf9a18c358b4c5d107a420c7317961ffa343fc59c9083789177514aee96523927688f276a0
diff --git a/net-mail/dbmail/dbmail-3.2.5.ebuild b/net-mail/dbmail/dbmail-3.2.5.ebuild
new file mode 100644
index 000000000000..ab3f44a299a8
--- /dev/null
+++ b/net-mail/dbmail/dbmail-3.2.5.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd readme.gentoo-r1
+
+DESCRIPTION="Fast and scalable sql based email services"
+HOMEPAGE="https://www.dbmail.org/"
+SRC_URI="https://github.com/dbmail/dbmail/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+doc jemalloc ldap libressl sieve ssl static systemd"
+
+DEPEND="dev-db/libzdb
+	sieve? ( >=mail-filter/libsieve-2.2.1 )
+	ldap? ( >=net-nds/openldap-2.3.33 )
+	jemalloc? ( dev-libs/jemalloc )
+	app-text/asciidoc
+	app-text/xmlto
+	app-crypt/mhash
+	sys-libs/zlib
+	dev-libs/gmime:2.6
+	>=dev-libs/glib-2.16
+	dev-libs/libevent
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+RDEPEND="${DEPEND}
+	acct-group/dbmail
+	acct-user/dbmail"
+DOCS=( AUTHORS README.md INSTALL THANKS UPGRADING )
+
+README_GENTOO_SUFFIX=""
+
+src_prepare() {
+	sed -i -e "s:nobody:dbmail: ; s:nogroup:dbmail: ; s:/var/run:/run/dbmail:" dbmail.conf || die
+	# change config path to our default and use the conf.d and init.d files from the contrib dir
+	sed -i -e "s:/etc/dbmail.conf:/etc/dbmail/dbmail.conf:" contrib/startup-scripts/gentoo/init.d-dbmail || die
+
+	default
+}
+
+src_configure() {
+	econf \
+		--enable-manpages \
+		--sysconfdir=/etc/dbmail \
+		$(use_enable doc manpages) \
+		$(use_enable static) \
+		$(use_enable systemd) \
+		$(use_with jemalloc) \
+		$(use_with sieve) \
+		$(use_with ldap auth-ldap)
+}
+
+src_install() {
+	emake DESTDIR="${D}" SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
+	einstalldocs
+
+	docompress -x /usr/share/doc/${PF}/sql
+	dodoc -r sql
+	dodoc -r test-scripts
+	dodoc -r contrib
+	## TODO: install other contrib stuff
+
+	insinto /etc/dbmail
+	newins dbmail.conf dbmail.conf.dist
+
+	# use custom init scripts until updated in upstream contrib
+	newinitd "${FILESDIR}/dbmail-imapd.initd" dbmail-imapd
+	newinitd "${FILESDIR}/dbmail-lmtpd.initd" dbmail-lmtpd
+	newinitd "${FILESDIR}/dbmail-pop3d.initd" dbmail-pop3d
+	newinitd "${FILESDIR}/dbmail-timsieved.initd" dbmail-timsieved
+
+	dobin contrib/mailbox2dbmail/mailbox2dbmail
+	doman contrib/mailbox2dbmail/mailbox2dbmail.1
+
+	# ldap schema
+	if use ldap; then
+		insinto /etc/openldap/schema
+		doins "${S}/dbmail.schema"
+	fi
+
+	keepdir /var/lib/dbmail
+	fperms 750 /var/lib/dbmail
+	fowners dbmail:dbmail /var/lib/dbmail
+	
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-mail/dbmail/files/README.gentoo b/net-mail/dbmail/files/README.gentoo
new file mode 100644
index 000000000000..b7e052261a91
--- /dev/null
+++ b/net-mail/dbmail/files/README.gentoo
@@ -0,0 +1,41 @@
+Please read the INSTALL file in /usr/share/doc/${PF}/
+for remaining instructions on setting up dbmail users and 
+for finishing configuration to connect to your MTA and 
+to connect to your db.
+
+DBMail requires either SQLite, PostgreSQL or MySQL.
+Database schemes can be found in /usr/share/doc/${PF}/
+You will also want to follow the installation instructions
+on setting up the maintenance program to delete old messages.
+Don't forget to edit /etc/dbmail/dbmail.conf as well.
+
+For regular maintenance, add this to crontab:
+0 3 * * * /usr/bin/dbmail-util -cpdy >/dev/null 2>&1
+
+Please make sure to run etc-update.
+If you get an error message about plugins not found
+please add the library_directory configuration switch to
+dbmail.conf and set it to the correct path
+(usually /usr/lib/dbmail or /usr/lib64/dbmail on amd64)
+A sample can be found in dbmail.conf.dist after etc-update.
+
+We are now using the init script from upstream.
+Please edit /etc/conf.d/dbmail to set which services to start
+and delete /etc/init.d/dbmail-* when you are done. (don't
+forget to rc-update del dbmail-* first)
+
+Changed pid directory to /run/dbmail (see
+http://www.dbmail.org/mantis/view.php?id=949 for details)
+
+The database config has changed to support libzdb db URI
+Please check the documentation (or Bug #479664)
+
+The database schema has changed since 3.0.x make sure
+to run the migration script
+
+Please be aware, that the single init-script for all services
+has been replaced with seperate init scripts for the individual services.
+Make sure to add dbmail-(imapd|lmtpd|pop3d|timsieved) using rc-update
+and remove dbmail if you want to take advantage of this change.
+
+
diff --git a/net-mail/dbmail/files/dbmail-imapd.initd b/net-mail/dbmail/files/dbmail-imapd.initd
index f2e16dff1706..c2925f9ecb0e 100644
--- a/net-mail/dbmail/files/dbmail-imapd.initd
+++ b/net-mail/dbmail/files/dbmail-imapd.initd
@@ -1,11 +1,5 @@
-#!/sbin/openrc-run
+#!/sbin/runscript
 #
-# chkconfig: - 91 35
-# description: Starts and stops dbmail-impad
-#
-
-
-PROGRAM=dbmail-imapd
 
 BIN_DIR=/usr/sbin
 PID_DIR=/run/dbmail
@@ -18,51 +12,37 @@ CONFIG=/etc/dbmail/dbmail.conf
 #extra_started_commands="reload"
 
 depend() {
-        need net
-        # This won't cause a hard failure if neither is installed, however.
-        use mysql
-        use pgsql
-        after mta
+	need net
+	use mysql
+	use pgsql
+	after mta
 }
 
-initService() {
-    # Avoid using root's TMPDIR
-    unset TMPDIR
-
-    # Check that config file exists.
-    if [ ! -e $CONFIG ]; then
-        eerror "Config file not found ($CONFIG)"
-        eerror "An example config can be found in /etc/dbmail/dbmail.conf.dist"
-        return 1
-    fi
-
-    checkpath -d $PID_DIR -m 750 -o dbmail:dbmail
-
-    RETVAL=0
+checkconfig() {
+	if [ ! -e "/etc/dbmail/dbmail.conf" ]; then
+		eerror "You need to create apropriate config"
+		eerror "in /etc/dbmail/ . Example can be found in /etc/dbmail/dbmail.conf.dist"
+		return 1
+	fi
+	# Avoid using root's TMPDIR
+	unset TMPDIR
 }
 
+
 start() {
-	initService
-        ebegin "Starting DBMail IMAP daemon ($PROGRAM)"
-            start-stop-daemon --start --quiet \
-                --pidfile $PID_DIR/$PROGRAM.$PID \
-                --exec $BIN_DIR/$PROGRAM \
-                --name $PROGRAM \
-                -- -f $CONFIG -p $PID_DIR/$PROGRAM.$PID 2>&1
-        eend $?
-}
+	checkconfig && \
+	ebegin "Starting DBMail IMAP daemon"
+	    start-stop-daemon --start --quiet \
+		--exec /usr/sbin/dbmail-imapd \
+		--name dbmail-imapd \
+		-- -p ${PIDFILE} -f /etc/dbmail/dbmail.conf 2>&1
+	eend $?
+}	
 
 stop() {
-        ebegin "Stopping DBMail IMAP daemon ($PROGRAM)"
-            start-stop-daemon --stop --quiet --retry 15 \
-                --pidfile $PID_DIR/$PROGRAM.$PID
-        eend $?
-}
+	ebegin "Stopping DBMail IMAP daemon"
+	    start-stop-daemon --stop --quiet --retry 5 \
+		--pidfile ${PIDFILE}
+	eend $?
+}	
 
-## not in 3.1.x yet
-#reload() {#
-#       ebegin "Reloading DBMail IMAP daemon ($PROGRAM)"
-#           start-stop-daemon --quiet --signal HUP \
-#               --pidfile $PID_DIR/$PROGRAM.$PID
-#       eend $?
-#}
diff --git a/net-mail/dbmail/files/dbmail-lmtpd.initd b/net-mail/dbmail/files/dbmail-lmtpd.initd
index 7062098fb7b7..083d0e6b8a8c 100644
--- a/net-mail/dbmail/files/dbmail-lmtpd.initd
+++ b/net-mail/dbmail/files/dbmail-lmtpd.initd
@@ -1,11 +1,5 @@
-#!/sbin/openrc-run
+#!/sbin/runscript
 #
-# chkconfig: - 91 35
-# description: Starts and stops dbmail-lmtpd
-#
-
-
-PROGRAM=dbmail-lmtpd
 
 BIN_DIR=/usr/sbin
 PID_DIR=/run/dbmail
@@ -18,51 +12,37 @@ CONFIG=/etc/dbmail/dbmail.conf
 #extra_started_commands="reload"
 
 depend() {
-        need net
-        # This won't cause a hard failure if neither is installed, however.
-        use mysql
-        use pgsql
-        after mta
+	need net
+	use mysql
+	use pgsql
+	after mta
 }
 
-initService() {
-    # Avoid using root's TMPDIR
-    unset TMPDIR
-
-    # Check that config file exists.
-    if [ ! -e $CONFIG ]; then
-        eerror "Config file not found ($CONFIG)"
-        eerror "An example config can be found in /etc/dbmail/dbmail.conf.dist"
-        return 1
-    fi
-
-    checkpath -d $PID_DIR -m 750 -o dbmail:dbmail
-
-    RETVAL=0
+checkconfig() {
+	if [ ! -e "/etc/dbmail/dbmail.conf" ]; then
+		eerror "You need to create apropriate config"
+		eerror "in /etc/dbmail/ . Example can be found in /etc/dbmail/dbmail.conf.dist"
+		return 1
+	fi
+	# Avoid using root's TMPDIR
+	unset TMPDIR
 }
 
+
 start() {
-	initService
-        ebegin "Starting DBMail LMTP daemon ($PROGRAM)"
-            start-stop-daemon --start --quiet \
-                --pidfile $PID_DIR/$PROGRAM.$PID \
-                --exec $BIN_DIR/$PROGRAM \
-                --name $PROGRAM \
-                -- -f $CONFIG -p $PID_DIR/$PROGRAM.$PID 2>&1
-        eend $?
-}
+	checkconfig && \
+	ebegin "Starting DBMail LMTP daemon"
+	    start-stop-daemon --start --quiet \
+		--exec /usr/sbin/dbmail-lmtpd \
+		--name dbmail-lmtpd \
+		-- -p ${PIDFILE} -f /etc/dbmail/dbmail.conf 2>&1
+	eend $?
+}	
 
 stop() {
-        ebegin "Stopping DBMail LMTP daemon ($PROGRAM)"
-            start-stop-daemon --stop --quiet --retry 15 \
-                --pidfile $PID_DIR/$PROGRAM.$PID
-        eend $?
-}
+	ebegin "Stopping DBMail LMTP daemon"
+	    start-stop-daemon --stop --quiet --retry 5 \
+		--pidfile ${PIDFILE}
+	eend $?
+}	
 
-## not in 3.1.x yet
-#reload() {#
-#       ebegin "Reloading DBMail LMTP daemon ($PROGRAM)"
-#           start-stop-daemon --quiet --signal HUP \
-#               --pidfile $PID_DIR/$PROGRAM.$PID
-#       eend $?
-#}
diff --git a/net-mail/dbmail/files/dbmail-pop3d.initd b/net-mail/dbmail/files/dbmail-pop3d.initd
index 156c030be37b..16c4d371f2ec 100644
--- a/net-mail/dbmail/files/dbmail-pop3d.initd
+++ b/net-mail/dbmail/files/dbmail-pop3d.initd
@@ -1,11 +1,5 @@
-#!/sbin/openrc-run
+#!/sbin/runscript
 #
-# chkconfig: - 91 35
-# description: Starts and stops dbmail-pop3d
-#
-
-
-PROGRAM=dbmail-pop3d
 
 BIN_DIR=/usr/sbin
 PID_DIR=/run/dbmail
@@ -18,51 +12,37 @@ CONFIG=/etc/dbmail/dbmail.conf
 #extra_started_commands="reload"
 
 depend() {
-        need net
-        # This won't cause a hard failure if neither is installed, however.
-        use mysql
-        use pgsql
-        after mta
+	need net
+	use mysql
+	use pgsql
+	after mta
 }
 
-initService() {
-    # Avoid using root's TMPDIR
-    unset TMPDIR
-
-    # Check that config file exists.
-    if [ ! -e $CONFIG ]; then
-        eerror "Config file not found ($CONFIG)"
-        eerror "An example config can be found in /etc/dbmail/dbmail.conf.dist"
-        return 1
-    fi
-
-    checkpath -d $PID_DIR -m 750 -o dbmail:dbmail
-
-    RETVAL=0
+checkconfig() {
+	if [ ! -e "/etc/dbmail/dbmail.conf" ]; then
+		eerror "You need to create apropriate config"
+		eerror "in /etc/dbmail/ . Example can be found in /etc/dbmail/dbmail.conf.dist"
+		return 1
+	fi
+	# Avoid using root's TMPDIR
+	unset TMPDIR
 }
 
+
 start() {
-	initService
-        ebegin "Starting DBMail POP3 daemon ($PROGRAM)"
-            start-stop-daemon --start --quiet \
-                --pidfile $PID_DIR/$PROGRAM.$PID \
-                --exec $BIN_DIR/$PROGRAM \
-                --name $PROGRAM \
-                -- -f $CONFIG -p $PID_DIR/$PROGRAM.$PID 2>&1
-        eend $?
-}
+	checkconfig && \
+	ebegin "Starting DBMail POP3 daemon"
+	    start-stop-daemon --start --quiet \
+		--exec /usr/sbin/dbmail-pop3d \
+		--name dbmail-pop3d \
+		-- -p ${PIDFILE} -f /etc/dbmail/dbmail.conf 2>&1
+	eend $?
+}	
 
 stop() {
-        ebegin "Stopping DBMail POP3 daemon ($PROGRAM)"
-            start-stop-daemon --stop --quiet --retry 15 \
-                --pidfile $PID_DIR/$PROGRAM.$PID
-        eend $?
-}
+	ebegin "Stopping DBMail POP3 daemon"
+	    start-stop-daemon --stop --quiet --retry 5 \
+		--pidfile ${PIDFILE}
+	eend $?
+}	
 
-## not in 3.1.x yet
-#reload() {#
-#       ebegin "Reloading DBMail POP3 daemon ($PROGRAM)"
-#           start-stop-daemon --quiet --signal HUP \
-#               --pidfile $PID_DIR/$PROGRAM.$PID
-#       eend $?
-#}
diff --git a/net-mail/dbmail/files/dbmail-timsieved.initd b/net-mail/dbmail/files/dbmail-timsieved.initd
index c5402bdf876e..657bfd586663 100644
--- a/net-mail/dbmail/files/dbmail-timsieved.initd
+++ b/net-mail/dbmail/files/dbmail-timsieved.initd
@@ -1,10 +1,9 @@
-#!/sbin/openrc-run
+#!/sbin/runscript
 #
 # chkconfig: - 91 35
 # description: Starts and stops dbmail-timsieved
 #
 
-
 PROGRAM=dbmail-timsieved
 
 BIN_DIR=/usr/sbin
@@ -14,55 +13,39 @@ PID=pid
 # Where is the dbmail.conf file located?
 CONFIG=/etc/dbmail/dbmail.conf
 
-## not in 3.1.x yet
-#extra_started_commands="reload"
+PIDFILE="/run/dbmail-timsieved.pid"
 
 depend() {
-        need net
-        # This won't cause a hard failure if neither is installed, however.
-        use mysql
-        use pgsql
-        after mta
+	need net
+	use mysql
+	use pgsql
+	after mta
 }
 
-initService() {
-    # Avoid using root's TMPDIR
-    unset TMPDIR
-    
-    # Check that config file exists.
-    if [ ! -e $CONFIG ]; then
-        eerror "Config file not found ($CONFIG)"
-        eerror "An example config can be found in /etc/dbmail/dbmail.conf.dist"
-        return 1
-    fi
-
-    checkpath -d $PID_DIR -m 750 -o dbmail:dbmail
-
-    RETVAL=0
+checkconfig() {
+	if [ ! -e "/etc/dbmail/dbmail.conf" ]; then
+		eerror "You need to create apropriate config"
+		eerror "in /etc/dbmail/ . Example can be found in /etc/dbmail/dbmail.conf.dist"
+		return 1
+	fi
+	# Avoid using root's TMPDIR
+	unset TMPDIR
 }
 
+
 start() {
-	initService
-        ebegin "Starting DBMail SIEVE daemon ($PROGRAM)"
-            start-stop-daemon --start --quiet \
-                --pidfile $PID_DIR/$PROGRAM.$PID \
-                --exec $BIN_DIR/$PROGRAM \
-                --name $PROGRAM \
-                -- -f $CONFIG -p $PID_DIR/$PROGRAM.$PID 2>&1
-        eend $?
-}
+	checkconfig && \
+	ebegin "Starting DBMail SIEVE daemon"
+	    start-stop-daemon --start --quiet \
+		--exec /usr/sbin/dbmail-timsieved \
+		-- -p ${PIDFILE} -f /etc/dbmail/dbmail.conf 2>&1
+	eend $?
+}	
 
 stop() {
-        ebegin "Stopping DBMail SIEVE daemon ($PROGRAM)"
-            start-stop-daemon --stop --quiet --retry 15 \
-                --pidfile $PID_DIR/$PROGRAM.$PID
-        eend $?
-}
+	ebegin "Stopping DBMail SIEVE daemon"
+	    start-stop-daemon --stop --quiet --retry 5 \
+		--pidfile ${PIDFILE}
+	eend $?
+}	
 
-## not in 3.1.x yet
-#reload() {#
-#       ebegin "Reloading DBMail SIEVE daemon ($PROGRAM)"
-#           start-stop-daemon --quiet --signal HUP \
-#               --pidfile $PID_DIR/$PROGRAM.$PID
-#       eend $?
-#}
diff --git a/net-mail/dbmail/metadata.xml b/net-mail/dbmail/metadata.xml
index d365ac52fdba..0e2a09a3ca2c 100644
--- a/net-mail/dbmail/metadata.xml
+++ b/net-mail/dbmail/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lordvan@gentoo.org</email>
-    <name>Thomas Raschbacher</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription>Dbmail is the name of a group of programs that enable the possiblilty of storing and retrieving mail messages from a database. Currently MySQL, PostgreSQL and SQLite can be used as database backends.</longdescription>
   <use>
     <flag name="sieve">Enable sieve filter support</flag>
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 73dcc9006922..6a734d6a21c3 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,5 +1,3 @@
-DIST dovecot-2.2-pigeonhole-0.4.24.2.tar.gz 1833284 BLAKE2B bee45fd129aee3d5126bd48b27829e7e266a5c1043411b6b23655bbf32e2f684763b82bff476a954bf7f0c7aae4e038c0892be70776726c7b324e409a8f89d78 SHA512 a51de88bcbac83ced7d314a560bd44f119dd80bf58f350da522501f072c0a4c02ff8c11152e2b858f14bb8ca9a9b665960cbe37a0c8ef4600b430e65ddbf3bf4
-DIST dovecot-2.2.36.4.tar.gz 6257899 BLAKE2B 3260e96f369e85f2dfd5ece0d9b12902c7192d057369e8a151cc6ab7b4f2033d4e1029fb862d412f2837fd384d7fe729cf1ab15cac9ac335e943bb1fdb532b51 SHA512 e33ab2f6c5f7b4ffca3d57580329f1df8e1655c755a1a6b575a4e49d57ea94d1ab67df2419033c9d68acf5959c6edfa596815dc2bc43798e9aef3d17d271cc4d
 DIST dovecot-2.3-pigeonhole-0.5.11.tar.gz 1912411 BLAKE2B ed35cbae5ea2c1da24a1a255c1fc943b9a8c35280840ea42c1b5f83ea327872bb83ae8901696abfe3b0d27dfd6c11d3fb1661614fad54eeab9d700b5f0b7b13a SHA512 793d93edc50192c52654e2f7244d3e01aaa4e69f786e3ecfcd658a4ab26a5099cc5319cb93221150db4ce94bc4515ffb38115b1d0eeb6e052b956efec680b33d
 DIST dovecot-2.3-pigeonhole-0.5.13.tar.gz 1908839 BLAKE2B 37fbd9d9b41ca1893c19ac546dd9b272b361752c70eed0596bbb743cd8c30d942427d5814ab551bb39eb844c7bd05074bb49b11a6b81747e2fc535b0f9993f14 SHA512 fcbc13d71af4e6dd4e34192484e203d755e5015da76a4774b11a79182b2baad36cab5a471346093111ace36a7775dfe8294555f8b777786dde386820b3ec5cd3
 DIST dovecot-2.3.11.3.tar.gz 7353412 BLAKE2B 0067989b35fe29c0d23f6ca25712a87fa69608cc4ee6081d9eb929d63e7a586ccc0d86fcdbe1aac67aea9f2678ab0e150f053667817b08f4a7246947bb812fdb SHA512 d83e52a7faab918a8e6f6257acc5936b81733c10489affd042c3a043cb842db060286cba9978be378e4958e9ac2e60b55ce289d7f3a88df08e7637e4785e23bb
diff --git a/net-mail/dovecot/dovecot-2.2.36.4.ebuild b/net-mail/dovecot/dovecot-2.2.36.4.ebuild
deleted file mode 100644
index de3249c26666..000000000000
--- a/net-mail/dovecot/dovecot-2.2.36.4.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# do not add a ssl USE flag.  ssl is mandatory
-SSL_DEPS_SKIP=1
-inherit autotools eapi7-ver ssl-cert systemd toolchain-funcs user versionator
-
-MY_P="${P/_/.}"
-major_minor="$(ver_cut 1-2)"
-sieve_version="0.4.24.2"
-if [[ ${PV} == *_rc* ]] ; then
-	rc_dir="rc/"
-else
-	rc_dir=""
-fi
-SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-	sieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="https://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-DEPEND="bzip2? ( app-arch/bzip2 )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lucene? ( >=dev-cpp/clucene-2.3 )
-	lzma? ( app-arch/xz-utils )
-	lz4? ( app-arch/lz4 )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	pam? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
-	selinux? ( sec-policy/selinux-dovecot )
-	solr? ( net-misc/curl dev-libs/expat )
-	sqlite? ( dev-db/sqlite:* )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	tcpd? ( sys-apps/tcp-wrappers )
-	textcat? ( app-text/libexttextcat )
-	vpopmail? ( net-mail/vpopmail )
-	zlib? ( sys-libs/zlib )
-	virtual/libiconv
-	dev-libs/icu:="
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-userdb-passwd-fix.patch"
-)
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_prepare() {
-	default
-	# bug 657108
-	elibtoolize
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no econf \
-		--with-statedir="${EPREFIX}/var/lib/dovecot" \
-		--with-rundir="${EPREFIX}/run/dovecot" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--without-stemmer \
-		--disable-rpath \
-		--with-icu \
-		--with-ssl \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with lz4 ) \
-		$( use_with lzma ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with solr ) \
-		$( use_with tcpd libwrap ) \
-		$( use_with textcat ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve ; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX}/var" \
-			--enable-shared \
-			--with-dovecot="${S}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install() {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-	sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-		-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-		"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update vpopmail settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		docinto plugins
-		dodoc doc/plugins/*.txt
-		docinto extensions
-		dodoc doc/extensions/*.txt
-		docinto locations
-		dodoc doc/locations/*.txt
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	# Let's not make a new certificate if we already have one
-	if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-	-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-		einfo "Creating SSL	certificate"
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-		install_cert /etc/ssl/dovecot/server
-	fi
-
-	elog "Please read https://doc.dovecot.org/installation_guide/upgrading/ for upgrade notes."
-}
diff --git a/net-mail/dovecot/dovecot-2.3.13-r100.ebuild b/net-mail/dovecot/dovecot-2.3.13-r100.ebuild
index 296043d1df06..286658722f04 100644
--- a/net-mail/dovecot/dovecot-2.3.13-r100.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.13-r100.ebuild
@@ -30,7 +30,7 @@ HOMEPAGE="https://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
 IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib zstd"
diff --git a/net-mail/dovecot/files/dovecot-userdb-passwd-fix.patch b/net-mail/dovecot/files/dovecot-userdb-passwd-fix.patch
deleted file mode 100644
index d5bff016394e..000000000000
--- a/net-mail/dovecot/files/dovecot-userdb-passwd-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/auth/userdb-passwd.c b/src/auth/userdb-passwd.c
-index 03cbd554ff..699db314ce 100644
---- a/src/auth/userdb-passwd.c
-+++ b/src/auth/userdb-passwd.c
-@@ -172,8 +172,11 @@ static void passwd_iterate_next(struct userdb_iterate_context *_ctx)
- 		return;
- 	}
- 
--	errno = 0;
--	while ((pw = getpwent()) != NULL) {
-+	for (;;) {
-+		errno = 0;
-+		pw = getpwent();
-+		if (pw == NULL)
-+			break;
- 		if (passwd_iterate_want_pw(pw, set)) {
- 			_ctx->callback(pw->pw_name, _ctx->context);
- 			return;
diff --git a/net-mail/ezmlm-idx/ezmlm-idx-7.2.2.ebuild b/net-mail/ezmlm-idx/ezmlm-idx-7.2.2.ebuild
index 6d5b5f6fa41a..eb1061057763 100644
--- a/net-mail/ezmlm-idx/ezmlm-idx-7.2.2.ebuild
+++ b/net-mail/ezmlm-idx/ezmlm-idx-7.2.2.ebuild
@@ -12,6 +12,7 @@ SRC_URI="https://untroubled.org/ezmlm/archive/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+#KEYWORDS="~alpha amd64 ~hppa ~mips ppc sparc x86"
 IUSE="mysql postgres sqlite"
 
 DEPEND="mysql? ( dev-db/mysql-connector-c:0= )
diff --git a/net-mail/getmail/Manifest b/net-mail/getmail/Manifest
index 11481bb56e55..ad55d6588a7d 100644
--- a/net-mail/getmail/Manifest
+++ b/net-mail/getmail/Manifest
@@ -1 +1 @@
-DIST getmail-6.13.tar.gz 185130 BLAKE2B c86340baab155da11a9dc208769501c6c9ef77e29e6a5922380b8bc676838d0a9c11a966966062ecfcd10f3108e6d07a196eddcca9a1ccd3d3e8bbea1d9cf891 SHA512 09467cea90b2b0c076a9d68022def311e2659a20e4c5cbc86a94e9c5015c11c148b41a546e3b6b61f40e8940c7d7fc3fa218ef69a04c7774f38cde28ea5ceeef
+DIST getmail-6.14.tar.gz 185308 BLAKE2B c74fce627e6a23e0b209dddca690301f80626d9c4489d8cd2391884908e6f1c017602ed23ca4d343e2dd400b911d3f808235231217afd38f96017d8f0d20b3a2 SHA512 b8d2df52cbf145ee7e00ec1dbf589013d3caf8e39a3981e6ae4f1e36fe0b3d3d88df639e03e8697c39e6d00e20ddf1e995ed17f0b1fa1fa2ea52a803c16f062f
diff --git a/net-mail/getmail/getmail-6.13.ebuild b/net-mail/getmail/getmail-6.14.ebuild
index 6ce7cd9e853e..6ce7cd9e853e 100644
--- a/net-mail/getmail/getmail-6.13.ebuild
+++ b/net-mail/getmail/getmail-6.14.ebuild
diff --git a/net-mail/getmail/metadata.xml b/net-mail/getmail/metadata.xml
index 70a76ec270bb..29482926fb64 100644
--- a/net-mail/getmail/metadata.xml
+++ b/net-mail/getmail/metadata.xml
@@ -9,6 +9,7 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <maintainer status="active">
       <name>Roland Puntaier</name>
diff --git a/net-mail/imapsync/Manifest b/net-mail/imapsync/Manifest
index 406d2d7a76f3..2db9f5643e0b 100644
--- a/net-mail/imapsync/Manifest
+++ b/net-mail/imapsync/Manifest
@@ -1 +1,2 @@
 DIST imapsync-1.882.tar.gz 1557501 BLAKE2B 92f37d0c6c64569016a15d71d1b95ca08e4a8bb2402a5151f1429260fb37db47ebfc273e2bb73b06ba77974100780924fa3f256565fcd3e77cbff4c7bbf7b56e SHA512 3953cb29b210c283be3fe72f1e1537594415bd5457b469b801625d6c857b982d2b2b3da9528dd1e6ccc6831c022ce495f7a5eaaea04d228bca374f185344f455
+DIST imapsync-1.977.tar.gz 1814568 BLAKE2B ccbe678f331a59b2ee50150b4e6dd3b2a7fb7750f204f3d67c90beed600b83b38a712bfa723dc0a73d21fb9bc03a5013f287469afa1164962cfb0f2923d93910 SHA512 b9810d53f5dc4e0a350e18dff03563c38cd64cff45ad741e77211a22ab49695de14bc4f09df6cf5fde7f3025f1f54d614f7c79ece1bda9f4c0052e5f38dedfd9
diff --git a/net-mail/imapsync/imapsync-1.977.ebuild b/net-mail/imapsync/imapsync-1.977.ebuild
new file mode 100644
index 000000000000..ebe0b0dca6f2
--- /dev/null
+++ b/net-mail/imapsync/imapsync-1.977.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Tool for incremental and recursive IMAP transfers between mailboxes"
+HOMEPAGE="https://ks.lamiral.info/imapsync/ https://github.com/imapsync/imapsync"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+#IUSE="test" # not fully supported yet
+
+RDEPEND="
+	dev-perl/App-cpanminus
+	dev-perl/Authen-NTLM
+	dev-perl/CGI
+	dev-perl/Crypt-OpenSSL-RSA
+	dev-perl/Data-Uniqid
+	dev-perl/Digest-HMAC
+	dev-perl/Dist-CheckConflicts
+	dev-perl/Encode-IMAPUTF7
+	dev-perl/File-Copy-Recursive
+	dev-perl/File-Tail
+	dev-perl/IO-Socket-INET6
+	dev-perl/IO-Socket-SSL
+	dev-perl/IO-Tee
+	dev-perl/JSON
+	dev-perl/libwww-perl
+	dev-perl/Mail-IMAPClient
+	dev-perl/Module-Implementation
+	dev-perl/Module-Runtime
+	dev-perl/Module-ScanDeps
+	dev-perl/Net-SSLeay
+	dev-perl/Package-Stash
+	dev-perl/Package-Stash-XS
+	dev-perl/PAR
+	dev-perl/Parse-RecDescent
+	dev-perl/Readonly
+	dev-perl/Readonly-XS
+	dev-perl/Regexp-Common
+	dev-perl/Sys-MemInfo
+	dev-perl/TermReadKey
+	dev-perl/Try-Tiny
+	dev-perl/Unicode-String
+	dev-perl/URI
+	virtual/perl-Compress-Raw-Zlib
+	virtual/perl-Data-Dumper
+	virtual/perl-Digest
+	virtual/perl-Digest-MD5
+	virtual/perl-Digest-SHA
+	virtual/perl-Encode
+	virtual/perl-MIME-Base64
+	"
+	# Not yet in tree:
+	# HTML::Entities
+	# JSON::WebToken
+	# JSON::WebToken::Crypt::RSA
+DEPEND="${RDEPEND}"
+	#test? (
+	#	virtual/perl-Test
+	#	dev-perl/Test-Deep
+	#	dev-perl/Test-Fatal
+	#	dev-perl/Test-MockObject
+	#	dev-perl/Test-Pod
+	#	dev-perl/Test-Requires
+	#	dev-perl/Test-Warn
+	#	dev-perl/Test-NoWarnings
+	#)"
+	# Not yet in tree:
+	# test? ( Test::Mock::Guard )
+
+RESTRICT="test"
+
+src_prepare() {
+	sed -e "s/^install: testp/install:/" \
+		-e "/^DO_IT/,/^$/d" \
+		-i "${S}"/Makefile || die
+
+	default
+}
+
+src_compile() { :; }
diff --git a/net-mail/isync/isync-1.3.3.ebuild b/net-mail/isync/isync-1.3.3.ebuild
index 2eca392e7b2a..5fb6331653c5 100644
--- a/net-mail/isync/isync-1.3.3.ebuild
+++ b/net-mail/isync/isync-1.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3 autotools
 else
 	SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 fi
 
 IUSE="libressl sasl ssl zlib"
diff --git a/net-mail/mailbase/mailbase-1.5-r1.ebuild b/net-mail/mailbase/mailbase-1.5-r2.ebuild
index ce871f5f8f8e..e7d481a196e8 100644
--- a/net-mail/mailbase/mailbase-1.5-r1.ebuild
+++ b/net-mail/mailbase/mailbase-1.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,9 +32,10 @@ src_install() {
 
 	dosym spool/mail /var/mail
 
-	newpamd "${FILESDIR}"/common-pamd-include pop
-	newpamd "${FILESDIR}"/common-pamd-include imap
 	if use pam ; then
+		newpamd "${FILESDIR}"/common-pamd-include pop
+		newpamd "${FILESDIR}"/common-pamd-include imap
+
 		local p
 		for p in pop3 pop3s pops ; do
 			dosym pop /etc/pam.d/${p}
diff --git a/net-mail/mailbase/mailbase-1.6.ebuild b/net-mail/mailbase/mailbase-1.6-r1.ebuild
index 81158f51db83..2d43e4feac08 100644
--- a/net-mail/mailbase/mailbase-1.6.ebuild
+++ b/net-mail/mailbase/mailbase-1.6-r1.ebuild
@@ -32,9 +32,9 @@ src_install() {
 
 	dosym spool/mail /var/mail
 
-	newpamd "${FILESDIR}"/common-pamd-include pop
-	newpamd "${FILESDIR}"/common-pamd-include imap
 	if use pam ; then
+		newpamd "${FILESDIR}"/common-pamd-include pop
+		newpamd "${FILESDIR}"/common-pamd-include imap
 		local p
 		for p in pop3 pop3s pops ; do
 			dosym pop /etc/pam.d/${p}
diff --git a/net-mail/mlmmj/Manifest b/net-mail/mlmmj/Manifest
index ddc879af3eff..486b67f60733 100644
--- a/net-mail/mlmmj/Manifest
+++ b/net-mail/mlmmj/Manifest
@@ -1,2 +1 @@
-DIST mlmmj-1.2.19.0.tar.bz2 284701 BLAKE2B a145b742a6024447d107b40bdd4072c1933069493360600161a3f585575a8cf2252393d53e8a66c0702301f148d73df7173b50234818bac4ae5b2269ff42f72b SHA512 c0f23b434941bfb5bfcb9a0f292edcfa62c9bb357014d41f82b03bd8ed1a951e3c8f09293dd333030b024d3da82c514de789b8916cc3c0f493ad8fefbe3a3afb
 DIST mlmmj-1.3.0.tar.bz2 292519 BLAKE2B abaf5c7ad53034d2201a2d3ba6d7f99ca83f47ec83df59e12a90a7118fbbde941d5ed2d14864a4af1568f67e74ea082fbc70fc9e44390673b76377bb3679c817 SHA512 c704d89f8a96c0ffc751a744ffdefb5e4304ab74be89292f06ce0c337b8ff1cc5a91737c8b1bd96fe3e993338986fa42bf360cfefc508e1eac74ab88ffda2494
diff --git a/net-mail/mlmmj/mlmmj-1.2.19.0-r1.ebuild b/net-mail/mlmmj/mlmmj-1.2.19.0-r1.ebuild
deleted file mode 100644
index 56b14c0b0327..000000000000
--- a/net-mail/mlmmj/mlmmj-1.2.19.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV="${PV/_rc/-RC}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="Mailing list managing made joyful"
-HOMEPAGE="https://mlmmj.org/"
-SRC_URI="http://mlmmj.org/releases/${MY_P}.tar.bz2"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-DEPEND="virtual/mta"
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS ChangeLog FAQ README* TODO TUNABLES UPGRADE"
-PATCHES=(
-	"${FILESDIR}"/mlmmj-1.2.19.0-listcontrol-customheaders.patch
-)
-
-src_configure() {
-	econf --enable-receive-strip
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/mlmmj/texts
-	doins listtexts/*
-
-	insinto /usr/share/mlmmj
-	doins -r contrib/web/*
-}
-
-pkg_postinst() {
-	elog "mlmmj comes with serveral webinterfaces:"
-	elog "- One for user subscribing/unsubscribing"
-	elog "- One for admin tasks"
-	elog "both available in a php and perl module."
-	elog "For more info have a look in /usr/share/mlmmj"
-}
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 5b54cfba18e8..59d7e1dbdeda 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,2 +1,2 @@
 DIST mu-1.4.13.tar.gz 2309545 BLAKE2B 9a83e86ab73e325617694f01877a11a93a5bd701cedc776640563f0a5e61946064e201d3f5da2110e1f9583dde9a73e401dd2f018161380435f48f132b2df103 SHA512 0f8e7f75332257e8cfdecf2c27bc23c83420387e40ecf92089232af6c545700a6c4925665b39fc236cacf8b26fa4b81df71775cdbe04c340fe3455c54c0d1bbc
-DIST mu-1.4.14.tar.gz 2309663 BLAKE2B 0c043596f6570f9749aba647054a7da78229fcaef03fc0f480c9381e057e34f15872f8e536f1754fdf30f22489cc9acfb83b301eb9f2fab8847b4fcc7f4863d1 SHA512 c51b9e1b8539349116cbd0e62741b3500ed51d12ada99bb3cde39a3e99b93d4a4f487795d56a31ae8189bf349003fe2fbfd95fa652c29231411bda04d9a6d06b
+DIST mu-1.4.15.tar.gz 2309695 BLAKE2B 9808e59b758525937ec97e0ca6515108c1fb4287f3134d0c6038a74ef57b4992fede6b8957ba4e7e1681d8d307aec32fa6b2931e588004849e6c1dfb7da2f7f5 SHA512 dd0426c1fb7fe2430b47fc1232e067d1c017b3c428bbd8012c542f6e1ffa7741bb145c6851f40cbc945403534dabb4aa99faf369166167d187f083dde1d30546
diff --git a/net-mail/mu/mu-1.4.14.ebuild b/net-mail/mu/mu-1.4.15.ebuild
index ab29acf0a6fd..ab29acf0a6fd 100644
--- a/net-mail/mu/mu-1.4.14.ebuild
+++ b/net-mail/mu/mu-1.4.15.ebuild
diff --git a/net-mail/poppassd_ceti/Manifest b/net-mail/poppassd_ceti/Manifest
index a7b79b5b06e8..9902ccd8d789 100644
--- a/net-mail/poppassd_ceti/Manifest
+++ b/net-mail/poppassd_ceti/Manifest
@@ -1 +1,2 @@
 DIST poppassd-ceti-1.8.7.tar.xz 71400 BLAKE2B ca26f7298a8f679c595a9cd66622f1e8ddeff80a7b1655df91a7a15668337112113806d0aef788a374c483cbc957e765b178428d839da2c853ebf87e16039548 SHA512 d50549a4f6bdd9eac7fa74a7787e47dbffff14da883d4e8e23e24802883761c1a392b8a7fbffe5fa726845f48b3b33e0dbc1743ad2d689a4d396c91d0a42f8f1
+DIST poppassd-ceti-1.8.9.tar.gz 15465 BLAKE2B 22f6b521d83c4b7c4a8842cde22710c17dda26f9cbfb39d020de05b14c045a1606fcebf51557c2e38c932e009554c5f0d1f770d5cfbf1666f81eb03a342c25f4 SHA512 cc8953aaed8cd6d2633d1c2040e364770598eb71d563a29fd3f4798730654d002ba720babab0596cc336ea8aff403064e17e8b17c3df657e5c840db2230a2077
diff --git a/net-mail/poppassd_ceti/poppassd_ceti-1.8.9.ebuild b/net-mail/poppassd_ceti/poppassd_ceti-1.8.9.ebuild
new file mode 100644
index 000000000000..b83c13df4644
--- /dev/null
+++ b/net-mail/poppassd_ceti/poppassd_ceti-1.8.9.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_IN_SOURCE_BUILD=1
+inherit cmake pam readme.gentoo-r1 systemd
+
+# Long ago it was just "poppassd", but upstream now seems to have
+# settled on "poppassd-ceti" (instead of "poppassd_ceti" or no suffix).
+MY_PN="poppassd-ceti"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Password change daemon with PAM support"
+HOMEPAGE="https://github.com/kravietz/poppassd-ceti"
+SRC_URI="https://github.com/kravietz/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# Tests seem to hang.
+RESTRICT="test"
+
+RDEPEND="sys-libs/pam"
+DEPEND="${RDEPEND}
+	test? ( app-admin/sudo )"
+
+S="${WORKDIR}/${MY_P}"
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="poppassd is installed, but has to be run as root to work.
+
+Most commonly a front end would require sys-apps/xinetd and connect to
+port 106: For this, edit /etc/xinetd.d/poppassd, install sys-apps/xinetd,
+and start the xinetd service.
+
+If you use systemd, you may be able to use the installed poppassd.socket
+and poppassd.service files instead of xinetd.  See README.md.bz2 and
+systemd documentation.
+
+Alternatively, a front end may be able to run it directly (if already
+root), or might use app-admin/sudo.  To use sudo, you'll need to configure
+/etc/sudoers with something similar to:
+
+    apache ALL=(ALL)       NOPASSWD: /usr/sbin/poppassd
+
+See also README.md.bz2 for related configuration and security
+considerations.
+"
+
+src_install() {
+	dodoc README.md
+	readme.gentoo_create_doc
+
+	pamd_mimic_system poppassd auth account password
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/poppassd.xinetd poppassd
+
+	systemd_dounit etc/systemd/poppassd.{socket,service}
+
+	exeinto /usr/sbin
+	exeopts -o root -g bin -m 500
+	doexe poppassd
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-mail/vacation/Manifest b/net-mail/vacation/Manifest
deleted file mode 100644
index e08e8da4205a..000000000000
--- a/net-mail/vacation/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST vacation-1.2.7.0.tar.gz 63849 BLAKE2B d2f2737677b0fe075041bac0a32b6f5f57d072040448b61416e7fee98e7d4184bbd22e25734ed5e4deeabb0d0c32953821d383c9d16cf79b325fa7f261956333 SHA512 50473777fa5d36c1b7ab438e1072a56298f8155c7aaa8f8d8daaa1dee5f85f54a7b17903c416e67dbac734368b1cdbbc599cd9aa58132b0ecb145ae8e058e97d
diff --git a/net-mail/vacation/metadata.xml b/net-mail/vacation/metadata.xml
deleted file mode 100644
index 2cbb745d7621..000000000000
--- a/net-mail/vacation/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="sourceforge">vacation</remote-id>
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/net-mail/vacation/vacation-1.2.7.0.ebuild b/net-mail/vacation/vacation-1.2.7.0.ebuild
deleted file mode 100644
index b61cdf637253..000000000000
--- a/net-mail/vacation/vacation-1.2.7.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="automatic mail answering program"
-HOMEPAGE="https://sourceforge.net/projects/vacation/"
-SRC_URI="mirror://sourceforge/vacation/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 x86"
-SLOT="0"
-
-RDEPEND="!mail-mta/sendmail
-	sys-libs/gdbm
-	virtual/mta"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	sed -i -e "s:install -s -m:install -m:" \
-		-e "s:-Xlinker:${LDFLAGS} -Xlinker:" Makefile || die
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS} -DMAIN"
-}
-
-src_install() {
-	emake BINDIR="${ED}/usr/bin" MANDIR="${ED}/usr/share/man/man" install
-}