gentoo resync : 17.10.2017

12 files changed, 43 insertions, 27 deletions

diff --git a/metadata/md5-cache/app-admin/ansible-2.4.0.0 b/metadata/md5-cache/app-admin/ansible-2.4.0.0
index 38ca0aed046d..123d9d20edf2 100644
--- a/metadata/md5-cache/app-admin/ansible-2.4.0.0
+++ b/metadata/md5-cache/app-admin/ansible-2.4.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=Model-driven deployment, config management, and command execution fr
 EAPI=6
 HOMEPAGE=http://ansible.com/
 IUSE=test python_targets_python2_7 python_targets_python3_5
-KEYWORDS=~amd64 ~x86 ~x64-macos
+KEYWORDS=amd64 x86 ~x64-macos
 LICENSE=GPL-3
 RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://releases.ansible.com/ansible/ansible-2.4.0.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1bc1c531c356573029e91c17dc5d0f35
+_md5_=fdd716f6a77d0ce56f3ec6472611125f
diff --git a/metadata/md5-cache/app-admin/apache-tools-2.2.34 b/metadata/md5-cache/app-admin/apache-tools-2.2.34
index 8194feda8535..3ecdf1568ed5 100644
--- a/metadata/md5-cache/app-admin/apache-tools-2.2.34
+++ b/metadata/md5-cache/app-admin/apache-tools-2.2.34
@@ -4,11 +4,11 @@ DESCRIPTION=Useful Apache tools - htdigest, htpasswd, ab, htdbm
 EAPI=6
 HOMEPAGE=https://httpd.apache.org/
 IUSE=ssl
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=Apache-2.0
 RDEPEND==dev-libs/apr-1* =dev-libs/apr-util-1* dev-libs/expat dev-libs/libpcre kernel_linux? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl:0= ) !<www-servers/apache-2.2.4
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/httpd/httpd-2.2.34.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=a325b145e10272065a58d90636e74742
+_md5_=2f44a495372d80f054cc131abba34686
diff --git a/metadata/md5-cache/app-admin/calamares-3.1.4 b/metadata/md5-cache/app-admin/calamares-3.1.6
index 3dabcda3c716..3a551f81c539 100644
--- a/metadata/md5-cache/app-admin/calamares-3.1.4
+++ b/metadata/md5-cache/app-admin/calamares-3.1.6
@@ -9,6 +9,6 @@ LICENSE=GPL-3
 RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 >=dev-cpp/yaml-cpp-0.5.1 >=dev-libs/boost-1.55:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5(+)] >=sys-libs/kpmcore-3.0.3:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) app-admin/sudo dev-libs/libatasmart net-misc/rsync >=sys-block/parted-3.0 || ( sys-boot/grub:2 sys-boot/systemd-boot ) sys-boot/os-prober sys-fs/squashfs-tools virtual/udev networkmanager? ( net-misc/networkmanager ) upower? ( sys-power/upower ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=5
-SRC_URI=https://github.com/calamares/calamares/releases/download/v3.1.4/calamares-3.1.4.tar.gz
+SRC_URI=https://github.com/calamares/calamares/releases/download/v3.1.6/calamares-3.1.6.tar.gz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=09755be37c7d731dc077c18ea8c72928
diff --git a/metadata/md5-cache/app-admin/clog-1.1.0 b/metadata/md5-cache/app-admin/clog-1.1.0
index a6d298b384dc..86a5f518935b 100644
--- a/metadata/md5-cache/app-admin/clog-1.1.0
+++ b/metadata/md5-cache/app-admin/clog-1.1.0
@@ -8,4 +8,4 @@ LICENSE=MIT
 SLOT=0
 SRC_URI=http://taskwarrior.org/download/clog-1.1.0.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=cdbe72bf97babb299f93b6afbf27bb2d
+_md5_=5d2e1f67eeb9be5a36f87c911cd17102
diff --git a/metadata/md5-cache/app-admin/conky-1.10.6-r2 b/metadata/md5-cache/app-admin/conky-1.10.6-r2
index c43a9ade0ef6..74002d6a3b51 100644
--- a/metadata/md5-cache/app-admin/conky-1.10.6-r2
+++ b/metadata/md5-cache/app-admin/conky-1.10.6-r2
@@ -10,4 +10,4 @@ RDEPEND=X? ( imlib? ( media-libs/imlib2[X] ) lua-cairo? ( >=dev-lua/toluapp-1.0.
 SLOT=0
 SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.10.6.tar.gz -> conky-1.10.6.tar.gz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=ff081b8da129ea1b5d1e59eb1bc0d399
+_md5_=3b2d237e9715362bbbf6856c4dd90b0b
diff --git a/metadata/md5-cache/app-admin/dxf-6.0.0 b/metadata/md5-cache/app-admin/dxf-6.0.0
new file mode 100644
index 000000000000..b1a1420f8721
--- /dev/null
+++ b/metadata/md5-cache/app-admin/dxf-6.0.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Docker registry v2 client in Python
+EAPI=6
+HOMEPAGE=https://github.com/davedoesdev/dxf
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/jwcrypto-0.4.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tqdm-4.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/www-authenticate-0.9.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/p/python-dxf/python-dxf-6.0.0.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7c8a47c6dee2d0d0423accf722a6c4c8
diff --git a/metadata/md5-cache/app-admin/dxf-6.1.0 b/metadata/md5-cache/app-admin/dxf-6.1.0
new file mode 100644
index 000000000000..2a30841a682a
--- /dev/null
+++ b/metadata/md5-cache/app-admin/dxf-6.1.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Docker registry v2 client in Python
+EAPI=6
+HOMEPAGE=https://github.com/davedoesdev/dxf
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/jwcrypto-0.4.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tqdm-4.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/www-authenticate-0.9.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/davedoesdev/dxf/archive/v6.1.0.tar.gz -> dxf-6.1.0.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4251ba489a3b2dc17002705967e3e0ed
diff --git a/metadata/md5-cache/app-admin/filebeat-5.6.2 b/metadata/md5-cache/app-admin/filebeat-5.6.3
index 8f2212de909b..c2fff3665fd6 100644
--- a/metadata/md5-cache/app-admin/filebeat-5.6.2
+++ b/metadata/md5-cache/app-admin/filebeat-5.6.3
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=!app-admin/filebeat-bin
 SLOT=0
-SRC_URI=https://github.com/elastic/beats/archive/v5.6.2.tar.gz -> filebeat-5.6.2.tar.gz
+SRC_URI=https://github.com/elastic/beats/archive/v5.6.3.tar.gz -> filebeat-5.6.3.tar.gz
 _md5_=53a9995d19c7cf1ce192a1b4765a28dd
diff --git a/metadata/md5-cache/app-admin/monit-5.23.0 b/metadata/md5-cache/app-admin/monit-5.23.0
index 510965751252..5651591a9a1d 100644
--- a/metadata/md5-cache/app-admin/monit-5.23.0
+++ b/metadata/md5-cache/app-admin/monit-5.23.0
@@ -4,10 +4,10 @@ DESCRIPTION=Monitoring and managing daemons or similar programs running on a Uni
 EAPI=6
 HOMEPAGE=http://mmonit.com/monit/
 IUSE=libressl pam ssl
-KEYWORDS=~amd64 ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ppc ~ppc64 x86 ~amd64-linux
 LICENSE=AGPL-3
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=http://mmonit.com/monit/dist/monit-5.23.0.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=16b2cc88e938f2dda031ad1026e10c11
+_md5_=d20955625c92b5a31da9e2301baf9573
diff --git a/metadata/md5-cache/app-admin/passwordsafe-1.02.1_beta b/metadata/md5-cache/app-admin/passwordsafe-1.02.1_beta
index 02b1b86a049e..47bd5e0653c1 100644
--- a/metadata/md5-cache/app-admin/passwordsafe-1.02.1_beta
+++ b/metadata/md5-cache/app-admin/passwordsafe-1.02.1_beta
@@ -10,4 +10,4 @@ RDEPEND=xml? ( dev-libs/xerces-c ) sys-apps/util-linux x11-libs/libXt x11-libs/l
 SLOT=0
 SRC_URI=https://github.com/pwsafe/pwsafe/archive/1.02.1BETA.tar.gz -> passwordsafe-1.02.1_beta.tar.gz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=f6c37fc45b9d86303055d23a6d0cf900
+_md5_=bb06154c5ba44ff011ce5b0893662dc8
diff --git a/metadata/md5-cache/app-admin/prom2json-0.1.0_p20170523 b/metadata/md5-cache/app-admin/prom2json-0.1.0_p20170523
index e9506f818108..f488869c6b3d 100644
--- a/metadata/md5-cache/app-admin/prom2json-0.1.0_p20170523
+++ b/metadata/md5-cache/app-admin/prom2json-0.1.0_p20170523
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare test unpack
 DEPEND=dev-util/promu >=dev-lang/go-1.8
 DESCRIPTION=A tool to scrape a Prometheus client and dump the result as JSON
 EAPI=6
-HOMEPAGE=https://github.com/prometheus/node_exporter
+HOMEPAGE=https://github.com/prometheus/prom2json
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/prometheus/prom2json/archive/4a7436442837da72f9e211d99f0145dff3246b66.tar.gz -> prom2json-0.1.0_p20170523.tar.gz
 _eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=6bfc4b2774437f48f55c1586ebf9ef3b
+_md5_=699f93213d211f4afbfd735d1264a53d
diff --git a/metadata/md5-cache/app-admin/sudo-1.8.21_p1 b/metadata/md5-cache/app-admin/sudo-1.8.21_p1
deleted file mode 100644
index 12496a4a48bf..000000000000
--- a/metadata/md5-cache/app-admin/sudo-1.8.21_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib sys-devel/bison >=app-portage/elt-patches-20170422
-DESCRIPTION=Allows users or groups to run commands as other users
-EAPI=6
-HOMEPAGE=http://www.sudo.ws/
-IUSE=gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris
-LICENSE=ISC BSD
-RDEPEND=gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib selinux? ( sec-policy/selinux-sudo ) ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) >=app-misc/editor-wrapper-3 virtual/editor sendmail? ( virtual/mta )
-REQUIRED_USE=pam? ( !skey ) skey? ( !pam ) ?? ( gcrypt openssl )
-SLOT=0
-SRC_URI=http://www.sudo.ws/sudo/dist/sudo-1.8.21p1.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.21p1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=5a2af540b3c73a1aee4884662c4f795c