gentoo resync : 31.12.2018

4 files changed, 11 insertions, 117 deletions

diff --git a/net-mail/mpop/Manifest b/net-mail/mpop/Manifest
index b4b3c1148b2d..1738207461e5 100644
--- a/net-mail/mpop/Manifest
+++ b/net-mail/mpop/Manifest
@@ -1,9 +1,5 @@
-DIST mpop-1.2.4.tar.xz 268900 BLAKE2B 9469c450930864ca902d333fac0fad492a798ca8012caa38730a31ba70caf11c65b8e56f67d0517c30303d880139ca161163bf52e334fea74a066993163cfcdb SHA512 2ddc395f76adcc9fa1a1bdf0749a29eeb40a51b3c1633fb0e6b967b68be79a160ae8aab8433a2565a2146ca0d24d2ad00e1cb5a66652e737dd0ccdbac27ae70f
-DIST mpop-1.2.5.tar.xz 269204 BLAKE2B bbcaef547676827c89c04dc8afb84f6679788b085d39dac5cc9881b0334ec1aae9752fedc44d762c85f381403a90c1e62306e1fc7ea9ef6fe075b8a1f6f642ee SHA512 9c724915f2f6b776ed0d8f27b3af5e2c86c63ccfd2eb4bcdf69f4f86f47d10ab23a21cd76e5ee173ba18bb7ccbc5f13a2dc9c2cbbfa91b9a40dddc5197c4c1de
-DIST mpop-1.2.6.tar.xz 269912 BLAKE2B cfcdf1cf4bf8e2ba6a9ccc8d7c725f2bcbcbcb545ad27b0bccfceba0d9b6d04d729035c96346027eb9c5821832f740d388163dcc7a15555d4d5c6361ab0824fe SHA512 ba4dedebbe4b7b9f84a339e7c605cc9082e95d8cf0c5331dbc74b83ef64f7de47da996e61dbbaa33dd093650a3021eb75a7f188a9abc985c741108d060b6bd7b
 DIST mpop-1.2.8.tar.xz 272632 BLAKE2B aebea78c44103284929d7819e00377c8d64d0de1c7cd877e8d63ea4e3481ccf05d9d27ec5b5f7433bf723bdd421a7fe8ed54a2e44ede9dbb3a6447a98e5596cd SHA512 34039d6a4b3b316679cb646ed0db6b0a11f47554576e9aad35402388718c3c7787e3854c144cec921cab0aea22e0484a1f71c2283bc1d0a37e6e69a0f6530602
-EBUILD mpop-1.2.4.ebuild 1103 BLAKE2B e377cbfc5858795778c509d3d3db6901dca5fab1ec62189f3500c8461bff0ae66c2aefbac67acc16ec8aa73e4689c536982dce484815e82ca5ad734edfc1f52d SHA512 2e4da67d2793521dd7178faf45b67f800219be22740a1be55858f5de0700afdc7c0cc105e4a692d7075c16ab27287af5de99345d9388e6b3af6948e2de782882
-EBUILD mpop-1.2.5.ebuild 1103 BLAKE2B e377cbfc5858795778c509d3d3db6901dca5fab1ec62189f3500c8461bff0ae66c2aefbac67acc16ec8aa73e4689c536982dce484815e82ca5ad734edfc1f52d SHA512 2e4da67d2793521dd7178faf45b67f800219be22740a1be55858f5de0700afdc7c0cc105e4a692d7075c16ab27287af5de99345d9388e6b3af6948e2de782882
-EBUILD mpop-1.2.6.ebuild 1103 BLAKE2B e377cbfc5858795778c509d3d3db6901dca5fab1ec62189f3500c8461bff0ae66c2aefbac67acc16ec8aa73e4689c536982dce484815e82ca5ad734edfc1f52d SHA512 2e4da67d2793521dd7178faf45b67f800219be22740a1be55858f5de0700afdc7c0cc105e4a692d7075c16ab27287af5de99345d9388e6b3af6948e2de782882
+DIST mpop-1.4.1.tar.xz 296968 BLAKE2B 89304b7c63882dd394ff6797d87ceca1aa8af3efa4198fc0adeeba5b5704b57459ee466319f59657d65dfac2a3b8531a4515e51391e7f5030008589e689a0a92 SHA512 66b2ad8fab2d4a8262eb3689b094ac19cc961ef9fd5fd51c2c72b14c9f759194b906d2450b7c6cbeddb78e871198a2be8b336bc1fc7d6990a2b8b9d66068a2e5
 EBUILD mpop-1.2.8.ebuild 1103 BLAKE2B 48d3ddc531310bdda5557bcb979356081c85a9147ddcc6188dd618e1cea9b29ae8b9df84e1b9bbd7f077f185c960b231b060485f5222b4861d4a549c924fbbea SHA512 8b9ac4154d874b5cddf9e5b5efe50b267f5d31b09ef92ca9fd598c0e1aafb517c85e8c8cd00b9db669b4a433ec7f105f772f7ac717b62fa1124dab3edd94daa9
