gentoo resync : 29.01.2021

18 files changed, 268 insertions, 203 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 59b0dba1049e..a4ec395cab00 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index c11951e553bd..8fb84d3d1d2d 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -1,8 +1,11 @@
+AUX README.gentoo 1652 BLAKE2B beb9d27ac8de471d4ac8a3c4f626e7005d471477943b424b2603fe9ec92a6910bf0102c472e2d17dc1217d4bd6c286cd50da5d9b5fc6bd23c436cec8c0a84afd SHA512 0af8a295ce85260ca559f6491e8b7e318125b4f424639877a5744d0906023ccbd63c18b59f7fdb60da7994df9c3f62cef10a5db0ee940aa12c2382e33340f0a2
 AUX dbmail-3.2.3-fno-common.patch 310 BLAKE2B 1166b001939b200e43b2dd048413e55bd53c9c385f93b40e95ee8306d3386eb365ee30c7ba26c853cc81ca231fd4d4551886f6760697ed40e1cdefd5617ecef3 SHA512 32f2524fdf0e6bf59bc0138d2fb62edad00c6700740fc21281de29dd3b455136bde4072ccf5017425cd417c5408498b688ee453f53166aa80eccba20382d736d
-AUX dbmail-imapd.initd 1539 BLAKE2B a05e964172d58063b2fa4addb83c38bca5859e5a092b5672026a7c2641cc5edd63eb2c3b1cad2c8b7ba2ab15e7a7b812417fdec2e01531087b0a8a32bd929b62 SHA512 d7246dd7db8a6e85298cdcd191b525fcd76b3d7526f0c3ad084628651ce54d599fed3313693c8607c79d4ab79580a0bc30f6a0f9e5b814f30d5a4bd92719719d
-AUX dbmail-lmtpd.initd 1539 BLAKE2B 6864a82613a8ad4f0cd72322d1383086ebd9f17443ea6534c655e47ce4452cf013a150f3e137df432eb380fb0eb31f05ef0ad6a8c50a076020aefa0b49a9da58 SHA512 5497841698749158c78bf1ef365aabf642370a301bb74b334972ca95d85f16c508cd88d56a41c675f9ad448bc762b5134e09a408ca9d2f40d68abeb83b1ee7d8
-AUX dbmail-pop3d.initd 1539 BLAKE2B 9b74cb310b832bf3cd37bcbb6a25969221792d7694d711e98bfdcb0c9898ce8d68974bd9c221957c7915bc73dba89ac8887961af388c88d44ae1ce17337a0551 SHA512 5968a31db02d6e48adc5ec26527e2ce8fdd0abf78754b911bcb588fa3414598ef0b4dc2ef44220049b015aaa5b0efeaf2be2ff3171562ff82e46d36e2d32d59e
-AUX dbmail-timsieved.initd 1554 BLAKE2B b082e00fc491c768fda2afce07bc30c087a7bf927f8cb16e79d60609932fa09e1052acfd39526cb7fb256c5c44cbcdbe6ac94f59f3b12330fe6e51648fa2aae7 SHA512 2340916c1f6abb0ccfbc98f0cd91a042035c0ff6751bee944e6b9227c14bb829152f22763bc87244b6718e4c3df44de6892b1961923a54eef5724ba9befbc34b
+AUX dbmail-imapd.initd 867 BLAKE2B 4b9c20f1bc99f13b8c133eee63e78e213debb206bde0f35e361edfe9b6068d1e0c97aad95e1d1743caa554d22fb23f6ebb2fc15adfb093ea9947262cb90d2ba5 SHA512 40fb4197f54c9890884a8b15c56f9eb4ff4d74eca114d678abea156fe9bc404b0860b79da7f4e3cc5d26d0d96dcee91049c28698b5496a3d2e6b7d409bcc9cbd
+AUX dbmail-lmtpd.initd 867 BLAKE2B d8829e2b7856d0ccfe6e52aceae59a0811aac70759e4f5f9998e3ed714b235aa0ec3bfa775d3a01ee8b49336f6e20e5fb3eae675d8389fff1862db56f7ed8a0d SHA512 4ced920476580ecfa968c4b0a438b98063aa55a108c2b27b728e76d4c08b58ba5e3295256b5e66f16edd7d247acd2f8bf91262dd49c0a8058dd6132e0473c641
+AUX dbmail-pop3d.initd 867 BLAKE2B 2d24bbe482c28fab0884377bbd47fe7a859313d8c8b20a939692c12942e8dd313067a0304016c8293c5ccce876bbeb533e4bbacfe04f893959821791d7b4d6dd SHA512 e12d73d56fae8852a9926badcb00ae4d83a990d700741bc8ad238bfa302a9f58087efb6e59ee3925230fa001be3004f48fe61e7b17d09cad51a836edc7a15bb2
+AUX dbmail-timsieved.initd 930 BLAKE2B 4eb24e608540d994d75c8aea44aa8128e603fd9c64c4a8205c9581cc521e4a0ca75391796d4a9b369cdcbe74636cdaf55c00408c14b7cc9ec4ad4db307445909 SHA512 7f66fa4b77a638e803f1763809da66bd26f54b435f8e4cff3304d4b4e62d1510485c1af943046489a8c37b3b93a8b6cf4901feefa9f1f38dcdaa313211f19fa0
 DIST dbmail-3.2.3.tar.gz 2444227 BLAKE2B baa812fb3e925e6d896762596426208fc2ac5fcb01cb8100cfbd0464f1342f934c099ca52fd857e05fc82b97227155e9dcfc987d6c9b5c37e7daf21b167c9841 SHA512 29cc89830278f2ff28a4221fc81d4ff13cc371fbca7fb51d5376e9243234220b552cb4b6ec035c150e6cfa178435c4f36b9ce132fc02334bc6cdeb1a41c8ed85
