gentoo resync : 04.05.2019

9 files changed, 304 insertions, 65 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 722a3b7abffc..fb12d434708a 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 6d9cdf1ac555..d632ff493eb8 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -3,9 +3,12 @@ AUX dovecot.init-r6 1573 BLAKE2B 7565a20d0677d6e380756627360e65703cd6a29982cb7e1
 DIST dovecot-2.2-pigeonhole-0.4.24.1.tar.gz 1810959 BLAKE2B f24b28dc7422ea4f379e372adf33ebbf7cbb146d55b01dbf40580767a14adf695b0a2726f591c0c34436bd93a8b48ee8a8c4307fffc6b082d9c028ce93e29a0a SHA512 99af8a1f4588d821c7000133c5c173ab05640d3411b826a0978db2d60c9a59d5b330ca2d38aa25aa1163f6d1b669dc97b8303e2bceda554f67d0029d5d0b34fd
 DIST dovecot-2.2.36.3.tar.gz 6270735 BLAKE2B 90bd6f7cd3769040215f574bb368c1ad835041fff54273e2477be2d2e057c1700472b08a24ed3a7cad469bd39449d94986bc6801373bb97a63975ddbb54cefa5 SHA512 47611dbde7ee854ad323dcdb726757c7172376761fa774f28fce3f9d74ed590319d812f0555abed5f8178c326c3cb7661ac0b708ca5982914e255cec60f72e35
 DIST dovecot-2.3-pigeonhole-0.5.5.tar.gz 1847487 BLAKE2B 9574388566778a4011ce6546021675ed9e07ba0d874dc4163e4cea10096f3bb8a434f198c3bb446b628ee18402afe94bd90b7123b3cf4d47e4095ddad12d9bfc SHA512 21519fc9b1152a947b64ce4251e1a4bdbe003b48233b1856a32696f9c1e29f730268c56eb38f9431bbfac345e6cd42e8c78c87d0702f39ebf20c6d326dcdbb94
+DIST dovecot-2.3-pigeonhole-0.5.6.tar.gz 1854287 BLAKE2B a26edf2a298d8c3de0d9977d56583bd2e0933495c5f554871a38d7b9e31701ebf3587d221c5ec398721a9c34816918c41b069de39c13f879334f9776fede1a17 SHA512 998a046d2eb5ff7bba615fd1a3efdfb1e7e1dabf191257f7fa2882074acc1735a0a4c11c5f31bab1e964b0118f1a8e9e51b3d5529b8fff6d1312c9a8257d9c20
 DIST dovecot-2.3.5.1.tar.gz 6953150 BLAKE2B 04484325e7b87f78c0aa6e3c769bc921e9dc62562cd8705b99166b7291b794f434b088dcf6512bc21c96d8937475cafa4d49c6ac611cb07f74a0d20e15e185c7 SHA512 e87754461fb0b065acd0ff10dc955000a2fe5baffed69efaf328ce9268f90140e9de444bc68e0bd48b565c7622885a79b1f90ff3dd2335c0c2362d05d9e73e8a
 DIST dovecot-2.3.5.2.tar.gz 6953228 BLAKE2B d3634ca0621349ed82c552b416bd633497ce9e4bdd5df30c2e35da1ab70a5934e2dda2b88ac6bbebeebc23918d9dcfb7a0976b1b51fba5eefd14327b2b2ea734 SHA512 041ec1c33c6accb5c89d96d7ab2f7dd59795f496c17faea1906e7977983e4a387aa855a238376515c09532731634d9d42e6d6be22659062855241847ea0213d5
+DIST dovecot-2.3.6.tar.gz 6980135 BLAKE2B 59ce625aafb96092cbd687aa0d5ccc3d7697228606978efa89bbf50e608915e381abb79348197aaf3b3fa046618bcf88acdc77420f9f028035653b8cb9843009 SHA512 ec28af2efcbd4ab534298c3342709251074dcdb0f0f4bcad0d24b996b273387e2ce557d7ab54abafb69be3ed7dd61f25c82b9710d78156932e2eff7f941c9eb2
 EBUILD dovecot-2.2.36.3.ebuild 8599 BLAKE2B ce60439de2676ad168bbb8355f61072019ea6ad4ef9e357b401bfced19b4d0d0f842926d83cf8e2348db460b1bb3dc7a5537b457835eedfe16e03a024fdfa65c SHA512 ed5940edaa0c1bf67065354f9e433901bc556a2c3db071d8c9d1c6a9ed02b86f151729c6ec5ece5a2924662d3ed8eaf1df19ce1979d325c03b932751b3921afe
 EBUILD dovecot-2.3.5.1.ebuild 8783 BLAKE2B d09a7e8b2545522a8f48939f46c586e537abcbe683f0ff790d82aae7d9be942dad171b5f6d94f3c8e9d85f1d0096f9c487cb4538297d0356fa20d2dc0f2abf76 SHA512 9b2a1a7dfedc3fb372b712ca0c0231ff2077632a42ce9722c4d369ffdaabd61b538e34da5523c5902f7a0f2d291d17c3739a0acfe19dba8b67e234b9df6d7b50
