2018-12-25 20:24:18 UTC

6 files changed, 22 insertions, 48 deletions

diff --git a/metadata/md5-cache/net-mail/getmail-5.6 b/metadata/md5-cache/net-mail/getmail-5.6
index 4f7e33573442..dd60909adfd3 100644
--- a/metadata/md5-cache/net-mail/getmail-5.6
+++ b/metadata/md5-cache/net-mail/getmail-5.6
@@ -4,11 +4,11 @@ DESCRIPTION=A mail retriever with reliable Maildir and mbox delivery
 EAPI=6
 HOMEPAGE=http://pyropus.ca/software/getmail/
 IUSE=ssl python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~x86 ~ppc-macos ~x86-macos ~x64-solaris
+KEYWORDS=amd64 ppc x86 ~ppc-macos ~x86-macos ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://pyropus.ca/software/getmail/old-versions/getmail-5.6.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f626750aabf5e3a6d62a40175ecd12c9
+_md5_=3e2020c78ac68c10e09c4add1cef12d0
diff --git a/metadata/md5-cache/net-mail/getmail-5.4 b/metadata/md5-cache/net-mail/getmail-5.8
index 89f36a798ca6..c1930e6410c4 100644
--- a/metadata/md5-cache/net-mail/getmail-5.4
+++ b/metadata/md5-cache/net-mail/getmail-5.8
@@ -1,14 +1,14 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A POP3 mail retriever with reliable Maildir and mbox delivery
-EAPI=6
+DESCRIPTION=A mail retriever with reliable Maildir and mbox delivery
+EAPI=7
 HOMEPAGE=http://pyropus.ca/software/getmail/
 IUSE=ssl python_targets_python2_7
-KEYWORDS=amd64 ppc x86 ~ppc-macos ~x86-macos ~x64-solaris
+KEYWORDS=~amd64 ~ppc ~x86 ~ppc-macos ~x86-macos ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=http://pyropus.ca/software/getmail/old-versions/getmail-5.4.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e69aa9c0d17a1fd1e6d6ae4ecc120ff2
+SRC_URI=http://pyropus.ca/software/getmail/old-versions/getmail-5.8.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=a872cf07882f4cea0d2451abaa119f21
diff --git a/metadata/md5-cache/net-mail/mpop-1.2.4 b/metadata/md5-cache/net-mail/mpop-1.2.4
deleted file mode 100644
index 7fce3f47b51d..000000000000
--- a/metadata/md5-cache/net-mail/mpop-1.2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=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= ) ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=A small, fast, and portable POP3 client
-EAPI=6
-HOMEPAGE=http://mpop.sourceforge.net/
-IUSE=gnutls idn libressl libsecret nls sasl ssl vim-syntax
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-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= ) ) )
-REQUIRED_USE=gnutls? ( ssl )
-SLOT=0
-SRC_URI=mirror://sourceforge/mpop/mpop-1.2.4.tar.xz
-_md5_=3a86788e86f83578d326cdbae12a8ac6
diff --git a/metadata/md5-cache/net-mail/mpop-1.2.5 b/metadata/md5-cache/net-mail/mpop-1.2.5
deleted file mode 100644
index 90cb24a4d7fd..000000000000
--- a/metadata/md5-cache/net-mail/mpop-1.2.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=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= ) ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=A small, fast, and portable POP3 client
-EAPI=6
-HOMEPAGE=http://mpop.sourceforge.net/
-IUSE=gnutls idn libressl libsecret nls sasl ssl vim-syntax
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-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= ) ) )
-REQUIRED_USE=gnutls? ( ssl )
-SLOT=0
-SRC_URI=mirror://sourceforge/mpop/mpop-1.2.5.tar.xz
-_md5_=3a86788e86f83578d326cdbae12a8ac6
diff --git a/metadata/md5-cache/net-mail/mpop-1.2.6 b/metadata/md5-cache/net-mail/mpop-1.2.6
deleted file mode 100644
index d1bf78599ba3..000000000000
--- a/metadata/md5-cache/net-mail/mpop-1.2.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=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= ) ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=A small, fast, and portable POP3 client
-EAPI=6
-HOMEPAGE=http://mpop.sourceforge.net/
-IUSE=gnutls idn libressl libsecret nls sasl ssl vim-syntax
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-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= ) ) )
-REQUIRED_USE=gnutls? ( ssl )
-SLOT=0
-SRC_URI=mirror://sourceforge/mpop/mpop-1.2.6.tar.xz
-_md5_=3a86788e86f83578d326cdbae12a8ac6
diff --git a/metadata/md5-cache/net-mail/mpop-1.4.1 b/metadata/md5-cache/net-mail/mpop-1.4.1
new file mode 100644
index 000000000000..99bb00fc10b2
--- /dev/null
+++ b/metadata/md5-cache/net-mail/mpop-1.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=idn? ( net-dns/libidn2 ) gnome-keyring? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( gnutls? ( net-libs/gnutls:0=[idn?] ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DESCRIPTION=A small, fast, and portable POP3 client
+EAPI=7
+HOMEPAGE=https://marlam.de/mpop/
+IUSE=gnutls idn libressl gnome-keyring nls sasl ssl vim-syntax
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3
+RDEPEND=idn? ( net-dns/libidn2 ) gnome-keyring? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( gnutls? ( net-libs/gnutls:0=[idn?] ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
+REQUIRED_USE=gnutls? ( ssl )
+SLOT=0
+SRC_URI=https://marlam.de/mpop/releases/mpop-1.4.1.tar.xz
+_md5_=205f8baaedb5c6bd7323c7582b5e04a9