gentoo resync : 09.06.2018

18 files changed, 36 insertions, 150 deletions

diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 9e132c14046d..be8de3029f29 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-mail/email-2.5.0 b/metadata/md5-cache/net-mail/email-2.5.0
deleted file mode 100644
index d5ccecf05c17..000000000000
--- a/metadata/md5-cache/net-mail/email-2.5.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst
-DESCRIPTION=Advanced CLI tool for sending email
-EAPI=0
-HOMEPAGE=http://email.cleancode.org
-KEYWORDS=alpha amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://email.cleancode.org/download/email-2.5.0.tar.bz2
-_md5_=18590f04a64060727315a98e8a3a70ab
diff --git a/metadata/md5-cache/net-mail/email-3.0.5 b/metadata/md5-cache/net-mail/email-3.0.5
deleted file mode 100644
index f5e4865df35f..000000000000
--- a/metadata/md5-cache/net-mail/email-3.0.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst setup
-DESCRIPTION=Advanced CLI tool for sending email
-EAPI=0
-HOMEPAGE=http://www.cleancode.org/projects/email
-KEYWORDS=~alpha ~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.cleancode.org/downloads/email/email-3.0.5.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=16b0d8d91a1c575e561e473079926c15
diff --git a/metadata/md5-cache/net-mail/email-3.1.2 b/metadata/md5-cache/net-mail/email-3.1.2
deleted file mode 100644
index 0031182c0e1f..000000000000
--- a/metadata/md5-cache/net-mail/email-3.1.2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst
-DESCRIPTION=Advanced CLI tool for sending email
-EAPI=0
-HOMEPAGE=http://www.cleancode.org/projects/email
-KEYWORDS=~alpha ~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.cleancode.org/downloads/email/email-3.1.2.tar.bz2
-_md5_=b1cef6f57eadd961a56681626d1d0692
diff --git a/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0 b/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0
deleted file mode 100644
index 1b900189eda8..000000000000
--- a/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup unpack
-DEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) >=sys-apps/sed-4
-DESCRIPTION=Simple yet powerful mailing list manager for qmail
-EAPI=0
-HOMEPAGE=http://www.ezmlm.org
-IUSE=mysql postgres
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) virtual/qmail
-SLOT=0
-SRC_URI=http://www.ezmlm.org/archive/7.0.0/ezmlm-idx-7.0.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	0cddcd9f34297dbca4a09fbdafa7398a	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e4f1b503a773c5d71ddae958098d5139
diff --git a/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r1 b/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r1
deleted file mode 100644
index cb7d6f99e837..000000000000
--- a/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup unpack
-DEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) >=sys-apps/sed-4
-DESCRIPTION=Simple yet powerful mailing list manager for qmail
-EAPI=0
-HOMEPAGE=http://www.ezmlm.org
-IUSE=mysql postgres
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) virtual/qmail
-SLOT=0
-SRC_URI=http://www.ezmlm.org/archive/7.0.0/ezmlm-idx-7.0.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	0cddcd9f34297dbca4a09fbdafa7398a	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f2c552c98f4b06d60a8adae80244d26c
diff --git a/metadata/md5-cache/net-mail/getmail-5.4 b/metadata/md5-cache/net-mail/getmail-5.4
index abfb2784c8e4..956785050251 100644
--- a/metadata/md5-cache/net-mail/getmail-5.4
+++ b/metadata/md5-cache/net-mail/getmail-5.4
@@ -8,7 +8,7 @@ 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=4
+SLOT=0
 SRC_URI=http://pyropus.ca/software/getmail/old-versions/getmail-5.4.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dbef4a75ac4700e63f7245a75ffecce7
