gentoo resync : 15.09.2019

4 files changed, 116 insertions, 6 deletions

diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 678aed3d4486..34631019eba1 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -1,11 +1,13 @@
 AUX fetchmail-6.3.26-libressl.patch 3948 BLAKE2B fa277ad3aa70d83f258be80a17b69d977c6c523eb37a305a7c82659231eff6ce6f63e3b7a4ccd4fe487f6a3bd163711f3ea3e338406fcec4ec8955a32007af91 SHA512 3d2aa5f7c388ae89d3ea701e4f83b9a477f31e39df13a6e84ede11be6a003f7b9e483f8439b3eaf27256f72cf7f9279d3f999f69f4cf210cb5d15ab124283389
-AUX fetchmail-6.3.26-python-optional.patch 285 BLAKE2B 9633469a2d6a96bb2678c3ef5453f9da96ed0077f23bd65ae6b34d91425a1dc3d3cbecbfa735dd76fd6de359927049925c31bcdded8a8f4de760b32cfc99c439 SHA512 38f39ea656d42852a05508caf6a2c444b47dea007265ca4373b4ebe7632c5477fb03edd4769576a79199425e3660ee098297beee19fa96f35301ed209b751e39
-AUX fetchmail-6.3.26-tests.patch 374 BLAKE2B 02478c368a5360284f241457e97b517778a4ff7a5b0f5f8f13a56951a91f613c915653515c0c84f6e8d1d416d91b08a94d0c7d5f8d396e9a584a2560937ab7b2 SHA512 9b65f3a70e52c25a90768228433f6c40da62d5627245ce862e23ebfae244209a9557731b7beec2be65b338c6670464fa0121b50c25154719cbc052c59f74841b
+AUX fetchmail-6.3.26-python-optional.patch 255 BLAKE2B ff13ec04926ae8362acea31c37719e9bc59599ad98f0ba8792d25101371984d38b2ea5ea9672a5b23b2600e743d6d57a718d3967f1c79dcb393c4f8757a58741 SHA512 7ac620a695d681278ed91f2f45a55822e5adfb0657c65be3edf09eb5259173e298cf509d1d7df7905bf2cb914b4869cca9cd0627dc0527a048edd9e9bd2a775d
+AUX fetchmail-6.3.26-tests.patch 344 BLAKE2B 7ebe51bf9253f14c64763c375e6bf213dd4ef3857780ceda2093ce7d576d6cd99e88e2ca00f424fca3f2aebc01cf8a09c9a6c758ec4b78232af1e9d628288c90 SHA512 bf049e35af40f10f386dbfc6aa95082c650bc5802f13d0f4d3f77d925cf5120b8166b7718e5321b99f26a1dc8fbeaddc42872dda7adbd57962ce04950ad373b2
 AUX fetchmail.conf 38 BLAKE2B 8458d0709652038a9a4661d68154ed87269aa3b9d07abb1a04645fe5acdfbee2c197b81356430e74ab63685c2f2f7003def4ca4a7f2ca04146abc42f4d91cafc SHA512 f6e3eb409a1d88bcfb02012491fdbbf859803dbee45998879525fd35a2377bae95504da8aafcb24bcc2e695e15c96f6ec6f7e6521d28012370a4ec5e2a25a351
 AUX fetchmail.confd 297 BLAKE2B 00f9a55be3b6351dc7b97758f3403feab9d1025bb2b0398ab3104c5180a321a2cff386d4a50fbc24bacd00a001052b3076b6fa5f3c831e48ecc2ce95b8ca27b1 SHA512 4dacd025d76a22c991c6dabe7c3d5b33b49348e83534d4de300a1b0d55a62dc0195e19065cb0a3a5da72f50700e7b92d4579be795a899f680e2a8be7dd508532
 AUX fetchmail.initd 993 BLAKE2B 76fb355805afc0b62f350f02dc0b0d6ac83659d2e15a49309192de313fa38b61e32db0bb9e5148c3d56bae61ca5e714f8d9576e0f95997d45a44d51f56c8235c SHA512 06091152111059425e86207e968ad5819eb67cd2dd264855e7b77a163b95591abc29befe4b3eb8bf2d2af105efb5006bb048f3db4ef3f8f4fafbb78767f69ebb
 AUX fetchmail.service 204 BLAKE2B 4683577d0da4929b068bd2f49516838644ac399e6ab27fb6ff9f3d5f1d8357302e11e6fc4d22d8944d504bdbb600e87b853e039601b8cca9763e1ca465573508 SHA512 088d7ff2c473d4b514cc5349ba6f10bb7f29ace1141d152db082c801a9dd0e6144a2dd350e27e97f633aaf286c2daa5253e52b5c410737c44f3fd9b5b57bab75
 AUX fetchmail_at.service 289 BLAKE2B ab28a4b96625404f5451aa2dd37b671a18d7bf72bb3792d20eecded0ef42f15ddd768470a9dd541a66a495e954632e9b12ba3c0cfb446c4e2832eb9d3993f8c3 SHA512 4f8208a286f2868a466e69919b7c9d965da099b44675105689bcc52b0d16acc8d46e77f6b9a72968e82a6cf900e20d07a9a7373fe26a1ba9c925edf6663180ed
 DIST fetchmail-6.3.26.tar.xz 1283816 BLAKE2B dd98d7470b8cb65de90cb1d798a2ed3e6aa723bc8e47bcd4d79ca489bdc439fd7204ffb11fea671e292c06616e5a0ccfd9f2689a4f21a1bbbd70677b0f04133e SHA512 8e0a2484e60eaf6c0231e2599e10fec6d207fa1c0fa02ec99b3ef9aea00b6d87275434e79470a25f06e358cdd4a293f9c46a82dd128fe733a99c85144e6caa63
