gentoo resync : 06.08.2019

17 files changed, 374 insertions, 64 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 9fbe2d35525b..e05b310556c2 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 43173f555114..0e45dbdb9e3a 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,14 +1,15 @@
-AUX dovecot-no-log-error-tcp_nodelay.patch 1374 BLAKE2B c665fdbd0d54dc8ddac8f4891197dfa813b39280ab8157a82a3946dc4284fb01710dd4fbc4c3961df4003d8027faeaf8e407223fbbdf0989145254aabb20e56a SHA512 48dc102d4d8e49e1cdfb0f0dee5ca67739f260f5467583c60d5fa6e3de8031da29a830ce56b8f786d6a9568b968bc64707031b193fd40af90c9fda58e152fd40
 AUX dovecot-userdb-passwd-fix.patch 500 BLAKE2B 133e7b13cf3dd1515db5694945abd2d00ecd89c4a766ea873099ebbdd450700e70b80696ba58b21cc4f7160fa3becde6453c9334d41cdad426e3f59bd9e5491e SHA512 18a26eed0c793b0ccee828dc5eafc6448dda94d705597b19c3333f21944e838b677af2884f5fb65eb2f6dc79158ad8b3143b24d3788d841038de6dd24885fc0d
 AUX dovecot.init-r6 1573 BLAKE2B 206318cbf7a6ef0276cb93237b091dd34dc2603a00f13ed288c787dc81f8902e770f7774c54eba90de49e9634eb93873046a043bd7825cfb65bab5b2ea9ce108 SHA512 982f9897e4a0a5a3957bb12785961c9cde72a2c941f55efdb23e9a26cec19efe89e3be4effe79522c297ea2b258d201db78c19b6e3f9cd5e68d3736c2a0f0063
-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.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.6.tar.gz 1854287 BLAKE2B a26edf2a298d8c3de0d9977d56583bd2e0933495c5f554871a38d7b9e31701ebf3587d221c5ec398721a9c34816918c41b069de39c13f879334f9776fede1a17 SHA512 998a046d2eb5ff7bba615fd1a3efdfb1e7e1dabf191257f7fa2882074acc1735a0a4c11c5f31bab1e964b0118f1a8e9e51b3d5529b8fff6d1312c9a8257d9c20
 DIST dovecot-2.3-pigeonhole-0.5.7.1.tar.gz 1857291 BLAKE2B 09763c87099ac50fbe86870855b100379a9b2a72d6077438bbf1f76ff3aed162ad781be27e6587a9742819137f6636f142a220f3b46d3c46115b10cbf4cb2efc SHA512 121eac4ad8bc1ddc55c554d00338bb553590b6aedffcb11e34f6cba102d59bd34580cb7218bd5fe820038c004d12db73f7a27ca135c3d4a12c4449bae3216355
+DIST dovecot-2.3-pigeonhole-0.5.7.2.tar.gz 1857602 BLAKE2B 8de6200bb1ca99d25b48c963c007e9fda07e21f0708d4542e497985a61c07270febd8f29171d607c4025f4651c2ef17d84447a789ebad896c55aa36ec2cd876c SHA512 7fc8d89ee31c8e8c16a9aeaeffb591f4188de36fc80e3a30a9ae10bc5acd7ea5d5d91e077fda566e61d588d9221ec53044ce17a9cc0c9c219dbe6824558a1d60
 DIST dovecot-2.3.6.tar.gz 6980135 BLAKE2B 59ce625aafb96092cbd687aa0d5ccc3d7697228606978efa89bbf50e608915e381abb79348197aaf3b3fa046618bcf88acdc77420f9f028035653b8cb9843009 SHA512 ec28af2efcbd4ab534298c3342709251074dcdb0f0f4bcad0d24b996b273387e2ce557d7ab54abafb69be3ed7dd61f25c82b9710d78156932e2eff7f941c9eb2
 DIST dovecot-2.3.7.1.tar.gz 7076500 BLAKE2B fba84e324de44a4f463769ee8b99ddc532f3ac3fad3c55a1035a367c7b186850cd49c3c45ecea439469e84abf2ae26dcfc8f454c3d2dab43be0fd89721c8053f SHA512 9addfe2be9ae745ac9164e1658e6638df96bd611d45f172e2cd1cb2c6596e4ce534674e9eea3c1d17f497555061031916e0fb9a9fbc6de0eb6034e2fd0bed3b9