+DIST dbmail-3.2.5.tar.gz 2463966 BLAKE2B f4099c6f869dbb041d7eccdf20f3a34d36918237cc0386c71a1d339da8651b9301e676b25201856038045bb9590f880353c6ccafd57330f9cf48382c1b4c603c SHA512 6b0d7e1f6f7449869db1e094ffce9e1ef315c60784ea5ae5f814f2cf9a18c358b4c5d107a420c7317961ffa343fc59c9083789177514aee96523927688f276a0
 EBUILD dbmail-3.2.3-r3.ebuild 4000 BLAKE2B c6a5d79374b0a017220f605affd06d37cc09818da99ac763d22cabdb61d4a4f0d8eee014f95fdc8b5680a3de1d7fc22b5f9439dedc7c3b1b446792d4a520c91a SHA512 38bb353cc721ae1a14d0fd9cbc48eb9d2b20798e9ffd52e8eb435e91910eb7cd741ae1497d60f936a11682e6f9c30f9b77f5a8c73b1d184e72e24a22f7db9cf6
+EBUILD dbmail-3.2.5.ebuild 2433 BLAKE2B 59669e7f0eea99372aa739588cbef61d13d336cbc158cfd16125d9cdd6d8d8f66e40967408eb26261d2a8219876282bf4c86b5a57306dcc3880890f7dc4cf273 SHA512 5c8da00d8301ff7135d706a972242b6e0c26f9eeb3c79c435a18ae713e3bbc01c6a781ea7ec823e667d0a4f9c9fea39bfbc6139e566fda0bede6771128abe251
 MISC metadata.xml 480 BLAKE2B 09dc565c0e3a53c0072229b6305cbcd4cf9d4927d6b7fba45cf27c772b2d78d96202d685a34d01eb6553c4a228975d8e3c4998c8ad8f7136e34229671b048248 SHA512 0acb11c787a286e0d8020f97d483102b57a323c80f6ed4c95d44a18d162856b3547db96fc92d1649061220cd8b009be44adfed2f7790cbe306662dd525f7a4ef
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/dovecot/Manifest b/net-mail/dovecot/Manifest
index 46ce221b32e4..98d807e05e97 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -12,6 +12,6 @@ EBUILD dovecot-2.3.11.3-r1.ebuild 8838 BLAKE2B d2db4a8a2f3dd6d6ee2cd4ab6401dbddb
 EBUILD dovecot-2.3.11.3-r2.ebuild 8878 BLAKE2B 6796b48d607fe36c8fb6a741bee5a8b702f4c1d309d24533f248b4f6359bc4c9e8c28fb0f81bbcbf23363737de54f01977364fdffc9c4c0acd56310efa238d5f SHA512 bbadf212ea9f462606aa2a424960fe38a1bee71ed28334bc665f39db1ec1602f4193d42b7ad33fbe83e8cec4ff8334c60151d7de54093a7b6744e24711de9e61
 EBUILD dovecot-2.3.11.3.ebuild 8676 BLAKE2B ddede1b054dde5b42d23cccfb06f4e66060d720b934c49804edeee423191baae808ae34fb50c86caf0b5b953eb5a073408396f2504e9f32ccf9834a7490f4a99 SHA512 8ff4591d1b3122c084d644b19ba4e482490f7700b14fa20d680ab023e472d8d570528b568cf159b4949f24bbdb991b0bfecb6393cd714117ba5abf771b223b08
 EBUILD dovecot-2.3.13-r1.ebuild 8571 BLAKE2B 4502f52c677e5ac28431a026dd63a71200cb07113662dc9031c5c2a862c9d751a614937933924b56de170d58ac93ba06df03940f46b08f94fe909ab811c3d9ac SHA512 8fe9fabd8f70bc31719556101df8e31a18185820960b9a631be3a40194d8cf282352f203ce596ca6c3ff3101786644926108d50a1f218ec30732d5241fd818d6