+DIST fetchmail-6.4.0.rc4.tar.xz 1254560 BLAKE2B 9f80cd0f1aa4ecc215e370154069f9b5fab04c84b1a6c196e5911a1481732568d7e391e2098437217c893ee00900e8980a7e59328dacd4e3faaadcdd242a71b4 SHA512 1085668464534f39c7939fdbe845397ca7f9c709bb0f816655643cb5a7d4adcb63e32a534f10303c5366d786bd7fd4650fd960c21f0346a10e78860e11bbd6fd
 EBUILD fetchmail-6.3.26-r4.ebuild 2651 BLAKE2B 37c23dd84e4a15d494370a816f902409c0c0845b30f7006166bfb049c29d5ca3dd21d498ccdd0258b9e6c6e52d46df999876b7feed55678bd62eb385f2043f82 SHA512 c91f4ee8a96b5c6e88761513eee5919c116f23e12af44bb880cf6e48a2a9b31847d6409279053900a3a28832c73abdeaa2406c28defc9ca3f65a69891f149aa3
+EBUILD fetchmail-6.4.0_rc4.ebuild 2629 BLAKE2B f1aa04c1239d4f0acb7883f628afc99d0bd47fe166f1bfee18bfec351652f9f20792de72b9d95bc8697781fa299077347e7747fbdc08aa379e25dc17cbf1750d SHA512 090bf0365767861d0c50de647070b87b1f71e0ae6f0088f25b0708ab994b25e9f8a5bbbe7514dddbc1074edf1157e39cab0d1fcd66014bace45dcf6708772e21
 MISC metadata.xml 431 BLAKE2B b8d0c68ff6274dadbcee2c3e51fdd524d026b5b5fbb20307949a190b8ac219a444f555b6c5420459932792fd02b2968d9b59c3bfb41252740bc7a191ce96c68a SHA512 b011852712d3310d0b9dd052215b514b4f2032ebf13733c49da7499207264524bb28231ca5d3309867f5154162c8b2f6dacc1a324b5f3f41c58818e04d705d46