+_md5_=e69aa9c0d17a1fd1e6d6ae4ecc120ff2
diff --git a/metadata/md5-cache/net-mail/getmail-5.6 b/metadata/md5-cache/net-mail/getmail-5.6
new file mode 100644
index 000000000000..126cbd2089c0
--- /dev/null
+++ b/metadata/md5-cache/net-mail/getmail-5.6
@@ -0,0 +1,14 @@
+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 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
+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	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f626750aabf5e3a6d62a40175ecd12c9
diff --git a/metadata/md5-cache/net-mail/mailbase-1 b/metadata/md5-cache/net-mail/mailbase-1
deleted file mode 100644
index 97c233738331..000000000000
--- a/metadata/md5-cache/net-mail/mailbase-1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst setup
-DESCRIPTION=MTA layout package
-EAPI=0
-HOMEPAGE=https://www.gentoo.org/
-IUSE=pam
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=pam? ( virtual/pam )
-SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=63028bca7666cef408cbc788bef232d3
diff --git a/metadata/md5-cache/net-mail/mailbase-1.2 b/metadata/md5-cache/net-mail/mailbase-1.2
deleted file mode 100644
index 6da8f30454db..000000000000
--- a/metadata/md5-cache/net-mail/mailbase-1.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst setup
-DESCRIPTION=MTA layout package
-EAPI=0
-HOMEPAGE=https://www.gentoo.org/
-IUSE=pam
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=pam? ( virtual/pam )
-SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ac54addf8ecec3f356f9b7efe06b69d7
diff --git a/metadata/md5-cache/net-mail/poppassd_ceti-1.8.5-r1 b/metadata/md5-cache/net-mail/poppassd_ceti-1.8.5-r1
deleted file mode 100644
index 6347f4268e2c..000000000000
--- a/metadata/md5-cache/net-mail/poppassd_ceti-1.8.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=virtual/pam
-DESCRIPTION=Password change daemon with PAM support
-EAPI=0
-HOMEPAGE=http://echelon.pl/pubs/poppassd.html
-IUSE=cracklib
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=virtual/pam sys-apps/xinetd cracklib? ( sys-libs/cracklib )
-SLOT=0
-SRC_URI=http://echelon.pl/pubs/poppassd-1.8.5.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8a162117aee815814c94ba821ee59574
diff --git a/metadata/md5-cache/net-mail/qmailadmin-1.2.10 b/metadata/md5-cache/net-mail/qmailadmin-1.2.10
deleted file mode 100644
index e9f59e503234..000000000000
--- a/metadata/md5-cache/net-mail/qmailadmin-1.2.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=virtual/qmail >=net-mail/vpopmail-5.3 net-mail/autorespond maildrop? ( >=mail-filter/maildrop-2.0.1 )
-DESCRIPTION=A web interface for managing a qmail system with virtual domains
-EAPI=0
-HOMEPAGE=http://www.inter7.com/qmailadmin.html
-IUSE=maildrop
-KEYWORDS=amd64 arm ~hppa ppc s390 sh sparc x86
-LICENSE=GPL-2
-RDEPEND=virtual/qmail >=net-mail/vpopmail-5.3 net-mail/autorespond maildrop? ( >=mail-filter/maildrop-2.0.1 )
-RESTRICT=userpriv
-SLOT=0
-SRC_URI=mirror://sourceforge/qmailadmin/qmailadmin-1.2.10.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=78477b83bd8c01e613b601365a548175
diff --git a/metadata/md5-cache/net-mail/qmailadmin-1.2.12 b/metadata/md5-cache/net-mail/qmailadmin-1.2.12
deleted file mode 100644
index 5777274dd9cf..000000000000
--- a/metadata/md5-cache/net-mail/qmailadmin-1.2.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prerm setup unpack
-DEPEND=virtual/qmail >=net-mail/vpopmail-5.3 net-mail/autorespond maildrop? ( >=mail-filter/maildrop-2.0.1 ) >=sys-apps/sed-4 >=app-admin/webapp-config-1.50.15
-DESCRIPTION=A web interface for managing a qmail system with virtual domains
-EAPI=0
-HOMEPAGE=http://www.inter7.com/qmailadmin.html
-IUSE=maildrop vhosts
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/qmail >=net-mail/vpopmail-5.3 net-mail/autorespond maildrop? ( >=mail-filter/maildrop-2.0.1 ) >=app-admin/webapp-config-1.50.15
-RESTRICT=userpriv
-SLOT=0
-SRC_URI=mirror://sourceforge/qmailadmin/qmailadmin-1.2.12.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	0cddcd9f34297dbca4a09fbdafa7398a	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	6ae2395d7f341093c36057cb4f69101a
-_md5_=54cb5de708160b65bb5ae4910aff724a
diff --git a/metadata/md5-cache/net-mail/qmailadmin-1.2.15 b/metadata/md5-cache/net-mail/qmailadmin-1.2.15
deleted file mode 100644
index 3d15143c5def..000000000000
--- a/metadata/md5-cache/net-mail/qmailadmin-1.2.15
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prerm setup unpack
-DEPEND=virtual/qmail >=net-mail/vpopmail-5.3 net-mail/autorespond maildrop? ( >=mail-filter/maildrop-2.0.1 ) >=sys-apps/sed-4 >=app-admin/webapp-config-1.50.15 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1 >=sys-devel/automake-1.15.1 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A web interface for managing a qmail system with virtual domains
-EAPI=0
-HOMEPAGE=http://www.inter7.com/qmailadmin.html
-IUSE=maildrop vhosts
-KEYWORDS=amd64 arm ~hppa ppc s390 sh sparc x86
-LICENSE=GPL-2
-RDEPEND=virtual/qmail >=net-mail/vpopmail-5.3 net-mail/autorespond maildrop? ( >=mail-filter/maildrop-2.0.1 ) >=app-admin/webapp-config-1.50.15
-RESTRICT=userpriv
-SLOT=0
-SRC_URI=mirror://sourceforge/qmailadmin/qmailadmin-1.2.15.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	0cddcd9f34297dbca4a09fbdafa7398a	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	6ae2395d7f341093c36057cb4f69101a
-_md5_=9158232fdd6059a25a8cf1494bf01bd7
diff --git a/metadata/md5-cache/net-mail/qmhandle-1.2.0-r1 b/metadata/md5-cache/net-mail/qmhandle-1.2.0-r1
deleted file mode 100644
index e64575a39ec5..000000000000
--- a/metadata/md5-cache/net-mail/qmhandle-1.2.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Qmail message queue tool
-EAPI=0
-HOMEPAGE=http://qmhandle.sourceforge.net/
-KEYWORDS=alpha amd64 arm hppa ia64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=virtual/qmail dev-lang/perl sys-process/psmisc
-SLOT=0
-SRC_URI=mirror://sourceforge/qmhandle/qmhandle-1.2.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=129cb6e0f4a20c89df168967ca57bdc5
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.33 b/metadata/md5-cache/net-mail/vpopmail-5.4.33
index 80f029e1550b..a3d31b41ca8b 100644
--- a/metadata/md5-cache/net-mail/vpopmail-5.4.33
+++ b/metadata/md5-cache/net-mail/vpopmail-5.4.33
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup
 DEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) spamassassin? ( mail-filter/spamassassin ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 >=sys-apps/sed-4
-DESCRIPTION=A collection of programs to manage virtual email domains and accounts on your Qmail mail servers
+DESCRIPTION=Collection of programs to manage virtual email on Qmail servers
 EAPI=4
 HOMEPAGE=http://www.inter7.com/index.php?page=vpopmail
 IUSE=clearpasswd ipalias maildrop mysql spamassassin
@@ -10,4 +10,4 @@ RDEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql
 SLOT=0
 SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.33.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	0cddcd9f34297dbca4a09fbdafa7398a	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=54ff53813fc61a0c8186f66fae1f347d
+_md5_=ea8118dba1c9975ce89af3d23ca3abae
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r1 b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r1
index 53a6199223be..c869e2b1f2ce 100644
--- a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r1
+++ b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql[server] ) spamassassin? ( mail-filter/spamassassin ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 >=sys-apps/sed-4
-DESCRIPTION=A collection of programs to manage virtual email domains and accounts on your Qmail mail servers
+DEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:=[server] ) spamassassin? ( mail-filter/spamassassin ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 >=sys-apps/sed-4
+DESCRIPTION=Collection of programs to manage virtual email on Qmail servers
 EAPI=5
 HOMEPAGE=http://www.inter7.com/index.php?page=vpopmail
 IUSE=clearpasswd ipalias maildrop mysql postgres spamassassin
 KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql[server] ) spamassassin? ( mail-filter/spamassassin )
+RDEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:=[server] ) spamassassin? ( mail-filter/spamassassin )
 REQUIRED_USE=mysql? ( !postgres )
 SLOT=0
 SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.33.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	0cddcd9f34297dbca4a09fbdafa7398a	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7159b4c06d8d78b03efbbfe70a48ac41
+_md5_=2a1b6e5ee036004f9366761a20a219e1
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r2 b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r2
new file mode 100644
index 000000000000..433868da85c9
--- /dev/null
+++ b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm prepare setup
+DEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c[mysqlcompat] ) ) postgres? ( dev-db/postgresql:=[server] ) spamassassin? ( mail-filter/spamassassin ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 >=sys-apps/sed-4
+DESCRIPTION=Collection of programs to manage virtual email on Qmail servers
+EAPI=6
+HOMEPAGE=http://www.inter7.com/index.php?page=vpopmail
+IUSE=clearpasswd ipalias maildrop mysql postgres spamassassin
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c[mysqlcompat] ) ) postgres? ( dev-db/postgresql:=[server] ) spamassassin? ( mail-filter/spamassassin )
+REQUIRED_USE=mysql? ( !postgres )
+SLOT=0
+SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.33.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	0cddcd9f34297dbca4a09fbdafa7398a	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=42b6c1db336288a09afa11a726ba29e6