-EBUILD dovecot-2.3.13-r100.ebuild 8751 BLAKE2B 1c9181b2a2f6258b49e373d3d39bb50d21e3ced88f06ccac0e84bb9e222801d677cb15324e965f43d8020a84c85a1bb04271a74e746a73510524ebcc92dd95ed SHA512 006af984f68e9de56b20cc454d4ecde0552976ee54b85fa913851365e746365970f1fc48b47b1aead38663de57cfdcc2423140ffdfea9125c5cf50400353d886
+EBUILD dovecot-2.3.13-r100.ebuild 8748 BLAKE2B 76ee86701360c2820b6d4b5c09d7e602d10beebcb6099b7ec9d192555b47b8320a76b3c73652dbc4004105cfc101eaa030f45a9e700dc714df2fa227e6ded637 SHA512 a2e6cc615f5612a66790e1d4a0f2212d4a437f641262fa790aa27e892be25b23a0d026f5daaa0708f9f47eb6bc5ae4ff1726092a1def3980916b7b7a5cc13309
 EBUILD dovecot-2.3.13.ebuild 8751 BLAKE2B 1c9181b2a2f6258b49e373d3d39bb50d21e3ced88f06ccac0e84bb9e222801d677cb15324e965f43d8020a84c85a1bb04271a74e746a73510524ebcc92dd95ed SHA512 006af984f68e9de56b20cc454d4ecde0552976ee54b85fa913851365e746365970f1fc48b47b1aead38663de57cfdcc2423140ffdfea9125c5cf50400353d886
 MISC metadata.xml 998 BLAKE2B c65428e9f0019e942fc1d634d53c2a85c7f8a699e34cf9c49ae09bfe9ce8a54fd368512f7a4d74f6a10baff949a9fe8021e1e0c009f8315b100fb5736efd34ae SHA512 f285f0928dc0915c8e8cebb966de84f5564be9f7dd3baa7c0cccb3343da75507003aeadf80fe34ffb4b69dd9208997a80fdb47c20bfd65fdc60c43423a00813c