diff --git a/net-mail/fetchmail/fetchmail-6.4.0_rc4.ebuild b/net-mail/fetchmail/fetchmail-6.4.0_rc4.ebuild
new file mode 100644
index 000000000000..c7094062242f
--- /dev/null
+++ b/net-mail/fetchmail/fetchmail-6.4.0_rc4.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk"
+
+inherit python-single-r1 user systemd toolchain-funcs autotools
+
+DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
+HOMEPAGE="http://www.fetchmail.info/"
+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"
+IUSE="ssl nls kerberos tk socks libressl"
+REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.6:= )
+		libressl?  ( dev-libs/libressl:= )
+	)
+	kerberos? (
+		virtual/krb5
+		!libressl? ( >=dev-libs/openssl-0.9.6:= )
+		libressl?  ( dev-libs/libressl:= )
+	)
+	nls? ( virtual/libintl )
+	!elibc_glibc? ( sys-libs/e2fsprogs-libs )
+	socks? ( net-proxy/dante )
+	tk? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	sys-devel/flex
+	nls? ( sys-devel/gettext )"
+
+DOCS="FAQ FEATURES NEWS NOTES README README.NTLM README.SSL* TODO"
+HTML_DOCS="*.html"
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.3.26-python-optional.patch
+)
+S=${WORKDIR}/${P/_/.}
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+
+	use tk && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	# don't compile during src_install
+	use tk && : > "${S}"/py-compile
+	eautoreconf
+}
+
+src_configure() {
+	use tk || export PYTHON=:
+
+	econf \
+		--enable-RPA \
+		--enable-NTLM \
+		--enable-SDPS \
+		$(use_enable nls) \
+		$(use_with ssl ssl "${EPREFIX}/usr") \
+		$(use kerberos && echo "--with-ssl=${EPREFIX}/usr") \
+		$(use_with kerberos gssapi) \
+		$(use_with kerberos kerberos5) \
+		--without-hesiod \
+		$(use_with socks)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	# fetchmail's homedir (holds fetchmail's .fetchids)
+	keepdir /var/lib/${PN}
+	fowners ${PN}:${PN} /var/lib/${PN}
+	fperms 700 /var/lib/${PN}
+
+	default
+
+	newinitd "${FILESDIR}"/fetchmail.initd fetchmail
+	newconfd "${FILESDIR}"/fetchmail.confd fetchmail
+
+	systemd_dounit  "${FILESDIR}"/${PN}.service
+	systemd_newunit "${FILESDIR}"/${PN}_at.service "${PN}@.service"
+	systemd_dotmpfilesd "${FILESDIR}"/${PN}.conf
+
+	docinto contrib
+	local f
+	for f in contrib/* ; do
+		[ -f "${f}" ] && dodoc "${f}"
+	done
+
+	use tk && python_optimize
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Please see /etc/conf.d/fetchmail if you want to adjust"
+		elog "the polling delay used by the fetchmail init script."
+	fi
+}
diff --git a/net-mail/fetchmail/files/fetchmail-6.3.26-python-optional.patch b/net-mail/fetchmail/files/fetchmail-6.3.26-python-optional.patch
index 2eafe4dcbb24..087fd6a5759f 100644
--- a/net-mail/fetchmail/files/fetchmail-6.3.26-python-optional.patch
+++ b/net-mail/fetchmail/files/fetchmail-6.3.26-python-optional.patch
@@ -1,5 +1,5 @@
---- fetchmail-6.3.26/Makefile.am
-+++ fetchmail-6.3.26/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -16,9 +16,11 @@
  pys=			fetchmailconf.py
  pym=			fetchmailconf.man
diff --git a/net-mail/fetchmail/files/fetchmail-6.3.26-tests.patch b/net-mail/fetchmail/files/fetchmail-6.3.26-tests.patch
index a0b3e8b5dfbb..691f34814eaa 100644
--- a/net-mail/fetchmail/files/fetchmail-6.3.26-tests.patch
+++ b/net-mail/fetchmail/files/fetchmail-6.3.26-tests.patch
@@ -1,5 +1,5 @@
---- fetchmail-6.3.26/Makefile.am
-+++ fetchmail-6.3.26/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -45,7 +47,7 @@
  check_PROGRAMS=