-EBUILD dovecot-2.3.5.2.ebuild 8785 BLAKE2B e733265849c5d7451f286d46ebee4c062b25f6b99d07928e9167a1c245ae203d9e0caf21bd51b9554e8079a503d977327ebddee23092e965493fac14f35c760d SHA512 5368dcc2ce883f5a7f13e45dfbc0dc1226827c851500f304dd9871f22a3ebb76d04d94c4472c2b535af9353291b394f9e97a5007883c8a35639a8c3604aa6fea
+EBUILD dovecot-2.3.5.2.ebuild 8784 BLAKE2B b8dc0bec0b0164b00cc070080169f018ed6c008ded304de3434e16fcf02bc9c3acdd1bf97d8cef0d83048b951fe1904a3cefccadfc3bbd4109299e7dc4d0991c SHA512 f54e6a872aac3bf38cbd9e9a3effec363e40483e9d2db022d156a7993a28c96a3470648cf059d00a165ecd1dff760df65d409b8c9658cfe9c82da0844df92956
+EBUILD dovecot-2.3.6.ebuild 8791 BLAKE2B 6e7c192f6ee0bbe9a0a8f8c2ead983390bef59947e59d5bdc876b34ff10e3f28ac45a6b68e7c895f909bd1c7c3bc4d91955dd1e2fb010e881b45aab10eab0e1c SHA512 4fc1f99e8d6c4d5ceace32c77a0ee517020df228dda9d781b2cd56cf96b62e2e7a51d4101f95144545fc14baec6e8da9c3e5ddab3f14c0f1592edcec1011fe63
 MISC metadata.xml 941 BLAKE2B 8432d32315ba8c4ad55cdbc6cdfc85b9cbd2aab5928f8f3fbaa1e33093a272ee36abfaeb8d4e6f2a7658bdf9a9f481efe3ac18e5b5b901c74addc63979bcc312 SHA512 f8347117eb6039d0340ab53e0ccd82cd269a3f50d2747a780ccfee26b6e598347337f73b75c1e6f4f814c86918c4d0325c4c784a04a86b3d66ceb58bfe94d98d
diff --git a/net-mail/dovecot/dovecot-2.3.5.2.ebuild b/net-mail/dovecot/dovecot-2.3.5.2.ebuild
index d180d778f29e..c1eb85fc4d43 100644
--- a/net-mail/dovecot/dovecot-2.3.5.2.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.5.2.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
 IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