-EBUILD dovecot-2.2.36.3.ebuild 8599 BLAKE2B ce60439de2676ad168bbb8355f61072019ea6ad4ef9e357b401bfced19b4d0d0f842926d83cf8e2348db460b1bb3dc7a5537b457835eedfe16e03a024fdfa65c SHA512 ed5940edaa0c1bf67065354f9e433901bc556a2c3db071d8c9d1c6a9ed02b86f151729c6ec5ece5a2924662d3ed8eaf1df19ce1979d325c03b932751b3921afe
-EBUILD dovecot-2.3.6-r1.ebuild 8717 BLAKE2B 5e61b8154648de4e65b5bd9601544bd032c2e8a03f7259654f819b6fab22379ddfac701930ef079e14f7ccaa7c08c86042c419281ce96baeb018f24686bbabc9 SHA512 264191a2fb2d79cd57e800d7c95a64f3c0677901941a7c3ace92cbad3e8f7c6cf812a5b68de78993715c7bc2793c809733510145c103020d6a5f7f555fc9976d
-EBUILD dovecot-2.3.6.ebuild 8782 BLAKE2B 0f108ca6de24026c9220d8ab60001726256bf2a39361fbe22b67e15ca8c1f9e1dc30868296045985f66ec656cb1903347efb96fca3a40af41c220c51884b6f66 SHA512 c3e032b287e03e70c50f8ffd28dfcc0cad977a76dc173e20b7ca801190b5f1747dc08b1a400e553853806c907ef3351b2d0956ecd645c05017ea2ea7d59b8602
-EBUILD dovecot-2.3.7.1.ebuild 8719 BLAKE2B 2d5fb6a84f8de0690b51f0d11844f065cff11474e37903dd516f0e468c01037cf69bd97b7d38371af52393a296a91707225dca3331021010a2a1b77a82b6b202 SHA512 7b4b37372ad55ed4249fae45d397ea237f458ea9bcc5ed9dbce9d317329509efb456e3bc09e26f670b04cfb7f4a36ea0969751fe49a9dc944d604a1aa9c00674
+DIST dovecot-2.3.7.2.tar.gz 7076231 BLAKE2B 2cb93aa594db722489063b490469dfe284b1f997b64c9a699b506ccbd04e8e7c2d503ddc12a2598958dfca88560c19487801a728f386b8fea5f637a75b83812e SHA512 172f7f0edb884259e4c050607510aee67a35c3a20b7dd147e7c8a25a04921c18f7d6b5c85af2c69ae8c4d53791550970e471b033dbfae94253e331053b6a317d
+EBUILD dovecot-2.2.36.4.ebuild 8567 BLAKE2B 4d29cba3ccfabee9a205074796fc7169eb6d0bd53d88a44262b7838b06252216aa0b37cb63d5fc88ae08c3b506d32752f6f6a61180d72ae1de7f745b3e352bab SHA512 77705e2406995c784460ff9cf71fcf605a4ec2f62721e8ab7280b1841b725971ab7d6d77e5ceddd31d7a6d715e515d07a1cac60b158296032b597df861b6bde6
+EBUILD dovecot-2.3.6.ebuild 8750 BLAKE2B c0a9f8e7c192bd05025514cea8afa1e25c9f7475aefba60868ecd2f72670036c6d489d67ae5ab1528647545c3a5dca687c916a51b1ea58ce28bbc3eacdce4efb SHA512 d4a86bea299e45614d3485695253676c4407e84f17c61da0959429b882161e51dc2886ffea19200fb581d4bac59e7013ae361e03c2fd6d3ec11e425bea5b867b
+EBUILD dovecot-2.3.7.1.ebuild 8687 BLAKE2B 0f9352889df0e72b8be0234df21909ec706a81cd666b5914253e16f39b0be4010da41d69f27c77c3368ef473692fefd4a9996abbe7cbf135f25ade3e4d803739 SHA512 f7ef9cc71b89a0f735554ee133ad29a25c40c634d9e664fd7427952451af3a1363e4f9ddb348a305cad28a94941f7c1f29b7b8a5244a44d6b439387847b5ebf4
+EBUILD dovecot-2.3.7.2.ebuild 8680 BLAKE2B 6cd1f0f0b1f35d915b16d7d4d06fa92ed1b668486628b82e21b9e15b2d79fe86cd7141c8a591e607574e7eba6a44cf6ecca25a8ed16b0626e8c7564fa12c2d90 SHA512 75a4a5dd9b55afbd751f5fb879c2b2e0ed53ea3202281138ecd348653d030d498c2642121fa75cd6868edda792cb2c6570f8dfdbaa7e98e4ed34a1658c81a90d
 MISC metadata.xml 941 BLAKE2B 8432d32315ba8c4ad55cdbc6cdfc85b9cbd2aab5928f8f3fbaa1e33093a272ee36abfaeb8d4e6f2a7658bdf9a9f481efe3ac18e5b5b901c74addc63979bcc312 SHA512 f8347117eb6039d0340ab53e0ccd82cd269a3f50d2747a780ccfee26b6e598347337f73b75c1e6f4f814c86918c4d0325c4c784a04a86b3d66ceb58bfe94d98d
diff --git a/net-mail/dovecot/dovecot-2.2.36.3.ebuild b/net-mail/dovecot/dovecot-2.2.36.4.ebuild
index 9e06b4534ad0..ddcf00b21ae2 100644
--- a/net-mail/dovecot/dovecot-2.2.36.3.ebuild
+++ b/net-mail/dovecot/dovecot-2.2.36.4.ebuild
@@ -9,7 +9,7 @@ inherit autotools eapi7-ver ssl-cert systemd user versionator
 
 MY_P="${P/_/.}"
 major_minor="$(ver_cut 1-2)"
-sieve_version="0.4.24.1"
+sieve_version="0.4.24.2"
 if [[ ${PV} == *_rc* ]] ; then
 	rc_dir="rc/"
 else