+EBUILD mpop-1.4.1.ebuild 1131 BLAKE2B 925850c2dcb32599974d63e7d3558ce6d3385ea14cd0118cd4e41fcc28eb17e00985ab514fa6cb4fdb1176294ec380712561061410e24ea2a57f56c9bd9acc2f SHA512 4f1eff4f81c5e78062da15cdcb2e4465bdd5f2d77994f0638b36645a992821185ac3ea6e88ef0d4cd19d59eefb154b875658a43de976413b574adfb5607bd1f2
 MISC metadata.xml 417 BLAKE2B 3c7a493ab2f179da566b98df102d3bfc7df20a3eef4694b1ec6ea8dde00197dd526f77af2d42e9c63670eace496992def5d2d29cc929f52f858935941e2ad669 SHA512 a0e8a9f86bf3a53d1ba38cb3da1c12a9df7372876f3cecf089dbef4048149ec7a11fc3f007aa2c50059a0be72c91a4c608e87d206be89c8f996f246e8a828012
diff --git a/net-mail/mpop/mpop-1.2.5.ebuild b/net-mail/mpop/mpop-1.2.5.ebuild
deleted file mode 100644
index 88d21a14ec47..000000000000
--- a/net-mail/mpop/mpop-1.2.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A small, fast, and portable POP3 client"
-HOMEPAGE="http://mpop.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gnutls idn libressl libsecret nls sasl ssl vim-syntax"
-
-RDEPEND="
-	idn? ( net-dns/libidn )
-	libsecret? ( app-crypt/libsecret )
-	nls? ( virtual/libintl )
-	sasl? ( virtual/gsasl )
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-REQUIRED_USE="gnutls? ( ssl )"
-
-DOCS="AUTHORS ChangeLog NEWS NOTES README THANKS"
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with ssl ssl $(usex gnutls "gnutls" "openssl")) \
-		$(use_with sasl libgsasl) \
-		$(use_with idn libidn) \
-		$(use_with libsecret )
-}
-
-src_install() {
-	default
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/vim/mpop.vim
-	fi
-}
diff --git a/net-mail/mpop/mpop-1.2.6.ebuild b/net-mail/mpop/mpop-1.2.6.ebuild
deleted file mode 100644
index 88d21a14ec47..000000000000
--- a/net-mail/mpop/mpop-1.2.6.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A small, fast, and portable POP3 client"
-HOMEPAGE="http://mpop.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gnutls idn libressl libsecret nls sasl ssl vim-syntax"
-
-RDEPEND="
-	idn? ( net-dns/libidn )
-	libsecret? ( app-crypt/libsecret )
-	nls? ( virtual/libintl )
-	sasl? ( virtual/gsasl )
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-REQUIRED_USE="gnutls? ( ssl )"
-
-DOCS="AUTHORS ChangeLog NEWS NOTES README THANKS"
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with ssl ssl $(usex gnutls "gnutls" "openssl")) \
-		$(use_with sasl libgsasl) \
-		$(use_with idn libidn) \
-		$(use_with libsecret )
-}
-
-src_install() {
-	default
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/vim/mpop.vim
-	fi
-}
diff --git a/net-mail/mpop/mpop-1.2.4.ebuild b/net-mail/mpop/mpop-1.4.1.ebuild
index 88d21a14ec47..04585c354521 100644
--- a/net-mail/mpop/mpop-1.2.4.ebuild
+++ b/net-mail/mpop/mpop-1.4.1.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="A small, fast, and portable POP3 client"
-HOMEPAGE="http://mpop.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+HOMEPAGE="https://marlam.de/mpop/"
+SRC_URI="https://marlam.de/mpop/releases/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gnutls idn libressl libsecret nls sasl ssl vim-syntax"
+IUSE="gnutls idn libressl gnome-keyring nls sasl ssl vim-syntax"
 
 RDEPEND="
-	idn? ( net-dns/libidn )
-	libsecret? ( app-crypt/libsecret )
+	idn? ( net-dns/libidn2 )
+	gnome-keyring? ( app-crypt/libsecret )
 	nls? ( virtual/libintl )
 	sasl? ( virtual/gsasl )
 	ssl? (
-		gnutls? ( net-libs/gnutls )
+		gnutls? ( net-libs/gnutls:0=[idn?] )
 		!gnutls? (
 			!libressl? ( dev-libs/openssl:0= )
 			libressl? ( dev-libs/libressl:0= )
@@ -38,7 +38,7 @@ src_configure() {
 		$(use_with ssl ssl $(usex gnutls "gnutls" "openssl")) \
 		$(use_with sasl libgsasl) \
 		$(use_with idn libidn) \
-		$(use_with libsecret )
+		$(use_with gnome-keyring libsecret)
 }
 
 src_install() {