diff --git a/net-mail/dovecot/dovecot-2.3.6.ebuild b/net-mail/dovecot/dovecot-2.3.6.ebuild
new file mode 100644
index 000000000000..ba029c4674e2
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.3.6.ebuild
@@ -0,0 +1,294 @@
+# Copyright 1999-2019 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 user
+
+MY_P="${P/_/.}"
+#MY_S="${PN}-ce-${PV}"
+major_minor="$(ver_cut 1-2)"
+sieve_version="0.5.6"
+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}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	)
+	managesieve? (
+	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
+IUSE_DOVECOT_OTHER="argon2 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="argon2? ( dev-libs/libsodium )
+	bzip2? ( app-arch/bzip2 )
+	caps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lua? ( dev-lang/lua:* )
+	lucene? ( >=dev-cpp/clucene-2.3 )
+	lzma? ( app-arch/xz-utils )
+	lz4? ( app-arch/lz4 )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	pam? ( virtual/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 )
+	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
+	#eautoreconf
+}
+
+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-rundir="${EPREFIX}/run/dovecot" \
+		--with-statedir="${EPREFIX}/var/lib/dovecot" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+		--without-stemmer \
+		--disable-rpath \
+		--without-libbsd \
+		--with-icu \
+		--with-ssl \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		$( use_with argon2 sodium ) \
+		$( use_with bzip2 bzlib ) \
+		$( use_with caps libcap ) \
+		$( use_with kerberos gssapi ) \
+		$( use_with lua ) \
+		$( 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 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+		fperms 4750 "${EPREFIX}/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 "${EPREFIX}"/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 http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
+}
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 4227d3bc9f28..b9dc18d16786 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -9,5 +9,5 @@ AUX fetchmail_at.service 289 BLAKE2B ab28a4b96625404f5451aa2dd37b671a18d7bf72bb3
 DIST fetchmail-6.3.26.tar.xz 1283816 BLAKE2B dd98d7470b8cb65de90cb1d798a2ed3e6aa723bc8e47bcd4d79ca489bdc439fd7204ffb11fea671e292c06616e5a0ccfd9f2689a4f21a1bbbd70677b0f04133e SHA512 8e0a2484e60eaf6c0231e2599e10fec6d207fa1c0fa02ec99b3ef9aea00b6d87275434e79470a25f06e358cdd4a293f9c46a82dd128fe733a99c85144e6caa63
 EBUILD fetchmail-6.3.26-r2.ebuild 2425 BLAKE2B 2494f8f8812c20bc39e158a40609e0095faae93b5b61ff2ffacbf09526243de134561364e17feab75d73ed4659b17a94b568b3048f7bf0a0ed4881e7b8823c93 SHA512 ce5b7f534479e4d10950bd86d8373f3cd0e3fb5429820f642ea17b1cefb9d954406560c3931f087c72f53925fef7f993e22e84366585117ff2932dcced7a1fb3
 EBUILD fetchmail-6.3.26-r3.ebuild 2492 BLAKE2B a3b72604373b946de64b233015db0cd1759fb7ff1fb395e83be755bde4fce0a591130f9d8bc2f66b88c6e06cda974585135b65a4225538b28d482dfe6c3cf56e SHA512 5fb98711761c9a2a7b720a3f46ba3b66d3a8371ec8229f5defa81d660a7984682a7e5beca026576fa507c14003ccbfecf613042b606cdeaaf7feafd01c48ddc5
-EBUILD fetchmail-6.3.26-r4.ebuild 2662 BLAKE2B dc7926562671e3fd0778398c8fa518b30853bc355749d2059c298ae4d1f3e7727b02605bbdeb6ed89428728e7d78083f512b281b22fcc1aecf54d18f033ea56e SHA512 edf9cdebd3142ca2cf2d494eda3c79189c55bd2201b02fe3b842c2d6432f58a23ad440fdfb0719bdca1267f5084fad4eb40a7a0d487902a125ba71392df0f7fe
+EBUILD fetchmail-6.3.26-r4.ebuild 2657 BLAKE2B d9241b624ca575150a506d5e7b70225bf19ed842575ac16c2381c5abf3c295d1c30a8910efc25c40a4059b48b821ca447622b3a967d5a10eb3a72dc044a3c06a SHA512 71bff3b48ba29d836d8807007ba53e5edb5249c7754af53455fc78bfb54028fd6c3b48d7a5bfe9dbe65a33b26a6fa38d2c598cdfc3a36397115d036722c01bd0
 MISC metadata.xml 431 BLAKE2B b8d0c68ff6274dadbcee2c3e51fdd524d026b5b5fbb20307949a190b8ac219a444f555b6c5420459932792fd02b2968d9b59c3bfb41252740bc7a191ce96c68a SHA512 b011852712d3310d0b9dd052215b514b4f2032ebf13733c49da7499207264524bb28231ca5d3309867f5154162c8b2f6dacc1a324b5f3f41c58818e04d705d46
diff --git a/net-mail/fetchmail/fetchmail-6.3.26-r4.ebuild b/net-mail/fetchmail/fetchmail-6.3.26-r4.ebuild
index f8cd837057e6..471891e51024 100644
--- a/net-mail/fetchmail/fetchmail-6.3.26-r4.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.3.26-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="ssl nls kerberos tk socks libressl"
 REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-mail/qmail-autoresponder/Manifest b/net-mail/qmail-autoresponder/Manifest
index b80068110b8f..6f51da1d33f5 100644
--- a/net-mail/qmail-autoresponder/Manifest
+++ b/net-mail/qmail-autoresponder/Manifest
@@ -1,5 +1,4 @@
 AUX qmail-autoresponder-0.97-remove-mysql.h.diff 347 BLAKE2B 9f68bfc64c126d1268630b94f309be16dc8cbc157989c5e3d93b721e4d8f809417d516750db555b99f19f25fc604da59c135855d90dd9017ad3cda6df7ba4f07 SHA512 fa1ae38b8c61c1a67c20653b4e19e48946c140496d7380f918818bc18171de36762c70fc664947a22d0fb479f224d16bb2741374e8813ac46768178e3285f7d5
 DIST qmail-autoresponder-0.97.tar.gz 28158 BLAKE2B b8659f2fd7201a8479b34a43afbbe2efff6a9a72a00167429926564a6323f385b03c3e45c420ac4cea63f52612f9da7acfeacb679f046e1f9019262a9196eb57 SHA512 02bc3afd7a13c9494913986d34c641804c731e26207d32aeff5de36fdbd872d6361872e7ab583d5df1e34fe2a7a35b621337974a2cc71a3283de22f0e6f60916