@@ -160,8 +160,8 @@ src_install () {
 	# 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"
+		fowners root:mail "/usr/libexec/dovecot/dovecot-lda"
+		fperms 4750 "/usr/libexec/dovecot/dovecot-lda"
 	fi
 
 	newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
@@ -187,7 +187,7 @@ src_install () {
 	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
+	fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext
 	rm -f "${confd}/../README"
 
 	# .maildir is the Gentoo default
diff --git a/net-mail/dovecot/dovecot-2.3.6.ebuild b/net-mail/dovecot/dovecot-2.3.6.ebuild
index a37dbd5f911f..7abeccbbadd2 100644
--- a/net-mail/dovecot/dovecot-2.3.6.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.6.ebuild
@@ -167,8 +167,8 @@ src_install () {
 	# 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"
+		fowners root:mail "/usr/libexec/dovecot/dovecot-lda"
+		fperms 4750 "/usr/libexec/dovecot/dovecot-lda"
 	fi
 
 	newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
@@ -194,7 +194,7 @@ src_install () {
 	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
+	fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext
 	rm -f "${confd}/../README"
 
 	# .maildir is the Gentoo default
diff --git a/net-mail/dovecot/dovecot-2.3.7.1.ebuild b/net-mail/dovecot/dovecot-2.3.7.1.ebuild
index 9ca01af7c7fa..89f0139e20b6 100644
--- a/net-mail/dovecot/dovecot-2.3.7.1.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.7.1.ebuild
@@ -164,8 +164,8 @@ src_install () {
 	# 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"
+		fowners root:mail "/usr/libexec/dovecot/dovecot-lda"
+		fperms 4750 "/usr/libexec/dovecot/dovecot-lda"
 	fi
 
 	newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
@@ -191,7 +191,7 @@ src_install () {
 	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
+	fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext
 	rm -f "${confd}/../README"
 
 	# .maildir is the Gentoo default
diff --git a/net-mail/dovecot/dovecot-2.3.6-r1.ebuild b/net-mail/dovecot/dovecot-2.3.7.2.ebuild
index 20f2b5332e0c..8f049006a00a 100644
--- a/net-mail/dovecot/dovecot-2.3.6-r1.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.7.2.ebuild
@@ -10,7 +10,7 @@ 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"
+sieve_version="0.5.7.2"
 if [[ ${PV} == *_rc* ]] ; then
 	rc_dir="rc/"
 else
@@ -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"
@@ -164,8 +164,8 @@ src_install () {
 	# 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"
+		fowners root:mail "/usr/libexec/dovecot/dovecot-lda"
+		fperms 4750 "/usr/libexec/dovecot/dovecot-lda"
 	fi
 
 	newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
@@ -191,7 +191,7 @@ src_install () {
 	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
+	fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext
 	rm -f "${confd}/../README"
 
 	# .maildir is the Gentoo default
@@ -287,5 +287,5 @@ pkg_postinst() {
 		install_cert /etc/ssl/dovecot/server
 	fi
 
-	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
+	elog "Please read https://wiki2.dovecot.org/Upgrading/ for upgrade notes."
 }
diff --git a/net-mail/dovecot/files/dovecot-no-log-error-tcp_nodelay.patch b/net-mail/dovecot/files/dovecot-no-log-error-tcp_nodelay.patch
deleted file mode 100644
index 3a2acd74fb65..000000000000
--- a/net-mail/dovecot/files/dovecot-no-log-error-tcp_nodelay.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/src/lib/ostream-file.c b/src/lib/ostream-file.c
-index e7e6f62d12..82bf729ac0 100644
---- a/src/lib/ostream-file.c
-+++ b/src/lib/ostream-file.c
-@@ -333,17 +333,17 @@ static int buffer_flush(struct file_ostream *fstream)
- static void o_stream_tcp_flush_via_nodelay(struct file_ostream *fstream)
- {
- 	if (net_set_tcp_nodelay(fstream->fd, TRUE) < 0) {
--		if (errno != ENOTSUP && errno != ENOTSOCK &&
--		    errno != ENOPROTOOPT) {
--			i_error("file_ostream.net_set_tcp_nodelay(%s, TRUE) failed: %m",
--				o_stream_get_name(&fstream->ostream.ostream));
--		}
-+		/* Don't bother logging errors. There are quite a lot of
-+		   different errors that need to be ignored, and it differs
-+		   between OSes. At least:
-+		   Linux: ENOTSUP, ENOTSOCK, ENOPROTOOPT
-+		   FreeBSD: EINVAL, ECONNRESET */
- 		fstream->no_socket_nodelay = TRUE;
- 	} else if (net_set_tcp_nodelay(fstream->fd, FALSE) < 0) {
--		/* We already successfully enabled TCP_NODELAY, so we're really
--		   not expecting any errors here. */
--		i_error("file_ostream.net_set_tcp_nodelay(%s, FALSE) failed: %m",
--			o_stream_get_name(&fstream->ostream.ostream));
-+		/* We already successfully enabled TCP_NODELAY, so there
-+		   shouldn't really be errors. Except ECONNRESET can possibly
-+		   still happen between these two calls, so again don't log
-+		   errors. */
- 		fstream->no_socket_nodelay = TRUE;
- 	}
- }
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index b7814d2fa227..0defee44ee7a 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -13,6 +13,6 @@ AUX twomsg.at 2216 BLAKE2B 8a0ac15f6c2a8824406d9a74e14f3143e48b9fd7636732bfae918
 AUX weed.at 1100 BLAKE2B 120c50265f45b192afa583e594cbf75d753f33aa129f71f3e076780e71224605d735722cb50ba078aa9747b286291d560d9b5e28393239995c1648407070db97 SHA512 84fa4564cb1876c1b9f1a8b143f8fc95829de5d2b02edf8894d86aa50efcdd5696d66d773737a8989ccc4ae22d4d0e2c4b7c055e281faabb82cea399150b2821
 DIST mailutils-3.4.tar.xz 2619672 BLAKE2B 3a49c319a7171b2659477e6892ae222a342243e84ed2ee93e6d77353e1871d57d101a3a6ee3d2442709adbfb090e4931e134369661e8e8aa407061c1eccdf862 SHA512 548d97a4a036ef0ef5a429c82ffa43dd377b210b4c4d3844e7e5dded0f963060e3733b7766821c06ccf4dc1135002608658bcd6420e75b4ca1f4f17cfc8e2573
 DIST mailutils-3.7.tar.xz 2846864 BLAKE2B d407d370a4823972c060ea6c6a6e16eefe46598fee8302159f9d44fe150ace32b6915e7e3d4ddaca63ed5d5a5cffce48514f7f6297413a97692eb609a295622d SHA512 aa93ee1cde76392808f492dae6c69625ab124a2c31a296449ba217fc26f292871b4d04f8720bf20377177eab33c01cbfe195d6ac3674c35e1db53157a6916a4d
-EBUILD mailutils-3.4-r3.ebuild 3661 BLAKE2B 282581bc98cbeeb486ed13f1524bd52e501b2643ab3a4b5bfb5bca7cebc51f3b78b13544b0a041c73b2b8b6f8c11aa15be29e522037b2ad339fd1408269eff55 SHA512 405bff601f64bd22e80063b863ae337caa4d29608bce3c55071e7eb954daff645f605ce43957980c847648e10243c0ee20dfea491d5fba4105c58ea10de56b85
+EBUILD mailutils-3.4-r3.ebuild 3659 BLAKE2B 2ebc7f7e7ade4bb105bdc048e9abdbf1760eda5ce61469389e9c75b3e417dc1cf99c8304aca16514f4f917ecbea7fcccec4f474828b57bf28dd3a79abfeac85d SHA512 6491a8647fa1d91013fc3e03f5195a488182997967fb90019f32c5bc7f8820f3db07e7bd10f4cb43788d28bfb517c8a52ad6969f3e79197bb6756cc4d003e6f0
 EBUILD mailutils-3.7.ebuild 3619 BLAKE2B acb7c1ca9fa7fabcb6713440bcfe7987b67179ccb687bf3b8247071a2cbf43a6852865362b9ea148c033b8587766bd575198a41001e25c9f823f7b12f9e75072 SHA512 434d96f09388488e44facf0bf973846ff3d324da5adbcc64335fd5f0da5b9a7367f7a35856e806e6c6e5e9c36ea624b84b96b80789648e8bf8652742a32c5891
 MISC metadata.xml 602 BLAKE2B e29b6203ef727041c0bb5483d46ddbd256f55f40d26ff94008fc3869dea23036369029a168a5b31fe3da8ee9c529d8c1cd9d0004691670cb9bebe77ef4973270 SHA512 602ef10835b14c359ac19dbce157ef5c073acb52286f7349feb4b8ec3940899ea4dba9d77ad4d4a3d540d86576cfb9f46e502cb9e8aa60cecb4a2f4b0b6358da
diff --git a/net-mail/mailutils/mailutils-3.4-r3.ebuild b/net-mail/mailutils/mailutils-3.4-r3.ebuild
index c2ccdf90bbc6..a3180e98440c 100644
--- a/net-mail/mailutils/mailutils-3.4-r3.ebuild
+++ b/net-mail/mailutils/mailutils-3.4-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
 	ldap mysql nls pam postgres python servers ssl static-libs +threads tcpd \
 	tokyocabinet"
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index c35b43f08144..51518d3f4515 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,6 +1,8 @@
 AUX 70mu-gentoo.el 76 BLAKE2B 478ebba49409f7b1fd601e4c6019cb9da7cc8c6f9b4f7318155225fa84ebd82cb73ba79637c0aa2dda9d9779e525b0577bc940a0d613a3fa64031e35f3178a46 SHA512 61cc2bf611a0d1f2aa53b4624c52e1aa9672a81b4b8d7386aad1bf70b0b0db6ee19e011acc5a1a28b220d99eb3683140a2ff02dc3e01ea68f512ee05ec7bc23e
 DIST mu-0.9.18.tar.gz 2250319 BLAKE2B 7eb83a797eccff706ac6b264a7d56feae80e40f370e190e0a94f2524dd73a8bfdb35599909f90d0a2b87fc513bbcf2b00fa307a3e4d0b6718ebdc7f7fcdc6df0 SHA512 47104d18547de0871782abc4e1c6dbf1f9b2489410e5716043861bf8d973d33d2138de7d7ac568b300ca86ae9f1a0fda0fa9555ad9a5938771336ef958183546
 DIST mu-1.0.tar.gz 2273670 BLAKE2B a771b00159142fa4a671d07cf9de6f0f941c432ddee31f19606c260ba3dfef857a36a333f5ede4ca30be88d7b7eae28e996e15a8deebd96971b341f0f72bfbbb SHA512 49b0b86f22e9a6ace1fc3fd6e7a8a523aa9edf092b953d59f59a1ef7311c8c546a261a1a186e3285cea788be20c816c70ac08d1514f700ff97258a2012ad394d
+DIST mu-1.3.3.tar.gz 2304029 BLAKE2B e2bbf3f7aa22ba2e1fd64b0e35df3e857dd3ec7874d08d36350a5d80abb36c667dee3cb43adf481dfbabd2a7944e84207d1913cb2525e637878a86fa70b213af SHA512 ab7844aef1ee6526a8b4ac1b98f6dc323fa01be6ac999f7b8a57b1c2aee6eec60a5643589c0477e8fede2f5140a8aa9050f00e52a30aaa1cd6b1cdbd66e441bf
 EBUILD mu-0.9.18-r2.ebuild 1967 BLAKE2B 2fc80cbf26459398f0f12824cb310eafe4b0af676dfaf1d680bbff480ff7bcbd363ef6db1b022d87b6fa6333be33c47e47baa2a04db9d00653062724075243d2 SHA512 d2d2aaf0e23a3edb2871353eea2beee972aad3a06d1ad30dedb94d0c283850a2ebbf537dd3245e447968ee202105fa0ff1f8b965964765d3e0312cf9f7f1a824
 EBUILD mu-1.0.ebuild 1970 BLAKE2B 1f0d0ec3b5cc6c79a0a83c4c5d0488e81e92304e15134dd4902aa78f63ca77a120a7d10930261eb061f425bdff3d985d0d9fee63f7952abf10a65768fbdbb39c SHA512 1c9522b996bc308452352ecd6343280e95ddc3ce2684918c18f032537d92f1327f9a1271a1abc30ace3469985c628c0eb1c567e61fd634d87e30fb3f0c1f36a8
-MISC metadata.xml 630 BLAKE2B 0a24656b86c87b2af1d9b00fc8be0fdccaa2fa28d6b1d8a4146b3d4df7a9edfa3934b28f54615115e1369da32b10e52fefc9ede45b5b59e4c5055d43f797427b SHA512 644b98b1c92e4a8b3e51a9d75d815869f84908aa0fd434c6ac24ca327820e6a2eed31013351a89f33aac9a8a0db91636e8912e5b0417556b45d888e3b1b7ac62
+EBUILD mu-1.3.3.ebuild 2099 BLAKE2B 863cb8a39459777dbae5fd4601fbb88a51d1fa3bdd97f76699f798484a715677e8b8c6fbae080ae2265ca078e13d9267c023bf06073053377ed25cd941441385 SHA512 f120292c849d27aa15a67fa84fc7f485b076d86565be96f42295115cb04daa55fb69d7b71be50b81aaa7de038fad5020c3c404dea64f8a200f1cd2715ad3c31d
+MISC metadata.xml 823 BLAKE2B de3b4bd9c6633407c16cf0cc5704a3d7fa6a67886139adaa7b23e1b1eea82e3ba19bcc53beaebdacc8d7a2da71539c216f7c62210d698b10ffe33215783e23ee SHA512 bd2265c198b8342c47c5cc428811993f8187b8dee981df72531097b9d8f2c01e21bc2ec39ab1a1f291e189ef2bdb788153f0bfe5f2479e6faa1cb9e6ce0079ae
diff --git a/net-mail/mu/metadata.xml b/net-mail/mu/metadata.xml
index f5c66685bfc7..52409e491151 100644
--- a/net-mail/mu/metadata.xml
+++ b/net-mail/mu/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>matt@offtopica.uk</email>
+		<name>Matt Smith</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		'mu' is a set of command-line tools for Linux/Unix that enable you to quickly find the e-mails you
 		are looking for, assuming that you store your e-mails in Maildirs.  It also includes an emacs based mail client mu4e.
diff --git a/net-mail/mu/mu-1.3.3.ebuild b/net-mail/mu/mu-1.3.3.ebuild
new file mode 100644
index 000000000000..96b9d5115927
--- /dev/null
+++ b/net-mail/mu/mu-1.3.3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common
+
+DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
+HOMEPAGE="http://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
+SRC_URI="https://github.com/djcb/mu/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs guile"
+
+# net-mail/mailutils also installes /usr/bin/mu.  Block it until somebody
+# really wants both installed at the same time.
+DEPEND="
+	dev-libs/gmime:3.0
+	>=dev-libs/xapian-1.4
+	dev-libs/glib:2
+	emacs? ( >=virtual/emacs-24.4 )
+	guile? ( >=dev-scheme/guile-2.0 )
+	!net-mail/mailutils"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+SITEFILE="70mu-gentoo.el"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Note: Author recommends that packages do not build the webkit toy
+	# Todo: Add gtk USE-flag
+
+	econf --disable-gtk \
+		--disable-webkit \
+		$(use_enable emacs mu4e) \
+		$(use_enable guile)
+}
+
+src_install () {
+	dobin mu/mu
+	dodoc AUTHORS HACKING NEWS NEWS.org TODO README README.org ChangeLog
+	if use emacs; then
+		elisp-install ${PN} mu4e/*.el mu4e/*.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		doinfo mu4e/mu4e.info
+	fi
+
+	doman man/mu-add.1 man/mu-bookmarks.5 man/mu-cfind.1 man/mu-easy.1 \
+		  man/mu-extract.1 man/mu-find.1 man/mu-help.1 man/mu-index.1 \
+		  man/mu-mkdir.1 man/mu-query.7 man/mu-remove.1 \
+		  man/mu-script.1 man/mu-server.1 man/mu-verify.1 \
+		  man/mu-view.1 man/mu.1
+
+	if use guile; then
+	       	  doinfo guile/mu-guile.info
+	fi
+}
+
+src_test () {
+	# Note: Fails with parallel make
+	emake -j1 check
+}
+
+pkg_postinst() {
+	if use emacs; then
+		einfo "To use mu4e you need to configure it in your .emacs file"
+		einfo "See the manual for more information:"
+		einfo "http://www.djcbsoftware.nl/code/mu/mu4e/"
+	fi
+
+	elog "If you upgrade from an older major version,"
+	elog "then you need to rebuild your mail index."
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 2ac172ef50dc..7f4af32582db 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -6,5 +6,6 @@ DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b404677
 DIST notmuch-0.28.4.tar.gz 922364 BLAKE2B f22d52ecc982b086b5d2a67d3b9ae4a379bdcb9e9acf3e77060fd7d97439347e3b4cd767f2c9c3c48657b80f63316f6abc09a653d6791e27b4a8996adccf42a9 SHA512 77d7ad81e1f7dc93ae6392346da434f6dc74c21d19be728c2a6ca283c429f36e7081387d223af58eb5f63f5d2a8ad8367f0103f0bb9d052890c07fe419abbee7
 DIST notmuch-0.29.1.tar.xz 660352 BLAKE2B d145aba2d1a376e8cbcff3d51f9a7093649912a54273f91cce2a56fb414e222c2bbf0aeb510894278bf7dca8a96412400d55897a4d42281ab9c110d9bc8207a6 SHA512 9b76a7c8c62cb67b64a0008f80a82eeecccd20267ddba67d4d96a768815466c305f154769947bb9526e02c7a1696faaf69e94b90007603b185589be0c7c2a5d8
 EBUILD notmuch-0.28.4.ebuild 5090 BLAKE2B 8987d5ca0226b9a8093a3e1d0c48cbd24272a4f5aa1e41833ea9cd10cb02fed6199181116700cb0cb025301460397d5cca6300e7c33ddb84aac54c8476c332bd SHA512 971f6d3a84f360f8e4bfe161017fb79c58918610752344dff99bc9872fb303b14e172e2224e52c32130742b1e74e97ec879b5e1b0cef2a7e386b2f7eef4156b5
-EBUILD notmuch-0.29.1.ebuild 5038 BLAKE2B 75f4181ae4670d6019d4715255b451c28a3cec3e0a2dc27a7bdfd3b3e7ad88bdf25eda710deae7e90f583a1998e9769f30559574d2887bf1b32cc46008e315fd SHA512 f3beed9c567af5a0af98af8c46f497adf1f6400d42fe75abc968cdbe65f38869e9b07fb65fa1a00c7d42f38be18b124f60775d15933ecf8cc8a9ff993cd57b7d
+EBUILD notmuch-0.29.1-r1.ebuild 5197 BLAKE2B f847ac52b619bd10a4a294b27bf1149dc5c0309933c197eb17d2fa9c91dfa41036dad9c480afa1390c49cb062e4c12e897eb7f970552d91d2775c2797601bc22 SHA512 0ef0cd052e0704c155274dc7cf90eb7b28cd097bb4baaaa1dacf8c7228a17a7a6a1ed871512dd2379763722531e349b6d8d9387c4f39a84578b18d5d2c19223b
+EBUILD notmuch-0.29.1.ebuild 5215 BLAKE2B 13850458a70677d973331165accdac1884c4186bef74cef558dd32af43a9247f579cd0a5a2992fefd5c7a941aa7001564a585d0aecc823d4958fcf5ccaf1e3c5 SHA512 d6261d95f80d5c2ba8a04176b394ff58028e8caa0b7b25b9d95f63c7ab3061adc2e569eb8ac4432332ff5ec13c8ee038c500be832e5d7ee70d60475b0047bb89
 MISC metadata.xml 1117 BLAKE2B 08710cbb42c20580235f5cfafa39715c33fb50de24cf98a182418db3c52ee1de5a1ee0e0775ae5756fee301c952995a1e7da52b9c13e5bd8c8b2fc0d1d74a5d2 SHA512 c420e475e5d16d35cceb1162c14eae143e5f539e771561d525af4ab0f0853e700b9a3209ee1a7aa9b4269c235737304c435d463cd8b1cf201402152ff0a6a4f3
diff --git a/net-mail/notmuch/notmuch-0.29.1-r1.ebuild b/net-mail/notmuch/notmuch-0.29.1-r1.ebuild
new file mode 100644
index 000000000000..0124be3ef9a2
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.29.1-r1.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
+	distutils-r1 toolchain-funcs
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.xz
+	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~x86 ~x64-solaris"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+	"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+
+CDEPEND="
+	!!<app-shells/bash-completion-1.9
+	>=dev-libs/glib-2.22:2
+	>=dev-libs/gmime-3.0.3:3.0
+	>=dev-libs/xapian-1.4.8:=
+	dev-python/sphinx
+	sys-apps/texinfo
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	crypt? ( dev-libs/gmime:3.0[crypt] )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+	test? (
+		app-misc/dtach
+		|| ( >=app-editors/emacs-23[libxml2] >=app-editors/emacs-vcs-23[libxml2] )
+		sys-devel/gdb
+		crypt? ( app-crypt/gnupg dev-libs/openssl )
+	)
+	valgrind? ( dev-util/valgrind )
+	"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	nmbug? ( dev-vcs/git )
+	mutt? (
+		dev-perl/File-Which
+		dev-perl/Mail-Box
+		dev-perl/MailTools
+		dev-perl/String-ShellQuote
+		dev-perl/Term-ReadLine-Gnu
+		virtual/perl-Digest-SHA
+		virtual/perl-File-Path
+		virtual/perl-Getopt-Long
+		virtual/perl-Pod-Parser
+	)
+	"
+
+DOCS=( AUTHORS NEWS README )
+SITEFILE="50${PN}-gentoo.el"
+MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
+PATCHES=(
+	"${FILESDIR}"/${PV}-0001-Use-loopback-IP-address-rather-than-name.patch
+)
+
+bindings() {
+	local ret=0
+
+	if use $1; then
+		pushd bindings/$1 || die
+		shift
+		"$@"
+		ret=$?
+		popd || die
+	fi
+
+	return $ret
+}
+
+pkg_pretend() {
+	if has_version '<net-mail/notmuch-0.18'; then
+		ewarn
+		ewarn "There are few not backward compatible changes between"
+		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
+		ewarn "(0.18 section) for details before first use!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if use emacs; then
+		elisp-need-emacs 23 || die "Emacs version too low"
+	fi
+}
+
+src_unpack() {
+	unpack "${P}".tar.xz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	bindings python distutils-r1_src_prepare
+	bindings python mv README README-python || die
+	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+	# assure that new Makefile.config will be generated
+	rm -f Makefile.config || die
+
+	sed -e 's@^install: all install-man install-info$@install: all install-info@' -i Makefile.local
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		append-ldflags -lnsl -lsocket   # non-autoconf configure
+		# disable gpgme test using too old gpg-key
+		sed -i \
+			-e '/GNUPGHOME=/d' \
+			-e '/SESSION_KEY =/c|| false ;' \
+			configure || die
+	fi
+}
+
+src_configure() {
+	python_setup  # for sphinx
+
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+		$(use_with doc api-docs)
+	)
+	tc-export CC CXX
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	python_setup  # for sphinx
+
+	V=1 default
+	bindings python distutils-r1_src_compile
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt || die
+		emake notmuch-mutt.1
+		popd || die
+	fi
+
+	if use doc; then
+		pydocs() {
+			pushd docs || die
+			emake html
+			rm -r html/_sources || die
+			rm html/{objects.inv,.buildinfo} || die
+			mkdir -p ../html && mv html ../html/python || die
+			popd || die
+		}
+		LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
+	fi
+}
+
+src_test() {
+	pax-mark -m notmuch
+	LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
+	pax-mark -ze notmuch
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		doman doc/_build/man/man?/*.?
+	fi
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	fi
+
+	if use nmbug; then
+		dobin devel/nmbug/nmbug
+		dobin devel/nmbug/notmuch-report
+	fi
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt || die
+		dobin notmuch-mutt
+		doman notmuch-mutt.1
+		insinto /etc/mutt
+		doins notmuch-mutt.rc
+		dodoc README-mutt
+		popd || die
+	fi
+
+	DOCS="" bindings python distutils-r1_src_install
+	use doc && bindings python dodoc -r html
+}
+
+pkg_preinst() {
+	if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
+		elog "To enable notmuch support in mutt, add the following line into"
+		elog "your mutt config file, please:"
+		elog ""
+		elog "  source /etc/mutt/notmuch-mutt.rc"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-mail/notmuch/notmuch-0.29.1.ebuild b/net-mail/notmuch/notmuch-0.29.1.ebuild
index ffa74708369a..4984cf17d69a 100644
--- a/net-mail/notmuch/notmuch-0.29.1.ebuild
+++ b/net-mail/notmuch/notmuch-0.29.1.ebuild
@@ -131,7 +131,14 @@ src_prepare() {
 		append-cxxflags -g
 	fi
 
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		append-ldflags -lnsl -lsocket   # non-autoconf configure
+		# disable gpgme test using too old gpg-key
+		sed -i \
+			-e '/GNUPGHOME=/d' \
+			-e '/SESSION_KEY =/c|| false ;' \
+			configure || die
+	fi
 }
 
 src_configure() {
diff --git a/net-mail/rss2email/Manifest b/net-mail/rss2email/Manifest
index 8314997aed1d..adf081a38df2 100644
--- a/net-mail/rss2email/Manifest
+++ b/net-mail/rss2email/Manifest
@@ -2,6 +2,6 @@ AUX rss2email-2.69-config-location.patch 433 BLAKE2B 068d30efe9658b51d3327a18ade
 DIST rss2email-2.71.tar.gz 63268 BLAKE2B 56c4e2b59611ffcb0e7a9ff3558e6ed4da3f5ba186d5c2f84b715b8b63bf4729a57c1986f910a46d81813f3e756e07a35959e3000f1bf65839a5da830c50377f SHA512 242a4f2e4fe64f42e3348f8c159d91f79121224beec4faf542393c8323bdcba85510a28fc967ec59702f08205de1d40c2a26235f9d5590751f392880a7211c60
 DIST rss2email-3.10_pre20171001.tar.gz 162385 BLAKE2B 91ae17c43cca616750139b6d559fcfff50be682f70a932ae3e1e281c2a1ae0c31419d37ce7d8887b72873359f0ce29dfb03a1a7c19cfdc2fc945902110b6a3a1 SHA512 d0174489b1d5be9f18e720351f994a87ac0d6131fd23914deb1305223a022e3a741cf279c68c533e8dfe99112af334223354dcd145b38c09e32e16e1a80898ff
 DIST rss2email_2.65-1.diff.gz 8626 BLAKE2B 25b497e099d6093d94a29bf79d89b53d51cff0ed71c926e709b17d8a5a066d13a64c75e162ab02fa34756c49891595f43d1031f4549bf5603238d76bf8e1ac3d SHA512 cb0ca7f6c02f342305c6c19f03973f91343ca530a6a858427bfd6a57948e6123e02d64b1285efed10cda9541f3237f666d8e1a7954a3c2b57866a68dd43b8d8d
-EBUILD rss2email-2.71-r1.ebuild 1621 BLAKE2B 90f214d11231318e13fe6acffce72837a36c6a39b378e0eb60fc0cc0ab6626b5e589c35975a11f1ef596adca540995c22e3235f227a93568d0005af2e1d363c8 SHA512 c758468374d63600c7800453186f1ce42279090cd3e39c9dff35f6fdb26a7720758ea0610bfbf99d95d38b9bd204a36217a6a91805eb662f7fd62b1f7baada53
+EBUILD rss2email-2.71-r1.ebuild 1607 BLAKE2B a0e69e478f16725053bb8bfdc195c4be5165dd5039a4a59cccb39886ed4914cb690428b40e920978f9c3111389e4c819fa9e6110bef3af65eaa45195fba9b401 SHA512 e35e6f5cb45092227df9d25456ab79d56922b5208d0875fef35f6ae4f1536e33619ab4d1473a5c8cc01854bdefcd574cd915a87fba171e73feca08dbe11b2bec
 EBUILD rss2email-3.10_pre20171001.ebuild 772 BLAKE2B d857de7cda75d2b8dee0754fb38766f6de250ca1dadbb9b3f89e7c40b352cd4abc16887919a0f5c82ae1511a15df2647580393ba9d649aa9024e2976c3262978 SHA512 ae9f03a4b150d80be8082d063b2d55b6e8e7d3c0cca9b0531a82191d79f596ed16fa9cb80bf7855c091ec06e3eecd33f31a3977a65355b310ceca743a904d29b
 MISC metadata.xml 435 BLAKE2B 92960d2f537c61ec2639907d5d2071d06ef3b29a49a70b8cf69dc3625d358e015cfd6bed1c735713d44c780de43d75082d1df133540ef4da38f996f44bcd31dd SHA512 2b7d4a2bafc039030ae131a0c567a782488a6d5b225fe0b0b62f2ffe9852c2006ce377b5cc05407503dc01ed427a8c8be4853d5c03902708f38841df24c9fcd8
diff --git a/net-mail/rss2email/rss2email-2.71-r1.ebuild b/net-mail/rss2email/rss2email-2.71-r1.ebuild
index b8476f504875..1fbb40b32186 100644
--- a/net-mail/rss2email/rss2email-2.71-r1.ebuild
+++ b/net-mail/rss2email/rss2email-2.71-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -44,8 +44,8 @@ src_prepare() {
 
 src_install() {
 	my_install() {
-		insinto "$(python_get_sitedir)"/${PN}
-		newins rss2email.py main.py || die
+		python_moduleinto ${PN}
+		python_newscript rss2email.py main.py
 	}
 	python_foreach_impl my_install