diff --git a/net-mail/dovecot/dovecot-2.3.13-r100.ebuild b/net-mail/dovecot/dovecot-2.3.13-r100.ebuild
index cfaa9df44771..ff93adddf94f 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/getmail/Manifest b/net-mail/getmail/Manifest
index db85441e35d4..6d558e49705f 100644
--- a/net-mail/getmail/Manifest
+++ b/net-mail/getmail/Manifest
@@ -1,3 +1,3 @@
-DIST getmail-6.13.tar.gz 185130 BLAKE2B c86340baab155da11a9dc208769501c6c9ef77e29e6a5922380b8bc676838d0a9c11a966966062ecfcd10f3108e6d07a196eddcca9a1ccd3d3e8bbea1d9cf891 SHA512 09467cea90b2b0c076a9d68022def311e2659a20e4c5cbc86a94e9c5015c11c148b41a546e3b6b61f40e8940c7d7fc3fa218ef69a04c7774f38cde28ea5ceeef
-EBUILD getmail-6.13.ebuild 779 BLAKE2B 1edbef38260d9e112287511cc35db1ea18ab43c453b9a5307d39a950f9d24d00233d3cbc08af972d64ce65dfd2f250c5e15e3946db71d08b73a8985920cbc8a0 SHA512 21969af79422b0f53ff9a1dfffcd571fb56f17561e5f08e6500d43bfb046c5f1fa32136544cdbc5b92dd2e0b28af12c08c5e34d83630316f0b86bb5254f78016
-MISC metadata.xml 660 BLAKE2B 13e8edbd157cd06f641b389b1dabfaac43b6fa067980598fa15fdb9e73ebbc5c76d785280d89dac4ee50086ad066c0721da8c0eefc1f3061fc197bbb14fe619b SHA512 0251a283ef3479a36698b621cd5da3f2488d4493968bebbd52b0d4aa1c065e7acb811496c1c9631a0417c65064e02546ebd3879e1f31c8e06a1fa49dfb189dc1
+DIST getmail-6.14.tar.gz 185308 BLAKE2B c74fce627e6a23e0b209dddca690301f80626d9c4489d8cd2391884908e6f1c017602ed23ca4d343e2dd400b911d3f808235231217afd38f96017d8f0d20b3a2 SHA512 b8d2df52cbf145ee7e00ec1dbf589013d3caf8e39a3981e6ae4f1e36fe0b3d3d88df639e03e8697c39e6d00e20ddf1e995ed17f0b1fa1fa2ea52a803c16f062f
+EBUILD getmail-6.14.ebuild 779 BLAKE2B 1edbef38260d9e112287511cc35db1ea18ab43c453b9a5307d39a950f9d24d00233d3cbc08af972d64ce65dfd2f250c5e15e3946db71d08b73a8985920cbc8a0 SHA512 21969af79422b0f53ff9a1dfffcd571fb56f17561e5f08e6500d43bfb046c5f1fa32136544cdbc5b92dd2e0b28af12c08c5e34d83630316f0b86bb5254f78016
+MISC metadata.xml 685 BLAKE2B 3b1be682242d3b6d0dd8823170d7fde1076b4b222de4b60988715343b3f0452602d5f20ceb33859e4ac3d7ff9d7c5503838cac35653bed16c524f06786a46922 SHA512 0cd71885a754d1b6b52bfd77ae8e4d0eaf26dbc8122135774aa694c5a758c2051c1f2f6e1578944f133800eebdccaf801230231355eb4eb1270949e680a1636a
diff --git a/net-mail/getmail/getmail-6.13.ebuild b/net-mail/getmail/getmail-6.14.ebuild
index 5f757ea11287..5f757ea11287 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 3744d7a8ade6..a69c1da4d9c1 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/mailbase/Manifest b/net-mail/mailbase/Manifest
index e330d7e110eb..ceb33c8249f3 100644
--- a/net-mail/mailbase/Manifest
+++ b/net-mail/mailbase/Manifest
@@ -4,6 +4,6 @@ AUX common-pamd-include 245 BLAKE2B 3c2a5133b232869a5749df49a7e1f94a51f68d3bd370
 AUX mailcap 2235 BLAKE2B 3cf2cba9c1f67feab3b63246f21f8aa78b808a42b2368add9f77c36cca8d92c13122f53663ac3fe4d8b0968a66a35803d98cce6197110f1efe08562e9f837e74 SHA512 1461deb4f065c0d1778acbbcb1e08db821740de0363d3905a569d45d459a76d8813ef1c2c052d6e84b4b9b5576c89e524ecf44a9fffd8e05e91f85eb917557b0
 AUX mailcap-r1 997 BLAKE2B 1e5dc595de7deb3ac0a5dd688de86f93dd9f0e954da705ece43911c0224f186351e3406c949747f0630fcc8aa35734af2937aa76eba93ee43d3a81c79bf86997 SHA512 1243571e089f781c7469ff5e36b9be2b57de492909e32acaa6dc31d61a0f8b1045d9ea94a6d719cc675d2b09ce4a2bfd12dadca0b5a61c45cb1509e32e2138e8
 AUX mailcap.5 9886 BLAKE2B a03170a94f30cda347c97909de7c066efbe2cc7295badd8f8c97abce52e154ce0b3635fadf83d18fe46966b2d550b2a321f4cf4483d1e32fbe420b85d2155f19 SHA512 fac60eeb754bbfa89518fd1ae5182e1ecf22f8d2b9f6883786fb78e5759eadbee58f927cf1084ea5e04958e6b505f178ba49dab7a570e91099a8ef2ceef608e3
