summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/net-mail
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/md5-cache/net-mail')
-rw-r--r--metadata/md5-cache/net-mail/checkpassword-0.90-r22
-rw-r--r--metadata/md5-cache/net-mail/checkpassword-0.90-r34
-rw-r--r--metadata/md5-cache/net-mail/cyrus-imapd-3.0.10-r12
-rw-r--r--metadata/md5-cache/net-mail/cyrus-imapd-3.0.112
-rw-r--r--metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r34
-rw-r--r--metadata/md5-cache/net-mail/getmail-5.134
-rw-r--r--metadata/md5-cache/net-mail/getmail-5.14 (renamed from metadata/md5-cache/net-mail/getmail-5.6)12
-rw-r--r--metadata/md5-cache/net-mail/mailbase-1.12
-rw-r--r--metadata/md5-cache/net-mail/mailbase-1.32
-rw-r--r--metadata/md5-cache/net-mail/mailbase-1.42
-rw-r--r--metadata/md5-cache/net-mail/mailbase-1.52
-rw-r--r--metadata/md5-cache/net-mail/mailbase-1.5-r12
-rw-r--r--metadata/md5-cache/net-mail/mailutils-3.4-r32
-rw-r--r--metadata/md5-cache/net-mail/mailutils-3.72
-rw-r--r--metadata/md5-cache/net-mail/notmuch-0.28.42
-rw-r--r--metadata/md5-cache/net-mail/notmuch-0.29.14
-rw-r--r--metadata/md5-cache/net-mail/notmuch-0.29.1-r14
-rw-r--r--metadata/md5-cache/net-mail/poppassd_ceti-1.8.5-r22
-rw-r--r--metadata/md5-cache/net-mail/qmailadmin-1.2.15-r14
-rw-r--r--metadata/md5-cache/net-mail/qmailadmin-1.2.164
-rw-r--r--metadata/md5-cache/net-mail/t-prot-3.48
-rw-r--r--metadata/md5-cache/net-mail/tnef-1.4.1711
-rw-r--r--metadata/md5-cache/net-mail/tpop3d-1.5.52
-rw-r--r--metadata/md5-cache/net-mail/tpop3d-1.5.5-r12
-rw-r--r--metadata/md5-cache/net-mail/vchkuser-0.44
-rw-r--r--metadata/md5-cache/net-mail/vpopmail-5.4.339
-rw-r--r--metadata/md5-cache/net-mail/vpopmail-5.4.33-r39
-rw-r--r--metadata/md5-cache/net-mail/vpopmail-5.4.33-r415
-rw-r--r--metadata/md5-cache/net-mail/vqadmin-2.3.74
29 files changed, 98 insertions, 30 deletions
diff --git a/metadata/md5-cache/net-mail/checkpassword-0.90-r2 b/metadata/md5-cache/net-mail/checkpassword-0.90-r2
index 4b79cc560c7d..0a5076feb8e5 100644
--- a/metadata/md5-cache/net-mail/checkpassword-0.90-r2
+++ b/metadata/md5-cache/net-mail/checkpassword-0.90-r2
@@ -8,5 +8,5 @@ LICENSE=all-rights-reserved
RESTRICT=mirror bindist
SLOT=0
SRC_URI=http://cr.yp.to/checkpwd/checkpassword-0.90.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=31480e169dc957c0e1db5aeff6311c12
diff --git a/metadata/md5-cache/net-mail/checkpassword-0.90-r3 b/metadata/md5-cache/net-mail/checkpassword-0.90-r3
index a98c7e3ba8ca..f8bf850762f0 100644
--- a/metadata/md5-cache/net-mail/checkpassword-0.90-r3
+++ b/metadata/md5-cache/net-mail/checkpassword-0.90-r3
@@ -9,5 +9,9 @@ LICENSE=all-rights-reserved
RESTRICT=mirror bindist
SLOT=0
SRC_URI=http://cr.yp.to/checkpwd/checkpassword-0.90.tar.gz
+<<<<<<< HEAD
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+=======
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+>>>>>>> next
_md5_=75110290a143f36f1ff2afa7f9dd0931
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.10-r1 b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.10-r1
index bfb1d6172395..338f60000512 100644
--- a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.10-r1
+++ b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.10-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib:0= dev-libs/libpcre:3 >=dev-libs/cyrus-sasl-2.1.13:2 dev-l
REQUIRED_USE=afs? ( kerberos ) backup? ( sqlite ) calalarm? ( http ) http? ( sqlite )
SLOT=0
SRC_URI=https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.0.10/cyrus-imapd-3.0.10.tar.gz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 preserve-libs ef207dc62baddfddfd39a164d9797648 ssl-cert 876f0e74ef1cc2e7c4edd9bca336d350 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 preserve-libs ef207dc62baddfddfd39a164d9797648 ssl-cert 876f0e74ef1cc2e7c4edd9bca336d350 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=ca437d57039d2a441d676c426d198609
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.11 b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.11
index 48c38b01ae01..f78045a85fc1 100644
--- a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.11
+++ b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.11
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib:0= dev-libs/libpcre:3 >=dev-libs/cyrus-sasl-2.1.13:2 dev-l
REQUIRED_USE=afs? ( kerberos ) backup? ( sqlite ) calalarm? ( http ) http? ( sqlite )
SLOT=0
SRC_URI=https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.0.11/cyrus-imapd-3.0.11.tar.gz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 preserve-libs ef207dc62baddfddfd39a164d9797648 ssl-cert 876f0e74ef1cc2e7c4edd9bca336d350 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 preserve-libs ef207dc62baddfddfd39a164d9797648 ssl-cert 876f0e74ef1cc2e7c4edd9bca336d350 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=686524ac8a3a5d8ac71800b2c2e214a4
diff --git a/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r3 b/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r3
index 36d2138fb81b..482aa744b134 100644
--- a/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r3
+++ b/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r3
@@ -10,5 +10,9 @@ RDEPEND=mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql ) v
REQUIRED_USE=?? ( mysql postgres )
SLOT=0
SRC_URI=http://www.ezmlm.org/archive/7.0.0/ezmlm-idx-7.0.0.tar.gz
+<<<<<<< HEAD
_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6
+=======
+_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6
+>>>>>>> next
_md5_=cad3612a19b8b193c5372eb773c33216
diff --git a/metadata/md5-cache/net-mail/getmail-5.13 b/metadata/md5-cache/net-mail/getmail-5.13
index c731b0ee4901..9eb0b86689d6 100644
--- a/metadata/md5-cache/net-mail/getmail-5.13
+++ b/metadata/md5-cache/net-mail/getmail-5.13
@@ -4,11 +4,11 @@ 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.13.tar.gz
_eclasses_=distutils-r1 9838160d624a44b2d56d1266a69fd473 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=b5ba49f9e106b0888ea624a1d55f7989
+_md5_=2a83e08a004ce0aadc4c77cf14cd22da
diff --git a/metadata/md5-cache/net-mail/getmail-5.6 b/metadata/md5-cache/net-mail/getmail-5.14
index e751de0d3a48..309f0761f9dd 100644
--- a/metadata/md5-cache/net-mail/getmail-5.6
+++ b/metadata/md5-cache/net-mail/getmail-5.14
@@ -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 mail retriever with reliable Maildir and mbox delivery
-EAPI=6
+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.6.tar.gz
-_eclasses_=distutils-r1 9838160d624a44b2d56d1266a69fd473 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=3e2020c78ac68c10e09c4add1cef12d0
+SRC_URI=http://pyropus.ca/software/getmail/old-versions/getmail-5.14.tar.gz
+_eclasses_=distutils-r1 9838160d624a44b2d56d1266a69fd473 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
+_md5_=b5ba49f9e106b0888ea624a1d55f7989
diff --git a/metadata/md5-cache/net-mail/mailbase-1.1 b/metadata/md5-cache/net-mail/mailbase-1.1
index 2c6118c37a11..4bba99902c14 100644
--- a/metadata/md5-cache/net-mail/mailbase-1.1
+++ b/metadata/md5-cache/net-mail/mailbase-1.1
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86
LICENSE=GPL-2
RDEPEND=pam? ( virtual/pam )
SLOT=0
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=a77a051178712694679987da552aaa4f
diff --git a/metadata/md5-cache/net-mail/mailbase-1.3 b/metadata/md5-cache/net-mail/mailbase-1.3
index 7257964485fb..a42eb9f670f6 100644
--- a/metadata/md5-cache/net-mail/mailbase-1.3
+++ b/metadata/md5-cache/net-mail/mailbase-1.3
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
LICENSE=GPL-2
RDEPEND=pam? ( virtual/pam )
SLOT=0
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=d99820722aad83c2714ee4b9b09e3ae3
diff --git a/metadata/md5-cache/net-mail/mailbase-1.4 b/metadata/md5-cache/net-mail/mailbase-1.4
index ddb72163b912..1aab0c45065a 100644
--- a/metadata/md5-cache/net-mail/mailbase-1.4
+++ b/metadata/md5-cache/net-mail/mailbase-1.4
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
LICENSE=GPL-2
RDEPEND=pam? ( virtual/pam )
SLOT=0
-_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6
_md5_=0052f0dfd9a85c59f90ec8167b43c608
diff --git a/metadata/md5-cache/net-mail/mailbase-1.5 b/metadata/md5-cache/net-mail/mailbase-1.5
index 842e50127a2b..28b4dafc4fa0 100644
--- a/metadata/md5-cache/net-mail/mailbase-1.5
+++ b/metadata/md5-cache/net-mail/mailbase-1.5
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
LICENSE=GPL-2
RDEPEND=pam? ( virtual/pam )
SLOT=0
-_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6
_md5_=d4dd89bf7076a3abbb375060bf953d6f
diff --git a/metadata/md5-cache/net-mail/mailbase-1.5-r1 b/metadata/md5-cache/net-mail/mailbase-1.5-r1
index 12fed612e3d6..cc223d65ca42 100644
--- a/metadata/md5-cache/net-mail/mailbase-1.5-r1
+++ b/metadata/md5-cache/net-mail/mailbase-1.5-r1
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
LICENSE=GPL-2
RDEPEND=acct-group/mail acct-user/mail acct-user/postmaster pam? ( virtual/pam )
SLOT=0
-_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
_md5_=21bb5366f91ef8b1ef04c7ba3947297d
diff --git a/metadata/md5-cache/net-mail/mailutils-3.4-r3 b/metadata/md5-cache/net-mail/mailutils-3.4-r3
index 99d1567f1895..df0ada0bdc9b 100644
--- a/metadata/md5-cache/net-mail/mailutils-3.4-r3
+++ b/metadata/md5-cache/net-mail/mailutils-3.4-r3
@@ -10,5 +10,5 @@ RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/n
REQUIRED_USE=python? ( python_targets_python2_7 ) servers? ( tcpd )
SLOT=0
SRC_URI=mirror://gnu/mailutils/mailutils-3.4.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=e40089284b68d146bc82375547356b5e
diff --git a/metadata/md5-cache/net-mail/mailutils-3.7 b/metadata/md5-cache/net-mail/mailutils-3.7
index a1dc8d1e1f0c..25d6cf076569 100644
--- a/metadata/md5-cache/net-mail/mailutils-3.7
+++ b/metadata/md5-cache/net-mail/mailutils-3.7
@@ -11,5 +11,5 @@ RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/n
REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) servers? ( tcpd ldap )
SLOT=0
SRC_URI=mirror://gnu/mailutils/mailutils-3.7.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 elisp-common 23f47b2e1de7abf387105eddd1318738 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 elisp-common 23f47b2e1de7abf387105eddd1318738 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
_md5_=ebcc34dfed458c8d468477ef55908e5b
diff --git a/metadata/md5-cache/net-mail/notmuch-0.28.4 b/metadata/md5-cache/net-mail/notmuch-0.28.4
index 034566b93d9c..c7513121ca21 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.28.4
+++ b/metadata/md5-cache/net-mail/notmuch-0.28.4
@@ -10,5 +10,5 @@ RDEPEND=!!<app-shells/bash-completion-1.9 >=dev-libs/glib-2.22:2 >=dev-libs/gmim
REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ) test? ( crypt emacs python valgrind )
SLOT=0/5
SRC_URI=https://notmuchmail.org/releases/notmuch-0.28.4.tar.gz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 9838160d624a44b2d56d1266a69fd473 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 9838160d624a44b2d56d1266a69fd473 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=772e42d5d610cefb77aa4a5ad3e40262
diff --git a/metadata/md5-cache/net-mail/notmuch-0.29.1 b/metadata/md5-cache/net-mail/notmuch-0.29.1
index 9fac0cbc9f90..5fc1562f8dbb 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.29.1
+++ b/metadata/md5-cache/net-mail/notmuch-0.29.1
@@ -10,5 +10,9 @@ RDEPEND=!!<app-shells/bash-completion-1.9 >=dev-libs/glib-2.22:2 >=dev-libs/gmim
REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ) test? ( crypt emacs python valgrind )
SLOT=0/5
SRC_URI=https://notmuchmail.org/releases/notmuch-0.29.1.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
+<<<<<<< HEAD
_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 9838160d624a44b2d56d1266a69fd473 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+=======
+_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 9838160d624a44b2d56d1266a69fd473 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+>>>>>>> next
_md5_=11f60673e1ea080b1f5d44322c9f3a30
diff --git a/metadata/md5-cache/net-mail/notmuch-0.29.1-r1 b/metadata/md5-cache/net-mail/notmuch-0.29.1-r1
index 6cdb57bf13ce..5062443131df 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.29.1-r1
+++ b/metadata/md5-cache/net-mail/notmuch-0.29.1-r1
@@ -10,5 +10,9 @@ RDEPEND=!!<app-shells/bash-completion-1.9 >=dev-libs/glib-2.22:2 >=dev-libs/gmim
REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ) test? ( crypt emacs python valgrind )
SLOT=0/5
SRC_URI=https://notmuchmail.org/releases/notmuch-0.29.1.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
+<<<<<<< HEAD
_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 9838160d624a44b2d56d1266a69fd473 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+=======
+_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 9838160d624a44b2d56d1266a69fd473 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+>>>>>>> next
_md5_=1da850985a849e40e328366997c4022e
diff --git a/metadata/md5-cache/net-mail/poppassd_ceti-1.8.5-r2 b/metadata/md5-cache/net-mail/poppassd_ceti-1.8.5-r2
index 6ab890f8f563..556b0b000b8d 100644
--- a/metadata/md5-cache/net-mail/poppassd_ceti-1.8.5-r2
+++ b/metadata/md5-cache/net-mail/poppassd_ceti-1.8.5-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
RDEPEND=virtual/pam sys-apps/xinetd
SLOT=0
SRC_URI=http://echelon.pl/pubs/poppassd-1.8.5.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=5b3eb7e3e1137eca7350e3485531a19e
diff --git a/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r1 b/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r1
index 2b231906c97c..7bd469e2183a 100644
--- a/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r1
+++ b/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r1
@@ -10,5 +10,9 @@ RDEPEND=virtual/qmail >=net-mail/vpopmail-5.4.33 net-mail/autorespond maildrop?
RESTRICT=userpriv
SLOT=0
SRC_URI=mirror://sourceforge/qmailadmin/qmailadmin-1.2.15.tar.gz
+<<<<<<< HEAD
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf webapp 16783e418aca3ffa461d68310bf7ab12
+=======
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf webapp 16783e418aca3ffa461d68310bf7ab12
+>>>>>>> next
_md5_=81763d323f0c111df8eb5464811259c0
diff --git a/metadata/md5-cache/net-mail/qmailadmin-1.2.16 b/metadata/md5-cache/net-mail/qmailadmin-1.2.16
index c3966abcff51..56aa4a56abb5 100644
--- a/metadata/md5-cache/net-mail/qmailadmin-1.2.16
+++ b/metadata/md5-cache/net-mail/qmailadmin-1.2.16
@@ -10,5 +10,9 @@ RDEPEND=virtual/qmail >=net-mail/vpopmail-5.4.33 net-mail/autorespond maildrop?
RESTRICT=userpriv
SLOT=0
SRC_URI=mirror://sourceforge/qmailadmin/qmailadmin-1.2.16.tar.gz
+<<<<<<< HEAD
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf webapp 16783e418aca3ffa461d68310bf7ab12
+=======
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf webapp 16783e418aca3ffa461d68310bf7ab12
+>>>>>>> next
_md5_=218b74da7689af053b70d6af57784a5e
diff --git a/metadata/md5-cache/net-mail/t-prot-3.4 b/metadata/md5-cache/net-mail/t-prot-3.4
index 6329fe9205da..7c22dccc14bf 100644
--- a/metadata/md5-cache/net-mail/t-prot-3.4
+++ b/metadata/md5-cache/net-mail/t-prot-3.4
@@ -1,10 +1,10 @@
DEFINED_PHASES=install
DESCRIPTION=TOFU protection - display filter for RFC822 messages
-EAPI=5
-HOMEPAGE=http://www.escape.de/~tolot/mutt/
+EAPI=7
+HOMEPAGE=https://www.escape.de/~tolot/mutt/
KEYWORDS=amd64 ~ppc x86
LICENSE=BSD-4
RDEPEND=dev-lang/perl dev-perl/Locale-gettext virtual/perl-Getopt-Long
SLOT=0
-SRC_URI=http://www.escape.de/~tolot/mutt/t-prot/downloads/t-prot-3.4.tar.gz
-_md5_=309aed04955bec08459912d367e68732
+SRC_URI=https://www.escape.de/~tolot/mutt/t-prot/downloads/t-prot-3.4.tar.gz
+_md5_=735154f3c73447ee68889ed7ddc4894d
diff --git a/metadata/md5-cache/net-mail/tnef-1.4.17 b/metadata/md5-cache/net-mail/tnef-1.4.17
new file mode 100644
index 000000000000..562b8f00e950
--- /dev/null
+++ b/metadata/md5-cache/net-mail/tnef-1.4.17
@@ -0,0 +1,11 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<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
+DEFINED_PHASES=prepare test
+DESCRIPTION=Decodes MS-TNEF MIME attachments
+EAPI=7
+HOMEPAGE=https://github.com/verdammelt/tnef/
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/verdammelt/tnef/archive/1.4.17.tar.gz -> tnef-1.4.17.tar.gz
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
+_md5_=d596ea87fa7e9fc15ab507015aa45b9c
diff --git a/metadata/md5-cache/net-mail/tpop3d-1.5.5 b/metadata/md5-cache/net-mail/tpop3d-1.5.5
index 8680aa03d625..c55279257f9d 100644
--- a/metadata/md5-cache/net-mail/tpop3d-1.5.5
+++ b/metadata/md5-cache/net-mail/tpop3d-1.5.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
RDEPEND=sha1? ( >=dev-libs/openssl-0.9.6 ) ssl? ( >=dev-libs/openssl-0.9.6 ) ldap? ( >=net-nds/openldap-2.0.7 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql[server] ) perl? ( >=dev-lang/perl-5.6.1 ) pam? ( virtual/pam >=net-mail/mailbase-0.00-r8 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
SLOT=0
SRC_URI=mirror://nongnu/tpop3d/tpop3d-1.5.5.tar.gz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=ba5b3313d42a328ddd1a43cfe4672864
diff --git a/metadata/md5-cache/net-mail/tpop3d-1.5.5-r1 b/metadata/md5-cache/net-mail/tpop3d-1.5.5-r1
index bad42100cce7..da060fabfa6d 100644
--- a/metadata/md5-cache/net-mail/tpop3d-1.5.5-r1
+++ b/metadata/md5-cache/net-mail/tpop3d-1.5.5-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
RDEPEND=sha1? ( >=dev-libs/openssl-0.9.6:0= ) ssl? ( >=dev-libs/openssl-0.9.6:0= ) ldap? ( >=net-nds/openldap-2.0.7 ) mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql[server] ) perl? ( >=dev-lang/perl-5.6.1 ) pam? ( virtual/pam >=net-mail/mailbase-0.00-r8 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
SLOT=0
SRC_URI=mirror://nongnu/tpop3d/tpop3d-1.5.5.tar.gz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
_md5_=a9b7a450c9ab7937d6562124de6085cc
diff --git a/metadata/md5-cache/net-mail/vchkuser-0.4 b/metadata/md5-cache/net-mail/vchkuser-0.4
index 64c3c905a471..c264dac53e37 100644
--- a/metadata/md5-cache/net-mail/vchkuser-0.4
+++ b/metadata/md5-cache/net-mail/vchkuser-0.4
@@ -8,5 +8,9 @@ KEYWORDS=amd64 x86
LICENSE=BSD
SLOT=0
SRC_URI=https://github.com/hollow/vchkuser/tarball/v0.4 -> vchkuser-0.4.tar.gz
+<<<<<<< HEAD
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+=======
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+>>>>>>> next
_md5_=755014e3a95090323c2d540ce2e773d2
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.33 b/metadata/md5-cache/net-mail/vpopmail-5.4.33
index 3348c85787ac..374f6cc1e8af 100644
--- a/metadata/md5-cache/net-mail/vpopmail-5.4.33
+++ b/metadata/md5-cache/net-mail/vpopmail-5.4.33
@@ -1,13 +1,18 @@
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-20170815 !<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
+DEPEND=acct-group/vpopmail virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) spamassassin? ( mail-filter/spamassassin ) >=app-portage/elt-patches-20170815 !<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=4
HOMEPAGE=http://www.inter7.com/index.php?page=vpopmail
IUSE=clearpasswd ipalias maildrop mysql 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 ) spamassassin? ( mail-filter/spamassassin )
+RDEPEND=acct-group/vpopmail virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) spamassassin? ( mail-filter/spamassassin )
SLOT=0
SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.33.tar.gz
+<<<<<<< HEAD
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=ea8118dba1c9975ce89af3d23ca3abae
+=======
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b6004263e129d342e95b6f22594c8c64
+>>>>>>> next
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r3 b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r3
index be08fa54e766..893593d570e2 100644
--- a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r3
+++ b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r3
@@ -1,14 +1,19 @@
DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:=[server] ) spamassassin? ( mail-filter/spamassassin ) >=app-portage/elt-patches-20170815 !<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
+DEPEND=acct-group/vpopmail virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:=[server] ) spamassassin? ( mail-filter/spamassassin ) >=app-portage/elt-patches-20170815 !<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:0= ) postgres? ( dev-db/postgresql:=[server] ) spamassassin? ( mail-filter/spamassassin )
+RDEPEND=acct-group/vpopmail virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( dev-db/mysql-connector-c:0= ) 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
+<<<<<<< HEAD
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=07672be193e116630d1440ea617f9cba
+=======
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f92ec6f4e7ff1842a50f66d1c847dc14
+>>>>>>> next
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r4 b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r4
new file mode 100644
index 000000000000..c5913bcc9053
--- /dev/null
+++ b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r4
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<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
+DEFINED_PHASES=configure install postinst postrm prepare setup
+DEPEND=acct-group/vpopmail virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:=[server] ) spamassassin? ( mail-filter/spamassassin ) >=sys-apps/sed-4 >=sys-apps/sed-4
+DESCRIPTION=Collection of programs to manage virtual email on Qmail servers
+EAPI=7
+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=acct-group/vpopmail virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( dev-db/mysql-connector-c:0= ) 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 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6
+_md5_=f400c06e1ac76596e98a56cd39a5fcc5
diff --git a/metadata/md5-cache/net-mail/vqadmin-2.3.7 b/metadata/md5-cache/net-mail/vqadmin-2.3.7
index 1c871d0581f7..486328410042 100644
--- a/metadata/md5-cache/net-mail/vqadmin-2.3.7
+++ b/metadata/md5-cache/net-mail/vqadmin-2.3.7
@@ -9,5 +9,9 @@ LICENSE=GPL-2
RDEPEND=virtual/qmail >=net-mail/vpopmail-5.3 net-mail/qmailadmin >=app-admin/webapp-config-1.50.15
SLOT=0
SRC_URI=http://www.inter7.com/vqadmin/vqadmin-2.3.7.tar.gz
+<<<<<<< HEAD
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf webapp 16783e418aca3ffa461d68310bf7ab12
+=======
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf webapp 16783e418aca3ffa461d68310bf7ab12
+>>>>>>> next
_md5_=76f0e82f676f68a5e9e149589573dde6