-EBUILD qmail-autoresponder-0.97-r1.ebuild 1370 BLAKE2B a59d4953ac00090079e466f6539cf948ba9312f801102a020633c14d93ea0ea59bf1642aa529e03ec6563c678a85dbe1839b3e6920f818115a0e7c64deadab70 SHA512 5c21559ea633760e0e400fc58f766446e3d597d12a390439decbf672f1a1145f56e3fa781832b002e96c8f44a6abd12b27615b2ca83a6927206514d6b3a122df
-EBUILD qmail-autoresponder-0.97-r3.ebuild 1407 BLAKE2B 0a635f13cacfe2d6b31b47fe6a65b55c34e750fe11f83d08fda254f260b2a26ddc60b1e217094a064302fc2ba41fe46a49a0fc6709158cf9edb226f71fd8c257 SHA512 e248936a769f31856b2d0defbd74b419eee25d65afc455810d631cdebfd0112b2ffbd558aa0f8c882a4190b6e031dbb30e073e59cf8d0a472e66bdf4518c670f
+EBUILD qmail-autoresponder-0.97-r3.ebuild 1406 BLAKE2B e0bf8ce404b0a5924d258c9d9e5e5ee75e8d73d7676ba6bd4bbd2e2c6c0da1678d1f80579fa626456b4019e813a9e8b8b175349faa90e228bd1258872c10b07f SHA512 54fb56f1b98e4afce05b2959f0ca46634948181977070b7515496e8ceb16c372051041c071cae1d8be3761f22a24384573e694b7bcdc9b43e1905bd9da99bf52
 MISC metadata.xml 415 BLAKE2B ce1cf3c127835055f2555ab5488f2fb9bf9858711fb6e5be022ee924c53876f3baa97c9a71c3f5993ca71ffd9a6caa5c0a5a804a0aa326eaf3293363dfc657c4 SHA512 d0735db9241b2f5c46d4a2f8e1e2d0b2afe8baa94ec633e474a83a61f894146e1727799f9e59d6efb986c207c4cb6893a130424497db132b89ea2ea1a2ebfeef
diff --git a/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r1.ebuild b/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r1.ebuild
deleted file mode 100644
index d7c0c1da018e..000000000000
--- a/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="Rate-limited autoresponder for qmail"
-HOMEPAGE="http://untroubled.org/qmail-autoresponder/"
-SRC_URI="http://untroubled.org/qmail-autoresponder/archive/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86"
-IUSE="mysql"
-
-DEPEND=">=dev-libs/bglibs-1.022
-	mysql? ( virtual/mysql )"
-RDEPEND="
-	${DEPEND}
-	virtual/qmail
-	mysql? ( virtual/mysql )
-"
-
-src_prepare() {
-	use mysql || epatch	"${FILESDIR}/${PN}-0.97-remove-mysql.h.diff"
-}
-
-src_configure() {
-	echo "/usr/include/bglibs" > conf-bgincs
-	echo "/usr/lib/bglibs" > conf-bglibs
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-}
-
-src_compile() {
-	# fails on parallel builds!
-	make qmail-autoresponder || die "Failed to make qmail-autoresponder"
-	if use mysql; then
-		make qmail-autoresponder-mysql || die "Failed to make qmail-autoresponder-mysql"
-	fi
-}
-
-src_install () {
-	dobin qmail-autoresponder || die
-	doman qmail-autoresponder.1
-	if use mysql; then
-		dobin qmail-autoresponder-mysql || die
-		dodoc schema.mysql
-	fi
-
-	dodoc ANNOUNCEMENT NEWS README TODO ChangeLog procedure.txt
-}
-
-pkg_postinst() {
-	elog "Please see the README file in /usr/share/doc/${PF}/ for per-user configurations."
-}
diff --git a/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild b/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild
index a870147e0830..a55799d54849 100644
--- a/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild
+++ b/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://untroubled.org/qmail-autoresponder/archive/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 hppa ~mips ppc ~sparc x86"
+KEYWORDS="alpha amd64 hppa ~mips ppc ~sparc x86"
 IUSE="mysql"
 
 DEPEND=">=dev-libs/bglibs-1.106