-EBUILD mailbase-1.5-r1.ebuild 933 BLAKE2B dff96452b2c4043a97165146a6b8d5aa4f1264f2e5497e816df4f85709c11f5e0f16f2182655acd222aa32616830391d43345e76afb7137a92fe0153628175fd SHA512 db38019437af137541a3a0a72abcc0157404063e1eeb43cb7721d4ddedafb10c195d5d26343a54d529d676fdf849725936234f510771fab39db215c3fc06de7e
-EBUILD mailbase-1.6.ebuild 1058 BLAKE2B 5fec9d5814c08ce9578e546014cf86968e1b7a5ae76ce823766603331439dd114cac8e9f1037e5f77486586a3080fef266e15c6700d5603bc627a39905f6c6f9 SHA512 cda44366a9970a2aff2eb1b5ac83c34b14176ac34492b0765720adbc3cf7eca78f45586cba66d00bbd37a7532b8098d08623211fac3ee6cc6a9e6ae8e166fe86
+EBUILD mailbase-1.5-r2.ebuild 936 BLAKE2B 223e524cf18377928c5d12c4b53609115f144719b3ced84dcb85bcf56a7cf886bda0f4017cd8daa785e2a7718567a65da9a794aded1736e411b6b9b212784ab8 SHA512 f16711ed2cf7a444cb4b9953be642de81aee7455bf349c5ffce99948b2ed748b75bc8718483994b487e33cb9d8e523622734dbf3318648f47a8d63c2a21eeee2
+EBUILD mailbase-1.6-r1.ebuild 1060 BLAKE2B 1c1b0e3cb64e9fa19fb435ec8fbe6729c40ab32b87772896e40fbb893259411e7545cca8e71736b6d2ea844f63590d09a24941c37be454be83019fca8a613b9a SHA512 63d52baa7f9cc803c507871937089e69760aae891a88299567dd370b3729897dae780d7b8e7ebcefd20f11f7d2a08b1c53a131e7f5aaa8a5fd9a229819fc0be8
 MISC metadata.xml 247 BLAKE2B 167e8eb377614081cdfda6ab24f1a1bcbcac4b7db4a34c79d682d3c47bc6de17c14fa679aa3a1d82a61988ef0fc044b99061635e1a50de646b9ddfe88444ebe8 SHA512 6dd50c3fa3c6a61cc3590827074f4dd0586cb36ef78dfaf161c09a613b198af88aa874b96f7958aa59761b0689ea903fac1bfca9d05023c648cf8dabc0596f4d
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/mu/Manifest b/net-mail/mu/Manifest
index 3667ad0129b1..41dbcfeb14ad 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,6 +1,6 @@
 AUX 70mu-gentoo-autoload.el 68 BLAKE2B 518f6544d9b36a845e58fca8c4c9dc02c6855f48576508d47718afb1b08b4f83ce87f257e68756690f4ac70ed9770b7064f2613dc3c4077bbcf9b826512644d0 SHA512 ae50746ba93e3ac81a11d3c8746b72182fcdadc3e29966d65233debd8e6b8aa56f76f5e6a70fc68f7761e4dd55045d2b32e3765cedcced4813de3682187beeea
 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
 EBUILD mu-1.4.13.ebuild 1774 BLAKE2B d4f32fe1efff5bec341b413caadc6841f85a1892fae4d428ece9cac413ddca7c4b3d05bb68dec532f328b4c0a16fc12ca6f6c0cf430b8a351be64dcef16ed361 SHA512 2c6a3d5ae29ff7d46954b32b30d0d7f0760e6f648e80b5ca1c1f8eaa16be54e92105ceeb8ccaac1169b54b8e9e2225b67dded9a7e39829257277d95f2696b24a
-EBUILD mu-1.4.14.ebuild 1776 BLAKE2B 3cf3dcf35f805d2be465b05908112c241513ab63f1c1ad68118ef063ea25e11cf084fdc4cfb63b50866672425c9fb71d2d8fce48e283421b0a8eeea3e11d7638 SHA512 3f455fe4bf7f32aee6a680a3ab78df2c953c2df565e203dc575d3faada6d73d5b62186453ce3fe131aec0a44c63d96349632197ec0945d148b6ee063a4307c0b
+EBUILD mu-1.4.15.ebuild 1776 BLAKE2B 3cf3dcf35f805d2be465b05908112c241513ab63f1c1ad68118ef063ea25e11cf084fdc4cfb63b50866672425c9fb71d2d8fce48e283421b0a8eeea3e11d7638 SHA512 3f455fe4bf7f32aee6a680a3ab78df2c953c2df565e203dc575d3faada6d73d5b62186453ce3fe131aec0a44c63d96349632197ec0945d148b6ee063a4307c0b
 MISC metadata.xml 895 BLAKE2B 2a8d3f5aa6673c03df5bcf495aded3bb07316b4833ed84ec3e2d7030f5cbab8333865da6a4bd67bc8ee69e39bc6540d4a77bd7ddf3b1b9fdd7b5a6dfb7278fe6 SHA512 e5e1e9f3084189fbdbc8fb55127b8b3eec4acd7685b0d4c9ab564644f21fcc53520b89f7ced7bb3972c13d577a030175a9665d30ba513112125409082a7ad7c0
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