gentoo resync : 04.12.2017

638 files changed, 3557 insertions, 6163 deletions

diff --git a/Manifest b/Manifest
index 002ebbc17033..2a2c5f7d8910 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 28836 BLAKE2B dbaa7209035381c08f2e94a1d19281502d6cdb6a4a0f97b737dce6b3abba1fdc399ac5d62fd110f4d5f2a84a7af3eb70e246f0656e557a0ae7ca66014d3c6932 SHA512 5e88f873afa946e2589c940acf4aad7497fce204f9350cea90d76cef3cc32b6f6ac95d6275a58941d85c8875bce3dfc9db3e22b0f36d4f385daa4096a8ee0ebe
-TIMESTAMP 2017-12-03T15:08:45Z
+MANIFEST Manifest.files.gz 28847 BLAKE2B ffe2ba4db60fce9a16f299be900ed1f6306de1cf882ebf3daeb0fb83917f2d03d883dc2c41b20ff422ed8697184b72b1cc414a46f03bfa86fccd96e196f891e4 SHA512 f24d6c3293539cb0c1a3f359e740c234e3833322cadc24b4abf468ac693aeb745999f739c725d553721cf30ae9e0df736c655fe9468664de09d00fae3ce4e38f
+TIMESTAMP 2017-12-04T11:08:48Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlokE31fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlolLMBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDBBhAAkLXUP5NeguiKVBKW0NCcPHfcYdWdQjGfv5XQCyxGUSGD8EoiDGxydYey
-f4Zw/i2DKi3v2WSBoVBuEsr3Y7JuZymzkLiy19r67a5WZa1BWIHImd525B6RPr/t
-Re97+Q6MkWxfkMFMpvFxgxc05VkinClRrELmMIhdZfk8ueA0jpilJ/FKJOCwtU7P
-XYgRPoesCFtSk0MARW/mD6uAFQa0lWkk99KFjGCg5Jcclk2XZRbD6iGQBMI5/DJL
-EkcD/YrvvYAgrnRQiryWjR97FEET1ItQTfW9UbK+DBoPCj/AF1s6XzRmv5CVG7ih
-6KNJQKfcoeVBNtOPR/9LRDF09lOr46++lQ+abWTdwi6Jnu/9M4t4ZtJ+/xnxhAGf
-TpDz9HrvB95UicVIUO/38Ac6uQEQRu4rvrYlN+D4BTmcPUJy9IbiLq9cg939+913
-gubB+uxlN4pNdWrpr1tlgLQAKmxIlsMReGwj7Y5BFLCgbPW9iZofyHskGQ4NUuGZ
-2dZQTqsKxMvOzeMeIYOHlF6nQZJgNypxd6NCrjenvnO8yzvP8xEQG4Vl3qzZL6DC
-wjHtyf20DCv8KLvT+nrMsQI4ICeRe2EJS76aYD1lrAygxxufhfzOYn5rZnHevTyk
-r2p+ckquZZmEqA5C3kYmrfHi8z57Csqn7clsC6q2MzUFDTb28ro=
-=qknM
+klB65Q//fc/T49Pj/yKtQuyqPeveJ2pwVuGW/5RgbyarXcPBN0nUFec7tRiBg+kn
+RYZqr1oJUU7zGfPQZUxgXQaKbJrAbtGvAdh18RG7gd6mUXtoxoXWFhUbdXil84sO
+ZKaECc//15ndbvoFPJaNfRS0zX7CVjJsXhni4llfMBpZm7hDOocvm4FgC2MM6jpR
+Bjik2hr68yBrSBRhcufji8qN0Mh4vEteTGEoTGEROuibBaUOZz3RrZZV1J9h1D9o
+LCAmRlutDmSOBx448H6ChSCyRvzCUbihO0acKr95oL5Tyln2SI8GCufEEFrynOpq
+MdWgGU2mZcHRP0ZGsUDvHp4fcvHXzvA51h44olPbdkSYth8m8nAPslCX95N03UTa
+71VAdYA3s+9JrVN2caIEpY5Co5H7eO/hYX+ZhuY8+ZbB6q9o+1mpTvdriphTNXjE
+kFhAm68UvBnoGoBWjPrI+BwAtZKgTYUV3F4a3X55OElx6hNH5pkiwf/cpfLNGfUt
+V8y4QqtvfRr7K33akJfZsiMacfZycr+rciTqLi8ED7p9hIpKUcrxNl7w+DrFhXwQ
+eRsz4HO3AOLuU7DdtlmszZWOu1c7eX4Ow4Pntm6K6paZzsytz+iiHeKJv61XuRcm
+NpzXqiirF+SLkK/P4bcIUCjyFQWsrbOnXRo3cBLAvjyuHjw43ag=
+=H45u
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 5f0cc2e87945..8bfd985a5675 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 8c0ca2c39013..aefe6738d33c 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index 4f34271651e1..35b3840f09f5 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -1,10 +1,10 @@
 AUX brltty-5.2-fix-ldflags.patch 2168 BLAKE2B c75da04cfb57b550634a18f67c81fb0fef857122795ff1a28c5d8fd654849cd4fe25a436b72aa851cb746f6eea52e7c2a52f5ba40f3d64797341678b4035070f SHA512 72ce6b722e90deb9e3d6d537b54ce2f8625154a5920eb555fb5fab1b65703a4ff88a2e0907b74a11454231507ebd9741533ee9b77ec5dfeffd3870179ebd98e8
 AUX brltty-5.2-major.patch 1511 BLAKE2B 69ee1619d30241bae78e70c0876f7d9df664fef38ef4666bc34d3da8a45bc55f1b278f735169724f6882c408135f5dc51e7e75af9a0adf74351db4b324a0b66d SHA512 88d1eb5340e105c8e975e89071d8f9f7818d417931442c69cd1fff5cdb197dc1c40e4618c6a9b62b15f972e03523ac9d3a18deb0e7d1be6b6c1aed1b309e29cf
 AUX brltty-5.2-respect-AR.patch 433 BLAKE2B 20fc18a063bc568925646d6d21fe6c59c33105957f9de155ea9046cac95bf1319bdeab3cecf5d0016d72a5a2f484534bb6eec8aa9d4ae4f6f5d325a6ee6c27bd SHA512 ce778cded4ee6f9ac45faedd3727c58746e780cff944d2c39ff71f792905c7f214b104641aef72a233d07df74a92cc2a596ac6bac1b76873d82d2c1383e994e9
-AUX brltty-5.2-sysmacros.patch 750 BLAKE2B 8d6955bf3a4792d460e85869951a8fd10e4d99014a79e3f56257b65be3acb36db1dca299f7af75995fd3bfb33619548531ad4fab31734b3503a2048945e17732 SHA512 f64cfd6351d20807624ed398d1f1c466b92d8f281934cecbeeeadf1f0faf360f33e2e3764c7b9f7467ccf62af206368986c41867f6f3f54ff966be78902119e2
+AUX brltty-5.2-sysmacros.patch 458 BLAKE2B ed2f09ed3a137758603d0067ec18708bbfc24fb3cad90954905ebeac4900dd70b679ccfc1d64c6f23fc9d4c7de0275a760222f8dcd935086541ef16cfd9ac963 SHA512 8e1ea5351c963df01603ff2469ff01079896fac40fbc1b91bb88f976749b639b4c925382e041f402f1cfef8a16716fb46109650b173539d69131f1e275ee1392
 AUX brltty-5.2-udev.patch 1208 BLAKE2B c8fc47d9ea27ca78c4634be47d43f406ba0875eb1b4a19048c264faa602918ac96024b03f56c642722cc9eabdbbe9a9f9005ca4de0d39538f746ed4ecadce3dd SHA512 0a1873dbdee7b97385199bd1f7158847bd8c52f7678783add4353c990ad5a93bc5378f38e52e3b1b30d071167802750cfccad227260dab8eba52e88cb230cefd
 AUX brltty.rc 242 BLAKE2B 68fc8de846cdaff11b2b6377d49985c8cbad1342dad03e60f3a3ef2e8aeb728994c05f6b9bb9378e5434c1e4cd03ead0716abf7344dea3f993ac10d9c12edc23 SHA512 067dc15ca297774ad773512f57e0b828ce97a07ac7156e4c72fc25b8b045eeca313ae566564c954193be83c72928dc3a26e1fadc4b2cc1755c607f515590cb9a
 AUX brltty.tmpfiles.conf 31 BLAKE2B e51c4c6e98da2d68ebd2aca39d3015ca28b40dbee5528155f9efb87ef8ec5264b382c78acf748514bd1f3902dbedcd471f4e18b0361c6a924108a950c75aceb9 SHA512 3d52a11e0d266ac508ab5447b6515f006f610e3bcb2ec396c3fe4c58a68874c9568f7fd6a143829f69c1b87680f1157953eae9fe326f5db3723c7e4b46390bf7
 DIST brltty-5.2.tar.xz 2532684 BLAKE2B 9b0555289177971abe12119f0604eebb196b8f493294741a31c684ebb5546eaccc0a729a8ca6b24e4075f0c29bf371e773743f02e0a102799c44c2293dc9894f SHA512 8e16701e9c9d776c76e3ad0cb4319b2753295fea229bd3f60cb0dffc0b6946037e6f98daafae873238c4eff90d4b8ddb697b7d425e700c5a098aba8fed9eed3f
-EBUILD brltty-5.2-r1.ebuild 5196 BLAKE2B 60d9aa930fa67463003111b02fe339bf8f4c73282c67d29165273263b852fe51dadb7e1b0468ddf26ed27ba986ba4f67a5ee100cdc36dc9f8ddcfe815c057fce SHA512 2c2be3c79a3b8054f82adc5ea06ee00864b72325cf7da0ffeaa50019a13b763fd40b6d4d0918ecb935698daf2b20527b83136ec3f940829053f7141a9fac9df3
+EBUILD brltty-5.2-r1.ebuild 5110 BLAKE2B a4721ce01383f259b44457f3c1f49998d319a96888a9c94e82ca98dd3e12d58e7753a86425fae215b1c7accced2cd561447a95de4845e0ae0e12176204c447f1 SHA512 714da26e215f751c0fa2d438e2e9008e8634d8f56ce71b1aec8db5662e719103b83b05d7a2156e6736b74249fec6f44f6478b1913c9c07244367d39650117d54
 MISC metadata.xml 1502 BLAKE2B 75f1750b615a2d6d022ed682f65ce6d0d45908e0d5724a162220a915371ae357cd904b0c09083153fb0f07facbc89024604fe86e3386e58a7d409a82f3865835 SHA512 337bf98d4e2ffac2ea0721a042bd31958809de5089090b0a79d73457f700d57fb8ffe637f4ad9e896992e98a13fdbe1ac9a3f7758d8ad2703334db8edfb7c32c
diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild b/app-accessibility/brltty/brltty-5.2-r1.ebuild
index 12ea62ef94e3..71cbc57d9d13 100644
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
 FINDLIB_USE="ocaml"
 
 inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
@@ -22,7 +22,7 @@ IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
 REQUIRED_USE="doc? ( api )
 	java? ( api )
 	ocaml? ( api )
-	python? ( api )
+	python? ( api ${PYTHON_REQUIRED_USE} )
 	tcl? ( api )"
 
 COMMON_DEP="bluetooth? ( net-wireless/bluez )
@@ -30,7 +30,7 @@ COMMON_DEP="bluetooth? ( net-wireless/bluez )
 	iconv? ( virtual/libiconv )
 	icu? ( dev-libs/icu:= )
 	python? ( ${PYTHON_DEPS} )
-	ncurses? ( sys-libs/ncurses:= )
+	ncurses? ( sys-libs/ncurses:0= )
 	nls? ( virtual/libintl )
 	tcl? ( >=dev-lang/tcl-8.4.15:0= )
 	usb? ( virtual/libusb:0 )
@@ -64,10 +64,8 @@ src_prepare() {
 }
 
 src_configure() {
-	filter-flags "_*_SOURCE*"
-	append-cppflags -D_DEFAULT_SOURCE
-	has_version ">=sys-libs/glibc-2.25-r5" && append-cppflags -DHAVE_SYS_SYSMACROS_H
-	has_version "sys-libs/ncurses[tinfo]" && append-libs -ltinfo
+	append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)"
+	append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
 
 	tc-export AR LD PKG_CONFIG
 	# override prefix in order to install into /
diff --git a/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch b/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
index d45d6104e4bb..f33e46a1890c 100644
--- a/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
+++ b/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
@@ -1,24 +1,20 @@
---- a/Programs/system_linux.c	2017-12-02 12:54:34.098643832 -0800
-+++ b/Programs/system_linux.c	2017-12-02 12:59:00.683592161 -0800
-@@ -24,6 +24,9 @@
+--- a/Programs/system_linux.c
++++ b/Programs/system_linux.c
+@@ -24,6 +24,7 @@
  #include <fcntl.h>
  #include <sys/ioctl.h>
  #include <sys/stat.h>
-+#ifdef HAVE_SYS_SYSMACROS_H
-+#include <sys/sysmacros.h>          /* major() w/newer glibc */
-+#endif
++#include <sys/sysmacros.h>
  
  #include "log.h"
  #include "file.h"
---- a/Programs/brlapi_client.c	2017-12-02 14:29:37.524205316 -0800
-+++ b/Programs/brlapi_client.c	2017-12-02 14:32:45.679948051 -0800
-@@ -73,6 +73,9 @@
+--- a/Programs/brlapi_client.c
++++ b/Programs/brlapi_client.c
+@@ -73,6 +73,7 @@
  #include <linux/tty.h>
  #include <linux/vt.h>
  #define MAXIMUM_VIRTUAL_CONSOLE MAX_NR_CONSOLES
-+#ifdef HAVE_SYS_SYSMACROS_H
-+#include <sys/sysmacros.h>          /* major() w/newer glibc */
-+#endif
++#include <sys/sysmacros.h>
  #endif /* linux */
  
  #ifdef __OpenBSD__
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 5c2f0814b8bd..4a72b06039be 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 95f5f069861f..219132167776 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,11 +1,6 @@
 AUX ansible-2.3.2.0-fix_key_error.patch 2733 BLAKE2B 0ce0c7f6bdd8f42f3796847d16037d667c53c0cc1855d1f0d6101e44425bc4edbf724153ec5e3744621aed18d042b0bce075496dd552ecff3037f1e7738a36ad SHA512 fc124b19d7fd2d60ab6d7f5185e23334740ca549a8d06eb093ac194e8f17ca92cb0a64735726e9313d026985182e33eea7f1c56a511aba938216cafa0810ca7e
-DIST ansible-2.3.2.0-pycryptodome.patch 32472 BLAKE2B 7e46379063586ac29b62afebe225faeeaacdcd15d03e9ac2d241c2581cde4b87a586efb8ca01eb3a00a245676fd176469789187992c4aa6c0ab4d9859b31b9eb SHA512 cf2b1528176a12e8e48001155d8f2351e1c4914df56ae8b8542a48ccee4158c23ed1eda537ac500f1b71553aa84c574b8297398a82c4c0721ed6f9d08ad5257d
-DIST ansible-2.3.2.0.tar.gz 4319664 BLAKE2B e31ecd6652b58ca83a2b4533cb76422b29825ce33aac29eb02567851b19986b80323a6f6c2783a72a9cfc86f691d27a8dd7f24c19b753daa9adc28a7f9885584 SHA512 458506da8ae65a80b442834c6047f02eb92acf9f7dd4465c63b4360c4c4817a0f7c48c92a614b91760a54d036ed13f417edf3524bb8a34a8a53ceb11efc928ac
-DIST ansible-2.4.0.0.tar.gz 6623856 BLAKE2B 7b70173ddb81e1dbb4862e7918fd5aeff2bf8ec0ad1d38b4f6b683e1c178188c409bdfad840c033b42eddea0cb5be4328b85dbc9c9921f08d3f35f5e5a7ab235 SHA512 78717b19599bdd46a7285b0b2a4c9d0d5b4cb86fd41dcf0b3340cf65945a55fae4508097058098fbeab871422c31d4f37ab4cd149abfd0af5add6004f65a207b
 DIST ansible-2.4.1.0.tar.gz 6675552 BLAKE2B 00497b33e833149510669c9e481b0893a2d016caf2949fa064ca0a2e4f62a6c5a3f94597673822418253b85abaf380308115dfaa4c1acd88f0c73322d87822d4 SHA512 86bda43d912fc6b9cbf662e7e9e3ca3178ac577bc7857c5dfc0e68a7083d76ad405b0ca9b34f680a0d635b87e0bf5dc8cbdeefb93174242e1942eabb74b07f1d
 DIST ansible-2.4.2.0.tar.gz 6503595 BLAKE2B df4ec4e24671f1488950f2d9eb7705fbad4e035d6ac67d5017417281455cc44cde1290976a9ed16675c0cc19a9190200b95b29890725c56df5f2699398accd6b SHA512 32a075959dca01e184d9c3988fc9c491e904e7627a38e3527c37a8b26340f331bd294cacfe7353d339d15488857ba5ee1b36d9ae4ebeb8b5827934a73f4b42b0
-EBUILD ansible-2.3.2.0-r2.ebuild 1675 BLAKE2B cd0fa9f8f6fb31fca682303deda3580601feaee948a33f216c29ff06901f320eb6ff048cfa4aff58daace856b8d67b583794575d11d79a5be0980b4768e089cd SHA512 7f6c8f28056800aeaf82403de41ef5971b8ea4977b2642f6531132b58e22aa7ff81d49b18f2d57261dbfebaf68e1ed625fa7331ac4cc5f489d2e68de274fe81c
-EBUILD ansible-2.4.0.0.ebuild 1422 BLAKE2B 55b6658da5a65b1a9ee082a3999290cd742b4a9ef5776578aa78411e877f48851b99c612eaa28187c5fa8b15109a8dc9bd6d290e7615c1667988cbfa50f723bc SHA512 227aabc8dfff8bdd0322ee083627daa823a2ffc1897b9abf15d725eda1de89348faa95749f7a0ba77a8f81dcd07c098c7f154508a8426c46a714aa067229ac86
 EBUILD ansible-2.4.1.0-r1.ebuild 1441 BLAKE2B c7d99a3d842b55015f0839ec115c341fd5e543c5b045573681a071d956fa74931135388f9cf081a26b80a40db0040fb63c2a6037d5cf496a5d39945eed955f2b SHA512 611e6a76d51e16fdfb0131862c39935938b439ed36e0bc5724bbc78f3944d9048e33c277120a6f681a647102c648dbcf2052f7008960cd97ee7afa133f16c41c
 EBUILD ansible-2.4.2.0.ebuild 1443 BLAKE2B 4328c78b8de3a5256ee78e7c18bdbcd9203818bec971276a010a0163160bbd1189ace5b2d8cbc037666a698538cafec6cca5b8ed5b3b1f865ca1e09e71d0d5bc SHA512 e6ee03e4e356c5063117791a17305d51786f4d3fdbb2d4a856165c743495dadd368aef2fccc224fc3401d1979ab27afbf7623e8d9d2afc6dbc184f956c8df2ae
 EBUILD ansible-9999.ebuild 1512 BLAKE2B 03254235d8b9ca79a612c59b004324d0b208b0619ea9648c08e311f13aec4fa83f94bc265665ed729e1bcb2810fae5fd222484dee4bd90624d25aee1f97236d5 SHA512 69428f04ff25266dc74805609796b6f36b3e2d6bfefae8c7c5b1202fc015b890cf8fec4754a5664e611e2d7f0a9d7e7a014b7be5909097611f5e894a33a38012
diff --git a/app-admin/ansible/ansible-2.3.2.0-r2.ebuild b/app-admin/ansible/ansible-2.3.2.0-r2.ebuild
deleted file mode 100644
index dce26e1069da..000000000000
--- a/app-admin/ansible/ansible-2.3.2.0-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1 eutils versionator
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="http://ansible.com/"
-SRC_URI="http://releases.ansible.com/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~prometheanfire/dist/ansible/ansible-2.3.2.0-pycryptodome.patch"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x64-macos"
-IUSE="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	|| (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-	)
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		<dev-python/mock-1.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-# not included in release tarball
-RESTRICT="test"
-
-PATCHES=(
-	"${DISTDIR}/${PN}-2.3.2.0-pycryptodome.patch"
-	"${FILESDIR}/${PN}-2.3.2.0-fix_key_error.patch"
-)
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/man/man1/*.1
-}
diff --git a/app-admin/ansible/ansible-2.4.0.0.ebuild b/app-admin/ansible/ansible-2.4.0.0.ebuild
deleted file mode 100644
index 546c17afaf98..000000000000
--- a/app-admin/ansible/ansible-2.4.0.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1 eutils versionator
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="http://ansible.com/"
-SRC_URI="http://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x64-macos"
-IUSE="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		<dev-python/mock-1.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-# not included in release tarball
-RESTRICT="test"
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/man/man1/*.1
-}
diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest
index 4b194db91f3e..bd2832ecd0d8 100644
--- a/app-admin/hddtemp/Manifest
+++ b/app-admin/hddtemp/Manifest
@@ -11,8 +11,8 @@ AUX hddtemp.service 283 BLAKE2B 825bb353f806b4ebbb7373e60aa8a15e46a39417dbb07aca
 AUX hddtemp.service-r1 214 BLAKE2B 201eeeb152e80c9f5579f5e52e475f061bfe587e2025d6e2824a3118d079089e56b34ed2895e7a1d0db8f21158409dd7247408368a2c1684e6657412abce6e10 SHA512 2218864bead8a0cc0f99d5125940f397fc1396d2e3f7afaf276c3bae0d6c2b2d23ebc51d3a93d3a492d055c8dcdaf44c56ed289d0343b9e264de48971d9153fd
 AUX hddtemp.service.conf 88 BLAKE2B 310463288da0fdee89d914c70aed0175b62d53a382851b9f65702c1137cbeb803a80f5d186a2d0a81ec3dd94fe9733501b28399647fdc864db1f11ab12f21b71 SHA512 dac10db31111623f20580d36b49f2d9b292df39991a4b2590085c08b7a8dbda3903d5dc268d328a71c0bd8d02e781949ab2abde243ae35da8f79bef21aa3fae3
 AUX update-hddtemp.db 819 BLAKE2B 2322abe8bc4c4f49a4c16267783d9d7ee46666e1e11b70438914d3c770b75f5b4912ddb17dff0555d9847b43d1e43b19a5a54598778b97bfb4c6829f7424f09f SHA512 7d923d582da2e8012de4ebb4243a4fccd6135cfca7d06f02f50b290c5984af288942f7588da7c8c57b91e362a8febc76f14b489798af14f66e3ec7bec9518ba4
-DIST hddtemp-0.3-beta15.tar.bz2 256372 SHA256 618541584054093d53be8a2d9e81c97174f30f00af91cb8700a97e442d79ef5b SHA512 7db5a3dff60c59ce147b996ea4f8b6de1abcd34301bb863507b4d4b44e72fdc031078867a7f37161e67e74f6b426a1d856d3081179c678d2a442815bb0faa94d WHIRLPOOL 2ce6a2336737e8cbb409443b874c6767c753fbe4bb700540f9a545e69cd951d3de5743d5b26bcd3a3f8e007b1364273ec85d15da8a00968895def063aaac7705
-DIST hddtemp-20080531.db.bz2 5627 SHA256 6a12bb68283c3224bef2ab086ae810b3f6b17b38f8203350acb3a73e21a6dfbd SHA512 cd03cc300aece4f7427fde1b58840643c8e41e6c0ce30b418a62bf44b268f249ef3dc4f5f4bcbc9cc0cfe0346c18d4f1da22451c87efc3d46faebcb81a1fe059 WHIRLPOOL 7443366204127c0831ce78a5dfd3506ff82a6c79a7daf75cc79e6bba6aad0357f7092c03e792e2e4ee31c2b47a8d8a15456e7b2c176d3a1c6b4633486f450666
-EBUILD hddtemp-0.3_beta15-r26.ebuild 2973 BLAKE2B 18d1ddd309316a39bc4859de34a04bc251d22f7391a1ab837dcaf608cda237ef291d886c57f5018391a57d42115c72a5d8163f4b46efdeeedddb2601ad07b6ca SHA512 1bd1fce9fd028d089c25db6be2eeb1e4426e02be0d790d64d0395c25ae801d893e611a985e966fc381e69266b8c347ebebf266eb2bb64ccefd486016d6bfe4a6
+DIST hddtemp-0.3-beta15.tar.bz2 256372 BLAKE2B 1c928234c36172c387a002190045cd05007f4b4b8d74eb378ba810ea9aad96951b7a9b3b0f872130677fca1f294d86f855327dcfa5a263c9f3c7d58fbbba502e SHA512 7db5a3dff60c59ce147b996ea4f8b6de1abcd34301bb863507b4d4b44e72fdc031078867a7f37161e67e74f6b426a1d856d3081179c678d2a442815bb0faa94d
+DIST hddtemp-20080531.db.bz2 5627 BLAKE2B b973a981ee55033c8ba190efd9dc8586589292ef1f2b00542be7db2be64df812847665abefc7517f7c71dc70df153766570f62b69fc4891e758e82200ff8d589 SHA512 cd03cc300aece4f7427fde1b58840643c8e41e6c0ce30b418a62bf44b268f249ef3dc4f5f4bcbc9cc0cfe0346c18d4f1da22451c87efc3d46faebcb81a1fe059
+EBUILD hddtemp-0.3_beta15-r26.ebuild 2972 BLAKE2B f273cee116ed77f85fdedaab31f82c6a7bd109b306a9d56745767050cc65ed79c2b28875f934b02fbdde87db6e8e1185605525f1562d930d3b5eadf8bc4edd0c SHA512 64c30191b0103c410b9d8461c283738a56ccdc09b7fd2f9d8ee3f4e05f1a16768d2e94fe74f7638e1ed8c3852976a19fe9f3766581c49ed884f686495eca1bf5
 EBUILD hddtemp-0.3_beta15-r7.ebuild 2624 BLAKE2B 5bf8b396d227f649fb99eb54e8f70e5aee830543a31f5690ed7cc0b06df4a7898428510c61672390bf99781f9d109fa6c7758a8db55f214b09838514bcd35c71 SHA512 e52873a21479241b582ce0648aa8c973298b1adbced6738172733537a267d421f52bf454672f81578ab1293cb79ebd9ba3487c9b7024a66c4be073338bb40d87
 MISC metadata.xml 260 BLAKE2B 41040f0f9342dec7a3993d99bd9fb49f624c8fc8a0be036b3c2e3f2f20d4182d23c5b98a5451f5d2d6906d749b7756b7ec10b1e135bfa7b1633234ebdae1370a SHA512 480d8cf7f249c083d64b11e13bd93b42856531860afa935a9265bfcf9491fbd3997a9b9d8e90630daba103402fc9aa08c63ef18091cd6ee68310c0a8f3c38af3
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r26.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r26.ebuild
index 988a38401bfc..3d5ce71a8247 100644
--- a/app-admin/hddtemp/hddtemp-0.3_beta15-r26.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r26.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/hddtemp/${MY_P}.tar.bz2 mirro
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ~ppc64 sparc x86"
 IUSE="network-cron nls selinux"
 
 DEPEND=""
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index ba95497cb153..065e3353809e 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -4,17 +4,15 @@ AUX puppet-fix-tests-4.7.0.patch 1102 BLAKE2B e5c98627620f9f76f1421a13969dba3b1d
 AUX puppet-systemd.patch 481 BLAKE2B 8ca58755e5c3a235c60eed11c98e20bbd3cb27c81531709b27981ee61f6f5dea63d2487d49761ff84e7590b608c170bcd369fe7ef3700a5df1bd03b29c66ec71 SHA512 08bb997cedea378efa4614e4b2ff04acdd68cdc376fde422677b64dc56b8256ecf7221210c20529bb5a9a49fa8c92f67667c7acd6ac64b665e79639318a3df97
 AUX puppet.init 917 BLAKE2B 0ebbcdd8c9d4154984130ba3f597969f5f070f65f246770583663df4f192052a0ed666d09d4d417864457814d6a680ac4f327dc2a83b774da3a3c0d4efea1c8d SHA512 6bd2e1c21abaa5149b853f1732a6bb84335a8b4ae4129db52da463597691fd983d347bc04aad69724034d37f953f50c6aa5316d517b9efed2414db8e3d94d7bf
 AUX puppet.init-4.x 764 BLAKE2B 997fef3e95718f3e0f46fa2ab5994ac994a585bcfe728a9dcdfb3ccd5b76e6fd879a4160dce1402803713344fc2082b43e3116b468e9b49fd1b17a043040f860 SHA512 170100981c7e24284a12a208cede1a73afbaeab73315fd15a7337d416825c6d26a29ee272244d39764ad4086bc6a6f99cdc56ed6a600282d6ff9ed74794bfaf8
-AUX puppet.init-r1 610 BLAKE2B 55c96df6845373a2b0849282763016427520821fff210d0dc8677e7410c16a4163537ccd2266c9128d13a69bd6e831b025f0f5e40a42d891062abdf243a8d087 SHA512 c1f3040f6ed07933bbf261ba5d3f7574fa500ebdc5b6f71eb15f02f71e355384175fbf8a5411d1be9b6a379b6fe3d74ca9d4ec164b6b4632eaa8878595573125
 AUX puppetmaster.confd 640 BLAKE2B 78d85ee9b2c413c59eadef3498a8a2e2ee6c6d029bf76655a4897fdf128fb38950ff8e62abfa806785906fdae648c544310b75f9a33694ce1fbc0c31fe4f04a8 SHA512 deb4004dd8448c503099a0cdfcbbfa8e2efed5dc088539bbce5c9db4337f2910b625598402b72db42d68a0a9b6d3570c18fb314f3c9406fa67f946c38c9bf44d
 AUX puppetmaster.init 1090 BLAKE2B 367b678860b955003ff8d79e69cd8c4a6d652ae738bec3c3314a3586b485ddafbfd9609e6f589472cd7c12b234e9ca1fa3cf492c1649b03c371ad29384df6555 SHA512 cb8b63aecee163c680449edfa63f9070582d3c1c924e3692dc7c18a7f84e166e9e4d88abae44d6e828eb3d4ab57b0d3a1f64e3a69453fa30d5559e4ae1716975
 AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8fc8eca3c0199828b2c0119547cd744c49f79334de1bc0a7227c0791a5b3645eedb51d3fa8be5822487354b1a SHA512 e177109d90f5954e7cd1968db1d0e0d0e2c6e98bc4d53d0ae0a816d181e304e1b7555f65d8807b98df9f0f8cf7ebafc9d8cca9c32574fb7127c4b480d23b5cc6
-AUX puppetmaster.init-r1 921 BLAKE2B e8918248f91d7699f4cdfdd49ebf11401f0ea82c59ead3fcc9b954493a0afce19d597328a8a097009472add04c39b7892e9d940a29a549afaae0a5a88c1ad227 SHA512 cb73ee391fc493648504af8eee2595af102ed9dcd9043f4316fb93749b37d0492e28f0082fc43bb8266357d1c298246e75f3d8b99d195dd169e3a5761f06fbba
 AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
 DIST puppet-4.10.1.tar.gz 2954351 BLAKE2B 6cf8ac28d8c09f4b82956b3fc8ebc17c0ec35c77818797e5101d03e099850b75fcfa35ec19bd351bcb51fb1d5071541f4f2b8b3be9eada3d21c00c8d8108aa95 SHA512 d232f062b93485f7eea8abb9c5420462e313e6050e7335159f051f7c7af86338c006ae4edc09e0e1370784ee7b076911ca563a4cfc6a1f2afc7179bed08d2032
 DIST puppet-4.10.8.tar.gz 2979824 BLAKE2B 802b65d48ff7d8303e3cc847a9f753a5e19c0ada6ee02dc1fc9c748da8d69462c34bdfeddeedf0057179ff1133665439c41e970c41ca1728463292ef26e996ab SHA512 9f3384702dd4938e1e00aeceb0745b760de32000e0dd59d5b846d1120a46026499176a51d0409e3a0ae414efc0872854c204d1941385695a4c57c209fbd1f28d
 DIST puppet-4.10.9.tar.gz 2981668 BLAKE2B 315c39953c2ba70b547fd7a393c7be0bd3c387bd52e3f383a932ebc03f9d96c17d988d53b15bcb8d08bc22ebcaf1c9c5cff00f9c34d730e231417565aad5311f SHA512 0ac70f716a602b15d28504cc594c5a0d4f8005083de6751c682dc9180feca68148d942353a63e16aaa2e783e6ebe90b8f77b0b033c671a5134bcbcdff36a3204
 DIST puppet-5.1.0.tar.gz 2734018 BLAKE2B d4169fee328710b7685de2606196de68e21ca31f9a9945bdd84255f5185fd2d95c6543a7b88b5130f1f01e60e04294664de71a8ccd1319c2e0bebf4d031e6225 SHA512 07019f40c5b7f18243f13abb899c2ff2ea4b135895ab98c13da3df50f8e720e2759f8eb39e349ff04286da7de504cffea3df8acf9711e8591b25001a2a3f9c15
-DIST puppet-5.3.3.tar.gz 2843386 SHA256 45360f64fe0375df617571d58e929515e2094daa1d0dc78e2b6718d7cbeaf18e SHA512 b5bb9ac4059855c7cac624ea0fdc2c3366cea82bf07bee195a179a0a709fa53e7fffe883e581c1e07a64705a638b156288301227f7334226ddc401a9bf770afe WHIRLPOOL 19c8511ba58186692ee0ace02158c16529715cc213f0eb7266bb078a10db6e698081edc4b3e0735f1e79fb568066cc6f1699d0b1a954a29d74d1a91f393130fa
+DIST puppet-5.3.3.tar.gz 2843386 BLAKE2B dc96282ff2d6bb6719362cd9b2e856537019bd888af8ba897e37fc97584cd76c1d4179b3b629d2bb20d1dade0f84ec88ab41dd0d66cccd2c850a87f96ccf4b65 SHA512 b5bb9ac4059855c7cac624ea0fdc2c3366cea82bf07bee195a179a0a709fa53e7fffe883e581c1e07a64705a638b156288301227f7334226ddc401a9bf770afe
 EBUILD puppet-4.10.1.ebuild 4911 BLAKE2B 9b7b3b8cb8a6aae28b460efadda66f84df31ed7458e9055e1242eb99854c817039e0ddf6874ede9c9204d2bc3bdb2c62adae2faf14778eec3c71140de024bf84 SHA512 5ea1902e13577a934344565db53ad42face48b08def199f32c2fbb38b2747f7f7e1b52882bce5289894e462431fe39f75c7f63f0271878e732cd2263e52b8eaa
 EBUILD puppet-4.10.8.ebuild 5566 BLAKE2B ef297d5556d0e44111d05cd81917b4715fe40d3b70adabcb1369ed442a24930d3b165b28501fe7c82343aa3cbcf9f42d26cbc5ae1062db19cc4572db6b2f546a SHA512 ecbad4f16a4789ee47039279fd5a7247f2600d50e80c8a69b2a1c6c1b8988db7e819ae01eb92660029a08b1f442054a41c53666b10ab084c857bfcc3b230d528
 EBUILD puppet-4.10.9.ebuild 5619 BLAKE2B eb324da5789174f5a2228911a24459e37b5afb0769fcceb956f2082cd12137038c1a08881a2dddbfaa4629f494a147f1189c742234b16acf727ce00b32ba4c96 SHA512 c5ba1cd5154ad8c24b76afa44a7e2b56ea186a075bed569ea25db860f98f918c0bcfa4574d7e58086ef947cbd25002bef702bb758d85864438cef4a89761b6fa
diff --git a/app-admin/puppet/files/puppet.init-r1 b/app-admin/puppet/files/puppet.init-r1
deleted file mode 100644
index 36398d26fe2b..000000000000
--- a/app-admin/puppet/files/puppet.init-r1
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-PUPPET_PID_DIR="${PUPPET_PID_DIR:-/var/run/puppet}"
-
-pidfile="${PUPPET_PID_DIR}/puppet.pid"
-PUPPET_LOG_DIR="/var/log/puppet"
-
-extra_started_commands="reload"
-
-command="/usr/bin/puppet"
-
-command_args="agent --pidfile ${pidfile} ${PUPPET_EXTRA_OPTS}"
-
-depend() {
-	need localmount
-	use dns logger puppetmaster netmount nfsmount
-}
-
-start_pre() {
-	checkpath --directory --owner puppet:puppet "${PUPPET_PID_DIR}"
-	checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
-}
diff --git a/app-admin/puppet/files/puppetmaster.init-r1 b/app-admin/puppet/files/puppetmaster.init-r1
deleted file mode 100644
index 22479c5e1a61..000000000000
--- a/app-admin/puppet/files/puppetmaster.init-r1
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-if [ "${SVCNAME}" = "puppetmaster" ] ; then
-	PUPPETMASTER_PID="master"
-else
-	PUPPETMASTER_PID="${SVCNAME#*.}"
-fi
-PUPPETMASTER_PID_DIR="${PUPPETMASTER_PID_DIR:-/var/run/puppet}"
-pidfile="${PUPPETMASTER_PID_DIR}/${PUPPETMASTER_PID}.pid"
-PUPPET_LOG_DIR="/var/log/puppet"
-
-command_args="master --pidfile ${pidfile} ${PUPPETMASTER_EXTRA_OPTS}"
-if [ -n "${PUPPETMASTER_PORT}" ] ; then
-	command_args="${command_args} --masterport ${PUPPETMASTER_PORT}"
-fi
-
-command="/usr/bin/puppet"
-
-depend() {
-	need localmount
-	use dns logger slapd netmount nfsmount
-}
-
-start_pre() {
-	checkpath --directory --owner puppet:puppet "${PUPPETMASTER_PID_DIR}"
-	checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
-	checkpath --file --owner puppet:puppet --mode 640 "${PUPPET_LOG_DIR}/masterhttp.log"
-}
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 581b5f16cfb9..9f84ec9dedfd 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,3 +1,8 @@
+AUX 3.12/syslog-ng.conf.gentoo 1184 BLAKE2B 44e7ed22649a32f8ba179466ab1fdb05d3e140b2f7d4094e29dc0bd7b5d9d4c5bf76e7f589929f6893c406faa1753356ec3f9afaa068c4c806475f3796e3b1c6 SHA512 d59aa50c836cfedd59bb596f73e9286094cdeeed7a02a8c4178613a8b8fa8b7151f82ea0fb6e66270a75cfdd6c1431e9c2991dd2ae96148581403e525203e653
+AUX 3.12/syslog-ng.conf.gentoo.fbsd 577 BLAKE2B 4f92dcd741eb7ba41d38a947d03d118e859f3a8a9c4ee8f02d9a2142af188a2783e898b2ef77857fa71bb5cf3b13960fac529a4c7228d615a50272397ac51b34 SHA512 9a8913f1375ee96c946d9af4f43d9bdb100b19362ca82b7e5538449e4360c085c84e225d204e04db83214304c7be8a1dc4a5ff8aaa8e25c071d8e0d99d5f2464
+AUX 3.12/syslog-ng.conf.gentoo.hardened 4511 BLAKE2B 18e4d0895dbc289f014ca917f9cc3493077021a8caddca4dc103f1f8c81376ccdf074407bbe1540f05c6b008c328200b3cda06bcb58ca2adf79f2578b5095365 SHA512 75cb811608f43c914ba31897ce417af6e3681dd3aa6f081841bfcea0455dded37f4b0b9beacbe9c958f37d57c382d96f0def24a03e955ae7d470337f33e2cc4a
+AUX 3.12/syslog-ng.confd 1492 BLAKE2B 8df9e16ec0fd8de141d1624f7451fefe19c49b2ba91ebdd63b6cce730ab2997715d7d352629f8bc6f7c700fce7fa04f291d3507dc421e1382a104dc264395e83 SHA512 8a346864dd88ac393f7080c4a073b20f21dfd547c2517abdd963beb50b9ac49565487a9508b042eb5d00055b2a5bef8db245cfa94c36ba1a60922caaae8bc4e0
+AUX 3.12/syslog-ng.rc 1921 BLAKE2B 3e93f17544f27450d80de36504dd4cf39a0aa6b7c51d9df057f254e784cd6b937d57a098ddd5f636da202c54e802ea255698b079032481089145f091fa5ccbd4 SHA512 51c0a7856b481030136a025ebe815d696156393b4318662847237db9a792c52ce0802fd3cdc2cfa325fc75ea22c89fef1c46d44b312e5f8167a9786eacea8ecb
 AUX 3.7/syslog-ng.conf.gentoo 1203 BLAKE2B 786a4315e11d2feb839aaad7af5fd3544c3c3319857009b716e732a34618a026f25e8f44b2f8c4ebb2fd74cd78eb676bb65c6573f3bb8f357cde71f728ef56a5 SHA512 44de47c9ba8927ab69cbd9479bc18f87a311fb7a7273912b236650385bbaddec28d3a706d822e53a4264fc8fd9895887243fb070252024b732bdb41a840d44be
 AUX 3.7/syslog-ng.conf.gentoo.fbsd 593 BLAKE2B 2b161a0aed035fdeba7dffdadcce28f29d2bd4077e391b8af98c031fa92366cf454349463f4ba457e08cf44f9b78a25b525bda9c55405102b079a89223a328d0 SHA512 947be1b330a98490da99d9e64d76732fe8eb54beb266ae1a546df7319cea998a89963ddf086e993025efbba1a8aefc2ecc4ff5bd440a50e565cfddbe35536d90
 AUX 3.7/syslog-ng.conf.gentoo.hardened 4520 BLAKE2B 968f77526cb027259acf507177f02b8d735a48aff78f809eb14e50795c26fee62b1e15602ed3ee16317ecb15f14d33135fa0dc54bea2ead002f96618991f87ec SHA512 2a0d31178e83ea9685ac1b5988652ef077b71d368d75eda46ebf0e1ef3dbb79e8c911bc6498d6a934912250ead902cfa4bb8ceff1f14a08e06f6152824e36128
@@ -8,6 +13,8 @@ AUX syslog-ng.logrotate 231 BLAKE2B ede8c2e3bd6fa67b2740bca74fa45e799a88dcb9aac4
 AUX syslog-ng.logrotate.hardened 1614 BLAKE2B c9845bb43bd09a210f06912131dd2ba88164f0dc58f9d81455c13bba0ee923d1b9a6025f6b8e5fd066254bf6d0c81588b8d515aa055da157c29aaa0aa63fd700 SHA512 141b0ce95ca8ea6a9faf1f94ae1feffceffae19dbd4337c55d7dd4e554d41b7b8846680fab77f361ff4bf6093e3fe239fd3cec32dbb56ddc7b5e0f40bc054760
 AUX syslog-ng.logrotate.hardened.in 1518 BLAKE2B c13fd2707266edef0e74476aaf8446c8f77d2ffa8508cd7b8c32d13a22ff63bc883ac7a79f21287681b906430ecb05bae7665c064adbe161e4e1647e3ace9c29 SHA512 43ab59f037d6955844ba9a12675b745351fd3144dc1db8b81fe1c6ef48798452ac9a6d94caa68978dae396eceaa1a6d476fc99221989cb40265d6bb9dbbbf620
 AUX syslog-ng.logrotate.in 219 BLAKE2B acfde709749d11790b451e3f9a0d9bc33f129e86e3f68bdd36cf2d2c9c5561c5308805aea36378e8d79995e1bf173e4471845805681be2c409b52479333c35d8 SHA512 7a838006ce61c9702d6ea77672affa8cb1dc2ec2c6a1a268a4ae4f5a59dcac1ccfe835d25144ef8376a60a11227fa64e38dc16f8d0eaff182f14a6644a3a5ceb
-DIST syslog-ng-3.7.3.tar.gz 3511155 SHA256 49201dcfd59c8992936aa16c694f5e6593d505b44895f6c66b7d7f7895ce2c62 SHA512 e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b WHIRLPOOL ee434b8919183a70f484e6c96246b020a53a42e4306b2dea3b8ec15de71a1ad5be5185f0f3df5da76f0ca68618ff8391806748c6bea4a6844648e0939a57e97a
+DIST syslog-ng-3.12.1.tar.gz 8905646 BLAKE2B abe273c561569047ef4ea0b21b08341d207ecc9a37ba88d1aa28f00de8a0c28cab2942b3d461b7b4fea940668b44ceda7f9c71b6f7c7583143f4bf65adb54036 SHA512 00370f8b090156c064d9fe932e2aafe3f78ffc01bc47b2bc2f0f3c6cbdf98ea8cc2084317b8c2b1a9755cce404646b20e131039ce55b87e24f4401a55b95ff7e
+DIST syslog-ng-3.7.3.tar.gz 3511155 BLAKE2B 25ba2ca241a5847c75792c78d39a4667f55cf1fcff46be5102256ee6a9d2f39e2042ac00fa0b1559f94e0df80a0853249692b443b565dd4f46f0354c453cacaf SHA512 e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b
+EBUILD syslog-ng-3.12.1.ebuild 4322 BLAKE2B 44d6035c8a388169ae2e3f185d3c4f789afe385510b913df465a856be4c1e8fc66e4490b3721c8a046c7ebba0f8d340dc22ceabdd5b35a34933e75b385689d6c SHA512 9d81812a4abca5401bb620574088cd44be86271da26cb11786ec64880e581e8ff0b1a2d36a405b57136c60498e718c6074b7ecfee13161ca20fe260f898d7e08
 EBUILD syslog-ng-3.7.3.ebuild 3972 BLAKE2B 6d4c5994419366aabc2df9e089ecee308fdae1b93f77469da4519ed4e50e3293c0898f28b95e0e102588dae352db5489d1c1021d21ca82b53d6b397d4f47b192 SHA512 637446d09bc29c9476177bfea1fac156b54174008d9b8b60a4ed6ae2ed39039aa8310b89b1a531db61a6e3c73d49d9aa92a931ef93531ff69903ceab5b7b48f0
-MISC metadata.xml 816 BLAKE2B cab2438c8f85e4748532b7547ed59b8494d01651b455cc2b8496fa3740f514d7ebda69d149d4acc121dea438f254453c46a8f4a9f4928bdc5de32910ad2322f6 SHA512 48b02eac0578a6c651eec75bfdd454dd100982014c5f3056986240ff009f876414ea421fa6186fc76977fedbc744b599b40622234c4bcaa44da755149d429a83
+MISC metadata.xml 880 BLAKE2B 9b7990fb5e4a4e373237b06d8468e958d98a60f52cba20d4018e1e0d39272525d503bf60206d8361798921e9c1da6b2fc8427ecf309cf2cdb8d2a39cdcd2da72 SHA512 84c16673492dbd6157c8f71810aa1377adce2855374485b1de57069f8516ba73893904b9ac22beb636eb9d04c7b3fcc49eebe7de9b219dfe8939f3f41136eb96
diff --git a/app-admin/syslog-ng/files/3.12/syslog-ng.conf.gentoo b/app-admin/syslog-ng/files/3.12/syslog-ng.conf.gentoo
new file mode 100644
index 000000000000..523a6804e149
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.12/syslog-ng.conf.gentoo
@@ -0,0 +1,36 @@
+@version: 3.12
+#
+# Syslog-ng default configuration file for Gentoo Linux
+
+# https://bugs.gentoo.org/426814
+@include "scl.conf"
+
+options {
+	threaded(yes);
+	chain_hostnames(no);
+
+	# The default action of syslog-ng is to log a STATS line
+	# to the file every 10 minutes.  That's pretty ugly after a while.
+	# Change it to every 12 hours so you get a nice daily update of
+	# how many messages syslog-ng missed (0).
+	stats_freq(43200);
+	# The default action of syslog-ng is to log a MARK line
+	# to the file every 20 minutes.  That's seems high for most
+	# people so turn it down to once an hour.  Set it to zero
+	# if you don't want the functionality at all.
+	mark_freq(3600);
+};
+
+source src { system(); internal(); };
+
+destination messages { file("/var/log/messages"); };
+
+# By default messages are logged to tty12...
+destination console_all { file("/dev/tty12"); };
+# ...if you intend to use /dev/console for programs like xconsole
+# you can comment out the destination line above that references /dev/tty12
+# and uncomment the line below.
+#destination console_all { file("/dev/console"); };
+
+log { source(src); destination(messages); };
+log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/3.12/syslog-ng.conf.gentoo.fbsd b/app-admin/syslog-ng/files/3.12/syslog-ng.conf.gentoo.fbsd
new file mode 100644
index 000000000000..a0f516c7a582
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.12/syslog-ng.conf.gentoo.fbsd
@@ -0,0 +1,24 @@
+@version: 3.12
+#
+# Syslog-ng default configuration file for Gentoo FreeBSD
+#
+
+# https://bugs.gentoo.org/426814
+@include "scl.conf"
+
+options {
+	threaded(yes);
+	chain_hostnames(no);
+
+	# The default action of syslog-ng is to log a STATS line
+	# to the file every 10 minutes.  That's pretty ugly after a while.
+	# Change it to every 12 hours so you get a nice daily update of
+	# how many messages syslog-ng missed (0).
+	stats_freq(43200);
+};
+
+source src { system(); internal(); };
+
+destination messages { file("/var/log/messages"); };
+
+log { source(src); destination(messages); };
diff --git a/app-admin/syslog-ng/files/3.12/syslog-ng.conf.gentoo.hardened b/app-admin/syslog-ng/files/3.12/syslog-ng.conf.gentoo.hardened
new file mode 100644
index 000000000000..8497ad8a3215
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.12/syslog-ng.conf.gentoo.hardened
@@ -0,0 +1,114 @@
+@version: 3.12
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# https://bugs.gentoo.org/426814
+@include "scl.conf"
+
+#
+# Syslog-ng configuration file, compatible with default hardened installations.
+#
+
+options {
+	threaded(yes);
+	chain_hostnames(no);
+	stats_freq(43200);
+};
+
+source src {
+    unix-dgram("/dev/log");
+    internal();
+};
+source kernsrc {
+    file("/proc/kmsg");
+};
+
+#source net { udp(); };
+#log { source(net); destination(net_logs); };
+#destination net_logs { file("/var/log/HOSTS/$HOST/$YEAR$MONTH$DAY.log"); };
+
+destination authlog { file("/var/log/auth.log"); };
+destination _syslog { file("/var/log/syslog"); };
+destination cron { file("/var/log/cron.log"); };
+destination daemon { file("/var/log/daemon.log"); };
+destination kern { file("/var/log/kern.log"); };
+destination lpr { file("/var/log/lpr.log"); };
+destination user { file("/var/log/user.log"); };
+destination uucp { file("/var/log/uucp.log"); };
+#destination ppp { file("/var/log/ppp.log"); };
+destination mail { file("/var/log/mail.log"); };
+
+destination avc { file("/var/log/avc.log"); };
+destination audit { file("/var/log/audit.log"); };
+destination pax { file("/var/log/pax.log"); };
+destination grsec { file("/var/log/grsec.log"); };
+
+destination mailinfo { file("/var/log/mail.info"); };
+destination mailwarn { file("/var/log/mail.warn"); };
+destination mailerr { file("/var/log/mail.err"); };
+
+destination newscrit { file("/var/log/news/news.crit"); };
+destination newserr { file("/var/log/news/news.err"); };
+destination newsnotice { file("/var/log/news/news.notice"); };
+
+destination debug { file("/var/log/debug"); };
+destination messages { file("/var/log/messages"); };
+destination console { usertty("root"); };
+destination console_all { file("/dev/tty12"); };
+#destination loghost { udp("loghost" port(999)); };
+
+destination xconsole { pipe("/dev/xconsole"); };
+
+filter f_auth { facility(auth); };
+filter f_authpriv { facility(auth, authpriv); };
+filter f_syslog { not facility(authpriv, mail); };
+filter f_cron { facility(cron); };
+filter f_daemon { facility(daemon); };
+filter f_kern { facility(kern); };
+filter f_lpr { facility(lpr); };
+filter f_mail { facility(mail); };
+filter f_user { facility(user); };
+filter f_uucp { facility(uucp); };
+#filter f_ppp { facility(ppp); };
+filter f_news { facility(news); };
+filter f_debug { not facility(auth, authpriv, news, mail); };
+filter f_messages { level(info..warn)
+	and not facility(auth, authpriv, mail, news); };
+filter f_emergency { level(emerg); };
+
+filter f_info { level(info); };
+
+filter f_notice { level(notice); };
+filter f_warn { level(warn); };
+filter f_crit { level(crit); };
+filter f_err { level(err); };
+
+filter f_avc { message(".*avc: .*"); };
+filter f_audit { message("^(\\[.*\..*\] |)audit.*") and not message(".*avc: .*"); };
+filter f_pax { message("^(\\[.*\..*\] |)PAX:.*"); };
+filter f_grsec { message("^(\\[.*\..*\] |)grsec:.*"); };
+
+log { source(src); filter(f_authpriv); destination(authlog); };
+log { source(src); filter(f_syslog); destination(_syslog); };
+log { source(src); filter(f_cron); destination(cron); };
+log { source(src); filter(f_daemon); destination(daemon); };
+log { source(kernsrc); filter(f_kern); destination(kern); destination(console_all); };
+log { source(src); filter(f_lpr); destination(lpr); };
+log { source(src); filter(f_mail); destination(mail); };
+log { source(src); filter(f_user); destination(user); };
+log { source(src); filter(f_uucp); destination(uucp); };
+log { source(kernsrc); filter(f_pax); destination(pax); };
+log { source(kernsrc); filter(f_grsec); destination(grsec); };
+log { source(kernsrc); filter(f_audit); destination(audit); };
+log { source(kernsrc); filter(f_avc); destination(avc); };
+log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); };
+log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); };
+log { source(src); filter(f_mail); filter(f_err); destination(mailerr); };
+log { source(src); filter(f_news); filter(f_crit); destination(newscrit); };
+log { source(src); filter(f_news); filter(f_err); destination(newserr); };
+log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); };
+log { source(src); filter(f_debug); destination(debug); };
+log { source(src); filter(f_messages); destination(messages); };
+log { source(src); filter(f_emergency); destination(console); };
+#log { source(src); filter(f_ppp); destination(ppp); };
+log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/3.12/syslog-ng.confd b/app-admin/syslog-ng/files/3.12/syslog-ng.confd
new file mode 100644
index 000000000000..42fa26ab4cf4
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.12/syslog-ng.confd
@@ -0,0 +1,42 @@
+# Config file for /etc/init.d/syslog-ng
+
+# If you are not using network logging, this entire section should be
+# commented out. Otherwise, choose one of the settings below based on
+# how you are configuring your network.
+#
+# If you are using the net.* scripts to configure your network, you should
+# set rc_need to match the interface through which your logging server
+# can be reached.
+#rc_need="net.eth0"
+#
+# If you are using an interface manager like wicd, dhcpcd in standalone
+# mode, networkmanager, etc to control your interfaces, set rc_need to
+# the name of that service.
+# rc_need="dhcpcd"
+#rc_need="networkmanager"
+#
+# If you are using newnet and configuring your interface statically with
+# the network script, you should use this setting.
+#rc_need="network"
+#
+# You can use this setting, but I do not recommend relying on it.
+#rc_need="net"
+#
+# You may also want to uncomment the following if you are using network
+# logging.
+#rc_use="stunnel"
+
+# For very customized setups these variables can be adjusted as needed
+# but for most situations they should remain commented:
+# SYSLOG_NG_CONFIGFILE=/etc/syslog-ng/syslog-ng.conf
+# SYSLOG_NG_STATEFILE_DIR=/var/lib/syslog-ng
+# SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist
+# SYSLOG_NG_PIDFILE_DIR=/run
+# SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE_DIR}/syslog-ng.pid
+# SYSLOG_NG_GROUP=root
+# SYSLOG_NG_USER=root
+
+# Put any additional options for syslog-ng here.
+# See syslog-ng(8) for more information.
+
+SYSLOG_NG_OPTS=""
diff --git a/app-admin/syslog-ng/files/3.12/syslog-ng.rc b/app-admin/syslog-ng/files/3.12/syslog-ng.rc
new file mode 100644
index 000000000000..abc652a4df60
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.12/syslog-ng.rc
@@ -0,0 +1,58 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf}
+SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/syslog-ng}
+SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE:-${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist}
+SYSLOG_NG_PIDFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/run}
+SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid}
+
+SYSLOG_NG_GROUP=${SYSLOG_NG_GROUP:-root}
+SYSLOG_NG_USER=${SYSLOG_NG_USER:-root}
+
+command="/usr/sbin/syslog-ng"
+command_args="--persist-file \"${SYSLOG_NG_STATEFILE}\" --cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}"
+extra_commands="checkconfig"
+extra_started_commands="reload"
+pidfile="${SYSLOG_NG_PIDFILE}"
+start_stop_daemon_args="--user \"${SYSLOG_NG_USER}\":\"${SYSLOG_NG_GROUP}\""
+description="Syslog-ng is a syslog replacement with advanced filtering features."
+description_checkconfig="Check the configuration file that will be used by \"start\""
+description_reload="Reload the configuration without exiting"
+required_files="${SYSLOG_NG_CONFIGFILE}"
+required_dirs="${SYSLOG_NG_PIDFILE_DIR}"
+
+depend() {
+	use clock
+	need hostname localmount
+	after bootmisc
+	provide logger
+}
+
+checkconfig() {
+	ebegin "Checking your configfile (${SYSLOG_NG_CONFIGFILE})"
+	syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}"
+	eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})"
+}
+
+start_pre() {
+	checkconfig || return 1
+	checkpath \
+		-d \
+		--mode 0700 \
+		--owner "${SYSLOG_NG_USER}:${SYSLOG_NG_GROUP}" \
+		"${SYSLOG_NG_STATEFILE_DIR}"
+}
+
+stop_pre() {
+	[ "$RC_CMD" = "restart" ] && sleep 1
+	return 0
+}
+
+reload() {
+	checkconfig || return 1
+	ebegin "Reloading configuration and re-opening log files"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}
diff --git a/app-admin/syslog-ng/metadata.xml b/app-admin/syslog-ng/metadata.xml
index e4e0c1e1bedb..90774e400b05 100644
--- a/app-admin/syslog-ng/metadata.xml
+++ b/app-admin/syslog-ng/metadata.xml
@@ -4,12 +4,13 @@
 	<!-- maintainer-needed -->
 	<use>
 		<flag name="amqp">Enable support for AMQP destinations</flag>
-		<flag name="smtp">Enable support for SMTP destinations</flag>
-		<flag name="spoof-source">Enable support for spoofed source addresses</flag>
+		<flag name="http">Enable support for HTTP destinations</flag>
 		<flag name="json">Enable support for JSON template formatting via <pkg>dev-libs/json-c</pkg></flag>
 		<flag name="mongodb">Enable support for mongodb destinations</flag>
 		<flag name="pacct">Enable support for reading Process Accounting files (EXPERIMENTAL, Linux only)</flag>
 		<flag name="redis">Enable support for Redis destinations</flag>
+		<flag name="smtp">Enable support for SMTP destinations</flag>
+		<flag name="spoof-source">Enable support for spoofed source addresses</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">balabit/syslog-ng</remote-id>
diff --git a/app-admin/syslog-ng/syslog-ng-3.12.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.12.1.ebuild
new file mode 100644
index 000000000000..0b8222f6656f
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.12.1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit autotools python-single-r1 eutils multilib systemd versionator
+
+MY_PV=${PV/_/}
+MY_PV_MM=$(get_version_component_range 1-2)
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="http://www.balabit.com/network-security/syslog-ng"
+SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test"
+
+RDEPEND="
+	amqp? ( >=net-libs/rabbitmq-c-0.8.0 )
+	caps? ( sys-libs/libcap )
+	dbi? ( >=dev-db/libdbi-0.9.0 )
+	geoip? ( >=dev-libs/geoip-1.5.0 )
+	http? ( net-misc/curl )
+	json? ( >=dev-libs/json-c-0.9 )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
+	python? ( ${PYTHON_DEPS} )
+	redis? ( >=dev-libs/hiredis-0.11.0 )
+	smtp? ( net-libs/libesmtp )
+	spoof-source? ( net-libs/libnet:1.1 )
+	systemd? ( sys-apps/systemd )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	>=dev-libs/libpcre-6.1
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	!dev-libs/eventlog
+	>=dev-libs/glib-2.10.1:2"
+DEPEND="${RDEPEND}
+	>=dev-libs/ivykis-0.36.1
+	sys-devel/flex
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	local f
+
+	use python && python_fix_shebang .
+
+	# remove bundled libs
+	rm -rv lib/ivykis modules/afmongodb/mongo-c-driver modules/afamqp/rabbitmq-c || die
+
+	if use !json ; then
+		sed -i -e '/cim/d' scl/Makefile.am || die
+		eautoreconf
+	fi
+
+	for f in "${FILESDIR}"/*logrotate*.in ; do
+		local bn=$(basename "${f}")
+
+		sed \
+			-e "$(usex systemd \
+				's/@GENTOO_RESTART@/systemctl kill -s HUP syslog-ng/' \
+				's:@GENTOO_RESTART@:/etc/init.d/syslog-ng reload:')" \
+			"${f}" > "${T}/${bn/.in/}" || die
+	done
+
+	default
+}
+
+src_configure() {
+	econf \
+		--disable-docs \
+		--disable-java \
+		--disable-java-modules \
+		--disable-riemann \
+		--enable-manpages \
+		--localstatedir=/var/lib/syslog-ng \
+		--sysconfdir=/etc/syslog-ng \
+		--with-embedded-crypto \
+		--with-ivykis=system \
+		--with-module-dir=/usr/$(get_libdir)/syslog-ng \
+		--with-pidfile-dir=/var/run \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		$(use_enable amqp) \
+		$(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client) \
+		$(use_enable caps linux-caps) \
+		$(use_enable dbi sql) \
+		$(use_enable geoip) \
+		$(use_enable http) \
+		$(use_enable ipv6) \
+		$(use_enable json) \
+		$(use_enable mongodb) \
+		$(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options") \
+		$(use_enable pacct) \
+		$(use_enable python) \
+		$(use_enable redis) \
+		$(use_enable smtp) \
+		$(use_enable spoof-source) \
+		$(use_enable systemd) \
+		$(use_enable tcpd tcp-wrapper)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf* \
+		contrib/syslog2ng "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.hardened" \
+		"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened"
+
+	# Install default configuration
+	insinto /etc/syslog-ng
+	if use userland_BSD ; then
+		newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
+	else
+		newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo" syslog-ng.conf
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${T}/syslog-ng.logrotate" syslog-ng
+
+	newinitd "${FILESDIR}/${MY_PV_MM}/syslog-ng.rc" syslog-ng
+	newconfd "${FILESDIR}/${MY_PV_MM}/syslog-ng.confd" syslog-ng
+	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
+	prune_libtool_files --modules
+
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	elog "For detailed documentation please see the upstream website:"
+	elog "https://www.balabit.com/sites/default/files/documents/syslog-ng-ose-${MY_PV_MM}-guides/en/syslog-ng-ose-v${MY_PV_MM}-guide-admin/html/index.html"
+
+	# bug #355257
+	if ! has_version app-admin/logrotate ; then
+		echo
+		elog "It is highly recommended that app-admin/logrotate be emerged to"
+		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
+		elog "for logrotate to use."
+		echo
+	fi
+}
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index dea77eef4fba..f3d5748a770f 100644
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index c2f0c71d2f4c..7412d579de10 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -13,14 +13,14 @@ AUX clamd.service 136 BLAKE2B 816447fb3a4410fbf8379e89cf3a4117563b3ad5d22ee50fe6
 AUX clamd_at.service 190 BLAKE2B 6d29a2412622a66cf2c0484934a737c0d3c5b3946d1806fa4e1f4bc63490a1acbeada0049b48532786f57e8e929231b6907905bb370d643588ff40da8fa1338b SHA512 b5121bfe761d21152356c8b1e0f0974a9c0bb9002b3d5b1af1c7940d94314250a4890388876b150b0f071c24b7261b93bbc9a6b94b896294c549fe6b572ee70a
 AUX freshclamd.service 191 BLAKE2B 5b517bf15d008454052bd0f7d5a10fb89284a5b64d1cd11570981ca07d70d4dbab6739175ef7434c5c16625fc4f342d21fe6c67970ebac9e64dc8c08732ab68e SHA512 aaf78e763d2aa9c17fc95edb1550547b6681a91fd239a86535e5193d36ff0e152c51c3a3957542f80d5b170805f296159958ac347886981ddd324bec4237da92
 AUX tmpfiles.d/clamav.conf 33 BLAKE2B 447c5ad4ad79bc70fc386833fa763451d30bf30f1ae26434039a3926ca5aae9734e0152c83b5b9aa5bed87b17c1b685c4ea9f41c9cb6b3197b1e78e800b71fd9 SHA512 eabe5a94c2679b82ea3e29272eb448b47e60b271381d3e97f3970b1a9e086d61662aff2d29887950a911025294aa7cea8bfd9003d257963566b251bcaeb5f6b2
-DIST clamav-0.98.7.tar.gz 15118851 SHA256 282417b707740de13cd8f18d4cbca9ddd181cf96b444db2cad98913a5153e272 SHA512 acf01961472c13ccb219420cc3fa3c3e6f8a733edef371dbc04ce5867900aa1535e956ec8ad50d31c8f872a0a1d79fcccac944cd86e29ecdfa4af18f7fd5afb9 WHIRLPOOL c9f2e6f52f07f68bdcccf55ca1aab0bf3deaa6963279459d64ecca076a9ed0ef53c25996b2b673e9746833822df24689a9fab0654064c5ee6ed372a86966fbb6
+DIST clamav-0.98.7.tar.gz 15118851 BLAKE2B 5fffd1896645b5e77f26819eb16e1d9e9cbb8a71d5627aa31ce009b37172fe5c9fff77d6646940c8065c856cf1a74737ffafc79d4e288b8d1202620fe568d1bc SHA512 acf01961472c13ccb219420cc3fa3c3e6f8a733edef371dbc04ce5867900aa1535e956ec8ad50d31c8f872a0a1d79fcccac944cd86e29ecdfa4af18f7fd5afb9
 DIST clamav-0.99.1.tar.gz 15990867 SHA256 e144689122d3f91293808c82cbb06b7d3ac9eca7ae29564c5d148ffe7b25d58a SHA512 9beb5c0ebff2aef741bb27811c1f10a7cd5da354ff67272ee8994d87c95e272a5983105af0fe1a734e1fa99f112dc4dddd9d82074a0df6715814817f85a45f4f WHIRLPOOL e2afd7b7d377c1a1af802e780839bb21bcd318035ac858b6cb11545db3673d3f74ba3159b837238982248720379f98ab51e279a8636bbea89331136891e88e5d
 DIST clamav-0.99.2.tar.gz 16067497 BLAKE2B 4155e3125ccc45cc6828033f207b6b8d3514253dfb8156428ad4096c0901d5a8500f9dd253b8f40afdc49a6039b647627868f75d51829ab7bd247ada5f3b8383 SHA512 7744ba8a344b163cf98e9737cddfd25d2120b34ee9c4518380e028c9ec3cd50127b198b0dfa9fde30f5ce9aab0c0e6384712fbc11287e77d16ce052fd7b6ac44
-DIST clamav-0.99.tar.gz 15968038 SHA256 d2792c8cfadd685fffc40b2199679628815df031fd3149ccf961649fc8787ea9 SHA512 328e66fa412ba61f5e44c839b254c7a84d2ce7821fda6cf29e4ee9532c06e45bdec62f202ca561223e984fff170bfd8280e5cc8e306c09a3017b17e7db3bbf56 WHIRLPOOL 696b425c0d3a6639d627e6dba000a57c4e532232f9f42a564a992c0b459d8041a1947b09548d99b621a5685c78d91045adf4b61731242f55eda2b8d5150fc8b8
+DIST clamav-0.99.tar.gz 15968038 BLAKE2B d3690f08215b8d870e8fb11b11eea6bb92a2eb4b7edddb037ed2f0e8c823a6c5856a3824716cd04f02ec985188ccd36ae41c5077df09ed1948281012dd28ef8c SHA512 328e66fa412ba61f5e44c839b254c7a84d2ce7821fda6cf29e4ee9532c06e45bdec62f202ca561223e984fff170bfd8280e5cc8e306c09a3017b17e7db3bbf56
 EBUILD clamav-0.98.7-r1.ebuild 4690 BLAKE2B b026aa7cd04fb464702fa0a339492cb6d3689df4f581ff6b4fd0f2f5aa1c6d2659841f379d2e819954895460c130a5157447f195240661cc5c2b841602c07173 SHA512 9fbf9f8d7915192590878794cf65903cb82a6e6485c5bcc683b65eba7d7f6df84d32a88b5d347d10b6101765d948b49e3d7de6f2464e660529aedbb36998c1ae
 EBUILD clamav-0.98.7.ebuild 4619 BLAKE2B c4de637f4fa70fec01c169a76b76c723672f41af4a185f0ace60e5ae7027ee01899643d18928f49c145296a0262a20bbea22da8329bbe8b398ceb1aa2e26e563 SHA512 d9284478227cca2739493a3d3b36fa32ce55065252646b9efde32579cc28e15a29f735403c749e1f2090a64563d0513bb492160a10e560b5d677528fe714e6b4
 EBUILD clamav-0.99.1.ebuild 4903 BLAKE2B 2027abb648b5f2c5674104b93c2e21cdd6a28ff675e39ef14558e5df511300bd6f53c8403275fdd54dbf118d18228964f2224c94622bd024dc595fe74afed322 SHA512 709c6ecfb5bc7b16b2f91872b00c332e0ba5b1471fa087afd4b919270c414d853f58bcc63959bcc72b793443dc1d6435490f457e1e49d6de60595f61fee7ebc8
-EBUILD clamav-0.99.2-r1.ebuild 5124 BLAKE2B 287fbc4641e00d3b560e7f65dd36e87c8aef60fbcf9927d91b98e24c0f3fd550eee696a1f2e9d31b204275244f2865fce75b87d2a50a436b902c7f02553c62c8 SHA512 dfc6c93e5444fb39a470792e7d220ff483f415d0c5e7d668a10d9c2a492d3a6bb971496c7dd902cdb6b50fd4aec7d9778483aa2f4db6069a2c7b9feb9718cf8a
+EBUILD clamav-0.99.2-r1.ebuild 5123 BLAKE2B eb88dae6a1f1a40eccdfe072ce602264e3c59eeda4bbbf91387aaef113784ad5ece9eb6684991f4d70d3348dc1594597e36a639b317324f0f2ca7f1e229041bd SHA512 ed25b297bd128bce316a3e6d4a0f2996e2ad704412b534d57094744e6ce1625e289cb52b4348fe494e21d86b209bd16140b80fe9b132c467751a34e6aee997c0
 EBUILD clamav-0.99.2.ebuild 5009 BLAKE2B dd41f2bc6a8db4e3b8f13ad88cb0eb4940af9582572fd6e316d187e8b0623662245ff099ee086fb6dfdbf0acb656d207363c1eacc2c8be84968c24adc0442084 SHA512 4d129d4bdbc8af11f73784a3539a7e8f2332b77954268390f6e4c7fff493549344e6bd4144123e808a1e3760f5ee08dcb840a5218606464a8662198ecbac5cc0
 EBUILD clamav-0.99.ebuild 4915 BLAKE2B 1bb2240f6e4145c4f0d45349aaacacfecab3a66bdd67b8d1fabf59c304b248bd458bf89085b06cf48c80d5d6c25ccd3e1a7397db83708c79d35dda181eee3237 SHA512 916034c7a2114ef083ae138b9f486dcf0b9d29e994ee6a5c7707dc17ee2b3633219fcff20c8af84c4bd1a8d4b4ca565d5285c4a880c435131da2062d198150b2
 MISC metadata.xml 740 BLAKE2B 2cc1cd27896d7a032b476bbbe6a1b176c95657de5267cc77f6fc1ce1758603d9cf0caa0f3a614bc4a366695a089833474c30afc607ba1dee2caaff1dfc9e6c48 SHA512 baff0fa3285a5bfd17b408dc88ad573df07ec4de5e2827d352465347c5ebceb466172c4f369dac5680c927cad3a887a60721358e43b26e8cd7eaf3cebcaba832
diff --git a/app-antivirus/clamav/clamav-0.99.2-r1.ebuild b/app-antivirus/clamav/clamav-0.99.2-r1.ebuild
index ec11c3e098f8..0157c34c7429 100644
--- a/app-antivirus/clamav/clamav-0.99.2-r1.ebuild
+++ b/app-antivirus/clamav/clamav-0.99.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="bzip2 clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs uclibc"
 
 CDEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 52b45d0c42a4..60674baa7dc2 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/moolticute/Manifest b/app-crypt/moolticute/Manifest
index 340ff607f029..aeebd211b0b0 100644
--- a/app-crypt/moolticute/Manifest
+++ b/app-crypt/moolticute/Manifest
@@ -1,6 +1,6 @@
 AUX 50-mooltipass.rule 84 BLAKE2B 574568b60d33216a8de4a90866f2dd4a53d5369fb7e112c6125b8492e8cdaff51067dffe4e36e07fa24cf8a9aaaa77a388f3217ad039a51d7ba0781239020a43 SHA512 26f8a9f2c5fb2f3a87a486f91d5fae7069955dc528eacb8a37a833d393be38b70e3a9784024287cdfeb93a90abad83400395bb803e82a091100bd44cb7b2c28d
 AUX moolticuted.init 309 BLAKE2B 1f967b7e497e7e2d5547baf3e1b18127590997d8221ed34da1b4b4b2843bb1590fbb0c4153cb89d7f68b4fc0852e66f38879362fdd482414e4b6ba6862f06e30 SHA512 bbb80cf14d3adf744538f03513b461eb8bd2b633ef314f9e935e919f288f629aa8d84ff856e3aa104a2933e16143fbdbff90d9df8651473c39907f5aff580ed0
-DIST moolticute-0.9.8_beta.tar.gz 4471922 SHA256 6d1524d104579c03901e1727c7eed3511fe74ce4dc538d846e69d28652129ddb SHA512 9b5829105172b9e461bfccf60de42aa0dc8529e319292006449f54f8590b3cf002c0e9b555b8ab379a6bfe6dad2e40ed142ea140e254337fa035f09e97e49465 WHIRLPOOL de95aed7084b974e370c14bafd989c4f07494fa5bccec64543bb944db73baf3cb0c5cb80bd7fc6314c38b3d30c661862aae72f19e098411f24db73710ffbf60b
-EBUILD moolticute-0.9.8_beta.ebuild 1048 BLAKE2B 349494218ee82dc74b507cb13492c94b70f2548487a8f6d77ff802ad6f7b65157de3cf3138619a55e21bdcc701168a742752df63a046ea49a11e09ab79cfad43 SHA512 553568747fa2c363fe33ee9e82b06516c32194a708344c09f38209d9734fcd9ad80400765bd2e2a03384e4aab105fef3b5842aedcedcf1cd4118068401e9ce5e
-EBUILD moolticute-9999.ebuild 1048 BLAKE2B 349494218ee82dc74b507cb13492c94b70f2548487a8f6d77ff802ad6f7b65157de3cf3138619a55e21bdcc701168a742752df63a046ea49a11e09ab79cfad43 SHA512 553568747fa2c363fe33ee9e82b06516c32194a708344c09f38209d9734fcd9ad80400765bd2e2a03384e4aab105fef3b5842aedcedcf1cd4118068401e9ce5e
-MISC metadata.xml 522 BLAKE2B 93dc4818b6960a26e4aaa29e7a7f37876ca9d460d5dc16e91dc64fe695699762b534072c6c33a668fdefe406a6f2a98ec442febbc088f2a79f37d7772f67f864 SHA512 a08a366830b4fa1cc03a49d0e8af159908a9d5d13e9a4e8e910fd133671da66893010707cfafd1c3548899a54e610e249085583def235bb8e3b32862d960dd45
+DIST moolticute-0.10.0_beta.tar.gz 4945663 BLAKE2B 371ab382239d635251b3921cbae24ee8f0ccefdd2ca2a102e73ecf2eccdef5a86f1613d9cc051871b37ebe9936ffb5f95719f7e3c36c4d7fdc58a18ba9948b73 SHA512 febb828cc179cbbc40684b7c382babfe998d8e14c59358d985658dabc0c414de7b5bec3187336459b286fb85b79f8d781254c7dc55ecd6519fc4ea50952af9b4
+EBUILD moolticute-0.10.0_beta.ebuild 1221 BLAKE2B d7846f6ffdf9461819bd57cdf6d800c2d3cbee5f62f8bfc4f8cf38b4001c79c9637d329a1ad0efb27d006cfb27b29ce838ac88065619b60ebe06f27203da2558 SHA512 8c60b98f38e898ba74aacc00bf0bc58bb9cebb701e3beaca6f4ec934c2041ce5132ae96c73e644348582a00e44012d9a1a5e05b3f0741e378edcdb67f04ca1c7
+EBUILD moolticute-9999.ebuild 1221 BLAKE2B d7846f6ffdf9461819bd57cdf6d800c2d3cbee5f62f8bfc4f8cf38b4001c79c9637d329a1ad0efb27d006cfb27b29ce838ac88065619b60ebe06f27203da2558 SHA512 8c60b98f38e898ba74aacc00bf0bc58bb9cebb701e3beaca6f4ec934c2041ce5132ae96c73e644348582a00e44012d9a1a5e05b3f0741e378edcdb67f04ca1c7
+MISC metadata.xml 530 BLAKE2B ab8901536d9ea0b2841cc0cb604cb7e0eab2765079d1964e561bcc61d10ba780cbce831eec8532cc5ed6866df98d0580ff9294ff10d571910bb67d10f065947c SHA512 8551a8d709f3a2fd054a948839518383d3d8f7187b507bcc275d5daa601e53fe1cc1cf3eb7c13c61f6318055964a0a1afba525726e65cd1e3f025b0266997d0e
diff --git a/app-crypt/moolticute/metadata.xml b/app-crypt/moolticute/metadata.xml
index ff819ee05d46..874684f5407a 100644
--- a/app-crypt/moolticute/metadata.xml
+++ b/app-crypt/moolticute/metadata.xml
@@ -10,7 +10,7 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">raoulh/moolticute</remote-id>
-		<bugs-to>https://github.com/raoulh/moolticute/issues</bugs-to>
+		<remote-id type="github">mooltipass/moolticute</remote-id>
+		<bugs-to>https://github.com/mooltipass/moolticute/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/moolticute/moolticute-0.9.8_beta.ebuild b/app-crypt/moolticute/moolticute-0.10.0_beta.ebuild
index 8609d2fec945..6176b1bb8674 100644
--- a/app-crypt/moolticute/moolticute-0.9.8_beta.ebuild
+++ b/app-crypt/moolticute/moolticute-0.10.0_beta.ebuild
@@ -4,18 +4,18 @@
 EAPI=6
 
 if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/raoulh/moolticute.git"
+	EGIT_REPO_URI="https://github.com/mooltipass/moolticute.git"
 	inherit git-r3
 	KEYWORDS=""
 else
-	SRC_URI="https://github.com/raoulh/moolticute/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/mooltipass/moolticute/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm"
 fi
 
 inherit gnome2-utils qmake-utils udev
 
 DESCRIPTION="Mooltipass crossplatform daemon/tools"
-HOMEPAGE="https://github.com/raoulh/moolticute"
+HOMEPAGE="https://github.com/mooltipass/moolticute"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -34,6 +34,15 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${P/_/-}"
 
+src_prepare() {
+	default
+
+	# Fill version.h with package version
+	if [[ ${PV} != 9999* ]]; then
+		sed -i "s/\"git\"/\"v${PV/_/-}\"/" src/version.h || die
+	fi
+}
+
 src_configure() {
 	eqmake5 PREFIX="/usr" Moolticute.pro
 }
diff --git a/app-crypt/moolticute/moolticute-9999.ebuild b/app-crypt/moolticute/moolticute-9999.ebuild
index 8609d2fec945..6176b1bb8674 100644
--- a/app-crypt/moolticute/moolticute-9999.ebuild
+++ b/app-crypt/moolticute/moolticute-9999.ebuild
@@ -4,18 +4,18 @@
 EAPI=6
 
 if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/raoulh/moolticute.git"
+	EGIT_REPO_URI="https://github.com/mooltipass/moolticute.git"
 	inherit git-r3
 	KEYWORDS=""
 else
-	SRC_URI="https://github.com/raoulh/moolticute/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/mooltipass/moolticute/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm"
 fi
 
 inherit gnome2-utils qmake-utils udev
 
 DESCRIPTION="Mooltipass crossplatform daemon/tools"
-HOMEPAGE="https://github.com/raoulh/moolticute"
+HOMEPAGE="https://github.com/mooltipass/moolticute"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -34,6 +34,15 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${P/_/-}"
 
+src_prepare() {
+	default
+
+	# Fill version.h with package version
+	if [[ ${PV} != 9999* ]]; then
+		sed -i "s/\"git\"/\"v${PV/_/-}\"/" src/version.h || die
+	fi
+}
+
 src_configure() {
 	eqmake5 PREFIX="/usr" Moolticute.pro
 }
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 09a740a64b2b..a71ad6b8bacc 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest
index 0955d5d66d9a..5cb7334bb9a6 100644
--- a/app-emulation/libguestfs/Manifest
+++ b/app-emulation/libguestfs/Manifest
@@ -6,8 +6,8 @@ AUX 1.28/0103_disable_php_bindings_makefile.patch 231 BLAKE2B b86d1fb1d8b3fa45f9
 AUX 1.36/0001-Update-libtool-initialization.patch 984 BLAKE2B afe8906c51c300493deec5a423b85634787e8dfe47841bd8d0c31eface0e40ac55698ca269f373381623ddd8d414241bc8775164ba43607a48cef1abed4d156d SHA512 c1d72b214d2ae5d1ecebc9333e1926d475d84c992af22379d3eb94f1ce5dbd0444b4f24d757de038d0b941d3f720d13e53837b0655019cb82c136622bca7496c
 AUX 1.36/0002-Add-support-for-Gentoo-in-distribution-detection.patch 725 BLAKE2B da5d03d8ba09577e30a954212a56ba1c182956cea00a290c380240e91aedf9c8b224d461c14b23d85eacc557b7c4600deb8dfd6cdc72355bd947087e2996c8ad SHA512 89f4375aef8f025b4cc1271f92d33a58927a13d05167c14c02fa48849bbe7283af684ea0e63632c7f7b8b04c9be463d29c07e65ca52b606283c1e0270c4db167
 AUX 1.36/0003-Workaround-autotools-utils-detection-of-gtk-doc.patch 1168 BLAKE2B 50cf3ece759e8089d90f95e233c4a1a52ffd20f32a75e24e239e441163fc4d5ef852be3b347575e3285d5969ef7eed98f67340c190f423c2ec356d52a7c60629 SHA512 8c45fb951ceecfc67bcbb426a1bd37bfd31981bde2b8235c1508ccf4eb3a1a44627beffc824a3cff333a40a425da17ef77962b5ea9c1a875acb6adf0d47e8931
-DIST libguestfs-1.28.5.tar.gz 12747537 SHA256 e9f38c6ad15cefe18b096a86334a60fc7df6367358f2641d8c5c5f3122ad9d91 SHA512 5ab25498fa9141950c1077cc52bae05a2781fa86a983b5fa49fbd4a4bca70710db3d4f7b9f45fb6f8b4ee8e3d77ffde7c4c0d9e9e526443e2a8251a62306ebb6 WHIRLPOOL cbbac5cce87dd41ad05b13732d0f5a3442c980152d8864522f5df47ffed7a260a131c819ceb40edd07cd74454fc9f4c0c7eb41fe734509a4e123d28bc58d813f
-DIST libguestfs-1.36.5.tar.gz 23012703 SHA256 c2f7c10c42de04567a9b5cfd8345a995fb951ded9a7fbe72fae061d66dfe8f98 SHA512 01f10ab902386130f0565f53d0c361b903d6790b572e5562a2180e896952ead2e7661795bd976a7e2442887ea17014a6767db8b6e575de634f32de82ca4124c6 WHIRLPOOL aec77d2f3070722d6f39b172054ae1f526f731757a7d539ad1b7dc93c328259560172c91b77ca182526b73f1cbebfd037dea441a7c386f8398a0628145580502
+DIST libguestfs-1.28.5.tar.gz 12747537 BLAKE2B b0cc023efef41955c4b448b68bd5578d88d305364afdc1fc24c7d26ba5fae4a1b81ee58799d42774ea28e162208edbf36a0e49c1a7e4f751c74e9c45e9a472a6 SHA512 5ab25498fa9141950c1077cc52bae05a2781fa86a983b5fa49fbd4a4bca70710db3d4f7b9f45fb6f8b4ee8e3d77ffde7c4c0d9e9e526443e2a8251a62306ebb6
+DIST libguestfs-1.36.5.tar.gz 23012703 BLAKE2B 31dcbef2ae1c287c4a353f671e6073cdb4eb2c7173666ff9589ed0e0ce909c2dfa00f2da14b40a0a6a9384dd830082f1f721b0c1dafabe2862391f0f75ff3f3d SHA512 01f10ab902386130f0565f53d0c361b903d6790b572e5562a2180e896952ead2e7661795bd976a7e2442887ea17014a6767db8b6e575de634f32de82ca4124c6
 EBUILD libguestfs-1.28.5-r3.ebuild 3754 BLAKE2B ca8d0cdcb60e7ba34805c64c932e2f06cbd72bbdca8e7777744a37cd43a69bb6964db5f72835d7473c505450396a6f2fa544ffc17a856e541561ce95fbc1acce SHA512 098c67112a8ff3c648351c060837154cb4ccb666ddb056a6e54ee4901e3d7e9b78e20bd73cef7fcd6895a248522242456bd721ab9123faf4e09dc3c6cd6631bd
-EBUILD libguestfs-1.36.5.ebuild 3990 BLAKE2B 016caea4acd2f6b17353d71f31de5b4cfcd0e94b843f1a82c3aebe426f9646c0dd2b94714c3ae132385a0166ecab9afc667dbfbd9750a47b02e8266cd7d4bb73 SHA512 b1e795faff2afca73cfc52df8d707df3955549e1a9830143a5d8a68cc126d1ba02bc634217ac511f4c0365e351f1c383fce0e3b319d7829f439012d666a2a73e
+EBUILD libguestfs-1.36.5.ebuild 3877 BLAKE2B 6f64972ce85db716ae89a73c7f27248c9fcd8427e2eabbeb277a887b27937756463057805287ba955430b37561e034fa40f020ff32539ba77b9b7b9b5a7dd2b0 SHA512 749338dfb6c0dc81ff122085f71fd0861ee6b5b71cbd8591d0392896ee28d59f2f09f3a970dd2f93cc3f520f81767690c8d58bb6ed100de1066a23151b8d33e2
 MISC metadata.xml 894 BLAKE2B 30fe5dbc28d2bdaf099d2fd6b2d94ec235c060f7d661e41dadd3aa7857f56926972394a86f039853a1dbd8bd1f47bfbc7c6cb8b0e61efe6410390a75a84f71af SHA512 ec4e41f3143e4f8128e59188cbd0a105d22c5f28d8c388489bd71177d6c0084b798a2d127308cc1e04406a5fe9cfb143dd5aaf3308dd1422f82a561abeae13af
diff --git a/app-emulation/libguestfs/libguestfs-1.36.5.ebuild b/app-emulation/libguestfs/libguestfs-1.36.5.ebuild
index bbd53624c9d4..941ac259350e 100644
--- a/app-emulation/libguestfs/libguestfs-1.36.5.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.36.5.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-2 LGPL-2"
 SLOT="0/"${MY_PV_1}""
 
 KEYWORDS="~amd64"
-IUSE="bash-completion erlang +fuse debug ocaml doc +perl python ruby static-libs
+IUSE="bash-completion erlang +fuse debug doc +perl python ruby static-libs
 selinux systemtap introspection inspect-icons test lua gtk"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -72,11 +72,10 @@ COMMON_DEPEND="
 		sys-libs/libsemanage
 	)
 	systemtap? ( dev-util/systemtap )
-	ocaml? ( >=dev-lang/ocaml-4.02[ocamlopt]
-		dev-ml/findlib[ocamlopt]
-		dev-ml/ocaml-gettext
-		>=dev-ml/ounit-2
-	)
+	>=dev-lang/ocaml-4.02[ocamlopt]
+	dev-ml/findlib[ocamlopt]
+	dev-ml/ocaml-gettext
+	>=dev-ml/ounit-2
 	erlang? ( dev-lang/erlang )
 	inspect-icons? (
 		media-libs/netpbm
@@ -139,7 +138,7 @@ src_configure() {
 		--without-java \
 		$(use_enable perl) \
 		$(use_enable fuse) \
-		$(use_enable ocaml) \
+		--enable-ocaml \
 		$(use_enable ruby) \
 		--disable-haskell \
 		--disable-golang \
@@ -162,9 +161,6 @@ pkg_postinst() {
 	if ! use perl ; then
 		einfo "Perl based tools NOT build"
 	fi
-	if ! use ocaml ; then
-		einfo "Ocaml based tools ( sysprep , ... ) NOT installed"
-	fi
 	if ! gtk ; then
 		einfo "virt-p2v NOT installed"
 	fi
diff --git a/app-emulation/wine-any/Manifest b/app-emulation/wine-any/Manifest
index f9e2131f61e2..b27b7010127e 100644
--- a/app-emulation/wine-any/Manifest
+++ b/app-emulation/wine-any/Manifest
@@ -11,9 +11,9 @@ DIST wine-staging-2.0.tar.gz 10182575 BLAKE2B 1de645f66fa3e5e0d8ceddf5439fd24651
 DIST wine-staging-2.17.tar.gz 10211107 BLAKE2B 7f791811f2c1f6e70aaa80841b49d8e6af90eae8ecd3b48fced5b7a14d069e90d8a6c23ac1c588254171695c04033e7d18a6dd373b94614fe044cd696664c532 SHA512 b652f6a852a1382c1b8275e172b7ac7608749c34aef5c0c5387cf262bf0da8db67a77ce397d49e53f3e2a8f210a3dbea1a9b3f3feb15c7d5bad8952b6fb7b53c
 DIST wine-staging-2.18.tar.gz 10243957 BLAKE2B 9592fd26564df981353c686bcaf1bd32028d04e4ae97cc412739abf05c845d43135ad6c3ee27ba14d8eda6e657c5c5fee96d4e76a546d4b6e6e905e5505b4898 SHA512 fe18b53d4160596d134ceed392f6459e9c183381f4712add43d8422e77d7d5d89ff34a3bb3afbd7740f250d85dfda0f3501e9600a41270790ae02138ed6d7dc7
 DIST wine-staging-2.19.tar.gz 10241240 BLAKE2B e661e3272328988e9a1aacc22fc02f0773804b58777f208c79c6af866032f31b6140a52e2aa5af954e52437db234712863d1369e960e98e2c212d1efc7f6344f SHA512 90916cb096bbfec35514eff4c1b6e2090b6e68e3e7af1164715f5abb1d255c5cfd6411f53c27cb277adcf0982fa6d6e508a7cdbc1404dcca6c2700b05c2c5483
-EBUILD wine-any-2.0-r1.ebuild 21057 BLAKE2B 2355047e0496ac9b3d97a13370cf224fe9be4763fb6d25442e571915530789e7faf0c26e2831fca16dfc8c938cb0175f04cd2b9d885f0a8fe975bc9fb02fd7c1 SHA512 3b0c81feb94e1b885a5df9d8a2e515f0d83c4a7b0fb596a2038bbdea36fec9eb34330ebd85478b76c8d5236fba4afd9fafdc4990e8e1c800b7043fad67c7d69f
-EBUILD wine-any-2.17-r1.ebuild 21120 BLAKE2B 06de4fea63e546484035fb616a1df5be78a400e47ffef01587f94eda8e1dc598a8879c15d247e341a08770d179cf9155af1a311f71af58608c263dd44872242a SHA512 5e2353d57c43a14a090928e648c2ad49b6af2e42e4e209a36ea9d14742778534419fd5e6836d08d441b0c9b7d09ac3a5b55324c68914340c358e9fa3c1e88b8d
-EBUILD wine-any-2.18.ebuild 20930 BLAKE2B 2c91c2174403adeabc1e633cdd4445776b3d433b554da0c7eef7f0fd5fb16b993134323822ab598f560970362eaf5aa4ea854fe0d3fb1a48e0d5abe50ebbd33c SHA512 9b04a9ac2afda0d091707633059d709554f5a2b99c8dfe01938ed4b384d21631064f19bf05c3f727ef776424f2417717ae39c77d03c0ee82b9b325b9612f1dfb
-EBUILD wine-any-2.19.ebuild 20930 BLAKE2B 2c91c2174403adeabc1e633cdd4445776b3d433b554da0c7eef7f0fd5fb16b993134323822ab598f560970362eaf5aa4ea854fe0d3fb1a48e0d5abe50ebbd33c SHA512 9b04a9ac2afda0d091707633059d709554f5a2b99c8dfe01938ed4b384d21631064f19bf05c3f727ef776424f2417717ae39c77d03c0ee82b9b325b9612f1dfb
-EBUILD wine-any-9999.ebuild 20930 BLAKE2B 2c91c2174403adeabc1e633cdd4445776b3d433b554da0c7eef7f0fd5fb16b993134323822ab598f560970362eaf5aa4ea854fe0d3fb1a48e0d5abe50ebbd33c SHA512 9b04a9ac2afda0d091707633059d709554f5a2b99c8dfe01938ed4b384d21631064f19bf05c3f727ef776424f2417717ae39c77d03c0ee82b9b325b9612f1dfb
+EBUILD wine-any-2.0-r1.ebuild 21058 BLAKE2B ced2b2f0910aa38f74266694f36e7123726a1e9601ddacbabad8792e64ac46697601e4c6ee4671d8585ba95cc9ae26aa825d246c1373c6acfa7271d60f4d7996 SHA512 c5d218ee46e1eeef780699b78944188676d66fed12d32d4fd3b4ac48fb360def3eeb0104071af30d919228296bf514083106d37e2deed35f2f592dc15006c8d8
+EBUILD wine-any-2.17-r1.ebuild 21121 BLAKE2B 908ab2caa2e1b0a1954add61506c96f2e7dad3eda2ea9b562c641d067cf0d59f33b45431cf9942a5187b20e76bc54a77cbf8c61cddd5274a1089d65bffb71a69 SHA512 c6efd719dc224d8a15a8fffd0fe462accf9cb9bbde89661c583f621bb05f1610dc68644ac465100ca8d176d76c80d5a737946f97df7c24d8bee529e855f503e7
+EBUILD wine-any-2.18.ebuild 20931 BLAKE2B 3ae2dfe0369834e1627f5e4a65898023f6171c58b408adfcb9f68e272c1268d7293174ce85afd6b3eb6f93b17752f8c1be5c57d6f8d522563a3adc2256040c18 SHA512 502d351496f88c05f5227ad3fff72a7ca2d76253f6e059127283862b400b15cb030ca1787d4459990d4c9d998c19fefbaff71757006a9def67447f5561d44337
+EBUILD wine-any-2.19.ebuild 20931 BLAKE2B 3ae2dfe0369834e1627f5e4a65898023f6171c58b408adfcb9f68e272c1268d7293174ce85afd6b3eb6f93b17752f8c1be5c57d6f8d522563a3adc2256040c18 SHA512 502d351496f88c05f5227ad3fff72a7ca2d76253f6e059127283862b400b15cb030ca1787d4459990d4c9d998c19fefbaff71757006a9def67447f5561d44337
+EBUILD wine-any-9999.ebuild 20931 BLAKE2B 3ae2dfe0369834e1627f5e4a65898023f6171c58b408adfcb9f68e272c1268d7293174ce85afd6b3eb6f93b17752f8c1be5c57d6f8d522563a3adc2256040c18 SHA512 502d351496f88c05f5227ad3fff72a7ca2d76253f6e059127283862b400b15cb030ca1787d4459990d4c9d998c19fefbaff71757006a9def67447f5561d44337
 MISC metadata.xml 3380 BLAKE2B 3f887b2ecf1dfc1873b97a59a27c5e648ff4e7870f8c673097b817016de92b280ea4c1405ec3deacac8ca091d3c7ac2f6ca1c1e7d46580475839172577c5c96f SHA512 eb5d7e8b3e996b32c86de67c317211cf9cf7b4e97aaff69b2c2343de4401e0a83240084c5ad461e4b96a2cd09315a97ecd5ea62bc75f1803d99f3bea722af4e1
diff --git a/app-emulation/wine-any/wine-any-2.0-r1.ebuild b/app-emulation/wine-any/wine-any-2.0-r1.ebuild
index 071651762edc..67dca4e7ea21 100644
--- a/app-emulation/wine-any/wine-any-2.0-r1.ebuild
+++ b/app-emulation/wine-any/wine-any-2.0-r1.ebuild
@@ -578,7 +578,7 @@ multilib_src_install_all() {
 	# respect LINGUAS when installing man pages, #469418
 	local l
 	for l in de fr pl; do
-		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+		use linguas_${l} || rm -rf "${D%/}${MY_MANDIR}"/${l}*
 	done
 
 	eval "${glob_state}"
diff --git a/app-emulation/wine-any/wine-any-2.17-r1.ebuild b/app-emulation/wine-any/wine-any-2.17-r1.ebuild
index 759f602d1745..ee8cd13d580a 100644
--- a/app-emulation/wine-any/wine-any-2.17-r1.ebuild
+++ b/app-emulation/wine-any/wine-any-2.17-r1.ebuild
@@ -580,7 +580,7 @@ multilib_src_install_all() {
 	# respect LINGUAS when installing man pages, #469418
 	local l
 	for l in de fr pl; do
-		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+		use linguas_${l} || rm -rf "${D%/}${MY_MANDIR}"/${l}*
 	done
 
 	eval "${glob_state}"
diff --git a/app-emulation/wine-any/wine-any-2.18.ebuild b/app-emulation/wine-any/wine-any-2.18.ebuild
index 5fb96a29e62c..877992c40321 100644
--- a/app-emulation/wine-any/wine-any-2.18.ebuild
+++ b/app-emulation/wine-any/wine-any-2.18.ebuild
@@ -576,7 +576,7 @@ multilib_src_install_all() {
 	# respect LINGUAS when installing man pages, #469418
 	local l
 	for l in de fr pl; do
-		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+		use linguas_${l} || rm -rf "${D%/}${MY_MANDIR}"/${l}*
 	done
 
 	eval "${glob_state}"
diff --git a/app-emulation/wine-any/wine-any-2.19.ebuild b/app-emulation/wine-any/wine-any-2.19.ebuild
index 5fb96a29e62c..877992c40321 100644
--- a/app-emulation/wine-any/wine-any-2.19.ebuild
+++ b/app-emulation/wine-any/wine-any-2.19.ebuild
@@ -576,7 +576,7 @@ multilib_src_install_all() {
 	# respect LINGUAS when installing man pages, #469418
 	local l
 	for l in de fr pl; do
-		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+		use linguas_${l} || rm -rf "${D%/}${MY_MANDIR}"/${l}*
 	done
 
 	eval "${glob_state}"
diff --git a/app-emulation/wine-any/wine-any-9999.ebuild b/app-emulation/wine-any/wine-any-9999.ebuild
index 5fb96a29e62c..877992c40321 100644
--- a/app-emulation/wine-any/wine-any-9999.ebuild
+++ b/app-emulation/wine-any/wine-any-9999.ebuild
@@ -576,7 +576,7 @@ multilib_src_install_all() {
 	# respect LINGUAS when installing man pages, #469418
 	local l
 	for l in de fr pl; do
-		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+		use linguas_${l} || rm -rf "${D%/}${MY_MANDIR}"/${l}*
 	done
 
 	eval "${glob_state}"
diff --git a/app-emulation/wine-d3d9/Manifest b/app-emulation/wine-d3d9/Manifest
index c81266ca8ec7..451bcd108ac1 100644
--- a/app-emulation/wine-d3d9/Manifest
+++ b/app-emulation/wine-d3d9/Manifest
@@ -7,9 +7,9 @@ DIST wine-d3d9-2.0.tar.gz 48373 BLAKE2B 80370a7519141030a7e54c2ea5db410b2bf1cde8
 DIST wine-d3d9-2.17.tar.gz 48722 BLAKE2B fa226943210349feb1b906233010fe874b28caf385fca6749a84903c5eba2ed7303a6a7b0e2a15dfe20af399ec9d755ad7ed71c18248018d3968c1e1bcc44951 SHA512 530d44a968a68e06449da2286b8c9740a80b681ff610f6ddc87e6fb569e6c29181341266a04238965a7bfc209e20c1521847b70daa8d3532c2a269db0d200154
 DIST wine-d3d9-2.18.tar.gz 48722 BLAKE2B 47bfd1514cf135b84be7b2a9843e3125acae6f7f817443730498739290503921f998455e1e093ad15c4ac68e020af447add9dfdc4385cbc9bf7af6f3143583f5 SHA512 0e66c51e1957b27ccb9f326b0aaf2b0d09b7bbc9d03e1d321aa1789d2560b8e60fd83c4e86999d96a03aa73a37c96f34d93245763969a314150900741aa03933
 DIST wine-d3d9-2.19.tar.gz 48818 BLAKE2B b053ee0ad798a7d8ad53b3daff1757caaa52f095435f2fb89893c7313d490a2359217a5638529e918a1446f13533a746836c1c22218cba875a1420816618408a SHA512 be43435cd53f367ca57080c08218db302a90bf85ec6e917e89375904c456b585b61fb6053f9b4366b7e844f8246cabe83460a9866f614dbb5df3edfb43b2f54a
-EBUILD wine-d3d9-2.0-r1.ebuild 18550 BLAKE2B 01fdc9d3b7693c632ecbb5b02be216760a49fc17285ee7bf4c58bc532721d5d5241ae65d703db3416a2449f12763137a2db4c7d8daa9211199f542fa133085ff SHA512 bab4e3dba15b15ef1c6a92a3a3644d22dfc64d579aa75f802610daf6388b3a342fff141494f980438ea2183676cf9f781c62c6114afdb2254e1a3755f8194de6
-EBUILD wine-d3d9-2.17-r1.ebuild 18613 BLAKE2B d0bd6a860c43343ba74467c783e5c027ebc8432bbc35c5f978c08741ae0d6f1c2303ca4c1d06d5b8e7a8c9fcc4ceaee49ffec39d15551fc08a117952cad452a2 SHA512 eb38e3fb9f40c45e7eb7cd7a5eb14a1337266438b9177b8ff41bbbecc557141ef24eccd67892a4ad9c50cf57793e08169607a6a37c807398a7ccc21b9bfc2ce3
-EBUILD wine-d3d9-2.18.ebuild 18423 BLAKE2B 475631fe63bf94c94517a794434f312ec8f8e20e86e7fb293ffc219d9c3af62966893f6d521057158acd7b1ccc4f602760cda3351aea49bd6b2e960de2755f99 SHA512 313b82c024888c5fde974975cb129cd2913662963cbdd14c97b29174c3e1a32df11af91630d7302d0b545f952cc2bc3e47f7c1ed3e640ab933d5727078257b3b
-EBUILD wine-d3d9-2.19.ebuild 18423 BLAKE2B 475631fe63bf94c94517a794434f312ec8f8e20e86e7fb293ffc219d9c3af62966893f6d521057158acd7b1ccc4f602760cda3351aea49bd6b2e960de2755f99 SHA512 313b82c024888c5fde974975cb129cd2913662963cbdd14c97b29174c3e1a32df11af91630d7302d0b545f952cc2bc3e47f7c1ed3e640ab933d5727078257b3b
-EBUILD wine-d3d9-9999.ebuild 18423 BLAKE2B 475631fe63bf94c94517a794434f312ec8f8e20e86e7fb293ffc219d9c3af62966893f6d521057158acd7b1ccc4f602760cda3351aea49bd6b2e960de2755f99 SHA512 313b82c024888c5fde974975cb129cd2913662963cbdd14c97b29174c3e1a32df11af91630d7302d0b545f952cc2bc3e47f7c1ed3e640ab933d5727078257b3b
+EBUILD wine-d3d9-2.0-r1.ebuild 18551 BLAKE2B ccf57c3389a3abbb551ea09df82d6638641c38a0e7702f6206dd0a9e97c01a675ed477a360d872ba2b9e5686e8c0e955852cad891d842bdba4027d849c9af3d2 SHA512 c556f51467d2e499f9cc74cdabce67493c5889a2b4e811cf151b6734698fefa06eeefa776f821eb75cf524e83fb526ce488a7cbcf79473816e65fdbea12a3fcf
+EBUILD wine-d3d9-2.17-r1.ebuild 18614 BLAKE2B 20ef1eca0b999b0f910af970fb90cef8fffe6fab45aa7fe571541304c47a263ebfb797e2f2920b999cca72cc0504a481f114574cf85232dab3e374466bf26c8d SHA512 d673727b7752865b516d5ceee1ba6f1b31c7812bb0d5ca155d99f4ee17e777f353396b93d1b0fb2e8cf74e7aeac2916c50c98dbb518bcb32fe4f398320f2f1f3
+EBUILD wine-d3d9-2.18.ebuild 18424 BLAKE2B 3ef07830d16f9debc6a7331a61b11e840417bd0305e6001fc189b10fba8f7445b86e2c846eaae351d8c67878cfe9dab923448b1cf00437da996d78d55a929985 SHA512 0d024f2a5bd9d3331fb09fab9dd86a20020bb9ae794cd131490b48ae50293309207108a5cf1c13efbeb7d5ede83f9da7055bac117c3dee193e56a852b00cb7e8
+EBUILD wine-d3d9-2.19.ebuild 18424 BLAKE2B 3ef07830d16f9debc6a7331a61b11e840417bd0305e6001fc189b10fba8f7445b86e2c846eaae351d8c67878cfe9dab923448b1cf00437da996d78d55a929985 SHA512 0d024f2a5bd9d3331fb09fab9dd86a20020bb9ae794cd131490b48ae50293309207108a5cf1c13efbeb7d5ede83f9da7055bac117c3dee193e56a852b00cb7e8
+EBUILD wine-d3d9-9999.ebuild 18424 BLAKE2B 3ef07830d16f9debc6a7331a61b11e840417bd0305e6001fc189b10fba8f7445b86e2c846eaae351d8c67878cfe9dab923448b1cf00437da996d78d55a929985 SHA512 0d024f2a5bd9d3331fb09fab9dd86a20020bb9ae794cd131490b48ae50293309207108a5cf1c13efbeb7d5ede83f9da7055bac117c3dee193e56a852b00cb7e8
 MISC metadata.xml 2847 BLAKE2B 3812c6a1ab5c6e0afaf377d01df19779bfbf76a8dad4061f08c352e9ef7a6ef1eb7a4546f189373929930a147cdcb2d55f29473cd5cbb6de3625680b02a34a68 SHA512 aa92412a3858822c2bf82c517008a2730eb9710126b1ef336020c3085c4e36503ee921661bd88a5b20d9fa01b539fbcee617620a7c7762665592d8cd711863a0
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild
index 9f694374f5e1..8942399bdde4 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild
@@ -518,7 +518,7 @@ multilib_src_install_all() {
 	# respect LINGUAS when installing man pages, #469418
 	local l
 	for l in de fr pl; do
-		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+		use linguas_${l} || rm -rf "${D%/}${MY_MANDIR}"/${l}*
 	done
 
 	eval "${glob_state}"
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.17-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.17-r1.ebuild
index c3bf9b8d1e4e..89a37fcf7162 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.17-r1.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.17-r1.ebuild
@@ -520,7 +520,7 @@ multilib_src_install_all() {
 	# respect LINGUAS when installing man pages, #469418
 	local l
 	for l in de fr pl; do
-		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+		use linguas_${l} || rm -rf "${D%/}${MY_MANDIR}"/${l}*
 	done
 
 	eval "${glob_state}"
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.18.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.18.ebuild
index ec6c3d60b3cf..339d78dd9057 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.18.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.18.ebuild
@@ -516,7 +516,7 @@ multilib_src_install_all() {
 	# respect LINGUAS when installing man pages, #469418
 	local l
 	for l in de fr pl; do
-		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+		use linguas_${l} || rm -rf "${D%/}${MY_MANDIR}"/${l}*
 	done
 
 	eval "${glob_state}"
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild
index ec6c3d60b3cf..339d78dd9057 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild
@@ -516,7 +516,7 @@ multilib_src_install_all() {
 	# respect LINGUAS when installing man pages, #469418
 	local l
 	for l in de fr pl; do
-		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+		use linguas_${l} || rm -rf "${D%/}${MY_MANDIR}"/${l}*
 	done
 
 	eval "${glob_state}"
diff --git a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
index ec6c3d60b3cf..339d78dd9057 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
@@ -516,7 +516,7 @@ multilib_src_install_all() {
 	# respect LINGUAS when installing man pages, #469418
 	local l
 	for l in de fr pl; do
-		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+		use linguas_${l} || rm -rf "${D%/}${MY_MANDIR}"/${l}*
 	done
 
 	eval "${glob_state}"
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 7cf7cb4a2cfe..b77e988d698a 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -7,9 +7,9 @@ DIST wine-staging-2.0.tar.gz 10182575 BLAKE2B 1de645f66fa3e5e0d8ceddf5439fd24651
 DIST wine-staging-2.17.tar.gz 10211107 BLAKE2B 7f791811f2c1f6e70aaa80841b49d8e6af90eae8ecd3b48fced5b7a14d069e90d8a6c23ac1c588254171695c04033e7d18a6dd373b94614fe044cd696664c532 SHA512 b652f6a852a1382c1b8275e172b7ac7608749c34aef5c0c5387cf262bf0da8db67a77ce397d49e53f3e2a8f210a3dbea1a9b3f3feb15c7d5bad8952b6fb7b53c
 DIST wine-staging-2.18.tar.gz 10243957 BLAKE2B 9592fd26564df981353c686bcaf1bd32028d04e4ae97cc412739abf05c845d43135ad6c3ee27ba14d8eda6e657c5c5fee96d4e76a546d4b6e6e905e5505b4898 SHA512 fe18b53d4160596d134ceed392f6459e9c183381f4712add43d8422e77d7d5d89ff34a3bb3afbd7740f250d85dfda0f3501e9600a41270790ae02138ed6d7dc7
 DIST wine-staging-2.19.tar.gz 10241240 BLAKE2B e661e3272328988e9a1aacc22fc02f0773804b58777f208c79c6af866032f31b6140a52e2aa5af954e52437db234712863d1369e960e98e2c212d1efc7f6344f SHA512 90916cb096bbfec35514eff4c1b6e2090b6e68e3e7af1164715f5abb1d255c5cfd6411f53c27cb277adcf0982fa6d6e508a7cdbc1404dcca6c2700b05c2c5483
-EBUILD wine-staging-2.0-r1.ebuild 20089 BLAKE2B 3db273dcba22608292a56bfcf4ecdd15baa6f778ad26d05acb38420a768195692c439106ff7c58231cb429e3bb89b0aa058b86cdeea943c8c3a58c98a76d20d3 SHA512 b38e650ca2e937c0eeb17ea6f895a7abb1fdaa41c055f5a76cfc804dfcdfd8d7594c06a3491df1d491f4b9f5765fcae45e1184c2ac135d89435a9e32caa3c52d
-EBUILD wine-staging-2.17-r1.ebuild 20152 BLAKE2B b6b23ec4fc2d794ac485f88bba9dc622b562fac7a70973bcd08a15a43e53ef2eefdc79fba8fa582799a07582288138cf2e9c6d1e1afd7ce11155b0deb96d2c18 SHA512 39d12656be030af0218a3944bbf6754149cbd9dcb95545b7738ed7c467ae129eba0e0735e2516f3fa668efee423b160a961e028ee087ecd9ec8bf6292a80a6b4
-EBUILD wine-staging-2.18.ebuild 19962 BLAKE2B 6c3bc13cb27ea492ed3379fea1de5fbe632167f848e8a54c5b2750aa033517552bdb62be226d124f58bd84d3c59fad7383cc156038d0425a18e27cf0ce803016 SHA512 7cbaa98a77a0cb848585e57389de6a15f3fc7629b0b8b8e4591ed6f7b9279202e2bbe00fcd9f1c257b5d722cbfd169abb0ca52d5066c49fff4e99aaee180ab84
-EBUILD wine-staging-2.19.ebuild 19962 BLAKE2B 6c3bc13cb27ea492ed3379fea1de5fbe632167f848e8a54c5b2750aa033517552bdb62be226d124f58bd84d3c59fad7383cc156038d0425a18e27cf0ce803016 SHA512 7cbaa98a77a0cb848585e57389de6a15f3fc7629b0b8b8e4591ed6f7b9279202e2bbe00fcd9f1c257b5d722cbfd169abb0ca52d5066c49fff4e99aaee180ab84
-EBUILD wine-staging-9999.ebuild 19962 BLAKE2B 6c3bc13cb27ea492ed3379fea1de5fbe632167f848e8a54c5b2750aa033517552bdb62be226d124f58bd84d3c59fad7383cc156038d0425a18e27cf0ce803016 SHA512 7cbaa98a77a0cb848585e57389de6a15f3fc7629b0b8b8e4591ed6f7b9279202e2bbe00fcd9f1c257b5d722cbfd169abb0ca52d5066c49fff4e99aaee180ab84
+EBUILD wine-staging-2.0-r1.ebuild 20090 BLAKE2B c9c2e5da108282eb449ae3318fef340f1925395bc2f1f7ec9442edb17fcc614a5ce99291ac3281113661607e8881fe313e39b5831877e6007a173839f486d25e SHA512 2c5e974c9f1f27cfb95835203d78afdcc6ea8a9a8e3e99afa3cdcb79443b778b2d3646815e0b62c61f8cfc88f919f5315b0f113680d3f40914da1857502604a1
+EBUILD wine-staging-2.17-r1.ebuild 20153 BLAKE2B bb6d62a97b2b3052f2ae078bf169f341f066099e5ad99c24f72f37cb2ef622c1f62d2cbad66579f3d7baf1f866bf2eb6140083c2b60948917994f6480eda3497 SHA512 c1492c05943063087d7e6df38a5a02d5124d6ec066767da452e4129360fac53de6f3d41b824cc795150ef7a8a5817ca23bac0e4751cc2b8db4f727e5ae0094cb
+EBUILD wine-staging-2.18.ebuild 19963 BLAKE2B 0a82a9d6e595da163c166eca60072c9622360bd0ea4c12b99f1c24f31641c11344a4e16328476ce476c75d3c998173995b2f2f6c840cef37f1eef641a833f572 SHA512 16ee67df9f2c9554b6dc6c5dca1b7bd445571b95e92d4558f770bc91af8567900b4b8dc97a93ccd7fe619ed3d4c65924778257b114e831cf1808716b3cbf423e
+EBUILD wine-staging-2.19.ebuild 19963 BLAKE2B 0a82a9d6e595da163c166eca60072c9622360bd0ea4c12b99f1c24f31641c11344a4e16328476ce476c75d3c998173995b2f2f6c840cef37f1eef641a833f572 SHA512 16ee67df9f2c9554b6dc6c5dca1b7bd445571b95e92d4558f770bc91af8567900b4b8dc97a93ccd7fe619ed3d4c65924778257b114e831cf1808716b3cbf423e
+EBUILD wine-staging-9999.ebuild 19963 BLAKE2B 0a82a9d6e595da163c166eca60072c9622360bd0ea4c12b99f1c24f31641c11344a4e16328476ce476c75d3c998173995b2f2f6c840cef37f1eef641a833f572 SHA512 16ee67df9f2c9554b6dc6c5dca1b7bd445571b95e92d4558f770bc91af8567900b4b8dc97a93ccd7fe619ed3d4c65924778257b114e831cf1808716b3cbf423e
 MISC metadata.xml 3027 BLAKE2B 2565248dcb436a4b8edad34c23e9778962be2410b1560817f9b250c34d009d23c22d926443d40b52f8c3f6d7884a0c4fb0eff4f1c46396c1db0d9c79c3a103e2 SHA512 d1c58d449c2b9ab201da4338718b724cfb7d282b22b506375a7d9531d64d601414f2ac734e5cc2cb812cc4904351cacac731456596818201cd9361bbb1393d20
diff --git a/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild
index 510cfb087fac..29be96989078 100644
--- a/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild
@@ -555,7 +555,7 @@ multilib_src_install_all() {
 	# respect LINGUAS when installing man pages, #469418
 	local l
 	for l in de fr pl; do
-		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+		use linguas_${l} || rm -rf "${D%/}${MY_MANDIR}"/${l}*
 	done
 
 	eval "${glob_state}"
diff --git a/app-emulation/wine-staging/wine-staging-2.17-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.17-r1.ebuild
index 9df84ca6f8f8..095835fb6e00 100644
--- a/app-emulation/wine-staging/wine-staging-2.17-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.17-r1.ebuild
@@ -557,7 +557,7 @@ multilib_src_install_all() {
 	# respect LINGUAS when installing man pages, #469418
 	local l
 	for l in de fr pl; do
-		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+		use linguas_${l} || rm -rf "${D%/}${MY_MANDIR}"/${l}*
 	done
 
 	eval "${glob_state}"
diff --git a/app-emulation/wine-staging/wine-staging-2.18.ebuild b/app-emulation/wine-staging/wine-staging-2.18.ebuild
index 7fc52bbe654b..7234eab80738 100644
--- a/app-emulation/wine-staging/wine-staging-2.18.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.18.ebuild
@@ -553,7 +553,7 @@ multilib_src_install_all() {
 	# respect LINGUAS when installing man pages, #469418
 	local l
 	for l in de fr pl; do
-		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+		use linguas_${l} || rm -rf "${D%/}${MY_MANDIR}"/${l}*
 	done
 
 	eval "${glob_state}"
diff --git a/app-emulation/wine-staging/wine-staging-2.19.ebuild b/app-emulation/wine-staging/wine-staging-2.19.ebuild
index 7fc52bbe654b..7234eab80738 100644
--- a/app-emulation/wine-staging/wine-staging-2.19.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.19.ebuild
@@ -553,7 +553,7 @@ multilib_src_install_all() {
 	# respect LINGUAS when installing man pages, #469418
 	local l
 	for l in de fr pl; do
-		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+		use linguas_${l} || rm -rf "${D%/}${MY_MANDIR}"/${l}*
 	done
 
 	eval "${glob_state}"
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 7fc52bbe654b..7234eab80738 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -553,7 +553,7 @@ multilib_src_install_all() {
 	# respect LINGUAS when installing man pages, #469418
 	local l
 	for l in de fr pl; do
-		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+		use linguas_${l} || rm -rf "${D%/}${MY_MANDIR}"/${l}*
 	done
 
 	eval "${glob_state}"
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index f045710fff33..aa0f433630ad 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -6,14 +6,12 @@ DIST wine-2.0.tar.bz2 23662707 BLAKE2B 1d485c1359ce8a0395a9f6378c1f8be33ea2836b8
 DIST wine-2.18.tar.xz 19546360 BLAKE2B 711b1396160b325a3021f066cc80eda0e2eb69c46ab671c6a4d1f417d0c2439e53854d37fee8507296386d1a828484af93e833f6c08413fd2571c03477e97386 SHA512 61cc39fa3d2b0a0ab3c5d17579865e6aea76dd9513a4b3c45975a2d5c05f2b4ba952b97eef547131a014763c7f692a08df29bc2ebf7e4ac7e2616e6a7822ddb9
 DIST wine-2.19.tar.xz 19549464 BLAKE2B 86d130cc43d7d674d2f478365952962b2792fd585b8d074564108bc7e9f4f7690337e4758b9a24e54fe8fd60187d3a96496a5ffc454ba674b02ecdde68efd3bb SHA512 83558231bdc592b1f69cfedf6c689063df7bd9fecdfafba6fb7f6a2c7fa7783973efb85a6a49305afc18b1aa268209ee5b9c0655756e05d7550468698dfa51ae
 DIST wine-2.20.tar.xz 19597556 BLAKE2B 80a9886fa77e5788b143521288f7d83c92754610c9426e58c759d2c33767bd23f7d2a44a17ceeec0bfe9065264393e0aa1087a0827ea7d438ffd938ba2eb2fb5 SHA512 d8d374d1e690ce9d3964fc81054fb7f4cd56cbae6bc44ebbf80b7dc7f04524baa2bd831e0be8f00de4cb0e14c1cb71780d424f5dcb9851fcaed9fb22f5ce5d23
-EBUILD wine-vanilla-2.0-r1.ebuild 17309 BLAKE2B e1b96b513d322cc7f6d82e17b168e7b78bf8b8a116a1a869a28e47160444307408e5e94fe5cd1c62b20bd109e5514cb202a5788fdb69957a485a0d42c3ea4ab9 SHA512 898edb3e826bf489b176d4a9d5d8de3db94f7c88c206f0ba8a6cd583103d40bea6f91f0dfa942c7b6510b7249e6e8e421f543ec2a6b9a6c8d68800f4af4088c3
-EBUILD wine-vanilla-2.0.1-r1.ebuild 17308 BLAKE2B b7a47ec48c0c0eec189ad08862f0772e579145981cf5ded328a00924ff4809ee3cd192fede1b850715cecc9a24dd2740f0841bb8cf19352c05a71b8a5cc9a6f1 SHA512 8df961b63c1a41b5b126870a89f7ae9041be87b34f451ddc378e776f112364575a8dd5b70d5ed5747bd4136780b185c9e8fdaab7093a03f25c43ffd640563147
-EBUILD wine-vanilla-2.0.1.ebuild 16990 BLAKE2B 09b30b8eeafe019c2488bdba2eed8b52fa30c560bcb243f78c0cbecc8d81ea83166286fe4b0dbb8f785cc3613b834f82c51cca2560e26ac0e5b1076854f5aba2 SHA512 15f19061d5b46efaea08c1b8aece580522cb28accf5e024c66074806043438348890ce5885d236f20009809e8214424b183311101bf81f575188e4fac7065659
-EBUILD wine-vanilla-2.0.2-r1.ebuild 17308 BLAKE2B b7a47ec48c0c0eec189ad08862f0772e579145981cf5ded328a00924ff4809ee3cd192fede1b850715cecc9a24dd2740f0841bb8cf19352c05a71b8a5cc9a6f1 SHA512 8df961b63c1a41b5b126870a89f7ae9041be87b34f451ddc378e776f112364575a8dd5b70d5ed5747bd4136780b185c9e8fdaab7093a03f25c43ffd640563147
-EBUILD wine-vanilla-2.0.2.ebuild 16990 BLAKE2B 09b30b8eeafe019c2488bdba2eed8b52fa30c560bcb243f78c0cbecc8d81ea83166286fe4b0dbb8f785cc3613b834f82c51cca2560e26ac0e5b1076854f5aba2 SHA512 15f19061d5b46efaea08c1b8aece580522cb28accf5e024c66074806043438348890ce5885d236f20009809e8214424b183311101bf81f575188e4fac7065659
-EBUILD wine-vanilla-2.0.3.ebuild 17118 BLAKE2B 0bc93430b8c7f6b2b81c1afd9b60997b7d972053a6fd06fdf18c146c96c137fbbe732bb65e0a7c819d4116afbb7015fc03f159c7cdc59c61a8c0de8a6b5f3109 SHA512 6ef26c1ef0efee178420559100ee2e490f6dbef16a9e9b6edf1222a0101a19223b219c2c2a4abbd3752eaabb11d3dfca2c59f1ffea49391c9199f63f79551ecc
-EBUILD wine-vanilla-2.18-r2.ebuild 17182 BLAKE2B e585bfe523cc83f965546eaeb11c2f8e1af283977cadba4eb4d0e9772abdd57ad5bcd1ab669e8040f181a6d34197f3d19476386bbbe9dac2ebce703022282c72 SHA512 d44a4f60d928162fd7e478ebee0b264b2e78dcfef772c55867885c5de51ea06557e628635932f06c97bc0bc6d2c2a9b5e4e02f31c57eb882675d53451806dd5b
-EBUILD wine-vanilla-2.19-r1.ebuild 17182 BLAKE2B e585bfe523cc83f965546eaeb11c2f8e1af283977cadba4eb4d0e9772abdd57ad5bcd1ab669e8040f181a6d34197f3d19476386bbbe9dac2ebce703022282c72 SHA512 d44a4f60d928162fd7e478ebee0b264b2e78dcfef772c55867885c5de51ea06557e628635932f06c97bc0bc6d2c2a9b5e4e02f31c57eb882675d53451806dd5b
-EBUILD wine-vanilla-2.20.ebuild 17267 BLAKE2B 5ac0564e75d436bffaf41d0b3492447626e81efd25b4f4a0bd61149cc2fed6e8b337aff51502f30f93888ec2b7960a486071855ef148987b1c3bc741bcaef7fd SHA512 0b9eb0b091310c5d495a1f7bfcb102b6d468563e8b2cf36a68642210740386ae769ec4784fa63e7879eefa09c4956ae2a661f97cef0c5654eb7c4954eaefbe2e
-EBUILD wine-vanilla-9999.ebuild 17267 BLAKE2B 5ac0564e75d436bffaf41d0b3492447626e81efd25b4f4a0bd61149cc2fed6e8b337aff51502f30f93888ec2b7960a486071855ef148987b1c3bc741bcaef7fd SHA512 0b9eb0b091310c5d495a1f7bfcb102b6d468563e8b2cf36a68642210740386ae769ec4784fa63e7879eefa09c4956ae2a661f97cef0c5654eb7c4954eaefbe2e
+EBUILD wine-vanilla-2.0-r1.ebuild 17308 BLAKE2B e07e2ff0fc11c92318a44cfecf98b3900d3e0fc614b28a8de09b3382053ed4950ff99cd558c52dc83119b8f433a04e96b22daf8b71c7cfb2837fc6d335e337c3 SHA512 23775b3aa9ef8dff2511fcf8b6ea6c9b0859eb9930851f4a275db4f971231be11fe20e1393cd32e9ac757460035d31d1433210dbf2a7c6905b0c57efe4556d86
+EBUILD wine-vanilla-2.0.1-r1.ebuild 17307 BLAKE2B d4c6c36bde516492e2b89ba01ebe49699d029aef6925bd1d8dd14df41dc1a49b28294d881d085f7961ca6a67c6aa5b6a0352d2b56bdd4c6457e66d4f1db7d85d SHA512 e2630f62a8cb6ceee42e795086f5682d5b2e1d9da8c2fa1e968301e0876cde7a77b23bec4ce64767edb4ee4656e9b771eba191e4fbe39673466387d4205e51f5
+EBUILD wine-vanilla-2.0.2-r1.ebuild 17307 BLAKE2B d4c6c36bde516492e2b89ba01ebe49699d029aef6925bd1d8dd14df41dc1a49b28294d881d085f7961ca6a67c6aa5b6a0352d2b56bdd4c6457e66d4f1db7d85d SHA512 e2630f62a8cb6ceee42e795086f5682d5b2e1d9da8c2fa1e968301e0876cde7a77b23bec4ce64767edb4ee4656e9b771eba191e4fbe39673466387d4205e51f5
+EBUILD wine-vanilla-2.0.3.ebuild 17117 BLAKE2B 16cdc1b7d3a19eecaa117ab0ea3160987db8afd8195aff1d5d236bee81556a1f537b11bf695dd8ef23cdd2df4712cb759e89b014e54aee148af16b24898bbd51 SHA512 031d4dcc857cc498456e3281d2e9c1b0dcd866c8281921ade96aba26161bb422bd74ac333706f2715816d59fab1f58bcf7830d58dcf41b19a4c72bf073256244
+EBUILD wine-vanilla-2.18-r2.ebuild 17183 BLAKE2B 9b23fb4c33483f072ed33946a1b3ca6413aeffb66f362b855f11fd533dda204c1419694f725cc3f406538335e1e8d9c67fa37fa0269cfca0833d6fe1240e48a5 SHA512 f5e89f07db4712b8ccc4b73785b4e9fb0f82fd8670359b408e0c273ee6f8273a465ed0e8d4e00abecc40377aec9349ab9b5db7a5e8b97cfab3a9da97231d23e0
+EBUILD wine-vanilla-2.19-r1.ebuild 17183 BLAKE2B 9b23fb4c33483f072ed33946a1b3ca6413aeffb66f362b855f11fd533dda204c1419694f725cc3f406538335e1e8d9c67fa37fa0269cfca0833d6fe1240e48a5 SHA512 f5e89f07db4712b8ccc4b73785b4e9fb0f82fd8670359b408e0c273ee6f8273a465ed0e8d4e00abecc40377aec9349ab9b5db7a5e8b97cfab3a9da97231d23e0
+EBUILD wine-vanilla-2.20.ebuild 17268 BLAKE2B a12c0b19d516be78e3839fabfd346f159bfddbbd196599fbc9c3de120030ee96805bc8ca14ff7ed58bb9ad74989b5bf655a12b93861f1e00b956baf28df839e0 SHA512 151aa40d36c47dccd709fed0d4e7614ca9a3352b00a748138cdcf2812efe152c51601708576e46d060335b170932aab32e873f67591aa8c9d194057dbe2642f4
+EBUILD wine-vanilla-9999.ebuild 17268 BLAKE2B a12c0b19d516be78e3839fabfd346f159bfddbbd196599fbc9c3de120030ee96805bc8ca14ff7ed58bb9ad74989b5bf655a12b93861f1e00b956baf28df839e0 SHA512 151aa40d36c47dccd709fed0d4e7614ca9a3352b00a748138cdcf2812efe152c51601708576e46d060335b170932aab32e873f67591aa8c9d194057dbe2642f4
 MISC metadata.xml 2603 BLAKE2B bafcbc708ea156b90b68c69625eb5f293e5a5fc28bfe44269d37bd74b26ad685d6183d0381eeec7f360ec31911884569ea4d2141e9a011e089c3f1cdc4874f2d SHA512 3488427cc15c66af3bfca0ded6a51bbad6f3b3a0935dcb94fc7061056356b6d83eb8a5fee21e6b12f9bce6824d755af9c81b98c755821f9bd0e714929868a759
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild
index d9e20bebdf64..461b5755cd2d 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(get_version_component_range 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.bz2"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	KEYWORDS="-* amd64 x86 ~x86-fbsd"
 fi
 S="${WORKDIR}/${MY_P}"
 
@@ -483,7 +483,7 @@ multilib_src_install_all() {
 	# respect LINGUAS when installing man pages, #469418
 	local l
 	for l in de fr pl; do
-		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+		use linguas_${l} || rm -rf "${D%/}${MY_MANDIR}"/${l}*
 	done
 
 	eval "${glob_state}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild
index 0a297502ec6c..1044daaffa8e 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(get_version_component_range 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	KEYWORDS="-* amd64 x86 ~x86-fbsd"
 fi
 S="${WORKDIR}/${MY_P}"
 
@@ -483,7 +483,7 @@ multilib_src_install_all() {
 	# respect LINGUAS when installing man pages, #469418
 	local l
 	for l in de fr pl; do
-		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+		use linguas_${l} || rm -rf "${D%/}${MY_MANDIR}"/${l}*
 	done
 
 	eval "${glob_state}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.1.ebuild
deleted file mode 100644
index 4024b4791354..000000000000
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.1.ebuild
+++ /dev/null
@@ -1,518 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MAJOR_V=$(get_version_component_range 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
-	KEYWORDS="-* amd64 x86 ~x86-fbsd"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20170830"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	X? ( truetype )
-	elibc_glibc? ( threads )
-	osmesa? ( opengl )
-	test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)
-	abi_x86_32? (
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-		!<app-emulation/emul-linux-x86-baselibs-20140508-r14
-		!app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
-		!<app-emulation/emul-linux-x86-db-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-		!<app-emulation/emul-linux-x86-medialibs-20140508-r6
-		!app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-		!<app-emulation/emul-linux-x86-opengl-20140508-r1
-		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-		!<app-emulation/emul-linux-x86-sdl-20140508-r1
-		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-		!<app-emulation/emul-linux-x86-soundlibs-20140508
-		!app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		!<app-emulation/emul-linux-x86-xlibs-20140508
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	>app-eselect/eselect-wine-0.3
-	!app-emulation/wine:0
-	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.6.4 )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	pulseaudio? (
-		realtime? ( sys-auth/rtkit )
-	)
-	samba? ( >=net-fs/samba-3.0.25[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	X? (
-		x11-proto/inputproto
-		x11-proto/xextproto
-		x11-proto/xf86vidmodeproto
-	)
-	prelink? ( sys-devel/prelink )
-	xinerama? ( x11-proto/xineramaproto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-wine_compiler_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	# GCC-specific bugs
-	if tc-is-gcc; then
-		# bug #549768
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-			ebegin "Checking for gcc-5 ms_abi compiler bug"
-			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-			# Run in subshell to prevent "Aborted" message
-			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/549768"
-				eerror
-				return 1
-			fi
-		fi
-		# bug #574044
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "Wine cannot be built with this version of gcc-5.3"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/574044"
-				eerror
-				return 1
-			fi
-		fi
-	fi
-
-	# Ensure compiler support
-	if use abi_x86_64; then
-		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-		# Compile in subshell to prevent "Aborted" message
-		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		if ! eend $?; then
-			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-			eerror
-			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-			eerror
-			return 1
-		fi
-	fi
-}
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-			eerror "You need gcc-4.4+ to compile 64-bit wine"
-			die
-		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-			eerror "You need clang-3.8+ to compile 64-bit wine"
-			die
-		fi
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-			ewarn "See package.env in man 5 portage for more information on how to do this."
-			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-		fi
-	fi
-
-	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-		eerror "See https://bugs.gentoo.org/487864 for more details."
-		eerror
-		return 1
-	fi
-}
-
-wine_env_vcs_vars() {
-	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-	local pn_live_val="${pn_live_var}"
-	eval pn_live_val='$'${pn_live_val}
-	if [[ ! -z ${EGIT_COMMIT} ]]; then
-		eerror "Commits must now be specified using the environmental variables"
-		eerror "WINE_COMMIT"
-		eerror
-		return 1
-	fi
-}
-
-pkg_pretend() {
-	wine_build_environment_check || die
-
-	# Verify OSS support
-	if use oss && ! use kernel_FreeBSD; then
-		if ! has_version ">=media-sound/oss-4"; then
-			eerror "You cannot build wine with USE=oss without having support from a"
-			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-			eerror
-			die
-		fi
-	fi
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-	wine_env_vcs_vars || die
-
-	WINE_VARIANT="${PN#wine}-${PV}"
-	WINE_VARIANT="${WINE_VARIANT#-}"
-
-	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-	MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
-	fi
-
-	default
-
-	l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-	eapply_bin(){
-		local patch
-		for patch in ${PATCHES_BIN[@]}; do
-			patchbin --nogit < "${patch}" || die
-		done
-	}
-
-	local md5="$(md5sum server/protocol.def)"
-	local PATCHES=(
-		"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-		"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-		"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-		"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-	)
-	local PATCHES_BIN=(
-	)
-
-	default
-	eapply_bin
-	eautoreconf
-
-	# Modification of the server protocol requires regenerating the server requests
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-	fi
-
-	# Edit wine.desktop to work for specific variant
-	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-}
-
-src_configure() {
-	wine_compiler_check || die
-
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--prefix="${MY_PREFIX}"
-		--datarootdir="${MY_DATAROOTDIR}"
-		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
-		--includedir="${MY_INCLUDEDIR}"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-		--libexecdir="${MY_LIBEXECDIR}"
-		--localstatedir="${MY_LOCALSTATEDIR}"
-		--mandir="${MY_MANDIR}"
-		--sysconfdir=/etc/wine
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with ncurses curses)
-		$(use_with udisks dbus)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_enable gecko mshtml)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with ldap)
-		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with pcap)
-		$(use_with png)
-		$(use_with pulseaudio pulse)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with v4l)
-		$(use_with X x)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	local PKG_CONFIG AR RANLIB
-	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	# set AR and RANLIB to make QA scripts happy; #483342
-	tc-export PKG_CONFIG AR RANLIB
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myconf+=( --enable-win64 )
-		else
-			myconf+=( --disable-win64 )
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-	emake depend
-}
-
-multilib_src_test() {
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	if [[ ${ABI} == x86 ]]; then
-		if [[ $(id -u) == 0 ]]; then
-			ewarn "Skipping tests since they cannot be run under the root user."
-			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-			return
-		fi
-
-		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
-	fi
-}
-
-multilib_src_install_all() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-	}
-	l10n_for_each_locale_do add_locale_docs
-
-	einstalldocs
-	prune_libtool_files --all
-
-	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-	fi
-
-	# Remove wineconsole if neither backend is installed #551124
-	if ! use X && ! use ncurses; then
-		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-		rm_wineconsole() {
-			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
-		}
-		multilib_foreach_abi rm_wineconsole
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-	fi
-
-	# Failglob for bin and man loops
-	local glob_state=$(shopt -p failglob)
-	shopt -s failglob
-
-	# Make wrappers for binaries for handling multiple variants
-	# Note: wrappers instead of symlinks because some are shell which use basename
-	local b
-	for b in "${D%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-	done
-
-	# respect LINGUAS when installing man pages, #469418
-	local l
-	for l in de fr pl; do
-		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
-	done
-
-	eval "${glob_state}"
-}
-
-pkg_postinst() {
-	eselect wine register ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine register --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-
-	xdg_desktop_database_update
-
-	if ! use gecko; then
-		ewarn "Without Wine Gecko, wine prefixes will not have a default"
-		ewarn "implementation of iexplore.  Many older windows applications"
-		ewarn "rely upon the existence of an iexplore implementation, so"
-		ewarn "you will likely need to install an external one, like via winetricks"
-	fi
-	if ! use mono; then
-		ewarn "Without Wine Mono, wine prefixes will not have a default"
-		ewarn "implementation of .NET.  Many windows applications rely upon"
-		ewarn "the existence of a .NET implementation, so you will likely need"
-		ewarn "to install an external one, like via winetricks"
-	fi
-}
-
-pkg_prerm() {
-	eselect wine deregister ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine deregister --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild
index 0a297502ec6c..1044daaffa8e 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(get_version_component_range 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	KEYWORDS="-* amd64 x86 ~x86-fbsd"
 fi
 S="${WORKDIR}/${MY_P}"
 
@@ -483,7 +483,7 @@ multilib_src_install_all() {
 	# respect LINGUAS when installing man pages, #469418
 	local l
 	for l in de fr pl; do
-		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+		use linguas_${l} || rm -rf "${D%/}${MY_MANDIR}"/${l}*
 	done
 
 	eval "${glob_state}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.2.ebuild
deleted file mode 100644
index 4024b4791354..000000000000
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.2.ebuild
+++ /dev/null
@@ -1,518 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MAJOR_V=$(get_version_component_range 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
-	KEYWORDS="-* amd64 x86 ~x86-fbsd"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20170830"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	X? ( truetype )
-	elibc_glibc? ( threads )
-	osmesa? ( opengl )
-	test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)
-	abi_x86_32? (
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-		!<app-emulation/emul-linux-x86-baselibs-20140508-r14
-		!app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
-		!<app-emulation/emul-linux-x86-db-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-		!<app-emulation/emul-linux-x86-medialibs-20140508-r6
-		!app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-		!<app-emulation/emul-linux-x86-opengl-20140508-r1
-		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-		!<app-emulation/emul-linux-x86-sdl-20140508-r1
-		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-		!<app-emulation/emul-linux-x86-soundlibs-20140508
-		!app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		!<app-emulation/emul-linux-x86-xlibs-20140508
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	>app-eselect/eselect-wine-0.3
-	!app-emulation/wine:0
-	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.6.4 )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	pulseaudio? (
-		realtime? ( sys-auth/rtkit )
-	)
-	samba? ( >=net-fs/samba-3.0.25[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	X? (
-		x11-proto/inputproto
-		x11-proto/xextproto
-		x11-proto/xf86vidmodeproto
-	)
-	prelink? ( sys-devel/prelink )
-	xinerama? ( x11-proto/xineramaproto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-wine_compiler_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	# GCC-specific bugs
-	if tc-is-gcc; then
-		# bug #549768
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-			ebegin "Checking for gcc-5 ms_abi compiler bug"
-			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-			# Run in subshell to prevent "Aborted" message
-			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/549768"
-				eerror
-				return 1
-			fi
-		fi
-		# bug #574044
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "Wine cannot be built with this version of gcc-5.3"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/574044"
-				eerror
-				return 1
-			fi
-		fi
-	fi
-
-	# Ensure compiler support
-	if use abi_x86_64; then
-		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-		# Compile in subshell to prevent "Aborted" message
-		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		if ! eend $?; then
-			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-			eerror
-			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-			eerror
-			return 1
-		fi
-	fi
-}
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-			eerror "You need gcc-4.4+ to compile 64-bit wine"
-			die
-		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-			eerror "You need clang-3.8+ to compile 64-bit wine"
-			die
-		fi
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-			ewarn "See package.env in man 5 portage for more information on how to do this."
-			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-		fi
-	fi
-
-	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-		eerror "See https://bugs.gentoo.org/487864 for more details."
-		eerror
-		return 1
-	fi
-}
-
-wine_env_vcs_vars() {
-	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-	local pn_live_val="${pn_live_var}"
-	eval pn_live_val='$'${pn_live_val}
-	if [[ ! -z ${EGIT_COMMIT} ]]; then
-		eerror "Commits must now be specified using the environmental variables"
-		eerror "WINE_COMMIT"
-		eerror
-		return 1
-	fi
-}
-
-pkg_pretend() {
-	wine_build_environment_check || die
-
-	# Verify OSS support
-	if use oss && ! use kernel_FreeBSD; then
-		if ! has_version ">=media-sound/oss-4"; then
-			eerror "You cannot build wine with USE=oss without having support from a"
-			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-			eerror
-			die
-		fi
-	fi
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-	wine_env_vcs_vars || die
-
-	WINE_VARIANT="${PN#wine}-${PV}"
-	WINE_VARIANT="${WINE_VARIANT#-}"
-
-	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-	MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
-	fi
-
-	default
-
-	l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-	eapply_bin(){
-		local patch
-		for patch in ${PATCHES_BIN[@]}; do
-			patchbin --nogit < "${patch}" || die
-		done
-	}
-
-	local md5="$(md5sum server/protocol.def)"
-	local PATCHES=(
-		"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-		"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-		"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-		"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-	)
-	local PATCHES_BIN=(
-	)
-
-	default
-	eapply_bin
-	eautoreconf
-
-	# Modification of the server protocol requires regenerating the server requests
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-	fi
-
-	# Edit wine.desktop to work for specific variant
-	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-}
-
-src_configure() {
-	wine_compiler_check || die
-
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--prefix="${MY_PREFIX}"
-		--datarootdir="${MY_DATAROOTDIR}"
-		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
-		--includedir="${MY_INCLUDEDIR}"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-		--libexecdir="${MY_LIBEXECDIR}"
-		--localstatedir="${MY_LOCALSTATEDIR}"
-		--mandir="${MY_MANDIR}"
-		--sysconfdir=/etc/wine
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with ncurses curses)
-		$(use_with udisks dbus)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_enable gecko mshtml)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with ldap)
-		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with pcap)
-		$(use_with png)
-		$(use_with pulseaudio pulse)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with v4l)
-		$(use_with X x)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	local PKG_CONFIG AR RANLIB
-	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	# set AR and RANLIB to make QA scripts happy; #483342
-	tc-export PKG_CONFIG AR RANLIB
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myconf+=( --enable-win64 )
-		else
-			myconf+=( --disable-win64 )
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-	emake depend
-}
-
-multilib_src_test() {
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	if [[ ${ABI} == x86 ]]; then
-		if [[ $(id -u) == 0 ]]; then
-			ewarn "Skipping tests since they cannot be run under the root user."
-			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-			return
-		fi
-
-		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
-	fi
-}
-
-multilib_src_install_all() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-	}
-	l10n_for_each_locale_do add_locale_docs
-
-	einstalldocs
-	prune_libtool_files --all
-
-	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-	fi
-
-	# Remove wineconsole if neither backend is installed #551124
-	if ! use X && ! use ncurses; then
-		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-		rm_wineconsole() {
-			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
-		}
-		multilib_foreach_abi rm_wineconsole
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-	fi
-
-	# Failglob for bin and man loops
-	local glob_state=$(shopt -p failglob)
-	shopt -s failglob
-
-	# Make wrappers for binaries for handling multiple variants
-	# Note: wrappers instead of symlinks because some are shell which use basename
-	local b
-	for b in "${D%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-	done
-
-	# respect LINGUAS when installing man pages, #469418
-	local l
-	for l in de fr pl; do
-		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
-	done
-
-	eval "${glob_state}"
-}
-
-pkg_postinst() {
-	eselect wine register ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine register --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-
-	xdg_desktop_database_update
-
-	if ! use gecko; then
-		ewarn "Without Wine Gecko, wine prefixes will not have a default"
-		ewarn "implementation of iexplore.  Many older windows applications"
-		ewarn "rely upon the existence of an iexplore implementation, so"
-		ewarn "you will likely need to install an external one, like via winetricks"
-	fi
-	if ! use mono; then
-		ewarn "Without Wine Mono, wine prefixes will not have a default"
-		ewarn "implementation of .NET.  Many windows applications rely upon"
-		ewarn "the existence of a .NET implementation, so you will likely need"
-		ewarn "to install an external one, like via winetricks"
-	fi
-}
-
-pkg_prerm() {
-	eselect wine deregister ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine deregister --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild
index ffa871203d4e..1339f35fceb8 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(get_version_component_range 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	KEYWORDS="-* amd64 x86 ~x86-fbsd"
 fi
 S="${WORKDIR}/${MY_P}"
 
@@ -479,7 +479,7 @@ multilib_src_install_all() {
 	# respect LINGUAS when installing man pages, #469418
 	local l
 	for l in de fr pl; do
-		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+		use linguas_${l} || rm -rf "${D%/}${MY_MANDIR}"/${l}*
 	done
 
 	eval "${glob_state}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.18-r2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.18-r2.ebuild
index d8b9031e8ed8..af944ca59599 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.18-r2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.18-r2.ebuild
@@ -481,7 +481,7 @@ multilib_src_install_all() {
 	# respect LINGUAS when installing man pages, #469418
 	local l
 	for l in de fr pl; do
-		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+		use linguas_${l} || rm -rf "${D%/}${MY_MANDIR}"/${l}*
 	done
 
 	eval "${glob_state}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.19-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.19-r1.ebuild
index d8b9031e8ed8..af944ca59599 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.19-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.19-r1.ebuild
@@ -481,7 +481,7 @@ multilib_src_install_all() {
 	# respect LINGUAS when installing man pages, #469418
 	local l
 	for l in de fr pl; do
-		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+		use linguas_${l} || rm -rf "${D%/}${MY_MANDIR}"/${l}*
 	done
 
 	eval "${glob_state}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild
index d64e83579c1b..7c70544b3d4d 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild
@@ -483,7 +483,7 @@ multilib_src_install_all() {
 	# respect LINGUAS when installing man pages, #469418
 	local l
 	for l in de fr pl; do
-		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+		use linguas_${l} || rm -rf "${D%/}${MY_MANDIR}"/${l}*
 	done
 
 	eval "${glob_state}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index d64e83579c1b..7c70544b3d4d 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -483,7 +483,7 @@ multilib_src_install_all() {
 	# respect LINGUAS when installing man pages, #469418
 	local l
 	for l in de fr pl; do
-		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+		use linguas_${l} || rm -rf "${D%/}${MY_MANDIR}"/${l}*
 	done
 
 	eval "${glob_state}"
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 52a98dd36ba4..2f0ce295f847 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/vifm/Manifest b/app-misc/vifm/Manifest
index b6cc7aaf555f..ee5588bb4156 100644
--- a/app-misc/vifm/Manifest
+++ b/app-misc/vifm/Manifest
@@ -1,7 +1,5 @@
 DIST vifm-0.7.2.tar.bz2 468086 SHA256 f95e49a8518dd1acc9b7b750658a98bcf1cb538e25520a5a300b5812108fbc8d SHA512 24a5ad44cecd01f489b95008f0b98ad6cd63656bc7fe4a888101f369f9b258cb87b8025efac30237fbaebc7aff14d173d02118839312017276f3f6b62ea4a3b9 WHIRLPOOL 9c954dbe659e3303315642738bafb962f6f20820af0fe587b3c525ad7a93aca3f9090fe5d2d871a291ce95c9add81f7d717ae5adbdcbe2a58d2889e0bf3e50dc
-DIST vifm-0.8.2.tar.bz2 892414 SHA256 8b466d766658a24d07fc2039a26fefc6a018f5653684a6035183ca79f02c211f SHA512 e2c9f84b8a24542f7153ef8a27b38ba8c251cb0ded72401f5e93fa92540d51b5c368a73147b9fa4a883dda5f880c1d8585c1b4879d46c0e00dea87eacecfdb25 WHIRLPOOL 26d5ff1249885c3be16d7ea7a09ded43498f60243aa46b5d2b8ed3e0d548b29e305943135bcc50a27cca539a5e3b9e240693b8381bdd9c45737e617641da784c
 DIST vifm-0.9.tar.bz2 971539 SHA256 ab10c99d1e4c24ff8a03c20be1c202cc15874750cc47a1614e6fe4f8d816a7fd SHA512 5ae2b03e672bd9a7f95a5c59141dabac8bc7946a4e307d6a3df70bdb52e1f7665b960a3d20709c811cbfbcf76f7836d23b5edb191968e5277fb705a291ab3a9a WHIRLPOOL c8990508f817fba4ceb6ea95e04da89b601faeb4bece63a9cea187d096f0d711807f820ffae5a1269d5a5f93d53975e30e568bff6fd09595ed4b3c1394261c96
 EBUILD vifm-0.7.2.ebuild 1471 BLAKE2B 0172539787d0e577b30b4ebfcf260012c3861a2ea0e27821671e981b785ccb0dbc9817e06d8f72164606566efdbcce8082a75627c7a8132f74256abe4dc432e6 SHA512 97f60228c3d17c96913abc074e02f3a67687e82b2b6b961bee0d82d3bebf5079115ebca7cc3bb9d901c0291aeeb91e722f083aac8947fc86947d6259966f18f0
-EBUILD vifm-0.8.2.ebuild 1947 BLAKE2B 1c84838dda38c665fe28d24ba3b035c2b8519a6a618d4431327cf3e11ea4ee78f5df3a2ca50b787b7b454f4631467d74a9facd354a02e45684fae027d995e793 SHA512 756a9958f861270ca440354f2ebfbb6fbfc76ffd10a4d5efe8c212fadab3a52c32f671d9a471f33fe22757d3c6f52d8b9f6f3e7c8eda88594212822b0fe659a5
 EBUILD vifm-0.9.ebuild 1974 BLAKE2B eb32205afdb5c4dfb84934a6875764549495b38341b719ca01b7cf86c8e7ccbab0b1fd5854e5509e88ba3cb3789d281c887e57fbce4545aa5088b9d5a6551ebf SHA512 7469278aeafedd5ae109fc4062a449c074f8750b23dfc99ffee47a7279e2258825214ba5f67c60ead14e87c49e547ed406e24650acd9962ff0724e2db415c5a0
 MISC metadata.xml 1457 BLAKE2B 0728b3f566cb00a2e3e48d84eff80de83629d026de506863a34a283de41cc80b99021da88b81e4332682b79176526cf65378d6b18142ec026c0dfe23447ecec1 SHA512 ea9d05e36d616a6d9588549317307e28acfe19f66493c870dca9767027124ba1ff45369e5f413dcac5697895f854baf148ef0afc687a801157bba40ce1be5f9a
diff --git a/app-misc/vifm/vifm-0.8.2.ebuild b/app-misc/vifm/vifm-0.8.2.ebuild
deleted file mode 100644
index 7b3de5c96e58..000000000000
--- a/app-misc/vifm/vifm-0.8.2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools vim-doc versionator
-
-DESCRIPTION="Console file manager with vi(m)-like keybindings"
-HOMEPAGE="http://vifm.info/"
-SRC_URI="mirror://sourceforge/vifm/${PF}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~s390 x86"
-IUSE="X developer +extended-keys gtk +magic vim vim-syntax"
-
-DEPEND="
-	>=sys-libs/ncurses-5.9-r3:0
-	magic? ( sys-apps/file )
-	gtk? ( x11-libs/gtk+:2 )
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="
-	${DEPEND}
-	vim? ( || ( app-editors/vim app-editors/gvim ) )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-DOCS="AUTHORS FAQ NEWS README TODO"
-
-src_prepare() {
-	sed -i -e '/stat.h/a#include <sys/sysmacros.h>' "${S}/src/modes/file_info.c" \
-		|| die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable developer) \
-		$(use_enable extended-keys) \
-		$(use_with magic libmagic) \
-		$(use_with gtk) \
-		$(use_with X X11)
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	einstall
-	dodoc ${DOCS}
-
-	if use vim; then
-		local t
-		for t in app plugin; do
-			insinto /usr/share/vim/vimfiles/"${t}"
-			doins "${S}"/data/vim/doc/"${t}"/"${PN}"*
-		done
-	fi
-
-	if use vim-syntax; then
-		local t
-		for t in ftdetect ftplugin syntax; do
-			insinto /usr/share/vim/vimfiles/"${t}"
-			doins "${S}"/data/vim/"${t}"/"${PN}".vim
-		done
-	fi
-}
-
-src_test() {
-	emake check
-}
-
-pkg_postinst() {
-	if use vim; then
-		update_vim_helptags
-
-		if [[ -n ${REPLACING_VERSIONS} ]]; then
-			elog
-			elog "You don't need to copy or link any files for"
-			elog "  the vim plugin and documentation to work anymore."
-			elog "If you copied any vifm files to ~/.vim/ manually"
-			elog "  in earlier vifm versions, please delete them."
-		fi
-		elog
-		elog "To use vim in vifm to view the documentation"
-		elog "  edit ~/.vifm/vifmrc and set vimhelp instead of novimhelp"
-		elog
-	fi
-}
-
-pkg_postrm() {
-	use vim && update_vim_helptags
-}
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index caa452edc49e..7ad0f65db58f 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index 38d5558f3550..c7d7435623b7 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -7,5 +7,5 @@ AUX kmymoney-4.8.0-kdepimlibs-optional.patch 5262 BLAKE2B 767b89b2dfe3b7bb6634be
 AUX kmymoney-4.8.0-soversion.patch 870 BLAKE2B 69a04e29456b6623c3fc3070ac1da51915f756194ff9678e03d32cb7867861a9f387d179f303a2cd14315fe1e6f9732a1e8a79b50d6388975c7248070b4ffc8d SHA512 b1687ddf582e2ed2ca2b26b4bd39428a69fee6469fbdba6b1f7575f433db822eaf9ef96d57c2b35a0bbe22e4fa140438e7005bab4953035ba5adfc853ef98070
 AUX kmymoney-4.8.0-tests.patch 7303 BLAKE2B 9af6e4438ddd5f0a992744f9b063a3b5e4d161f3b7740121071e947d7e34d60a3ef72b0fc718d9fca24653e9382d29e721a6fe6ee509ff562f3dac9dec98658e SHA512 e7f8cd817eee087faa02b7ca4320a2df0a3c52f4db2dfe8ce32314d2abb8572f0f2caa8b0f96e4a43be3fab3dff76e5211e693cfa6105ee85d1252cc6e3bcfbb
 DIST kmymoney-4.8.0.tar.xz 20785888 SHA256 c2a635710aafa6925a49803c480e043e0bf4bc5b62430689aa5eb95619f48ac2 SHA512 883635a94333341cbe3d6c835fe1dbc1cc5ed5cc834f76c945030ec680aee4fc6ceb367fdde811672a392eb5cd7b735c858e0be5a7f7964a4ccf5f9ba8865381 WHIRLPOOL acbada22e3e9c83e88e571b397c37da79eb36ce05a55786c352af306d3f863dc2db7140c9f1e1757393ea7f6dc9a1728debe077c71ce28b655c65e707f1130cd
-EBUILD kmymoney-4.8.0-r2.ebuild 2206 BLAKE2B e4c276c11743f16daf3660a5f68fe27a2535504d54ded4a5dd67b9eb2366c78323935a6945dd9ab1b3afb78d6457456645acb0870d6eff66129f0583cd451b55 SHA512 e55f0d764337c93506e9956f090b89080c60661aff8e7c530c8a36de9096cc85427dedb0bbca937ffe55b40f3c3cc633429571c30e5c3f4e88ca572a0e902999
+EBUILD kmymoney-4.8.0-r3.ebuild 2080 BLAKE2B 47916c64c9bc3f9fcc906d11c2e1a02df5224f40297454ab228b99f8a5d8ca4df5dd068052fccc0a218efe3bcf9e8b16f53bad2b0d691acf0a0357d12dda9362 SHA512 f74c37356f2059c14c224aa600af5fc0b6cb6217be1ce431bf57223d93299ca515ecdd1801487c06502703b61bb81faa42be6358e3cda17c4099335d6c19dfaf
 MISC metadata.xml 607 BLAKE2B 3c2d771c20d49a41fef17d5b82bb7530f7db7611f19fa708045a81c55392cb06c0a82df7c0e9c80f8f2fb089e9233ea5a570700c37d3f0ca8782505ddf5216df SHA512 53ff98b9a6a419763e03670c0f6b5da707ff0b17f9f6ac8c03df46502599225d8780c099627fe8bc1c35f13452b80deb88d6fd0da450634f42a9aed827d256e1
diff --git a/app-office/kmymoney/kmymoney-4.8.0-r2.ebuild b/app-office/kmymoney/kmymoney-4.8.0-r3.ebuild
index b6f87338fb73..b61523303b5c 100644
--- a/app-office/kmymoney/kmymoney-4.8.0-r2.ebuild
+++ b/app-office/kmymoney/kmymoney-4.8.0-r3.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=6
 
-KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr gl
-hu it kk nds nl pl pt pt_BR ro ru sk sv tr uk zh_CN zh_TW"
 KDE_HANDBOOK="optional"
 SQL_REQUIRED="always"
 VIRTUALX_REQUIRED="test"
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index fd9a5539a855..00e5334984cb 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/docbook-xsl-stylesheets/Manifest b/app-text/docbook-xsl-stylesheets/Manifest
index 23dc9aa80191..7e0c16fd0ed8 100644
--- a/app-text/docbook-xsl-stylesheets/Manifest
+++ b/app-text/docbook-xsl-stylesheets/Manifest
@@ -1,5 +1,5 @@
 AUX nonrecursive-string-subst.patch 1205 BLAKE2B 0c7bb8e3ba646a137bc0b50722448c65437881672a4bbb3f3dc7a181e5074f667fca0fbcb4475b83f04ac63bdddbf3dae800b7a7094b5d9aea270faeb81d9e50 SHA512 6a26838078a3ce28273dddfa1af6a378cffc28b6d1ba48a4cfc839addd7bf58ce217d6584b735f9c75381954744ab2386c75fa3c593858b6e27882be55c00d04
-DIST docbook-xsl-1.79.1.tar.bz2 21967928 SHA256 725f452e12b296956e8bfb876ccece71eeecdd14b94f667f3ed9091761a4a968 SHA512 83325cbaf1545da6b9b8b77f5f0e6fdece26e3c455164b300a1aa3d19e3bd29ae71fd563553a714a5394968d1a65684c6c7987c77524469358d18b8c227025c7 WHIRLPOOL 3bd03072aba15cda9e7a18cb6c1edfc91cdb706811fd07d5aa69df1ffd5a48394848079cf63c67360104f0c0ec89920268b49d358c62bf5f61d6030938be0a0f
+DIST docbook-xsl-1.79.1.tar.bz2 21967928 BLAKE2B 42b7e989616d16fa100c2dad713830ecedf6c7e26f56f99a9bf9330385c753f282cea1033e689196352bd41f9dca59a06ff09fc4638051cb478a630df9bfeb0b SHA512 83325cbaf1545da6b9b8b77f5f0e6fdece26e3c455164b300a1aa3d19e3bd29ae71fd563553a714a5394968d1a65684c6c7987c77524469358d18b8c227025c7
 EBUILD docbook-xsl-stylesheets-1.79.1-r1.ebuild 2122 BLAKE2B b1a124e1349a4a6f0e267be4a57d1ef9a88d3c49570107fa8ec56cea286c242f31b34b3b05b80150fab519ea50d51587a84284ab44fb6ec5dd3b107f413c1311 SHA512 69c1f46596e62747f2011d69def968960f8243393998b5897f83dd4a641931e25dfe496ae502ee5c83714bc887b5c8023b8f208b1b3897d6f472eae134c2b2b3
-EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2205 BLAKE2B 9a7772c50d666f4b26533417e59e15576fe86156207e454e918d23eed77b069672e2edfcf07743f775d933b5a95fa601a989da35b7ea06ed944a01f1f4f1c5bd SHA512 08cfc53c2763f048067ffac104399fd2ba0ebe96be2a27b5d109f571fa7e962bb83138847c7e735ee73b24f69d94f2c65de3b816f5a1bdf218b02cbea2dc1efe
+EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2204 BLAKE2B 698270179dc6ddfe8ee606832d30ef19a54c96bec803ae204ac593e378b3868b3d7d8591dd93c5e535b8a78ccf035e5e2724d459ccee2b183fa1ce93c80a8744 SHA512 01115efcec06425a1e1fbe0be634c474b757b10ca26e3b6e765a4d362cc1e1b39d5fb4ac2d938f83cd2806f0b7bf7dd2e65063322a972da88dbfe95725de8d1d
 MISC metadata.xml 413 BLAKE2B c4ba1418a2d7499d953111afac5907a4dd53c183f8a2613218aa0f0f510f1b75d04c6839c5407f20703ebab963d505dc09e081cfb053970147b07001caea6920 SHA512 7c32b5261d0bfe9f552efd08854233b47958d04cab7b932ddb67cfe163319f8f8ea82d1b169203b9e2158d3a436862d7050dcc762d3b525ba806690640ad3892
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
index 77db5fdb1ab0..b1fa7e4e9acb 100644
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ruby"
 
 RDEPEND=">=app-text/build-docbook-catalog-1.1
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 73d4abb67f31..82fdc51b5dcc 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/gsl/Manifest b/dev-cpp/gsl/Manifest
index cf0aa7146490..08b83117c886 100644
--- a/dev-cpp/gsl/Manifest
+++ b/dev-cpp/gsl/Manifest
@@ -1,3 +1,4 @@
-DIST gsl-0_pre20171105.tar.gz 55870 SHA256 5adc4b4ba53102099f63b898da161469a854d4fd47e90195421fbe8bd8b50352 SHA512 0db9cae9af710c45f66d1e2b73e2002f921876d400165d13dbe9ede7aa9335249458a9f97d4eda4cff0b3a5ceebb6ef84b631310921011fedee8776fcec89e6a WHIRLPOOL 98e26057646f6be4cc6632901b2b45c5e46218e9048cd64561f7f118ee0e8feadeca3ca66a0b73a36a431b666fe7946c6f864dbcf97296bae3945b2350dcf2e5
+AUX gsl-0_pre20171105-use_system_catch-636828.patch 921 BLAKE2B e2dcbb1b8ccfd7047565f70c0e487b1da699d832a8dc66c7f7824fbfa3d9f12bcecd82dca4d23af02efb467577cd0e3c23bab0eb99778e755504b3569e863668 SHA512 4581e4c3a6408458936b7b49a269bb62d46c8d313f7bf10ba7c7eae642d62baaa2e8ddca5e46e54591fe91e65389e0d4b0fc272c90bdf94c6b08acb3d3160a5f
+DIST gsl-0_pre20171105.tar.gz 55870 BLAKE2B cc26a8a304a65cd6a487d22369b5b23169e07144a7629388fffdbf263619c0849f00efcc1a072408e3e89dd933e3309c15049d0fec30de07267b5b693c5c9657 SHA512 0db9cae9af710c45f66d1e2b73e2002f921876d400165d13dbe9ede7aa9335249458a9f97d4eda4cff0b3a5ceebb6ef84b631310921011fedee8776fcec89e6a
 EBUILD gsl-0_pre20171105.ebuild 601 BLAKE2B 6d56f6463b3a675fe752d541ef1ed7fd92ab24fb08bb870e00755fbb5d9f37ee1814442d221aa1180e257283917f8280c5486ce452ff73ad82da1962ff5f43cd SHA512 1f01a505b9716fafe174435051fe5a41168bf5aa7d9c2b3c46b3dac8848f3e9d31b6c7dedbc67323e9fa813f45d365e06c790eb57d0680cdcd8307e478c19714
 MISC metadata.xml 546 BLAKE2B 8ed1288cb4f89f8e15554171875541dd0d100b2d6608d5093e5be319a08e5a03334865548bd8c42337723961af42a75d2ad160acf58f259b4107c790e032ab12 SHA512 e5aa4be86c8c44e14384ec27e0a7a14f246ee60a1b789d97bd67ef5d00553f09449aa6ec0eb51fd4a6b17d25e8ccffe6b9a7921056bc406acf758ae2de6bd958
diff --git a/dev-cpp/gsl/files/gsl-0_pre20171105-use_system_catch-636828.patch b/dev-cpp/gsl/files/gsl-0_pre20171105-use_system_catch-636828.patch
new file mode 100644
index 000000000000..e72eae02311e
--- /dev/null
+++ b/dev-cpp/gsl/files/gsl-0_pre20171105-use_system_catch-636828.patch
@@ -0,0 +1,31 @@
+# Disable upstreams catch download, we always want to use the system installed 
+# version. Gentoo bug 636828.
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 86ce5a4..9b7d4f7 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -10,21 +10,8 @@ list(APPEND CATCH_CMAKE_ARGS
+     "-DNO_SELFTEST=true"
+ )
+ 
+-if(GIT_FOUND)
+-    # add catch
+-    ExternalProject_Add(
+-        catch
+-        PREFIX ${CMAKE_BINARY_DIR}/catch
+-        GIT_REPOSITORY https://github.com/catchorg/Catch2.git
+-        GIT_TAG v2.0.1
+-        CMAKE_ARGS ${CATCH_CMAKE_ARGS}
+-        LOG_DOWNLOAD 1
+-        UPDATE_DISCONNECTED 1
+-    )
+-else()
+-    # assume catch is installed in a system directory
+-    add_custom_target(catch)
+-endif()
++# assume catch is installed in a system directory
++add_custom_target(catch)
+ 
+ # this interface adds compile options to how the tests are run
+ # please try to keep entries ordered =)
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 20d07b8b4855..e112b94aaba9 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest
index 912dd3364de4..5ff4a5b7b6b3 100644
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -1,13 +1,16 @@
+AUX cabal-2.0.0.2-no-bootstrap.patch 255 BLAKE2B 49b913ac6c5c43c92aab70abfb39059731f636e3a23064c7ca5d8773b28409fc834b480985d9ac4b402af5c4dd6c11000f6d7f90fd8b7c2d2268789764d4522a SHA512 b09d267b1099233aa0fc2a17afe3ade979f263f113ae3b70c5f2e9663c1a88860ca09fdbae489779851efab07f897579714da80a955e9a70f30ad0811f168c9f
 DIST Cabal-1.18.1.2.tar.gz 323545 BLAKE2B d9e88f8f512b6bf23f8c57b6719fcf560b24aa2b20a0be3aeaba455dbea79c7320cfec495f31524a098b2d0298fe04cdd29c65f8c527066fcac82ba1f592e761 SHA512 a91abbdb86bcb7a47e871e9b9a2cb4720b41f2cf6998416cc557460ff821e9b711cf8c346bf16c7b07c180815cb901f7b27e5cda3701f3ace554613ceb27e3c6
 DIST Cabal-1.18.1.3.tar.gz 705715 BLAKE2B 46d6c446e9410d7bd3e3f2e68e2e950e180f8fde4332ba3c4657add30dd721d7e2887b830e9c2954d3ce8e521e42d7db90d87150804589ad5fbea5c08b6b3fca SHA512 3c6f2d3be36384140007ca1146edcca5461bf0e93cde8d2b32bd9d69f74df51975bfbc91ec7cce92d9c78929f91f9e7e8b595488bc1c328dbed313a6fcd76708
 DIST Cabal-1.18.1.5.tar.gz 706722 BLAKE2B ff1b301882d39c0388f6ecd39ad73cadebdc9096b0e185fcf1299897e536be23714ba9126033d98b60558272fc28e9d72f638ee94d9f769e61d00c2d2bd1a092 SHA512 a5bb21bcb0a95f22572a1d6d4338415bf00eab9b77c2fb4775c81f7554d282fea9160646687bd903197cb5d429f0fcd28b30b577a8915ec92740a91fa13c68ef
 DIST Cabal-1.20.0.2.tar.gz 717941 BLAKE2B 38aa5742a1f0137b3f81af6543d7810b98f15b6aeb6e83ea169aacab0bcb1d14629df885cc9c02bb64567069e475497cf2ac716731bf84ee89bdf177404cc5e0 SHA512 6dfe30ebe5859ccd934f76fc32bd4757d89e3bcb02a528bebaa0a63f22c0494eb4a941b2fed2e004671875586fed113860e82413bed99f70be565f4f343ac3d3
 DIST Cabal-1.22.8.0.tar.gz 405552 BLAKE2B 9484ba4b485f6119a7b9e27565ac26ea403b407711a8dcfcee127e03f3cce6a0e96165126a996b39a8f29e97e65eff4f5ec308fb3f53c53cb795cb8ba1ab0daf SHA512 3666e8a66751ea8ae93109c1e33c2909c00c65ddcd77458c41303481e06ebd7230215e12c133cc2fca47ba352c61411ff72ca0994b6d45b5987156bce2fbcdf3
 DIST Cabal-1.24.2.0.tar.gz 441440 BLAKE2B b4ce800ab35c0771b9da1947b459bae7cf6236724b6073bff3eb51732b08b71f65596f9f3fb7a09eacea4a1ee88d9bd6350298919f095fb2479770f98539faf5 SHA512 707015930d6bd463290c59ef043a5acea79f22d43920ac249d2391c0b8960a10261a83c8aa1a326b6e95311edb048c9edbdc211dc1b79aee86884061af6c8b36
+DIST Cabal-2.0.0.2.tar.gz 1551128 BLAKE2B bc053a31ddd966577b1c4d5b80bd778fe0b5aadef08d3eee1f8613ab2dd9bc3a0371ad1687033a4489bfced3b46926b0cbdea20d53ada4ed1ab615c7e080de39 SHA512 0eac73132dbee80cce8bf6ce95d531526c983e90dde3348edf6ee583e7fe352393dc6806eb7f35cd38729d979dd418267f1884ec49b4c9e7d858d9b17dff900f
 EBUILD cabal-1.18.1.2.ebuild 1310 BLAKE2B c6490c92d19e9f84fd33b859865170b083cbe0726337965311d5e17ffac9e7a8ffbc24a8137207ad07fdb3ac0c9b72c48b1fcfe7b9acb6910622de2281c1eb67 SHA512 79d6d4fea74176190c4cf9b37be79790c0d1f340b3f4c29a3e0ed3cbb19d048b04b3d4c3a7769bfe3eaf4707613725afba7452f28132ce30b14494c8b49b9e21
 EBUILD cabal-1.18.1.3.ebuild 1489 BLAKE2B d1ef02de7c0517988a8c6bef39520b5068b67f329fcfbccbc43b7006232ffbd5303ece6aee2bc69509d7d058070016c540a7543b3d3152a4ce72bf62d2b9bfd2 SHA512 312fbc3f713bfd170a1a5825c374f8fb81b59b242c8b6c7e516d1f10f47eb62b8ff26af1907bb45d7b0701cc3a4a913af837bd7a237fd7dde32b673a0b090f4b
 EBUILD cabal-1.18.1.5.ebuild 1504 BLAKE2B d1abcbbebf88b2860178efa5c996fcc0834bf6e1317279d21224bec54adefc628764b8149b8053457226c3ae8aa19d4448b78f624e4a35fe11c3a5dda308c56b SHA512 6631bc5ac5017b5167e9830370a1d37fb39c5411ef0daa8cc1454cd24a99f3b9e3bca7edd9c154b132f42a46ade7f04dd48de05bc2babd53c779ad26ea5caeb0
 EBUILD cabal-1.20.0.2.ebuild 1566 BLAKE2B a94e9df84ae92684444d10916d01ebbed387ebd7b414b6434405c43cb9e98b53e2325fabe8548b05c64efe1f42c7cb71f0ddfb533ce8fe91df5493ba698e41ea SHA512 43a24a9d1f800fa4267808ad85c156e602916c156e380fad32ec9abe987e72eb2126c31a05881cdaf357b62bff61dcc325e3aae06bcbf4cda427405130fecfcd
 EBUILD cabal-1.22.8.0.ebuild 1453 BLAKE2B d728a8fafe08b4240e025eda34cae7def1000300749ca0d931a9df406b275904d9a3ff7287d98a665881fc1b8dec4a051675da90741e0e37623554109fb34322 SHA512 2ab65a807e81402a63d215f1876da576c7ac3e23d40e37789dc2af40a7062f7f408f6721180f8f089832973c3548b478f5b09752bc99544621132a1599f0fc3d
 EBUILD cabal-1.24.2.0.ebuild 936 BLAKE2B fde47bbeb66732209eaa9b4389420b0c8130ed77f9c5744d4829ba8cb62f91ac27a8fa56108c564154a67c5f8908152cc8b65d0f3e28b090e8e63041cbb983a0 SHA512 50796827840967c4ba091ddc63e1dc854feabefc7dd0b87abf4ba57f0766fe8692a32f4350647c28b06db74d7b3aa1c4014e4c2aff6fee9a76071cb4597f04e7
-MISC metadata.xml 223 BLAKE2B e11afb7bd2d6874573289d9011b6d3c0c64ea9a0c8a1b56a21e28be81ea22dec73294b216eecdf1557301fa04792d24ec07aad40137bb4d00d85a495cf735ee6 SHA512 a95e1e8e49facff470233b8ce06b8b8de0bee533571391e53624f051b0518bc9e448293b7827515708058d0b98fc92c435440158362e1b1f52c9b99c5a3f47d7
+EBUILD cabal-2.0.0.2.ebuild 1014 BLAKE2B ad1f0e55d1ca91f0ae260ab0e130d3dd579e9bca7fc919366a3911ec397e76f325758a3b3b574a3e2c1e0e20b5d9bbdc36ca54f5c78fe2c6941a6f82ae6fc893 SHA512 8b78c7509cdfbfff4e682079c97ce9d68c679de981f5e211ac426ebae16dd259c54093b4f9ca56ce9bd1057cbdbe462a43e7c329c7dfb78caac1a32d1ce89bb5
+MISC metadata.xml 620 BLAKE2B c506aec421eed73838acb77891628cece6a7e8045069b51325669067f8900bd3028aaa93a784a5c4f0383909ff46ffa4044d09e091518e0bf207eea0f1594c4c SHA512 e52cb4657e879d3a4d384daa3fcb8c109e61278ca2875b3fbc6c55b5e4ff9c98716eb7d740ef425634130d13639f92cdde7b04f88e266f112d393b99ce389b0b
diff --git a/dev-haskell/cabal/cabal-2.0.0.2.ebuild b/dev-haskell/cabal/cabal-2.0.0.2.ebuild
new file mode 100644
index 000000000000..6940bc3c4e4d
--- /dev/null
+++ b/dev-haskell/cabal/cabal-2.0.0.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.3.9999
+#hackport: flags: -parsec-struct-diff
+
+CABAL_FEATURES="lib profile test-suite"
+CABAL_FEATURES+=" nocabaldep" # in case installed Cabal is broken
+inherit haskell-cabal
+
+MY_PN="Cabal"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A framework for packaging Haskell software"
+HOMEPAGE="http://www.haskell.org/cabal/"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+#not keyworded yet: many packages are broken
+#KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RESTRICT=test # circular dependencies
+
+RDEPEND=">=dev-lang/ghc-7.8.1:="
+DEPEND="${RDEPEND}"
+
+CABAL_CORE_LIB_GHC_PV="PM:8.2.1"
+
+PATCHES=("${FILESDIR}"/${P}-no-bootstrap.patch)
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-parsec-struct-diff
+}
diff --git a/dev-haskell/cabal/files/cabal-2.0.0.2-no-bootstrap.patch b/dev-haskell/cabal/files/cabal-2.0.0.2-no-bootstrap.patch
new file mode 100644
index 000000000000..2eed504b5654
--- /dev/null
+++ b/dev-haskell/cabal/files/cabal-2.0.0.2-no-bootstrap.patch
@@ -0,0 +1,10 @@
+diff --git a/Setup.hs b/Setup.hs
+index 42784ab..6bb3f8a 100644
+--- a/Setup.hs
++++ b/Setup.hs
+@@ -1,2 +1,4 @@
+-import Distribution.Simple
++{-# LANGUAGE PackageImports #-}
++-- forces not to use local files
++import "Cabal" Distribution.Simple
+ main :: IO ()
diff --git a/dev-haskell/cabal/metadata.xml b/dev-haskell/cabal/metadata.xml
index b3df786ec763..97bee0727e40 100644
--- a/dev-haskell/cabal/metadata.xml
+++ b/dev-haskell/cabal/metadata.xml
@@ -1,7 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-  </maintainer>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		The Haskell Common Architecture for Building Applications and
+		Libraries: a framework defining a common interface for authors to more
+		easily build their Haskell applications in a portable way.
+		
+		The Haskell Cabal is part of a larger infrastructure for distributing,
+		organizing, and cataloging Haskell libraries and tools.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 0e92b360abe0..91fbab11cc76 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 571df4159615..768f9ef0c80c 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -17,9 +17,9 @@ DIST perl-cross-1.1.7.tar.gz 97622 BLAKE2B c58dd51492cfbda6fc58b43d9de45c35dd5ed
 EBUILD perl-5.24.1-r2.ebuild 17081 BLAKE2B 3f2b034a7d0f6d8ecffd137e878f70fd2ea799b2808668a7b1d4b2087f91a7df272083a954cc849717d30bd0a52a0261916969bc31f8493bbbd54151445a13f3 SHA512 7c46c1b392371db63a03d2174613cc008f50045f3a50693034853a2c809b59c8dbef7b36a00f2be20d5f09aae62760365c32d9268d770d49a20a9b191af0ecac
 EBUILD perl-5.24.2.ebuild 17076 BLAKE2B e9f0500f185c2e281aadb4a7025a478895946e8f4adcdd32bf27709e60387c523d07c00f4456e213a52304f3ec027d1432d13a823b52251ef4457dacbc4c08d3 SHA512 c6bafe77fe764ed6a318a731ee4240e31b1555afb45a416bf2e9eb650d680ea618f37b5dafdccdfd34e2676e5f1e3f1fbc8d4757d6694149a733b6f81f4251ea
 EBUILD perl-5.24.3.ebuild 17074 BLAKE2B adc941ce1cd25915a14d6f2b57c5f9d996dd2cd9145d14775b76dc1cd674f2031073ca6858d9a1fb49635ea580f89b7bfd6bb4dc34d6510ed2cfc8bf92144a16 SHA512 729ece15a14c7ab5c01d950d370bbf2a299c7782e39fbac9a90e911f7cff4696049284670a679b18fd0f430ecefbcfc966dbc1ad8d79628321efb8ae4ed901aa
-EBUILD perl-5.26.0.ebuild 17985 BLAKE2B e898f97092b112a2c36996744e75ddb22dcae12512179dda24fd582c5d5c7d9a6fa1e2037ff6eb7244433cf510fff9c9602934bbcd3ad5d8672c4d38a5be4cfe SHA512 f45357a04344573edcbe589d5da44b5a915a5db8262c7bdc34c73c163a184050d4f0223106696504b8f9f1fa2297b4534313a8513d45aa12240027eef833f6a4
-EBUILD perl-5.26.1-r1.ebuild 19361 BLAKE2B e54858729035448863f6469d214a4445242df6c87054ff55760a1849e26caff9df0015d512cfcc9277a9599f19a1b9c0aad4ba36d31fa23c549d7e00364eeda4 SHA512 faf300e65fea48059af5c9e4e7e96519a5c61766524ac8d8f096896aaeda9293bab36e09e0ab4cb3063292677f29315ed142e09f2b4a37092a7235dd8fa4e3a8
-EBUILD perl-5.26.1.ebuild 19090 BLAKE2B 0553dbd71b3154c9448c9c1c46a932826b8fd52b413bca70e72d4b01907c29edc8a032f7cc8d3ca5c3a421692941aa80297fad1705f111a6144fdf58845df10a SHA512 dcbca9dfd36210eef3d1b57419e711b592479079c10aa212971b9778b82a777f87bead09c907c713cdde7af6292bc29bc57e472f4969830e04d6f09ae10ea453
-EBUILD perl-5.26.9999.ebuild 19354 BLAKE2B 8ab0f5a020e1ee1e15962c60c71e7acf473bd9fde0eb7332289faa9816e35485db9a3b704aba685cd54b57169773aabfe7c43167a116ce1098159c0425f29a69 SHA512 9d0c68ab7be7dcc91581fddb70906ab44f4461f750689785ac185bd71bba41b4495248c7d770b7bbc79e624592cebf832899d40e15cf7ec9e6903ed325011457
-EBUILD perl-5.28.9999.ebuild 19340 BLAKE2B 03482553c53712fa60f03a2b8414477b7993c76fe17dcdf3303ce91f08da4ec09472d0361a5eb75fd106e0f31ef082083f3845948fa037498e202df0bf6ac657 SHA512 aa3fdfa3535b11e620f95b18f9c2e8a175492844abb52aecbd2ee5c70a2bd83aeb628313d16ecd4f7a4f5efe49a3589b196950338f7550244bdc2137299b7088
+EBUILD perl-5.26.0.ebuild 17878 BLAKE2B e49c729dcdf208399fdefeddc97e4e2ac57d289bb433b3ef0c2176f850dbb44477ac5b1e9c2b66fdbc0466c9a5c335c5f001f565e0fe3fe4f43a2790669e2105 SHA512 574fce3abb6a2ca762a4db9b9deb36906980d5d3c8a1c99cbd3761871e423a1bcd678c513e8d728359acfbccef67253743d48c14e544b4498f724e24ad965609
+EBUILD perl-5.26.1-r1.ebuild 19254 BLAKE2B 73e46934f072a5469f531b699d22e550d526ead8eb55f37675708f65655f7728241021d92362278f685250739c29dc8d30d4784e06cc3c04c239c0d449977fdb SHA512 320cd2b0eb69881e5893d06c304dbeedc64bc7878ff4ad2ec8864cd15274129fdff0b32710212569edcd8b94b542cf0bb617ca0aa73d3f579f182d46f71a0443
+EBUILD perl-5.26.1.ebuild 18983 BLAKE2B ef92b27b06f0866a1e7e7a3d35f87d8378e1d6df1a42ab68e03682c978f35429f83f23beef2921a214382ecd84e706bddb4a49d1a218d5dc133b71f15faa327c SHA512 903eee39e82711ff898fc7b3628bd06baf7d5ce6ca0b685b7852991755cf7779cc869e076a14a13293eab549d60453026411d3dc2b277873184975ff9ff491c4
+EBUILD perl-5.26.9999.ebuild 19247 BLAKE2B e8b3991aea3b19d75e2db0ca6d4ace191175ab2c8e289014324e8d0a9457aeb20a184b22d27db28d4c4da2033c9878c3dd0d11eeed787a4b37458636ee19db9f SHA512 cd0795a3f6894a936f52e6c563aac208d160ea24a88b50a13c00b85ebb8515d0aea6c6c7f78183d89567f4a6d05926f4f9a3768014bf59818c5ea49f1d356a36
+EBUILD perl-5.28.9999.ebuild 19233 BLAKE2B 50a9b4a9a6078d20b2fbff1ad6eb73474ec4444eced2ea4368525bc68717612cd9b21f6a1bbc47f733c69c1cb4b281982a7091dd4ca1791a952d67ee6f78ce9c SHA512 9add4dd31298f3519cc029fb84abce15db0917fa221fcbd4b69f0b41bb9512ac4ec1daeaa2721a32e6e1477e77ba681bdad53b1772fa494450bebfb4757ff9c8
 MISC metadata.xml 430 BLAKE2B 8625fd07f63a7943a85c3919d6ae6db622b752caa2803c56c72a22b270244261331fbab8b760e6d00acb8480770c9ef1d1beaaa22cc6044660821687c0cd8c33 SHA512 ca4c43e2016b7df707894713465700a90d2b8551b57fc4d660cff75edb1e8cc2456f9ae10431839ad6738f290d4f5911fae360eaa1d4670859d855de3d568583
diff --git a/dev-lang/perl/perl-5.26.0.ebuild b/dev-lang/perl/perl-5.26.0.ebuild
index 6a1ce9639e77..cbf0ad1a94d2 100644
--- a/dev-lang/perl/perl-5.26.0.ebuild
+++ b/dev-lang/perl/perl-5.26.0.ebuild
@@ -285,10 +285,6 @@ src_prepare_perlcross() {
 	cp -a ../perl-cross-${CROSS_VER}/* . || die
 
 	sed -i \
-		-e 's/(15 + $CLEANUP)/(13 + $CLEANUP)/' \
-		cnf/diffs/perl5-${PV}/makemaker-test.patch || die
-
-	sed -i \
 		-e 's/MakeMaker\.pm .*/MakeMaker.pm bf9174c70a0e50ff2fee4552c7df89b37d292da1/' \
 		-e 's/MM_Unix\.pm .*/MM_Unix.pm b0ec308fe2d7dcfcef5732880db0fae1f4ea80fa/' \
 		cnf/diffs/perl5-${PV}/customized.patch || die
diff --git a/dev-lang/perl/perl-5.26.1-r1.ebuild b/dev-lang/perl/perl-5.26.1-r1.ebuild
index f4f6054d3728..3a6ded81ff59 100644
--- a/dev-lang/perl/perl-5.26.1-r1.ebuild
+++ b/dev-lang/perl/perl-5.26.1-r1.ebuild
@@ -286,10 +286,6 @@ src_prepare_perlcross() {
 	cp -a ../perl-cross-${CROSS_VER}/* . || die
 
 	sed -i \
-		-e 's/(15 + $CLEANUP)/(13 + $CLEANUP)/' \
-		cnf/diffs/perl5-${PV}/makemaker-test.patch || die
-
-	sed -i \
 		-e 's/MakeMaker\.pm .*/MakeMaker.pm bf9174c70a0e50ff2fee4552c7df89b37d292da1/' \
 		-e 's/MM_Unix\.pm .*/MM_Unix.pm b0ec308fe2d7dcfcef5732880db0fae1f4ea80fa/' \
 		cnf/diffs/perl5-${PV}/customized.patch || die
diff --git a/dev-lang/perl/perl-5.26.1.ebuild b/dev-lang/perl/perl-5.26.1.ebuild
index a7e2522f1e1d..d201810751b7 100644
--- a/dev-lang/perl/perl-5.26.1.ebuild
+++ b/dev-lang/perl/perl-5.26.1.ebuild
@@ -286,10 +286,6 @@ src_prepare_perlcross() {
 	cp -a ../perl-cross-${CROSS_VER}/* . || die
 
 	sed -i \
-		-e 's/(15 + $CLEANUP)/(13 + $CLEANUP)/' \
-		cnf/diffs/perl5-${PV}/makemaker-test.patch || die
-
-	sed -i \
 		-e 's/MakeMaker\.pm .*/MakeMaker.pm bf9174c70a0e50ff2fee4552c7df89b37d292da1/' \
 		-e 's/MM_Unix\.pm .*/MM_Unix.pm b0ec308fe2d7dcfcef5732880db0fae1f4ea80fa/' \
 		cnf/diffs/perl5-${PV}/customized.patch || die
diff --git a/dev-lang/perl/perl-5.26.9999.ebuild b/dev-lang/perl/perl-5.26.9999.ebuild
index 3dc88edc18b6..79b8c3037c1f 100644
--- a/dev-lang/perl/perl-5.26.9999.ebuild
+++ b/dev-lang/perl/perl-5.26.9999.ebuild
@@ -286,10 +286,6 @@ src_prepare_perlcross() {
 	cp -a ../perl-cross-${CROSS_VER}/* . || die
 
 	sed -i \
-		-e 's/(15 + $CLEANUP)/(13 + $CLEANUP)/' \
-		cnf/diffs/perl5-${PV}/makemaker-test.patch || die
-
-	sed -i \
 		-e 's/MakeMaker\.pm .*/MakeMaker.pm bf9174c70a0e50ff2fee4552c7df89b37d292da1/' \
 		-e 's/MM_Unix\.pm .*/MM_Unix.pm b0ec308fe2d7dcfcef5732880db0fae1f4ea80fa/' \
 		cnf/diffs/perl5-${PV}/customized.patch || die
diff --git a/dev-lang/perl/perl-5.28.9999.ebuild b/dev-lang/perl/perl-5.28.9999.ebuild
index 267767fa38dc..ea454ceccebf 100644
--- a/dev-lang/perl/perl-5.28.9999.ebuild
+++ b/dev-lang/perl/perl-5.28.9999.ebuild
@@ -286,10 +286,6 @@ src_prepare_perlcross() {
 	cp -a ../perl-cross-${CROSS_VER}/* . || die
 
 	sed -i \
-		-e 's/(15 + $CLEANUP)/(13 + $CLEANUP)/' \
-		cnf/diffs/perl5-${PV}/makemaker-test.patch || die
-
-	sed -i \
 		-e 's/MakeMaker\.pm .*/MakeMaker.pm bf9174c70a0e50ff2fee4552c7df89b37d292da1/' \
 		-e 's/MM_Unix\.pm .*/MM_Unix.pm b0ec308fe2d7dcfcef5732880db0fae1f4ea80fa/' \
 		cnf/diffs/perl5-${PV}/customized.patch || die
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index a267d71cb50f..5fdfa4663fcc 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -2,7 +2,6 @@ AUX 2.7-disable-nis.patch 823 BLAKE2B eccd1ceb7e7e66848e1c7520ae9c5f2f57a27203a5
 AUX 3.4-getentropy-linux.patch 1766 BLAKE2B b0999a96833f2b6db936f0c97f8405c8b6eb2fcf926f4c4c41590d903435c1435be21795ea1d44355f5c2e3a745b1528bf04cfda362372a12f796fd1bb51629a SHA512 52e888819b3c265e0920efa00911311a2029a6a80162ca56e69892ffc49c28487852882b27e560b9f8ff1c16ee41d074423b6c565596b37c6efca2dd8eb45675
 AUX 3.6-blake2.patch 1335 BLAKE2B af3acdee3c789199fab8a2eb0140ff7a470f2873db506163d2e81117e1efed2c245d629f13a49d313a63af98200d5dad5f3d5bcc3e43e66af5bb0e39778faa55 SHA512 f8f9b4424df36f58354c24b7eb571c63a7bb49a1d2fd5399562ab28371eb3a80ed829c7e4fc19f5b3d9955a83a46d09a63819e4da0dafdef0a5a3f6b1e679d71
 AUX 3.6-disable-nis.patch 864 BLAKE2B a960b2f44ff1358677ebb0cf82bcff1ddc7812ed511d0f492fdac07c848f0de8dbd0e8a9200b276709532b5524eed9e779b33d6c4ee34c1f9d23e4eb1f862d99 SHA512 a86a17c90743e8a3712ceaf14ea1a88b96bd5504a4feaadc0168f3211c2afbc130fad8147a40d7ac65268ff1d6293b0c3f98ad36845efebeacfc628149ef13f3
-AUX 3.6.1-test_socket-AEAD.patch 3501 BLAKE2B c35283bf715dcab4c7b368645850f35b0c8e2f479dc9e2595d9ad8e5ec1c1e11372f01ff5fa612f9068862ef3ab5c335b273f13bb698e120a826df69ae41220e SHA512 7c813ea3c9eb45f50164b58fd4908e6ccf48eba7d027f252a2c13dab09662a52c4d950c4c7583d50a8752848f52e0854e6974d8c2ebbb38a38fedaa97878bc28
 AUX pydoc.conf 169 BLAKE2B ce40bb3d5f858bd7a8d9ef5bf215a8ab592568a724f0e08aea219da014dac12fdfcbcf5fb168bb9aa57be110f74d656aed46179ffe11e3c992d84a647e442b7b SHA512 30d0776a4004cd641e6f283658c3c24915a21ea15fe40e506ff2c3a5f95936aa00c9490b04ab25f29e9b7ac65cd88fd54ca0b08e000e73820b13c7c57c0bf5b2
 AUX pydoc.init 600 BLAKE2B fb8775a6663483e5112ec283627610b746020d88494e772b92bb718a9493a52606e565c6c2fa4917a5cb963f166283d09883bd26903f2f3ced6c240d4e292a7f SHA512 9e71ad53486b6882a8441b24225c602195ee33d29dd1b60df27febbc6b752e79929be356152a489f893dcfb11f9c066b999787bc27a8ac61062c86e67a69e87a
 AUX python-2.7.10-cross-compile-warn-test.patch 775 BLAKE2B 617938353c7e19a9b931544ff1fdcd60cf46e3a68f3ff63bc6ac16432220aad13df4d2b405a968505fb64d31da51a478c46499944ab58e9bbfa5a5b44d392f00 SHA512 652941239541f6139ee3580ec0ea5240baf07ae1afb786f76a69b1d748de1f4dda2740a95c28866e9b0b59023410f8a1e86507642595991c0d90d187519cb758
diff --git a/dev-lang/python/files/3.6.1-test_socket-AEAD.patch b/dev-lang/python/files/3.6.1-test_socket-AEAD.patch
deleted file mode 100644
index 426e3371441c..000000000000
--- a/dev-lang/python/files/3.6.1-test_socket-AEAD.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 4ac01f0ff3e3c9c02f5cc8c55f2fbe4639808f5e Mon Sep 17 00:00:00 2001
-From: Mariatta <Mariatta@users.noreply.github.com>
-Date: Thu, 16 Mar 2017 20:58:42 -0700
-Subject: [PATCH] update test_socket AEAD test for kernel 4.9 and up (GH-133)
- (GH-548)
-
-(cherry picked from commit 9764c151c51480a7ca6042b1ccd69be2620ff360)
----
- Lib/test/test_socket.py | 15 +++++++--------
- 1 file changed, 7 insertions(+), 8 deletions(-)
-
-diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
-index 5315d475df..1508f20c9f 100644
---- a/Lib/test/test_socket.py
-+++ b/Lib/test/test_socket.py
-@@ -5479,7 +5479,7 @@ class LinuxKernelCryptoAPI(unittest.TestCase):
-             self.assertEqual(len(dec), msglen * multiplier)
-             self.assertEqual(dec, msg * multiplier)
- 
--    @support.requires_linux_version(4, 3)  # see test_aes_cbc
-+    @support.requires_linux_version(4, 9)  # see issue29324
-     def test_aead_aes_gcm(self):
-         key = bytes.fromhex('c939cc13397c1d37de6ae0e1cb7c423c')
-         iv = bytes.fromhex('b3d8cc017cbb89b39e0f67e2')
-@@ -5502,8 +5502,7 @@ class LinuxKernelCryptoAPI(unittest.TestCase):
-                 op.sendmsg_afalg(op=socket.ALG_OP_ENCRYPT, iv=iv,
-                                  assoclen=assoclen, flags=socket.MSG_MORE)
-                 op.sendall(assoc, socket.MSG_MORE)
--                op.sendall(plain, socket.MSG_MORE)
--                op.sendall(b'\x00' * taglen)
-+                op.sendall(plain)
-                 res = op.recv(assoclen + len(plain) + taglen)
-                 self.assertEqual(expected_ct, res[assoclen:-taglen])
-                 self.assertEqual(expected_tag, res[-taglen:])
-@@ -5511,7 +5510,7 @@ class LinuxKernelCryptoAPI(unittest.TestCase):
-             # now with msg
-             op, _ = algo.accept()
-             with op:
--                msg = assoc + plain + b'\x00' * taglen
-+                msg = assoc + plain
-                 op.sendmsg_afalg([msg], op=socket.ALG_OP_ENCRYPT, iv=iv,
-                                  assoclen=assoclen)
-                 res = op.recv(assoclen + len(plain) + taglen)
-@@ -5522,7 +5521,7 @@ class LinuxKernelCryptoAPI(unittest.TestCase):
-             pack_uint32 = struct.Struct('I').pack
-             op, _ = algo.accept()
-             with op:
--                msg = assoc + plain + b'\x00' * taglen
-+                msg = assoc + plain
-                 op.sendmsg(
-                     [msg],
-                     ([socket.SOL_ALG, socket.ALG_SET_OP, pack_uint32(socket.ALG_OP_ENCRYPT)],
-@@ -5530,7 +5529,7 @@ class LinuxKernelCryptoAPI(unittest.TestCase):
-                      [socket.SOL_ALG, socket.ALG_SET_AEAD_ASSOCLEN, pack_uint32(assoclen)],
-                     )
-                 )
--                res = op.recv(len(msg))
-+                res = op.recv(len(msg) + taglen)
-                 self.assertEqual(expected_ct, res[assoclen:-taglen])
-                 self.assertEqual(expected_tag, res[-taglen:])
- 
-@@ -5540,8 +5539,8 @@ class LinuxKernelCryptoAPI(unittest.TestCase):
-                 msg = assoc + expected_ct + expected_tag
-                 op.sendmsg_afalg([msg], op=socket.ALG_OP_DECRYPT, iv=iv,
-                                  assoclen=assoclen)
--                res = op.recv(len(msg))
--                self.assertEqual(plain, res[assoclen:-taglen])
-+                res = op.recv(len(msg) - taglen)
-+                self.assertEqual(plain, res[assoclen:])
- 
-     @support.requires_linux_version(4, 3)  # see test_aes_cbc
-     def test_drbg_pr_sha256(self):
--- 
-2.12.2
-
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 5a0d8d681497..c1fdfe67234a 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -1,20 +1,18 @@
 DIST pl-6.6.6.tar.gz 14838653 SHA256 9f80bb274e2f31fd68b0acbe35982c012d5f8311dbe44ec1d8d04351a776996d SHA512 a850b0f6b283d34aa77d5e9d8a0053161fa534fa6d8935c7472362ff7b59ea6035de0658d9e38c317e2d92ed810370f2adc3e92b6346fc0ff392d18f1c8012a6 WHIRLPOOL 448d844fe45aee97ad2e37bea3f81dd5eb388e1dcb9f1c4dc54c18991aa91d481bff5b70174fb06edb06c1361759621a570a083fe36d62bffdf6028c49244b2a
 DIST swi-prolog-6.6.6-gentoo-patchset-0.tar.gz 1590 SHA256 2b240d15562603120e0314bb69bde50089326c11876b7a62106c05f9d48ace71 SHA512 807c7e897dd5b9eef14e063ea53c03047f3acb23174a70a613258adf7f85dc1f7637158fde70aab2e0f40de4bc6ac5e3548dd09dbe3745d916a388f43eb832eb WHIRLPOOL 0a0dbc361cfbe343c8b3562a2c0535905eb1443eea0783b14f96bda43c04e8db6264f476c07da766c6936dc6088e34059f799a3244717390644bf0f5ae83018e
 DIST swi-prolog-7.2.3-gentoo-patchset-1.tar.gz 1875 SHA256 c11e48122dc468f21e08da4a65f5a2daa9e0ddbc2e186bbd952626c95b29db04 SHA512 3506f4168d52f7d3539cd753c5153750df8c3239b78ffac1784c634b585d5fb0c825700e77abc9c1f467af71473ae1861eef629ebdf76b7c783d276c393f40fc WHIRLPOOL 8b70ab91592280d0634c6c897771696c0c63d30680044994cedf69f18cd4f386adf833998e64d4ad892cff97300b5bbfaa8dec8448ea04ebaba7e31f7e9c30d0
-DIST swi-prolog-7.4.2-gentoo-patchset-3.tar.gz 3256 SHA256 6d6a98be7e0c8f69b0c2fac213a0b690112d985fdc87752eb9010f442b35c792 SHA512 bc1b408e311d10ab59fa221bf5ef3d3cb1003a3edcdd13fd000cbc647117458e1f130e960cc37968481ccc2047529ca128159fac8e0ee75114022ed439905cce WHIRLPOOL b91b8d2a588acee744d104618aed27125988a6998e7bbb517744394b0348afe6b189285cee8c37b43372b25e7bf69efb96d304e7c8d4e3a86b8e3612430f1ada
-DIST swi-prolog-7.5.15-gentoo-patchset-2.tar.gz 2789 SHA256 55a853a8ed12b5df7b2bff921aa49f79d1192d177176fffffe4ec62c3ccede18 SHA512 8c0bdfcf2be99aacef221c4a66d9323fa64e207496b04bd454dd25e2b33c5dc629302e7a0c99baca8545923a302f9b38d24a26e356a247f82745b64d05785c63 WHIRLPOOL 9b54d62cffe2d80a82039617f1619bf8d96579d5a352bcae5a4e435e1c615bc63a372d4613f2acacf14b94a207292a025a7e56d9669e091835eede502d5b528f
-DIST swi-prolog-7.7.1-gentoo-patchset-0.tar.gz 1126 SHA256 1b9d5606c09815068ab3f1acef81dce1a42db382755932a5cef19ccd78b98d33 SHA512 e25d8e380a1f5c47958bea5756da9686b8325ace79ef5bfcd4b82cbeb04061b484ef284b10a3190e389df9c6e2f3c5dc61a01e2319cbd46b590823e9ed1de175 WHIRLPOOL 4504c40aa6dd085c40a5b5958186c2028a2fbe568886190e6763395071eff5675d041d91212f0eb6a3e62a6680fb69bc67f97ededbbd34b1864acecee8ef2223
+DIST swi-prolog-7.4.2-gentoo-patchset-3.tar.gz 3256 BLAKE2B d7997d7307db738f0948a89f5e1cee195be4424737e50df915a293c7cb1b3bc1ce09ebd372e8c5f24c95df7335676f12cdc04749de25396eac71471704cfc579 SHA512 bc1b408e311d10ab59fa221bf5ef3d3cb1003a3edcdd13fd000cbc647117458e1f130e960cc37968481ccc2047529ca128159fac8e0ee75114022ed439905cce
+DIST swi-prolog-7.5.15-gentoo-patchset-2.tar.gz 2789 BLAKE2B 3ffdd7cd4c6c9e99548a6205c57a6fae8a9a9285efb1f24cf3327300eb09bba047ee93a8b76d5f9185aeb6efa7bdd5ec333d140df03080a8dad1bf43fa84d8b9 SHA512 8c0bdfcf2be99aacef221c4a66d9323fa64e207496b04bd454dd25e2b33c5dc629302e7a0c99baca8545923a302f9b38d24a26e356a247f82745b64d05785c63
 DIST swipl-7.2.3.tar.gz 16192142 SHA256 43657d51b7c5887bc2d2bced50a9822b86a08a6841399b8e76ee877f51d646b5 SHA512 da27a6b171d3b471401f1a91e86a4dbe98973d8a1db8c72aa27e452311d08b893b01a1de8f9f4dafcdac460774b4ea980050256d37284546941e1bdf84f8cd7b WHIRLPOOL de695c8e0317921dcc13898f7a3c88d1012e3f87f633cd25766ca5cb6637b29ca81b9245d015614089291a7d9abd0d8c7109ccae1df9297d78301d241cb258b3
 DIST swipl-7.4.1.tar.gz 16498678 SHA256 891e314e8f5d856ef71d8bbce5d255a18b0c8f227628748bb0e1e19473273cc1 SHA512 a3e49cc43aed05808901860fe302711d2850b23740a987d1071822d7b4888aca30a8b5f7c94e1e7191057a031f45adeedb0fbff9139d0294e6ec07032da6798d WHIRLPOOL 5605043173e6bbebed316504b3eb20a0ccc4891d25ae7a7eafc7de6eadef1688367a524e1d81fd0c1ff427e1ece39295555bbf7114deb6056b12b3c3ce2196ed
-DIST swipl-7.4.2.tar.gz 16496738 SHA256 7f17257da334bc1e7a35e9cf5cb8fca01d82f1ea406c7ace76e9062af8f0df8b SHA512 5b526d4f079e7a36184f871bb7341330bcadaeee2a69af981fbcad71ae76c77331b1f157174ac2b31d96e069dc530afa86c024de6709edd9dc8baee3b4ebffb3 WHIRLPOOL 2dad1a5e7ae3670b3a3965010d60420a27cb9623b35cdee83360f6f3a4fadc3dbf2a91fd3e7178b59c9b81723dfe6036fb968953218e7611179b52117a16cb19
+DIST swipl-7.4.2.tar.gz 16496738 BLAKE2B a8f45c4277e48c0aa38f8b278b466dcb9e0a776325a9ed9e08c252660671d3ee0ee441978394682276b3fb9b0eca73ad10e02aba4671630bef0a1e8f813dd3c5 SHA512 5b526d4f079e7a36184f871bb7341330bcadaeee2a69af981fbcad71ae76c77331b1f157174ac2b31d96e069dc530afa86c024de6709edd9dc8baee3b4ebffb3
 DIST swipl-7.5.13.tar.gz 16748371 SHA256 3680231e22ac1622c507652649e17ad07bc41ff08484f4e4f767ec04802c435c SHA512 a19037a6a9ffa06d3775d3669e51431b8f83ec37c2515955b0721bfa7dc4ab4661b740689f2aa74ee0bf0b0fff40b0d0a85453d3cfce3b0936082d719878ea23 WHIRLPOOL b81b30db11677992d0ef55c4619615a47c3576aab1e115c5fe78731d7675ba1d0c0223d540b693804720cbd4bfe9d2177069ce111f1981af5668001c6225c5ce
 DIST swipl-7.5.14.tar.gz 16743212 SHA256 2e83e96a0eace037da3f75fc44e9c8f4e3b2cf8fd3c27f8f05ff489276aec572 SHA512 f655b9adff90909398772f5612dfbf3a4e6c7ecb17b4c959a58547f30c67c861ad574cf044267280fd22a05503ead10c807d33f54f2cbf8af6ea19753c9b1d34 WHIRLPOOL 93451c566c39901a7c480bb8bc5eb1f53c3ae7adc5ee2e0281c8746b804dd4522a2cfb2e825122753ca212306798ab0659992f588ad8230b6262eeb84a0dd479
-DIST swipl-7.5.15.tar.gz 16757246 SHA256 aca07ce9c564e608586e7ae7b9a56c82ca5dd919cde1a1edf1121efa16bda568 SHA512 07344914726a5a1d3e9d6542c06be7c0937cbe3ac59b64025e068e513c99c66be991af9da0d4200364edec24c143295740c232621173039bffda2fbf379fbf33 WHIRLPOOL 5b0cc1b9cfb1f362d4145759a6f575c9bd606a717e33bd02c741321ce7303855bb472ea12ce058b02de0b96a3300807774c8697033403cf183dc9d67c6f95c88
-DIST swipl-7.6.0-rc1.tar.gz 16750608 SHA256 83f1e0038fc8c19bc90974a404bc4d696fa61976a1ce8b34a7aec672d21b88df SHA512 1cf61e4c8d92ed734e006a69f1ea025932cdd5b9d4efc3e9e1336347440dddc4ec9e4cabdf53892576f74c81ffdbc94dcfec605b7f7e42d6b2fd815e6f63a398 WHIRLPOOL 432812cfe1a921729c97e25ddf9e4112177df80bd77eda3aff81f47df7eddbeae658c221bcfa5c979f3d603e110b9928feecb6d16748e9703e3c2a4b4f5d7e4c
-DIST swipl-7.6.0-rc2.tar.gz 16752769 SHA256 df3677b24866fffad103cd252b5dbd00cf63a9daec7862a21f204aa048641644 SHA512 149f9a7106e19d848e53514fac5f553afc540b7eca7d4936ff9ebd79c616327d561081b10b8b7cb2075b9bedf691d0bd4ad843b209548715b1e928d14a73cc78 WHIRLPOOL 10ce442b72b6d20e7e6644d227f2343ae15c853fa213dbb99a1b7ab3378375eed8a7a4f7ccdaf412e02f8b2e291e475214ec7c601c255f19389a2aa0cbbeb2e8
-DIST swipl-7.6.0.tar.gz 16763479 SHA256 591c76bdeff29ded4d1dbb009fcba1c51067a5f6f3a69fada7e4327fcef4b0ff SHA512 4c9a857bcb612361e8248a39616e07fe36d8b68e1099e00917320a0177b454bc13f89f32fee1d961a1facd46bef3814f717dbaf12ab4f00ca8ea313242feb8bf WHIRLPOOL 512e64aba8f22027720762f0751b8de13f701a95abef0df66f2ce5279d769a08317b00524b6a7de60a1225edcfdd80c6d78a6ee55716d8615e4396fc115a5e12
-DIST swipl-7.7.0.tar.gz 16761831 SHA256 a1f603302fee12bfc390272ca76381401f5483c3a5521d391265404af58fdfcb SHA512 196e0c17cfaa9368a0032372cfc64e4b96f55048a4457c9ca28b1180b9277fba7811c2a72f410502f12544ca21751013b73002bf7c84cfb79ed0f909a871a24e WHIRLPOOL d2665b75a2bcb147b207bfc3b6c66be1344a7411420d8e016ae1e6e89f27f70325ef6b4804107a76f6d1714a961d5b689655037b0cb596efb8028fd85cc86a3e
-DIST swipl-7.7.1.tar.gz 16762129 SHA256 fda2c8b6b606ff199ea8a6f019008aa8272b7c349cb9312ccd5944153509503a SHA512 d95cc460c5eecf3d122c5e558266fd9203a0e8fe389ea1c83f08783e819bae04fe5e55f727ac6fffe89242dae7dc059fdabe09f1093915ba0e5675ee0e278de5 WHIRLPOOL 812eb2c5098f737b99cd063f156b11fed0151e59b949403620b498e2aa477dc08aa2fdd4da7669f2c7998cfbaabbfb0edb85f43aaeee32ae0b347880d577c4d2
+DIST swipl-7.5.15.tar.gz 16757246 BLAKE2B 5dcff6bb764cd73b24fc40122bbb1f22c57186086c419d9b2422a09d0c26c939a3903ac6a819ca8b71fe9c6711281091e15ab2f5e56480d80bbf44d78f689c48 SHA512 07344914726a5a1d3e9d6542c06be7c0937cbe3ac59b64025e068e513c99c66be991af9da0d4200364edec24c143295740c232621173039bffda2fbf379fbf33
+DIST swipl-7.6.0.tar.gz 16763479 BLAKE2B 6262f213a918bea1f2ea250df791db4b0675b084ed8b78b4164a31a4a028bb86dd64154dc77aa4f111f2fb43ba645044c232e7213c7d3d00cff4892d20cdfce1 SHA512 4c9a857bcb612361e8248a39616e07fe36d8b68e1099e00917320a0177b454bc13f89f32fee1d961a1facd46bef3814f717dbaf12ab4f00ca8ea313242feb8bf
+DIST swipl-7.6.1.tar.gz 16764536 BLAKE2B a493b103d9d6206db5a6c895ec1ff6237a122dd611a79803218a46e5611812fcdcf794b887018d4f7bea4d03315581234f99e8cb1a57d11ca502454666b418c4 SHA512 60b6f37b7449941b31ea1ca20372dadcd27585611c8040bb9155fd0c2e3802c554039135e3a084ed56ff9b20842ee607dcaa425afe55421bba00ee1c6cd169a4
+DIST swipl-7.7.2.tar.gz 16775518 BLAKE2B e29ffedfe0ca8c7f4e467fb506d8c17deadaecf867f3ab01dbce777d6b79186ab03ab81e416f0000d0ae423be6d29a3f8dc2492f82e59e9d2f8ad94617a152a8 SHA512 4db5fa3d44061e21fa6811d9b84b42cdc99d9fca4000c6d66fd37017be3bb138f2278a4685feb6698c8ecab643b865b5a015699889eb04aeabf233c5dfa106d7
+DIST swipl-7.7.3.tar.gz 16779027 BLAKE2B f533eec9d75dd46b5cbe68b185d503d49aff96effa397648e61cf813bf0caa7bf50549d72301ec20b14fc42d25abd2cb566fe1b2b8b51a7e1c8e957db15fa084 SHA512 231bbbd12c7df4c0fd130ccda370cb8144b2e605895787aa83ff127f3ffa0c9bf016cca0c146ff8c3a42d9f0b32e4d7619f2f0eebbe37ec9e980c45c8ccffdc4
 EBUILD swi-prolog-6.6.6.ebuild 2799 BLAKE2B 47c0d56dae0ce19be9efd09122ef8e6e3655abd3459cd25a9a0cf4734fbb132b8725c79775942da8cb2c5eb40bc35f4c0b5a39064a5e41387d4480379fd71435 SHA512 1d30fcb84653a0cdf7cf4f5a78898d5fb29f939095d19a21324a9587ee6ca98543ae16d564ff8880cdf99c6d5a091c2f0e5dc79074ceadc5a7cd3fe340609d22
 EBUILD swi-prolog-7.2.3-r1.ebuild 3170 BLAKE2B ca7604653a23dbc9158e96e54684482fd1c82e6bea8f9753e73c91d46df95a105d70114c0aae8c86e8b9ef45debf97116755b4fc48ecdae95680045ae60035ba SHA512 fe35661ef51094ddf0aff61659f33de5be0252216b94f45e658215146dd53379881f7077c20ace1ef67b70ad9d7128ccd26e122392a1100ab8db195c9324867a
 EBUILD swi-prolog-7.4.1.ebuild 3337 BLAKE2B 6ec047c27c5f76f8cf1fe29e6c8f45d051f1b7d565217af160a022d0b3b45ecd4c18506348ec2d1d19d498953185b22941814a05559b7fa20b3666f48ede932c SHA512 d3b2fb20a92a39d5b4927cc4e2056a1ba3c66978467050817e84cfe46d795989d7d64721bb3b64a8b632dfa359e308d60db7b2c83efc2298c8318ef6314f08e9
@@ -23,8 +21,7 @@ EBUILD swi-prolog-7.5.13.ebuild 3336 BLAKE2B 57d7fa818cfb39c9e5a7300947195f3779b
 EBUILD swi-prolog-7.5.14.ebuild 3391 BLAKE2B 1fce7c6943761b7c50d9bc5e58cdadb3c5b4e3b0f1bab9aac56918e4559e3fc598a1b53650852eaf01434809c78be9632d8e07e858d2b5d5df5c6ad080e1252a SHA512 0ff31376662be4aa72867e0f419ff3b9953eecc80912171fd0f5b415d467dadb996e1d12e8aa27224c1cf1eace75e18592c1ba57f1077400b4e1323f1f8e4b43
 EBUILD swi-prolog-7.5.15.ebuild 3452 BLAKE2B 5496dbba5d067db9369099788c8faa8f5f17ccb6a15b105331d9fa7a233114f2b101ed9cfa107158bd4f7282a751d15b1182789a66de84885112c44909c5eb41 SHA512 da0c9dee16a6bddd98bb8850086fa1562988398be3ca6698d249bdb85e6cebd1d491a1270f9cd1b16212ec36d0811e2cf0cbbb49ebbcc62840eb0cf2bbaf3bf6
 EBUILD swi-prolog-7.6.0.ebuild 3392 BLAKE2B 77fca0aec35200f39f2dd60fccd13c9d6fbe78f14c03c0f57a5d42e9b280285b497e612d364352eb763850b38bc7af626172e76752211f195f2fa54f5d8157e9 SHA512 486bc74f0e77862452cf7bc63687cb1ba1395b9d10a2bb50dcb6334ad986d09153595a325703dc9413a2b22675aa838c66c94b5fe4ca582e1418701a31da002a
-EBUILD swi-prolog-7.6.0_rc1.ebuild 3415 BLAKE2B 68001cd0b08347701e2bf2f112cf24af700264825eacda69fff79551fab02f023dab686c7ea19e980f9618448bcccaf4bed6fb3f905528c841051e8d008ca1f4 SHA512 f2a8da35ab1a7b502b302b32a28be06f5ba13df635bf4e0198588bf3f567ef6d3c46ee8a0946f25718a0a4fe7e29ca219e984024be051ae5f3524e05d36cd4dd
-EBUILD swi-prolog-7.6.0_rc2.ebuild 3415 BLAKE2B 68001cd0b08347701e2bf2f112cf24af700264825eacda69fff79551fab02f023dab686c7ea19e980f9618448bcccaf4bed6fb3f905528c841051e8d008ca1f4 SHA512 f2a8da35ab1a7b502b302b32a28be06f5ba13df635bf4e0198588bf3f567ef6d3c46ee8a0946f25718a0a4fe7e29ca219e984024be051ae5f3524e05d36cd4dd
-EBUILD swi-prolog-7.7.0.ebuild 3391 BLAKE2B 835abf471153da13183829a571d1e89b7aeedb4124c6442e5501a40ff0cce77d7efec22d9b272532172268c792378bf74696677da31d864fd33da4a58d24fc5f SHA512 43ae2aa636d09515efb8e25455b4ece4f3b5657a9d4deb651579843791014c04785c5279293f7fa04df39ba87d1e7b4eda786f4e455389cfed111c984a13dbc9
-EBUILD swi-prolog-7.7.1.ebuild 3452 BLAKE2B 4dc9c4ebe495300dbc642cbe79f8c9d18f2606ec51e0c0fe0cc0aac2f9b2b537df4452b72ea1547f9c1b330f600e395069a04a278a9888bf8ef706419cd8d3d4 SHA512 1de74904c23296fcd42a40d783bfb22df400dbb2437d028cd02a554054ecbb68d3639e3ab217f72279fa16ee2f335b7fdc54ac01c1bb559b062fd803c3e4dcaf
+EBUILD swi-prolog-7.6.1.ebuild 3392 BLAKE2B 77fca0aec35200f39f2dd60fccd13c9d6fbe78f14c03c0f57a5d42e9b280285b497e612d364352eb763850b38bc7af626172e76752211f195f2fa54f5d8157e9 SHA512 486bc74f0e77862452cf7bc63687cb1ba1395b9d10a2bb50dcb6334ad986d09153595a325703dc9413a2b22675aa838c66c94b5fe4ca582e1418701a31da002a
+EBUILD swi-prolog-7.7.2.ebuild 3391 BLAKE2B 835abf471153da13183829a571d1e89b7aeedb4124c6442e5501a40ff0cce77d7efec22d9b272532172268c792378bf74696677da31d864fd33da4a58d24fc5f SHA512 43ae2aa636d09515efb8e25455b4ece4f3b5657a9d4deb651579843791014c04785c5279293f7fa04df39ba87d1e7b4eda786f4e455389cfed111c984a13dbc9
+EBUILD swi-prolog-7.7.3.ebuild 3391 BLAKE2B 835abf471153da13183829a571d1e89b7aeedb4124c6442e5501a40ff0cce77d7efec22d9b272532172268c792378bf74696677da31d864fd33da4a58d24fc5f SHA512 43ae2aa636d09515efb8e25455b4ece4f3b5657a9d4deb651579843791014c04785c5279293f7fa04df39ba87d1e7b4eda786f4e455389cfed111c984a13dbc9
 MISC metadata.xml 367 BLAKE2B 07c7ff161f07b547325566650cd882c90dbe98ac5afc0015d68bc0338cebd678ac82c3a45edd3e4f7e613d5d493324899dc8e3b4ca448f447744f439e60458fd SHA512 bacbb17fc3518d3bf845d097d17dba772a745fd7343ab6e8c751a417a540c8c003f29b86c66374bee538d7a5d96ab95e67b1c619d47f80d0e332482daabee74a
diff --git a/dev-lang/swi-prolog/swi-prolog-7.6.0_rc1.ebuild b/dev-lang/swi-prolog/swi-prolog-7.6.0_rc1.ebuild
deleted file mode 100644
index 3e75dfdeeb3b..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-7.6.0_rc1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PV=${PV/_/-}
-
-inherit eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/stable/src/swipl-${MY_PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc pcre readline ssl static-libs test uuid zlib X"
-
-RDEPEND="sys-libs/ncurses:=
-	archive? ( app-arch/libarchive )
-	berkdb? ( >=sys-libs/db-4:= )
-	zlib? ( sys-libs/zlib )
-	odbc? ( dev-db/unixODBC )
-	pcre? ( dev-libs/libpcre )
-	readline? ( sys-libs/readline:= )
-	libedit? ( dev-libs/libedit )
-	gmp? ( dev-libs/gmp:0 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	java? ( >=virtual/jdk-1.7:= )
-	uuid? ( dev-libs/ossp-uuid )
-	X? (
-		virtual/jpeg:0
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/swipl-${MY_PV}"
-
-src_prepare() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		epatch "${WORKDIR}"/${PV}
-	fi
-
-	if ! use uuid; then
-		mv packages/clib/uuid.pl packages/clib/uuid.pl.unused || die
-	fi
-
-	# OSX/Intel ld doesn't like an archive without table of contents
-	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use ppc && append-flags -mno-altivec
-	use hardened && append-flags -fno-unit-at-a-time
-	use debug && append-flags -DO_DEBUG
-
-	# ARCH is used in the configure script to figure out host and target
-	# specific stuff
-	export ARCH=${CHOST}
-
-	export CC_FOR_BUILD=$(tc-getBUILD_CC)
-
-	cd "${S}"/src || die
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_enable gmp) \
-		$(use_enable static-libs static) \
-		--enable-shared \
-		--enable-custom-flags COFLAGS="${CFLAGS}"
-
-	if ! use minimal ; then
-		local jpltestconf
-		if use java && use test ; then
-			jpltestconf="--with-junit=$(java-config --classpath junit)"
-		fi
-
-		cd "${S}/packages" || die
-		econf \
-			--libdir="${EPREFIX}"/usr/$(get_libdir) \
-			$(use_with archive) \
-			$(use_with berkdb bdb ) \
-			$(use_with java jpl) \
-			${jpltestconf} \
-			$(use_with libedit) \
-			$(use_with pcre) \
-			$(use_with odbc) \
-			$(use_with readline) \
-			$(use_with ssl) \
-			$(use_with X xpce) \
-			$(use_with zlib) \
-			COFLAGS='"${CFLAGS}"'
-	fi
-}
-
-src_compile() {
-	cd "${S}"/src || die
-	emake
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake
-		./report-failed || die "Cannot report failed packages"
-	fi
-}
-
-src_test() {
-	cd "${S}/src" || die
-	emake check
-
-	if ! use minimal ; then
-		unset DISPLAY
-		cd "${S}/packages" || die
-		emake \
-			USE_PUBLIC_NETWORK_TESTS=false \
-			USE_ODBC_TESTS=false \
-			check
-		./report-failed || die
-	fi
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-
-	if ! use minimal ; then
-		emake -C packages DESTDIR="${D}" install
-		if use doc ; then
-			emake -C packages DESTDIR="${D}" html-install
-		fi
-		./packages/report-failed || die "Cannot report failed packages"
-	fi
-
-	dodoc ReleaseNotes/relnotes-5.10 INSTALL README.md VERSION
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-7.6.0_rc2.ebuild b/dev-lang/swi-prolog/swi-prolog-7.6.1.ebuild
index 3e75dfdeeb3b..ac17db45d196 100644
--- a/dev-lang/swi-prolog/swi-prolog-7.6.0_rc2.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-7.6.1.ebuild
@@ -3,15 +3,13 @@
 
 EAPI=5
 
-MY_PV=${PV/_/-}
-
 inherit eutils flag-o-matic java-pkg-opt-2 multilib
 
 PATCHSET_VER="0"
 
 DESCRIPTION="free, small, and standard compliant Prolog compiler"
 HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/stable/src/swipl-${MY_PV}.tar.gz"
+SRC_URI="http://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
@@ -46,7 +44,7 @@ DEPEND="${RDEPEND}
 	X? ( x11-proto/xproto )
 	java? ( test? ( =dev-java/junit-3.8* ) )"
 
-S="${WORKDIR}/swipl-${MY_PV}"
+S="${WORKDIR}/swipl-${PV}"
 
 src_prepare() {
 	EPATCH_FORCE=yes
diff --git a/dev-lang/swi-prolog/swi-prolog-7.7.0.ebuild b/dev-lang/swi-prolog/swi-prolog-7.7.2.ebuild
index 7aba5bdec8ae..7aba5bdec8ae 100644
--- a/dev-lang/swi-prolog/swi-prolog-7.7.0.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-7.7.2.ebuild
diff --git a/dev-lang/swi-prolog/swi-prolog-7.7.1.ebuild b/dev-lang/swi-prolog/swi-prolog-7.7.3.ebuild
index f035badb09bb..7aba5bdec8ae 100644
--- a/dev-lang/swi-prolog/swi-prolog-7.7.1.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-7.7.3.ebuild
@@ -9,8 +9,7 @@ PATCHSET_VER="0"
 
 DESCRIPTION="free, small, and standard compliant Prolog compiler"
 HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 1bb21278af8a..24684e95ae83 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/c-blosc/Manifest b/dev-libs/c-blosc/Manifest
index ec8dbe22a6e5..98d4faeeac2f 100644
--- a/dev-libs/c-blosc/Manifest
+++ b/dev-libs/c-blosc/Manifest
@@ -1,15 +1,4 @@
-AUX c-blosc-1.11.1-fix-build-system.patch 1241 BLAKE2B 8f129285c54fdbafd79e00117b575a04a3506a11f5682ae6d010250237be6ee24fd2615651c581a30a5db3cdb78f535fe6a76f38b326cce331d7728cedc8c6c3 SHA512 48fd5af901b8fbd444fac0aefd404c91e70cb49d7d3f0247a8aca6b9ff2238760456df8670d87fae291753657f3cce3058883c0a53c584f712fb099b3d3dd987
 AUX c-blosc-1.11.2-fix-build-system.patch 803 BLAKE2B 1472877db42d6a952b8f91a75ba437c6693701cc255a44638c5035d4f723563a5c0dfb5baee73ce0eb061bbaf45c8a49988ba799f35ff3d8b79159e73ea15afe SHA512 3064040af07acc445e4c7a9e962939eafa02d75366e6eee2ce12f15cc5846fbb4214a17d27f9366e8c08b69a3565cb04910008b1e4bd62d6ded3087e1a27124b
-AUX c-blosc-1.3.2-shared-libs.patch 902 BLAKE2B 210f39a9390196dd5dea60c8de934b3b7a38577774748ef98f6bf038c6d496480a8c9195db76a53f851620162b7cfaeea4416a0bdc5bdb6ab4411ea910a8aea1 SHA512 d5e21dcd0086f44bb9b9823437f7f46c362543a84a947c2f85a2b0e0486324bc2e8726adfafda5e86e2650e778dcdebf5c00364a2dc094e8dd738850a1c44ed8
-AUX c-blosc-1.5.3-shared-libs.patch 1008 BLAKE2B b302d10d82faadc92c00852d5bf3cc6b6d1e48fd10ef0b8e505b972fb05636be27778a96f5cc8022d3c1627a71763e89d1ea49ad774ec63ddf096545daa90c36 SHA512 009d4cce6d904d8fe65d63dca95850e5a460c01e20ab3ff1b9943f18f145abda3a3d765d3a7af79b3a1a6cf7ac740ec65ac8e8889e6a43359d2d3d1696614d9b
-DIST c-blosc-1.11.1.tar.gz 622500 SHA256 d15937961d37b0780b8fb0641483eb9f6d4c379f88ac7ee84ff5dd06c2b72360 SHA512 75100cd8447c78c97b02ed8242d966c37c4050f216805d927b3d41367cb7899adfa13a9b61bc3bf3306be976f99f1a668c95f5a83f61929ccdf48f4edf630cb7 WHIRLPOOL db9226096078519002cfd3c93db92fa9ed71f2d6c3a9bca3cf267e63ea6c7d2f34ace6947af652a208e1b715e1aed53674733e67428381c04ff6c31f3a455b11
-DIST c-blosc-1.11.2.tar.gz 633280 SHA256 f000bba88d17534fc18a10e11261127a9ab011557bed5fd0659624a3f3c03c5f SHA512 c1282f60f4ef9d24844be225587e7f46c43ba8a5071f5ee49a7326bce9e84b65312c4f9606e78fd3d1209a4ca50f1c31312a7c377caf9522c9915177c92a4d7b WHIRLPOOL b90564425993843e00ba5a92c2174b8c14646f9dc4adb3844d31876e715a7efb8ed3cfbe75a5b3ff8f6cde0e6d3e5f485b53c021cd85d77268d0b501b7a6387c
-DIST c-blosc-1.3.2.tar.gz 229790 SHA256 7c21c4484c1ad7d6beddd73f35379e0d980530466cd6d87402e035c931983697 SHA512 0488042628b8b3d02e8e7b58d3d942751a43567e99e1e89f452765ad1aeba395248322df6a37daf828571b3c262ebaa54d3ca49cfed78ab499994454faf6bbdb WHIRLPOOL 195232123fbbd4f76f3a209069e7895c3ba900e98c49ca8334e1975634770463d993ae36f99fefb680d7c78a28ca979c27cd4af4412e83c804315f6cf52420fe
-DIST c-blosc-1.3.5.tar.gz 231653 SHA256 60efbbd2ef613480d135dbb245260e7cd904cfd785cc2504458615d7b397675a SHA512 4c11309a3f5dd0e2ecb35f62480cf86a9ad8d8d84b0d744c0597a51d8f51010a2ed0ad868cc3aef1f674efc1c35ee3312ad727cb308b348026f08db0ac9ab04a WHIRLPOOL 58742b85bf1d9637492871cab0f0c0b87c96162b2dfbf196e91f62569f6a06077b901a202fab43f39472ccf728550340a85bd60f3fee1d6e0e76d655659db3f0
-DIST c-blosc-1.5.3.tar.gz 240821 SHA256 d6d7c72d8e49311618f5f1609df1a9b2ca070655b563b9f7b80d5dc92fceaf4f SHA512 92f0a47ff6af2b776795315fce52e49c12e947e9007f97d05182a8369831e0ba80ff7b2b116fdedc4ef2b984106b014c90f82e233d5aed85cd91e3256f4a7313 WHIRLPOOL 9178c1a4e8e476b2a0556106ecbf58eb10bd076e3c731048d988f1e3dcaefa593cea176c6f5ec391c54a651421cce40858f1eae4ba9fc91d60a0fc158fe9fbc7
-EBUILD c-blosc-1.11.1.ebuild 1301 BLAKE2B d73c171bb538be082831ec4b2a83118406539e659f32b811d1e6e6596ed51f1ed045964a83679e93c60ed0f72ad329cee5df7ddd7d8c2527f3af46564c15f749 SHA512 761b3c5c4339988868e73530d24833f3625e70bbc6a94a29c5aa733f21828c1cf260783f58f9ac4ee6e4e5ad6d39d6ca2f1cd23e325f9e18f8269742645de000
+DIST c-blosc-1.11.2.tar.gz 633280 BLAKE2B 426de12ffa0db784fc26316e5758836517f3b3498111cfea64ebd2bc4582ebc6236f64845d41e75db272d3741ab8a7f22a12e0847fb7c98ba10a3ae2c2906e22 SHA512 c1282f60f4ef9d24844be225587e7f46c43ba8a5071f5ee49a7326bce9e84b65312c4f9606e78fd3d1209a4ca50f1c31312a7c377caf9522c9915177c92a4d7b
 EBUILD c-blosc-1.11.2.ebuild 1295 BLAKE2B 6fa832e8eadb8974601885ca87434c0cae161bb7754549a632a654bca7cfa35f69fccf663f40d4f433f06110b95e56ae8c69f78c97809e54eb593be6c7eaffb3 SHA512 cc150fa9fc5f1d0529f09e2e015dde5914a45e5a4e00a6b726ac7b56810b50a8c143e3e2715144ecf58ed82ed21bb738a7fa94ed77d59faa381b3e2413648d37
-EBUILD c-blosc-1.3.2.ebuild 1029 BLAKE2B c1de4999b45d539a5d2da1d1d477c6b95e6cf6998f555ee74185acdbe4ec73e2f59ce3f82957f6ebcd52c43a64991848df40098aaf354810c47cff04ae411da9 SHA512 15f9ad0c23b97f9592d44f72de845c4fc0e290b5d9e35770e59d02622b02140b32dfa5de8ce4a9c8e998640c2246766d4b9697c617454d699a60cf1857a0197d
-EBUILD c-blosc-1.3.5.ebuild 1048 BLAKE2B b1236538effa6cf7edc2422a88d2fed422772754b806d0b3da1d0b9c2bb1067d56b88fd531d05e18708a8be59f988997ed56668f96b9ee1cc399483140198a10 SHA512 139515d15918a869358bed7f8a4bcd24f89218fb0be747a00602e8a522974edb536a18b8d3dc1d2781f11a74adb0d6196266af6d395db28ef3b57584eecc2de1
-EBUILD c-blosc-1.5.3.ebuild 1101 BLAKE2B 11cb4f07686fe3f9a8dbdbfafcfb9ba1d8233b6550a28bb4c9c2108f03a0a8f6663f9a2f120daa2637129dc19d3f51eb6920631e83ca548ba687d056903544ff SHA512 880f8667f2aa9e858cb383b7fa95d6b42425145631a5e10bbfa30c685e398adfebde4e12a234bd5bb95822a8b2e14d32d0e1b64a28f29603b163fdf77840a8c7
 MISC metadata.xml 900 BLAKE2B f517d69206738bc44ce57589b720e290fadc3b7e3303cb31782ab8fb6fca859b837716b6ee95a874b22cea713dc7aea436d4a2ec2520f4d5d460f6d6018c2aa0 SHA512 6d6221a4cc1c0f347158f0b2fa729ffb6e87dc720c0a7866529a7120a2b6534daf630f8812b2c5525d7c00646dbe3cfa953257f89330107621c9be08d2c5db0d
diff --git a/dev-libs/c-blosc/c-blosc-1.11.1.ebuild b/dev-libs/c-blosc/c-blosc-1.11.1.ebuild
deleted file mode 100644
index 3403bc18c331..000000000000
--- a/dev-libs/c-blosc/c-blosc-1.11.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Blocking, shuffling and lossless compression library"
-HOMEPAGE="http://www.blosc.org/"
-SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="cpu_flags_x86_avx2 +lz4 +snappy static-libs test zlib zstd"
-
-RDEPEND="
-	lz4? ( >=app-arch/lz4-0_p120:= )
-	snappy? ( app-arch/snappy )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.rst RELEASE_NOTES.rst THOUGHTS_FOR_2.0.txt ANNOUNCE.rst )
-PATCHES=( "${FILESDIR}/${PN}-1.11.1-fix-build-system.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# remove bundled libs
-	rm -rf internal-complibs || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC=$(usex static-libs)
-		-DBUILD_TESTS=$(usex test)
-		-DBUILD_BENCHMARKS=OFF
-
-		-DDEACTIVATE_AVX2=$(usex !cpu_flags_x86_avx2)
-		-DDEACTIVATE_LZ4=$(usex !lz4)
-		-DDEACTIVATE_SNAPPY=$(usex !snappy)
-		-DDEACTIVATE_ZLIB=$(usex !zlib)
-		-DDEACTIVATE_ZSTD=$(usex !zstd)
-
-		-DPREFER_EXTERNAL_LZ4=ON
-		-DPREFER_EXTERNAL_SNAPPY=ON
-		-DPREFER_EXTERNAL_ZLIB=ON
-		-DPREFER_EXTERNAL_ZSTD=ON
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/c-blosc/c-blosc-1.3.2.ebuild b/dev-libs/c-blosc/c-blosc-1.3.2.ebuild
deleted file mode 100644
index ade8c684c907..000000000000
--- a/dev-libs/c-blosc/c-blosc-1.3.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Blocking, shuffling and lossless compression library"
-HOMEPAGE="http://www.blosc.org/"
-SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="hdf5 +lz4 +snappy static-libs test zlib"
-
-RDEPEND="
-	hdf5? ( sci-libs/hdf5 )
-	lz4? ( >=app-arch/lz4-0_p120 )
-	snappy? ( app-arch/snappy )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-shared-libs.patch )
-DOCS="RE* AN*"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_BENCHMARKS=OFF
-		-DPREFER_EXTERNAL_COMPLIBS=ON
-		$(cmake-utils_use hdf5 BUILD_HDF5_FILTER)
-		$(cmake-utils_use !lz4 DEACTIVATE_LZ4)
-		$(cmake-utils_use !snappy DEACTIVATE_SNAPPY)
-		$(cmake-utils_use static-libs BUILD_STATIC)
-		$(cmake-utils_use test BUILD_TESTS)
-		$(cmake-utils_use !zlib DEACTIVATE_ZLIB)
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/c-blosc/c-blosc-1.3.5.ebuild b/dev-libs/c-blosc/c-blosc-1.3.5.ebuild
deleted file mode 100644
index 1223d9761149..000000000000
--- a/dev-libs/c-blosc/c-blosc-1.3.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Blocking, shuffling and lossless compression library"
-HOMEPAGE="http://www.blosc.org/"
-SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="hdf5 +lz4 +snappy static-libs test zlib"
-
-RDEPEND="
-	hdf5? ( sci-libs/hdf5:0= )
-	lz4? ( >=app-arch/lz4-0_p120:0= )
-	snappy? ( app-arch/snappy:0= )
-	zlib? ( sys-libs/zlib:0= )"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.3.2-shared-libs.patch )
-DOCS="RE* AN*"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_BENCHMARKS=OFF
-		-DPREFER_EXTERNAL_COMPLIBS=ON
-		$(cmake-utils_use hdf5 BUILD_HDF5_FILTER)
-		$(cmake-utils_use !lz4 DEACTIVATE_LZ4)
-		$(cmake-utils_use !snappy DEACTIVATE_SNAPPY)
-		$(cmake-utils_use static-libs BUILD_STATIC)
-		$(cmake-utils_use test BUILD_TESTS)
-		$(cmake-utils_use !zlib DEACTIVATE_ZLIB)
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/c-blosc/c-blosc-1.5.3.ebuild b/dev-libs/c-blosc/c-blosc-1.5.3.ebuild
deleted file mode 100644
index 80c7837bc729..000000000000
--- a/dev-libs/c-blosc/c-blosc-1.5.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Blocking, shuffling and lossless compression library"
-HOMEPAGE="http://www.blosc.org/"
-SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="hdf5 +lz4 +snappy static-libs test zlib"
-
-RDEPEND="
-	hdf5? ( sci-libs/hdf5:0= )
-	lz4? ( >=app-arch/lz4-0_p120:0= )
-	snappy? ( app-arch/snappy:0= )
-	zlib? ( sys-libs/zlib:0= )"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-shared-libs.patch )
-
-DOCS=( README.rst RELEASE_NOTES.rst THOUGHTS_FOR_2.0.txt ANNOUNCE.rst )
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_BENCHMARKS=OFF
-		-DPREFER_EXTERNAL_COMPLIBS=ON
-		$(cmake-utils_use hdf5 BUILD_HDF5_FILTER)
-		$(cmake-utils_use !lz4 DEACTIVATE_LZ4)
-		$(cmake-utils_use !snappy DEACTIVATE_SNAPPY)
-		$(cmake-utils_use static-libs BUILD_STATIC)
-		$(cmake-utils_use test BUILD_TESTS)
-		$(cmake-utils_use !zlib DEACTIVATE_ZLIB)
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/c-blosc/files/c-blosc-1.11.1-fix-build-system.patch b/dev-libs/c-blosc/files/c-blosc-1.11.1-fix-build-system.patch
deleted file mode 100644
index 02c5fc2d8ab3..000000000000
--- a/dev-libs/c-blosc/files/c-blosc-1.11.1-fix-build-system.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Make the build system respect CFLAGS
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -195,7 +195,7 @@
-    CMAKE_SYSTEM_PROCESSOR STREQUAL AMD64)
-     if(CMAKE_C_COMPILER_ID STREQUAL GNU)
-         # We need C99 (GNU99 more exactly)
--        SET(CMAKE_C_FLAGS "-std=gnu99")
-+        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
-         set(COMPILER_SUPPORT_SSE2 TRUE)
-         if(CMAKE_C_COMPILER_VERSION VERSION_GREATER 4.7 OR CMAKE_C_COMPILER_VERSION VERSION_EQUAL 4.7)
-             set(COMPILER_SUPPORT_AVX2 TRUE)
-@@ -244,16 +244,6 @@
- endif()
- 
- # flags
--# @TODO: set -Wall
--# @NOTE: -O3 is enabled in Release mode (CMAKE_BUILD_TYPE="Release")
--
--# Set the "-msse2" build flag only if the CMAKE_C_FLAGS is not already set.
--# Probably "-msse2" should be appended to CMAKE_C_FLAGS_RELEASE.
--if(CMAKE_C_COMPILER_ID STREQUAL GNU OR CMAKE_C_COMPILER_ID STREQUAL Clang OR CMAKE_C_COMPILER_ID STREQUAL Intel)
--     if(NOT CMAKE_C_FLAGS AND COMPILER_SUPPORT_SSE2)
--         set(CMAKE_C_FLAGS -msse2 CACHE STRING "C flags." FORCE)
--     endif(NOT CMAKE_C_FLAGS AND COMPILER_SUPPORT_SSE2)
--endif(CMAKE_C_COMPILER_ID STREQUAL GNU OR CMAKE_C_COMPILER_ID STREQUAL Clang OR CMAKE_C_COMPILER_ID STREQUAL Intel)
- 
- if(MSVC)
-     if(NOT CMAKE_C_FLAGS)
diff --git a/dev-libs/c-blosc/files/c-blosc-1.3.2-shared-libs.patch b/dev-libs/c-blosc/files/c-blosc-1.3.2-shared-libs.patch
deleted file mode 100644
index 484db1f6dd3c..000000000000
--- a/dev-libs/c-blosc/files/c-blosc-1.3.2-shared-libs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- hdf5/CMakeLists.txt.orig	2014-02-05 16:55:55.001344161 -0800
-+++ hdf5/CMakeLists.txt	2014-02-05 16:57:03.767739650 -0800
-@@ -23,16 +23,16 @@
- 
- # install
- install(FILES blosc_filter.h DESTINATION include COMPONENT HDF5_FILTER_DEV)
--install(TARGETS blosc_filter_static DESTINATION lib COMPONENT HDF5_FILTER)
-+install(TARGETS blosc_filter_shared DESTINATION lib${LIB_SUFFIX} COMPONENT HDF5_FILTER)
- if(BUILD_STATIC)
-     install(
--        TARGETS blosc_filter_shared DESTINATION lib COMPONENT HDF5_FILTER_DEV)
-+        TARGETS blosc_filter_static DESTINATION lib${LIB_SUFFIX} COMPONENT HDF5_FILTER_DEV)
- endif(BUILD_STATIC)
- 
- 
- # test
- if(BUILD_TESTS)
-     add_executable(example example.c)
--    target_link_libraries(example blosc_filter_static ${HDF5_LIBRARIES})
-+    target_link_libraries(example blosc_filter_shared ${HDF5_LIBRARIES})
-     add_test(test_hdf5_filter example)
- endif(BUILD_TESTS)
diff --git a/dev-libs/c-blosc/files/c-blosc-1.5.3-shared-libs.patch b/dev-libs/c-blosc/files/c-blosc-1.5.3-shared-libs.patch
deleted file mode 100644
index c46f66987445..000000000000
--- a/dev-libs/c-blosc/files/c-blosc-1.5.3-shared-libs.patch
+++ /dev/null
@@ -1,27 +0,0 @@
- hdf5/CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/hdf5/CMakeLists.txt b/hdf5/CMakeLists.txt
-index d91194f..032a292 100644
---- a/hdf5/CMakeLists.txt
-+++ b/hdf5/CMakeLists.txt
-@@ -44,16 +44,16 @@ endif(MSVC)
- 
- # install
- install(FILES blosc_filter.h DESTINATION include COMPONENT HDF5_FILTER_DEV)
--install(TARGETS blosc_filter_shared DESTINATION lib COMPONENT HDF5_FILTER)
-+install(TARGETS blosc_filter_shared DESTINATION lib${LIB_SUFFIX} COMPONENT HDF5_FILTER)
- if(BUILD_STATIC)
-     install(
--        TARGETS blosc_filter_static DESTINATION lib COMPONENT HDF5_FILTER_DEV)
-+        TARGETS blosc_filter_static DESTINATION lib${LIB_SUFFIX} COMPONENT HDF5_FILTER_DEV)
- endif(BUILD_STATIC)
- 
- 
- # test
- if(BUILD_TESTS)
-     add_executable(example example.c)
--    target_link_libraries(example blosc_filter_static ${HDF5_LIBRARIES})
-+    target_link_libraries(example blosc_filter_shared ${HDF5_LIBRARIES})
-     add_test(test_hdf5_filter example)
- endif(BUILD_TESTS)
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 9a5da5ead661..feeb1a09bf58 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -1,13 +1,14 @@
 AUX icu-58.1-iterator.patch 4097 BLAKE2B 826626cbb471ebbd9d40c4827d8244d91a94020fb22051b2e4e1abdc633617cb5ad7de063c8b1c84ed2220ac30846c8666fadf18bd41ba65959687b36cd13794 SHA512 46c51629fb5ff14cdfcbc355bff6cceb7132fc79176ec7fcf76bd9ac8553fccbf6528508753b73a0a4301721260ad60a359bf56c66e3bd0151415a4a226ff21c
 AUX icu-58.1-remove-bashisms.patch 5888 BLAKE2B 03a7197360a956799eb52a615272dcf1ad3a5ae2ddfdb08eeaa9bec4d037493583bf181417df49087fcca6f6aa3d977a8e72b98df68e3389c4e47343c062d036 SHA512 54835db4db5bca704aed015a911a1f5285fbd3f6d09493cdcf98493d87a03851c9ee79cc9cbcb45da409513ad5b3af38b302aa5d164992d94af1f80c6349aeb8
 AUX icu-58.2-CVE-2017-7867.patch 8934 BLAKE2B 7f934d75a99953d69ac54f8544c698d3bd774a37a463237b6b043713a35f2991a444a482191107070b1d1c0055f813d3692102cb08091cc7cda575e37fb076db SHA512 6e29326f378461ae07b253c59550447096352be1247e575d974839cea37ec326f7fa8dca58caab63544582ef9f4b3c71c9e3fa0eceb2e85fb7380ee71b138c5a
+AUX icu-58.2-darwin.patch 2076 BLAKE2B d85d07ae3ade827a81bf2ce4eb2813a6535d7cd70e68241b29ee72c0a41115e3cab0490727771309c32f1eb0853c1a8ce3cf6aae64186037d8ee75d035cb0478 SHA512 fe884a72d354324ad0b1e5502d834fbecafae22a290fb152058d6507b218c4f07efc34cc7d978bae0adb54f74dadf00df7a2679c480dc7681ee287da7f678cb7
 AUX icu-58.2-glibc226.patch 463 BLAKE2B 840440c4a3eb0882ac6733d3c5f44568bc081fce6f3f641e01d76f01fe1f35f74cc2465e89b3353ab86569c7478090df459a659d69143810ba121e15c27923dd SHA512 20d8e76c43ef5549ca7f104b052661269c99d4af45b2a65bd9d72e28b01d0c3b70c066b51799e09d7117a4a39e44fd463fae2522a238a41972c0679c290c5da3
-DIST icu4c-58_1-src.tgz 23366443 SHA256 0eb46ba3746a9c2092c8ad347a29b1a1b4941144772d13a88667a7b11ea30309 SHA512 59b2a76834192a35125fda326587e613ef4486152cf0278c6f22568d4ae02c4b2d897efcea2654ef2b11bd1c3154aecd38cb68a70f69430736f343689f94c155 WHIRLPOOL faf2624a83f0d6f874166b328522dc9c89088db2690433ab05e96371722b635b81fd5210c7e87fe8e5df6681e881cf10204832925b448552affe8c2f6c851e37
-DIST icu4c-58_2-src.tgz 23369902 SHA256 2b0a4410153a9b20de0e20c7d8b66049a72aef244b53683d0d7521371683da0c SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a WHIRLPOOL 25829f8ee870b703fd604ae5b9b584390a142f5011e2a5db18332453e2f1640d81270086f243318eeb93f187b04ea23dab14901ab81c8d924c8d47b1f77aee5a
+DIST icu4c-58_1-src.tgz 23366443 BLAKE2B 16f1c778d925893769c6e0f0901fe02e57289535a25edd8ee8c96bdf4551499ead2c75d0f7e733fb89d1670c5065f1e8013ebe14cbdc34881a67452e622cd990 SHA512 59b2a76834192a35125fda326587e613ef4486152cf0278c6f22568d4ae02c4b2d897efcea2654ef2b11bd1c3154aecd38cb68a70f69430736f343689f94c155
+DIST icu4c-58_2-src.tgz 23369902 BLAKE2B cdd2e02c3aba050f5b7f8b38c5a3731e3e5f1cc1403ef86a50908b95560ea3cf8a2d47119fa60cf34f22a8b65eaa2392fd5bcbd3bc48b3da541fe3d9bd7392c0 SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a
 DIST icu4c-59_1-src.tgz 22706578 SHA256 7132fdaf9379429d004005217f10e00b7d2319d0fea22bdfddef8991c45b75fe SHA512 9348aa68d72a74cd1f26588c30c80eee1b48800a26930d7eb0749390fd65f7930ee8843058b6a6dd5f265e79054fef661e807ded16a1ad691cbc5ebc5ab944c4 WHIRLPOOL f213951e98b7e1b59a3caf193f671fd9dff9a77c49aa3c4c118d6e3414688830ffb029d5c01495b369d4e666ab38669340a4c24a26f93742a99145972e20ede0
 DIST icu4c-60_1-src.tgz 23296064 BLAKE2B 4f90c1f4f00b686d2632429fbaa6a6ec3d977e414f8d00cf82a525a1504c9d8c9b1a19458b495e5847abbcfff933038752f96d6bd165d206582f8ec1b77fff40 SHA512 a6798f70add1b3bac2197a49e09a0bb636279af7019ce572f63a30ab713e09657ee9d9b20aac7ea806fbb84667ca2eca981411e5053b47c3c705aa496a669233
 EBUILD icu-58.1-r1.ebuild 3332 BLAKE2B 951e0963b151c25950a2373a5d68575a14b6f9d0672c7954ee8c03796a34abf21787c81047e6e3df481d85de0afe7948920a533e146105c368917b6d7dcae18a SHA512 03883866e050b61cbeb8268247f8a59b6516df75a33be729b7a8c513a887d951d748af42950bdcb5484dff9d9734daad570943845aa75996297312ac0181a258
-EBUILD icu-58.2-r1.ebuild 3420 BLAKE2B a7dc1032168ffc7fc124bb3ac717ca50bfc9d0c7cd79aff09ef58f7e2a4ac085e5e8386ca5e2d0d3a9c8d2cfd44acb45b307c01b204c07d7682704b067643382 SHA512 f1b4ac7b406f696b41434a321c2000454233aaf715002894e5c51f92f97b914a34c7d5d5c0287e0434d088d9b3864f2146f6b3917c5fda894d385a2ef24556b2
+EBUILD icu-58.2-r1.ebuild 4052 BLAKE2B 7f3258a4b34395d70fe644255021236f8db6a7e064dae9c0133655d0a51e80ab029e63e6f76fb0d5b063b47ec8b68f239e68bf8f58b66d0e83ac29b8676da061 SHA512 aa772b809d2fda7b50d9ff58bce94324bb3d76be3a4d64e395895a1a3d079a51a71019b610b6155052c5ad0a9cc7d33700104b1688ec73790fe49b437d3d9b42
 EBUILD icu-59.1.ebuild 3342 BLAKE2B c3f45fbbeeab2cc2a92cae23b5058783f5aec1c7bbbd28f6922e7e091077e7aece5f43365b8b16a54a60c714ac2bad31e18eda24010b7a7b74ac4cc7ab519e0a SHA512 708ec7e483bb078b1d0f7067ba720197b37280de9a09ba1fb92a944aad3613fd1db93f94cc1d53ce457a2ec610afe88232a040a25128d873bc401b91f0bc5911
-EBUILD icu-60.1.ebuild 3301 BLAKE2B 835d101f49b5f0867076cc95f1fa9f4e497e54c7dd702ae48c7e3713391afdd5a25705784c4ba6f90f11ae9e8b6023ce3035c31bc5a4198cee7bf649a8e00d95 SHA512 2df4928eb96e5e276a0853e2c699d7e610ed8cf07c0f03d62a4b1016796ac2654685387fc34554690493c3d4f1bd48b42f2f226345ae1f4dcb80a4c20d7b096b
+EBUILD icu-60.1.ebuild 3721 BLAKE2B 98e5114b569dd89706c2aac9043d63c97822ad37c7b200fd5591843d9c81e1fefc6550d2f094c132cd5a3fc69f9fd42d4383a1774fb12fc2ede47e46dfaccae6 SHA512 622002eecc800f595b159a125a62306ca94b4d3f924a4ab9c31a50bb5b2c2a3bb2aac38a90384a5bfda13347fbe025a39e5538598e706d8b9d34a392e212a3a6
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/files/icu-58.2-darwin.patch b/dev-libs/icu/files/icu-58.2-darwin.patch
new file mode 100644
index 000000000000..e5a9000a346c
--- /dev/null
+++ b/dev-libs/icu/files/icu-58.2-darwin.patch
@@ -0,0 +1,55 @@
+same as 4.7, but retargetted to apply with eapply
+
+--- a/config/mh-darwin
++++ b/config/mh-darwin
+@@ -4,6 +4,13 @@
+ ## Copyright (c) 1999-2011 International Business Machines Corporation and
+ ## others. All Rights Reserved.
+ 
++
++SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO)
++FINAL_SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO_TARGET_VERSION).$(SO)
++MIDDLE_SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO_TARGET_VERSION_MAJOR).$(SO)
++
++IS_DARWIN = yes
++
+ ## Flags for position independent code
+ SHAREDLIBCFLAGS = -dynamic
+ SHAREDLIBCXXFLAGS = -dynamic
+@@ -28,7 +35,7 @@
+ ifeq ($(ENABLE_RPATH),YES)
+ LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET))
+ else
+-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET))
++LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET))
+ endif
+ 
+ ## Compiler switch to embed a runtime search path
+--- a/stubdata/Makefile.in
++++ b/stubdata/Makefile.in
+@@ -32,7 +32,11 @@
+ 
+ 
+ ifneq ($(ENABLE_SHARED),)
++ifeq ($(IS_DARWIN),)
+ SO_TARGET = $(STUBDATA_LIBDIR)$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX)$(STUB_SUFFIX).$(SO)
++else
++SO_TARGET = $(LIBDIR)/$(STUBDATA_LIBDIR)$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX)$(STUB_SUFFIX).$(SO)
++endif
+ ALL_SO_TARGETS = $(FINAL_SO_TARGET) $(MIDDLE_SO_TARGET) $(SO_TARGET) $(BATCH_STUB_TARGET) $(SHARED_OBJECT)
+ endif
+ 
+--- a/tools/ctestfw/Makefile.in
++++ b/tools/ctestfw/Makefile.in
+@@ -31,7 +31,11 @@
+ endif
+ 
+ ifneq ($(ENABLE_SHARED),)
++ifeq ($(IS_DARWIN),)
+ SO_TARGET = $(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO)
++else
++SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO)
++endif
+ ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT)
+ endif
+ 
diff --git a/dev-libs/icu/icu-58.2-r1.ebuild b/dev-libs/icu/icu-58.2-r1.ebuild
index 1eaa578e41b3..cb2f808c5fc5 100644
--- a/dev-libs/icu/icu-58.2-r1.ebuild
+++ b/dev-libs/icu/icu-58.2-r1.ebuild
@@ -13,7 +13,7 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug doc examples static-libs"
 
 DEPEND="
@@ -34,6 +34,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-58.1-iterator.patch"
 	"${FILESDIR}/${PN}-58.2-CVE-2017-7867.patch"
 	"${FILESDIR}/${PN}-58.2-glibc226.patch"
+	"${FILESDIR}/${PN}-58.2-darwin.patch"
 )
 
 pkg_pretend() {
@@ -66,6 +67,12 @@ src_prepare() {
 		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
 		configure.ac || die
 
+	# Fix compilation on Solaris due to enabling of conflicting standards
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e '/define _XOPEN_SOURCE_EXTENDED/s/_XOPEN/no_XOPEN/' \
+			common/uposixdefs.h || die
+	fi
+
 	eautoreconf
 }
 
@@ -116,6 +123,12 @@ multilib_src_configure() {
 	# icu tries to use clang by default
 	tc-export CC CXX
 
+	# make sure we configure with the same shell as we run icu-config
+	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
+	export CONFIG_SHELL=${EPREFIX}/bin/sh
+	# probably have no /bin/sh in prefix-chain
+	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL=${BASH}
+
 	ECONF_SOURCE=${S} \
 	econf "${myeconfargs[@]}"
 }
diff --git a/dev-libs/icu/icu-60.1.ebuild b/dev-libs/icu/icu-60.1.ebuild
index c8f9ddca1727..773d5b35d4ba 100644
--- a/dev-libs/icu/icu-60.1.ebuild
+++ b/dev-libs/icu/icu-60.1.ebuild
@@ -13,7 +13,7 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug doc examples static-libs"
 
 DEPEND="
@@ -31,6 +31,7 @@ MULTILIB_CHOST_TOOLS=(
 
 PATCHES=(
 	"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
+	"${FILESDIR}/${PN}-58.2-darwin.patch"
 )
 
 pkg_pretend() {
@@ -113,6 +114,12 @@ multilib_src_configure() {
 	# icu tries to use clang by default
 	tc-export CC CXX
 
+	# make sure we configure with the same shell as we run icu-config
+	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
+	export CONFIG_SHELL=${EPREFIX}/bin/sh
+	# probably have no /bin/sh in prefix-chain
+	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL=${BASH}
+
 	ECONF_SOURCE=${S} \
 	econf "${myeconfargs[@]}"
 }
diff --git a/dev-libs/ivykis/Manifest b/dev-libs/ivykis/Manifest
new file mode 100644
index 000000000000..b75f9886e9ae
--- /dev/null
+++ b/dev-libs/ivykis/Manifest
@@ -0,0 +1,3 @@
+DIST ivykis-0.42.2.tar.gz 653885 BLAKE2B e4a5310ce6fd15aea79091edd56221f77c64a68472fa9bd44715da8c21b4b54f55c2e8c886491afcb8c206107b78b20cd7ad727a96690e8c718f2a2aaeb32aac SHA512 0a166869b434668219c379a8acf7b2da17cb1e29aef74f9dde869a322d3b34e36c84bd67800f7fb234a29bf9372061329189f02ab6d7f85bb2622b4c43185270
+EBUILD ivykis-0.42.2.ebuild 360 BLAKE2B a432cc5d87e501cf44a16ece4434153a931c51a8f2bb7a328fbfa08920b3f6be7eddcf21cbc3c6df284c0fed29a9d8073b5d4c55375ba454506c6d58b30d2b19 SHA512 b9bba4cb3f5c6775535ff34536a04a1cb960a8b3ac53ae7bea83c28db2d81bd574d42b5baaf63ac50b16e1e529131dcfb7fd97ea89b394e7fbffcc252a9ec12e
+MISC metadata.xml 462 BLAKE2B 64b01c11fccd36c0d1c027c8c904ea843adcd233cea786bac604d81044929f420a64ceb9b6a713bfea8637710899254981b44213ac3832173b556026d51b2ee9 SHA512 70b8289fc39f3a8132f8d85577c8795d9ae44fc72934765fa12226f147b43d28472afa77d9a39e65d48d123dfc9a69f509090956317258de3e3cdf8f95a03e9e
diff --git a/dev-libs/ivykis/ivykis-0.42.2.ebuild b/dev-libs/ivykis/ivykis-0.42.2.ebuild
new file mode 100644
index 000000000000..e4cc425e4469
--- /dev/null
+++ b/dev-libs/ivykis/ivykis-0.42.2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Library for asynchronous I/O readiness notification"
+HOMEPAGE="https://github.com/buytenh/ivykis"
+SRC_URI="https://github.com/buytenh/ivykis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-libs/ivykis/metadata.xml b/dev-libs/ivykis/metadata.xml
new file mode 100644
index 000000000000..4f289fcb4a9d
--- /dev/null
+++ b/dev-libs/ivykis/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>hydrapolic@gmail.com</email>
+    <name>Tomáš Mózes</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">buytenh/ivykis</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest
index 62fa46eea1f6..8b80ecdd6aaf 100644
--- a/dev-libs/jemalloc/Manifest
+++ b/dev-libs/jemalloc/Manifest
@@ -15,11 +15,11 @@ DIST jemalloc-3.3.1.tar.bz2 252997 SHA256 35c433cc1df5cdf9eb58b7980338552fc1d7aa
 DIST jemalloc-3.6.0.tar.bz2 338964 SHA256 e16c2159dd3c81ca2dc3b5c9ef0d43e1f2f45b04548f42db12e7c12d7bdf84fe SHA512 ebe7c64558a87a735b5906d5cb7527c241664eeae7328538675a12eabe7a1004be0f8766a3bd2a78e61334b196ca7ffc0ee8b8ff59167922a35f126cd1e76e43 WHIRLPOOL d5452005951b10d9d529349481779d79361ec8d8ac1f36f4b54408b5e0184f35d79fee8378188d98f1b8e41ae13557a2cf41ab849b68856ba69f33870fe6e980
 DIST jemalloc-4.4.0.tar.bz2 440144 SHA256 a7aea63e9718d2f1adf81d87e3df3cb1b58deb86fc77bad5d702c4c59687b033 SHA512 2f88fb17ede3bf87e334e9c80949870e0dd85b5adcdd89a1750ccf6df5240f35293159ac0a360d3a29cf0b1d17edf86dcc7997c6bf3190ae7da7442d3a3cc14e WHIRLPOOL 1485ce6cf08ee2233117e281d1a61f376d2b6c73f28c68f2cc1956471bcb56a4eef045c0011de141b669d94d7339de5e79860f6b21bfbeffab821d5eb528759c
 DIST jemalloc-4.5.0.tar.bz2 449992 SHA256 9409d85664b4f135b77518b0b118c549009dc10f6cba14557d170476611f6780 SHA512 76953363fe1007952232220afa1a91da4c1c33c02369b5ad239d8dd1d0792141197c15e8489a8f4cd301b08494e65cadd8ecd34d025cb0285700dd78d7248821 WHIRLPOOL 33dc51258d6d27942b656fc355cdde24becf0cd50a507375dd51b2fa6c55a6444ff21bcdae0ebe4fae8d2e95fa31989f5cf8bd435a7a59385ebb225a0a4441fe
-DIST jemalloc-5.0.1.tar.bz2 499300 SHA256 4814781d395b0ef093b21a08e8e6e0bd3dab8762f9935bbfb71679b0dea7c3e9 SHA512 8cb5957a5724eb2bbad120cf0028ea8b2b14b4a416c1751b7c967351a7fd51135058ea0d3c4dc1d127c86f3aa7e9fd5ef101857110aabfdb7789427791c432c3 WHIRLPOOL 7bbaa407b1e403ef3bb5ecf6289dcf7f3cc9e31d8077d6e9b10e434e8f02e8e8c45ec890b67bcf39f8b7419ffcae893b4aa256f1a05750b196fcfbfadbd8696a
+DIST jemalloc-5.0.1.tar.bz2 499300 BLAKE2B 551933fcd93315968cbf89bfadc40313717ff216141af8a131f2333d10090438ddf36fbfdc0ee831cbec6f930ae15aa9cfaafae72ed4f38dd97b00712ca918e8 SHA512 8cb5957a5724eb2bbad120cf0028ea8b2b14b4a416c1751b7c967351a7fd51135058ea0d3c4dc1d127c86f3aa7e9fd5ef101857110aabfdb7789427791c432c3
 EBUILD jemalloc-2.2.5-r1.ebuild 908 BLAKE2B 4a61107376367d2d8174b3c8cfd4daa10fd6c129b15b057feb7698615c28c20dcf2ef782f86503ed7e35d39aacee36e36a65284c5b417b97a230e1869273b37b SHA512 7d046cb6f169e188cbe432aede49f2b9c8973cfc13aa9d159debabb3cdddfbef8f98f91ba5fa649350639b86f737aaf0d4da0415e96a0c09dd3012e08e488a4a
 EBUILD jemalloc-3.3.1.ebuild 1049 BLAKE2B 212d3d82e378b88b2c65b7789a72b56871be595793333ad2b0bca8ed772f2d6fe379a0289101539014ff557239bd1c6676cae9bcf2ae6b186254646e522ed089 SHA512 a5a0bed33a86fe3783cdcadefe3cd0929bc1fbcffd24ef5ce5bd4cfc51b03d70f77c5161deabb80a36fef30c45c02d6683d49c266e354b9722d8919c6e3c275b
 EBUILD jemalloc-3.6.0.ebuild 1863 BLAKE2B 78225216889fba0c657d36d371ea1a9e0ba6e4471a00c85528a74a0e4131db29dd8ddaaaae6de742b32b2290d12c7f46e1a8cae3d7c47a13f8363863a7755590 SHA512 fde66a60ee8b6e0a860c024c4b3475267dd42be2102cacf68b04df6e736d2747ff163589bbd615f5c3f8e58add090b3b20c6c1d91bb174ad8ff6b792eee7dc1d
 EBUILD jemalloc-4.4.0.ebuild 1728 BLAKE2B aea84d47093a3cbc5d38de7ef10abef7054af2e2f43d0160f773f9e5cf01cda7f12879d7cb46c4dab6494187e45623c0fa9db6aee022b5aae06a2e070d4d0991 SHA512 f63bdca82f62dce58e17ada58816154cb7f0aa214b75b269eb082124de4e750d9721b2453da8e9cdadd8d7c3b75fdc6498538594f05b097c824288271317d988
 EBUILD jemalloc-4.5.0.ebuild 1764 BLAKE2B d1e09429445f465b28221ef4e5bf8944c616348ab824c505a28da54a67ad3e135ee2ba709d30d36d403f1469a12b9bef773ef8df96709c52f999912db27bb9f2 SHA512 665b73e2e6bdadba26f772a58bf68a89844fa8a5afb1ff932e08d23c5e27b22c54bd9b3824b5023db45bff6fe2ea8899c19c0ab655b8e8762feef448e6798f4e
-EBUILD jemalloc-5.0.1.ebuild 1879 BLAKE2B b55e36028a1b09d135b5b8c1790a2ae026859d0caa3fbe79c1b0a0b0f2d13819348ed0267ff2b1d5576c455398d5bcda0e41e14719bfac5f275209d9f1d39512 SHA512 4cf16943689b5e0b4f2926d591a67a16b757ccb5fc2bf3d4526238c34cce2dec64f6fb0f024e01eb4171f60334d31356098785c91a5d469015b37f1c1e50c8fe
+EBUILD jemalloc-5.0.1.ebuild 1892 BLAKE2B bd2474ddffb110f2d839dc9750e16d314e7b7993fd7084aef8c56d0cbb50a9abe648589dca79860d257aa195332efe448c890db34c7178afdc6e009068a53e00 SHA512 0ffff440dc2f084e7f1793d9296adda87333ff56e918adf13ad47c3af98060d2e58a6a43487b98ba643cf8245f396f447357d57f963117af0f98b6ad2c7315b8
 MISC metadata.xml 762 BLAKE2B db6f1712f7b716c824f199ec10e566fa543aa594a6bc75f60adca55e249163a96adbdff109a49327799bee090b3abadd9961c74878c0b0a9c54aa0cb4118f2a1 SHA512 4fdae623c6f76fad566807e7a48c3cf11b5818bf2f93e32f6c0a53558732642f0011dabb7bd4d7f637c8df141cccdb1075c48177a83caac78f9f375b3e57278a
diff --git a/dev-libs/jemalloc/jemalloc-5.0.1.ebuild b/dev-libs/jemalloc/jemalloc-5.0.1.ebuild
index 62fde4876592..ad448d5e1f78 100644
--- a/dev-libs/jemalloc/jemalloc-5.0.1.ebuild
+++ b/dev-libs/jemalloc/jemalloc-5.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.b
 
 LICENSE="BSD"
 SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE="debug hardened +hugepages lazy-lock static-libs stats xmalloc"
 HTML_DOCS=( doc/jemalloc.html )
 PATCHES=( "${FILESDIR}/${PN}-5.0.1-strip-optimization.patch"
diff --git a/dev-libs/libowfat/Manifest b/dev-libs/libowfat/Manifest
index 961cc1f10d13..84dd87ba138a 100644
--- a/dev-libs/libowfat/Manifest
+++ b/dev-libs/libowfat/Manifest
@@ -4,6 +4,6 @@ DIST libowfat-0.30.tar.xz 177368 SHA256 db4a3a853cfbb9e83b27f565b580f6fdc519475b
 DIST libowfat-0.31.tar.xz 183684 BLAKE2B 67c60ebba10463f28196e3d9ed5f20fdbe79db8b499b226fb02d4f38833747e5e709054473267a1e139e1bef29222220e7f60cf2f472ac58ca67b52dca2c5661 SHA512 b3ce973d6edc501ddaa6caa84dc3b74e3e31ced92e4f707038858cd36c977863251a7eaeababdad34ffe6b8ad13c9702118464f6f9fd827e05f6fbc5004408b5
 EBUILD libowfat-0.29.ebuild 1198 BLAKE2B b4a6e652dc77fbc50db31410b5e58c6c2fe059d60df00e60f793fac21e68e103e7eeb85412c5c0ac96919dfccefa1dc94812912dbc4aaf1984436190937f7c4d SHA512 446ee891a8604a19f39e5bc0bcd37dbf4ae3e9fca1e5b5cef6d24a01a6119f73ec8f1633a3f6b059b208d1fbca15e40bce2b904d7b6ee2d75ec99dd7cada841a
 EBUILD libowfat-0.30.ebuild 1026 BLAKE2B d35c40d4375dd501fa8df9b121b31a74fc21a033725779b8d33a1346e7f92d6928cc15839252c784c66509bbc3c1d98e9e77f02840bbdf975b2f45eae19852a6 SHA512 8ae182cf0a435cefe2073763df621957683e1d375d39cc59670803e9db687d3848ada95e8d4a95e7817dfbd35a936285cd6f5e47695e1b54a1b918e2366fd801
-EBUILD libowfat-0.31-r1.ebuild 1006 BLAKE2B a91141d962550acf0487fe817d5661ba4a18375b8e6a84dd7fc18ab1202badc5f84fc0ab805bccb94fa4f26beda9ace224bdf237f5f5d62541ccda29539f2234 SHA512 7f08240d5845b6e55dc2e99b2c8b87df103d53de15df5a1e1966664165d07ce59558074bd155e189a1fa1c81d84c5bd687bcfc4b34373cfed6c88bdc7e48f0a9
+EBUILD libowfat-0.31-r1.ebuild 1005 BLAKE2B 96cb1f9b6e7e79baf08f3aa13e3cb535c181c1e324c626dd0490a512cebc431ef73c13e2ba89173502a17af5e77b5578123c17ffc0147b06dc99c5eacf1531c0 SHA512 c21ed62f9716323987d7134652ecd2d06bb084badddbd1ec3e175e3ac4ce7a1800f15a46e6537c82d82e5643979592fa66b80aeb28164f13131783e6b54fcdaa
 EBUILD libowfat-0.31.ebuild 1026 BLAKE2B 5ca76e7803d80029fca8b0538580e46977ac62a1e4e098f41ce2e308af51e37c99acae17d3e1e3a1059858a7be5ca0f8e708541ae84e1fff44e1bee0f9c41539 SHA512 fbe734a5b7d82d1ea2c97fee08c5e6f685f14df0a5079e51e0f09c4fe6156e9b48e81901ab7923af9f569f9c9edfe369e25ff92d55a32042532d8c1c22f01797
 MISC metadata.xml 430 BLAKE2B 16b95e09cd79b1b22a0b391fbd70b3ef51b08dd5d92449613f21e8e1ac85f16fdb5e0bde3a298aa7b2c740439c909836a3a71dc55022a1322746f2078522ed78 SHA512 83ef95906f9aa9e0a88eb9241dd1245cd6628a24acc06fc99d97028ef9d82e4369fbed5643d88d51ae514dedf70dde032443a1523d335ea0fb1f96cdd9149a79
diff --git a/dev-libs/libowfat/libowfat-0.31-r1.ebuild b/dev-libs/libowfat/libowfat-0.31-r1.ebuild
index 38dc2d79329a..aa21affe38c3 100644
--- a/dev-libs/libowfat/libowfat-0.31-r1.ebuild
+++ b/dev-libs/libowfat/libowfat-0.31-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.fefe.de/libowfat/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa sparc ~x86"
 IUSE="diet"
 
 RDEPEND="diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )"
diff --git a/dev-libs/uriparser/Manifest b/dev-libs/uriparser/Manifest
index 19a1fea4854d..8c54e06dfb73 100644
--- a/dev-libs/uriparser/Manifest
+++ b/dev-libs/uriparser/Manifest
@@ -10,5 +10,5 @@ EBUILD uriparser-0.8.0.ebuild 1101 BLAKE2B 1ce433e4c4b04b16f8d7d3b988795e42f3358
 EBUILD uriparser-0.8.1.ebuild 1181 BLAKE2B eb01d3626841ad1a15af59ac4a836679bc7579eba67e364be6a33df71f6afc0b8f8ad37314252acec688938cc2ddd504490d032f5a67157cb4c96c49dc8d1d09 SHA512 777af89fa40025b074c0836b2ac9f85d6c435aaa5606aa94acad9464c18cf24196543ddf1dead6608e3cfc1a8f801fdddf6174d77a4111f13a53ed36683d11df
 EBUILD uriparser-0.8.2.ebuild 1078 BLAKE2B 44b31bc8043d1647a66144b05e59323b634ee94673eb53807da8e9688d0be4b912f20f3842b8443652962cc0b11dbb438cd85a65ff276659eea178ea21d0b01a SHA512 d9f89173b19be0675a1e108d0894ce78a96635ca40d48fab625faa207eeaa7a16ec5659d3f17feeabd6413b865e73150644fd6203d93f0356bb0764123321413
 EBUILD uriparser-0.8.3.ebuild 971 BLAKE2B 2cb27a9c6dde3711633eb2fe8bc4b2e7c0fe0a0b5925caf35bd25240637bbd734ba00a09c93a06b3318dbfb4dc85042ee712d76b6de2b0e848bab272ab7dde69 SHA512 e2736b924941f39a6b8d4810c550d4ae89d6b869cc643c3499916ac7bac4f1e5e6e76110b856498f0e4e09793d8851e71c3bd2df7b2af97c0f6cf29c51079457
-EBUILD uriparser-0.8.4.ebuild 971 BLAKE2B 2cb27a9c6dde3711633eb2fe8bc4b2e7c0fe0a0b5925caf35bd25240637bbd734ba00a09c93a06b3318dbfb4dc85042ee712d76b6de2b0e848bab272ab7dde69 SHA512 e2736b924941f39a6b8d4810c550d4ae89d6b869cc643c3499916ac7bac4f1e5e6e76110b856498f0e4e09793d8851e71c3bd2df7b2af97c0f6cf29c51079457
+EBUILD uriparser-0.8.4.ebuild 976 BLAKE2B b408b3abb8eca1b16822b7385a124e01b4021a7434037f6c03dbb2e49ed296ab2830f63d1fc1479f0799fe1562bc5fac386cb813042518f24fc11792bf950af1 SHA512 d356896c3040b0dd6e5935183ab0f26c996aacdae1725904800c49d4a23d6acbebd9d7919d07cf15f9edad7dde46526acc0ae19bbfb919d1bb230fb4a6a6eb99
 MISC metadata.xml 542 BLAKE2B ea02a2f11456940eeab83ac904b7b8893c0c41428161f0391eeb9aecbeb51f7d22ec215455837932f0a2b193e937ce41290d5e795ab0cc434b23e13b37dc7146 SHA512 6798e6f833cbbb1ebd80cf04bc5950e5bafd8b689d79211a0a778467b9785b18720918b1822106dadcb96044df2ec8f681c3cda049b1bf3ca1fa072f409dfc45
diff --git a/dev-libs/uriparser/uriparser-0.8.4.ebuild b/dev-libs/uriparser/uriparser-0.8.4.ebuild
index 0f26dee35fc6..97ad9a716173 100644
--- a/dev-libs/uriparser/uriparser-0.8.4.ebuild
+++ b/dev-libs/uriparser/uriparser-0.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc qt4 test unicode"
 
 RDEPEND=""
diff --git a/dev-perl/Archive-Zip/Archive-Zip-1.590.0.ebuild b/dev-perl/Archive-Zip/Archive-Zip-1.590.0.ebuild
index 6cb1d4c29071..a57a8c6eb7be 100644
--- a/dev-perl/Archive-Zip/Archive-Zip-1.590.0.ebuild
+++ b/dev-perl/Archive-Zip/Archive-Zip-1.590.0.ebuild
@@ -11,8 +11,7 @@ inherit perl-module
 DESCRIPTION="A wrapper that lets you read Zip archive members as if they were files"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
-~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Archive-Zip/Manifest b/dev-perl/Archive-Zip/Manifest
index 61028c053e13..6b5b8eb0327b 100644
--- a/dev-perl/Archive-Zip/Manifest
+++ b/dev-perl/Archive-Zip/Manifest
@@ -1,9 +1,9 @@
 DIST Archive-Zip-1.53.tar.gz 189493 SHA256 c66f3cdfd1965d47d84af1e37b997e17d3f8c5f2cceffc1e90d04d64001424b9 SHA512 ddf2f518e31c41b31c1ee66c1b4c09c8e964f1f458c6403b9a0f2ff6f41e54284a8995db7c0d1a8b08143f464b02a38fc0162bde9c0ad13f38e8b44a575482b3 WHIRLPOOL 69970596329334bcba3059bc5661880de5ae2938f32303e84c5f9f440b473ba3b37c8886d10358b48055abf8baefce100ef0d40c9b43121a7bc00bf5e81d21e5
 DIST Archive-Zip-1.56.tar.gz 190124 SHA256 109f3ccaee5bc963144f700e96206c248dd83f855dffc9b796a76518c36400f8 SHA512 f636cfbc9cff43a153e20621ab1f155a8eb9395ae59a7d97ce1dfd6f82335f0b9600d09e37e7f3e16c1d8054bbf000a7ffcb44629337ce6a94ca0e191924e801 WHIRLPOOL 431f1cb58a47657df05b60b7b97ac46cfb568c137d2f0da33dd7a710f35411c92e6c7c23d9ace3bc7dc5349274786ae82d03943def0167ba18654315b2b87afc
 DIST Archive-Zip-1.57.tar.gz 190218 SHA256 4238b4df7e5f244c684dec83f75c0fa56819c01c61f9314c91f6a60fd41d3694 SHA512 accf68cb2b7171cd244b8ff92dd9d24c945856700731cede249273a5d44364f9bd1008d06472befc1af9c2d1bc70706f5ac792bede54a58d22ac882f4f3c81aa WHIRLPOOL 5ff0a2e2c493848e6d6c449be8d9c21e7301a7b8473441be68218b91edf79073a568fc3b3848e0d5bb05a31ab844781f2b1ca2ec452a3dd9b740dc8b287c6137
-DIST Archive-Zip-1.59.tar.gz 192151 SHA256 7a4b1b0aa43ae7231bb3212e86ab6b538725625df06e82772c3da24c8b26e75d SHA512 ca9df48d770bf34945daa1721b9372ed90816b8a2a3d61523fc91c583ef545df169528093d6cd15fbc7e962ce0aab17f0fe8899fd35a6f0245c97b7cb379dd5f WHIRLPOOL b08d1a2d65015b3a40c6c399b939fedb05fe6211404c5c61c919b2c9ac1a5cdbabde3891f6c2981c0c8258ef7228396f0baaeb6f1cc3197a7e8838e124368b69
+DIST Archive-Zip-1.59.tar.gz 192151 BLAKE2B 1899ec51343250e496bc3121abea3e08cd49cd33289184ba9ef1486e9b6a3f643fb264d78f0c21d47d6889d1d50e905e9c5c6f79d385d5de2a47d41bd0102dc6 SHA512 ca9df48d770bf34945daa1721b9372ed90816b8a2a3d61523fc91c583ef545df169528093d6cd15fbc7e962ce0aab17f0fe8899fd35a6f0245c97b7cb379dd5f
 EBUILD Archive-Zip-1.530.0.ebuild 711 BLAKE2B 40f7bc2e0beabaa54ad4907a58188503612954b94837303433952638d282af0d41f74f4080a2a6bea13ddd3a4413ba45d793673d44a468449be3ff00cbba4eae SHA512 63858d2a3cc9be6cb84211aec7c911682b6d17238a57e45e6c31459e3c04e1cb24d5f2f25f65a651a01e6c1560cb94ed83eb3aba2673bd45bb37c906a4767d2b
 EBUILD Archive-Zip-1.560.0.ebuild 707 BLAKE2B 7005f8233ce7d6b131e0f236e00bae6fcd07af3b2d16db5dc81cefb906700dddb168dff125ee3847950fd4c7a5fb23e29b464c6ef7150b967d804f17b1a6866c SHA512 3c7949cd1b6ca52c003030db5f4d85014c8e9f13c2ac5d113a4e8d7ee4a18d863027ba920d713d7d10944353f6a172d66b731bb4edebb60e1f9707227185abf0
 EBUILD Archive-Zip-1.570.0.ebuild 791 BLAKE2B 332fe60c24f4dfc358f807188c4787ec7cc43b711544e4c2179bb6de6f25911ca4f473d290a0ede3b7efca74f1c1746e9062446864e849f3feea692ca01bcd9a SHA512 6a7ef47cd61b350bb1716c1fe86a87d0e6e675f5031032b940d7640b44b3bcb5587b3ece3d845aa2e57480d58f42a961d1df01f16f560bfc36bd2c9ccaa00a57
-EBUILD Archive-Zip-1.590.0.ebuild 790 BLAKE2B d328babf4517bee6b16bf5625a385f3fadab1e09b6dc97f7eab696906432f75439095659dc86b4b8198d5ee8a9c27b5a17d329f6419bb0e3b65370af2c511d8c SHA512 7a6e5e50580474933537cd9e76f3623653e045a26af5e701f6800d4d895ca37eb490a36e9e01971b30e1278a12579ae728b9461130354cc7d5feb10d2120b5b3
+EBUILD Archive-Zip-1.590.0.ebuild 789 BLAKE2B a9117fdb6e2d8fcca8d10d5797800de40d3b0154f0c35890203da02d8bd53af49eea0537fb80e08301ffbe89ae649c440190d8af993dfc36ce8b47891128a6fa SHA512 3276c42e2d0ffc633d2c37e65932fa681606c576dc1355cf6562f5ad65802ebaaf9ddb27f31eee8e2ce2e96e718a43ff9d5201d5e6d3ed9ce5b06f5b298aed99
 MISC metadata.xml 1187 BLAKE2B 93311e721bebc19566b1108db3e9ec72034db4aaacbbb3abba77d35c5c53ad87a8c57ab7a3778a9062ac452983a0bbefdf7fd11b49c23df07e043974f8922acc SHA512 cab4eed19897f888eb2ff9cc094ba567053eeb115610b0dd4093db37cb8a24488454bfda9b75668f57d37d46e64e3cec5fa300b4227fe40b437c167fb38b690f
diff --git a/dev-perl/Email-Find/Email-Find-0.100.0-r1.ebuild b/dev-perl/Email-Find/Email-Find-0.100.0-r1.ebuild
index a70478f7b53b..84574d7a33c8 100644
--- a/dev-perl/Email-Find/Email-Find-0.100.0-r1.ebuild
+++ b/dev-perl/Email-Find/Email-Find-0.100.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Find RFC 822 email addresses in plain text"
 
 SLOT="0"
-KEYWORDS="amd64 hppa ~mips ppc ppc64 x86 ~x86-linux"
+KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 x86 ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-perl/MailTools
diff --git a/dev-perl/Email-Find/Manifest b/dev-perl/Email-Find/Manifest
index 974f6fac04b4..73eb3c7cb900 100644
--- a/dev-perl/Email-Find/Manifest
+++ b/dev-perl/Email-Find/Manifest
@@ -1,3 +1,3 @@
 DIST Email-Find-0.10.tar.gz 39511 SHA256 29aaa007d0dea4a8d8db778cf191eadeca91c4e9883ba4a8e2dc4d54e8ccf20e SHA512 0c31a108de7b146a9b1a35dad15d4a8afb6bf036f228b4997247e1406ea15a8a6c0ba6d79ba36c4262be69970211653b71587771d2d0170ca506a7f531265720 WHIRLPOOL c6a40dc29aca7abb937f66a5ce0b1df873dae3545a29d09e78d80a75576eef7054cdcdfbf302b9ae987a882ff07713b2caee11d8385339c02f0945f5c5df8890
-EBUILD Email-Find-0.100.0-r1.ebuild 421 BLAKE2B 95e26ee616260fed41358a8b9c103651f6b56420554b7521273f369a6f60ba6990178d61493acb578c7c4273bd5ae802a56dca9bb06d70b897e936105dc3bd6d SHA512 41108e6004257c0705fddd97487a7c3b62ae88c8d802f4d2f0f5122679c7886e5a1efa8483f57b1e91d3191a132b62dca0c2c266f9738664c0bc7c483bab3ca5
+EBUILD Email-Find-0.100.0-r1.ebuild 426 BLAKE2B 1869598a4428d10d682ed2e7ec5761cb147052108326ceeb74c8e2cce624d73424f41e663ad8254fd47184970b92b75b949f9fa3cf7c4d3706e13a1645784a63 SHA512 b31bf50834fa3008bf98163e7153dc63d537018fe8221e33297ea2c8823b43c9035579170033cd8d386cd1e2a490c24daee7d62f86e0281c1b812b809d4ab4d9
 MISC metadata.xml 460 BLAKE2B dd55f62ad5512be7087e7bfa93df1daffc3213e6e89f106b8a062a803851700ab267bc7844d37f551fd04242da2f920f373f09e646d6931dec66607b1c5bcd1f SHA512 08ad3fde31149f98de29b5412129285e449859318855efc5c5ad61644d140ceba65543d0ce606b123247c25dfe83c3efdac9ceb9268a16d80136fb8ce151b8e9
diff --git a/dev-perl/Email-Valid/Email-Valid-1.202.0.ebuild b/dev-perl/Email-Valid/Email-Valid-1.202.0.ebuild
index 71e4dc0e46d4..900ec2ed1df8 100644
--- a/dev-perl/Email-Valid/Email-Valid-1.202.0.ebuild
+++ b/dev-perl/Email-Valid/Email-Valid-1.202.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Check validity of Internet email addresses"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Email-Valid/Manifest b/dev-perl/Email-Valid/Manifest
index de24df7becb6..f643251f94fa 100644
--- a/dev-perl/Email-Valid/Manifest
+++ b/dev-perl/Email-Valid/Manifest
@@ -3,5 +3,5 @@ DIST Email-Valid-1.198.tar.gz 32952 SHA256 ab502c4c1398b1e0700b4d03532e31aad8705
 DIST Email-Valid-1.202.tar.gz 33891 SHA256 d021089b662a60e6a0c8abdb72bd9c5e46848d248d98a98c1ea2addf1aac13a2 SHA512 16605a0f935cb429f83209e0b67a36339c74ce77aea1aefbb338a00d236f57648672bb179e543dcb28b02603ccdc0a9c6a696176eecb5075cbd119d1de7a114c WHIRLPOOL b73d89e898f1027433d178918663d705e36464ca35804a5fcb9be39a5aa95b17bdeb7c4c585715ad07301977d7e5545716d95b3efdf74ea61833a88e96862740
 EBUILD Email-Valid-1.196.0.ebuild 623 BLAKE2B d289a5ddd1765b9504590e14345d734cdf8dff017c7890640b6903169406398af2a2edebc1bdb8b7df405f1dccfb9a0aeb68293ca97a941c04b9477adf9eb252 SHA512 97ce0f4add1303357b87410e1dc2316cbf40ba56684838249b259cc7ce6d3ced929b8435fe266a808f9dd5f32fad79daa349d9e3a852995b066d4865489c211a
 EBUILD Email-Valid-1.198.0.ebuild 667 BLAKE2B f1734317020c6c4de458a3ca724fa371a4b853e75f27ade31dc4d442c099b9cc924c712a0ccd1f7669e8312ef13902ea82382b83153b1da085a33c3d35f95ec8 SHA512 d86643fe6d46bdd6ba4129e7f458c6bfd439b6edd07afa1106acfb035141930cd1e4d2658037579d40abd0fa0cf4b1e25b79fd25b576664f7bf7b42ecf341d36
-EBUILD Email-Valid-1.202.0.ebuild 667 BLAKE2B 9a7c4ba389925b1cc69f439cfdde9499375b29cfca160e81921159ba69994b549d1466e82cea43031ab2fc3af2366c61161361dc621074dc7ea9a0ee2bc9576f SHA512 f64a219a26e38d7b4e0270deb07607ea17103a95c9521d22b96b9714c43c10e50efd4bddfe9bc3a67a51cf335c45977b62133b283c3ffa5abbab9ebb8f766f73
+EBUILD Email-Valid-1.202.0.ebuild 672 BLAKE2B ee0f8c4b4acda3108bc162295a358a72b303f7bc138fd770c7c16a70a6f306af1784013027e9e3a3bc264f11ff86c5471000478aa2c02c7d44dcee7fd6435ac3 SHA512 8a2c63d5c857b17f60b752601ab16ff5b800133c47967ac58568075e0b5b9ff52a2293cef9dbb39ee6ebeaef336ad4a55d23d6d75c98a175d601c85ebba138fa
 MISC metadata.xml 394 BLAKE2B 62ecef1e269014bc28e745ba5c635d9ce69009f5e2a43597225d64b7fc634ed94f52f1696ff06e32272fd96aec16e897f956dee18acb21dfda1316f6c4e04d45 SHA512 45933ff20d285de8387006ef8f07b7979bcdfc052e05c8fdcce68561025c19dd48990fdb3fcc9376ad90109d5ea8f8ffb9e006b078d39e689910ccc57ae493dc
diff --git a/dev-perl/Gtk2/Gtk2-1.249.920.ebuild b/dev-perl/Gtk2/Gtk2-1.249.920.ebuild
index 140e7da429cb..3c14a9208a74 100644
--- a/dev-perl/Gtk2/Gtk2-1.249.920.ebuild
+++ b/dev-perl/Gtk2/Gtk2-1.249.920.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Perl bindings for GTK2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Gtk2/Manifest b/dev-perl/Gtk2/Manifest
index 5898112e6959..5b36ee546ffc 100644
--- a/dev-perl/Gtk2/Manifest
+++ b/dev-perl/Gtk2/Manifest
@@ -7,5 +7,5 @@ EBUILD Gtk2-1.247.0.ebuild 702 BLAKE2B c12cb8b41f7de39392efa7d28b42ae8e0eabca438
 EBUILD Gtk2-1.249.500.ebuild 740 BLAKE2B 1b4d21e03dc7eecbbd9cd13f37be0bd867c12deeb794c34722b2254dd6100a0f5841ae4964b657cd9c99c6cd76c90b9f88803754a75ce9864c4d2e92f568d73d SHA512 33a63b5e1dd1911608b8a5a29781c4b79b57b1c7cc072cf9524b99b42196c832ed02aad01687c9772a89b999ec6aaa6c5b9b08f9d49ac1507d541f0e374f065b
 EBUILD Gtk2-1.249.700.ebuild 649 BLAKE2B 8bc01a7377b37d26454b30de32c139a318422d2203c749fde92de1b23c43098cfc7cb94d05f61004ec9daa16dd31383ac755411ab9d58c734ff299a6f7f65b6b SHA512 e5d665e70722c2009f8b0b5489e5fd1d1bfb7ad2f5b9fbe8b6fdac9aadfa26a4c49506061a71b8c72fb47775c06864482b27dd180228ebff523df744ca4ae41a
 EBUILD Gtk2-1.249.910.ebuild 650 BLAKE2B 9472404a609cbe571a31b395acea5bb9c5debb413e967347f0597c73f0c7e8227cc36ab80bb64ba8083d0e2a9b762f7fdcac6c21d3ccf81dae644f084280e394 SHA512 b87c86d9dff01eae2912354fbcd76eb8e3e2fa0726cb486b3c83ce97c3d97d7b24f44c517bbba523b43be9654b0ea0fe2d8063bd90c18681da409f4c4d080d23
-EBUILD Gtk2-1.249.920.ebuild 681 BLAKE2B 4c09c826567368244d3a677b17896a95e3a97d16f1697fa87930dda7dfc61850d40a46549a65e447aca095aac0134b7a3a7ba9210c37584929cba9c4a1fbd8c8 SHA512 9295bca2c105f03de8aa4004addaf86da9152da540c7f12e23c41f138091ef684d20e70a3fd119b8d3563a17f379e70828d28208b7c313338083bda0d283f441
+EBUILD Gtk2-1.249.920.ebuild 680 BLAKE2B 9ddaccd7ff6d58a34eef8f84539f99b8558991ed5f488c267f61b2f656933e03e5520aa3f50a3a5f51212b1ab9bf1f21e3b46f6d2f0a6f0400e85ccd07250055 SHA512 ea29fe801b15cd2c3bc53d6da569214d5e14b13a19eec30b376a611a52fc80113749a559efac52917552084bde42bda05e341d76460da4aa6e030305b3d8603e
 MISC metadata.xml 1289 BLAKE2B caeb953c97aa87c06496de24cac26534978d476dfd0f6ce20a24a78010342c576a9f4dedb5827dba8d791d1e691bcd9431b5fa47c0fee6cc7cc9471e74605441 SHA512 eff99cdc1dd2c95f13e038a0795d5817eb5352bad745610968f075c139115ffcc9d3784d60550d47602a6095a2d27ae4e22e3d19ede7712d6b08f94af186fcc9
diff --git a/dev-perl/HTML-FromText/HTML-FromText-2.70.0.ebuild b/dev-perl/HTML-FromText/HTML-FromText-2.70.0.ebuild
index 39c3c9abc3fc..f3d7ab43dc44 100644
--- a/dev-perl/HTML-FromText/HTML-FromText-2.70.0.ebuild
+++ b/dev-perl/HTML-FromText/HTML-FromText-2.70.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Convert plain text to HTML"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86"
 IUSE="test"
 
 # Email::Find::addrspec -> Email-Find 0.09
diff --git a/dev-perl/HTML-FromText/Manifest b/dev-perl/HTML-FromText/Manifest
index f680a6eab24c..7a2d95a80339 100644
--- a/dev-perl/HTML-FromText/Manifest
+++ b/dev-perl/HTML-FromText/Manifest
@@ -1,5 +1,5 @@
 DIST HTML-FromText-2.05.tar.gz 13875 SHA256 6510e5c817aae9c1414e418fa853daa7f9835736df60a658db6fd1c65ad0a15e SHA512 69263aa7aca3ce002e2e0db9553b15f01e5e6d7d148a410846b170cf19d3fcfbbfd9b7cc52d9264de081b9292cec89ec1ed17e3069552dc27a83620e901602cb WHIRLPOOL 95d8441d260850c710b4835cd1dc6a51fbb281210e73f047283586674ef91ef319e5f14ecca184b1b37913a93165d4625cca5a57cb83c8c4324bc5ae668db6bc
 DIST HTML-FromText-2.07.tar.gz 23596 SHA256 c5e010324105be707fb5746bb5f2d30ccbc8e4f78d2a6e159b4147a462fe23ad SHA512 4aacb6be9d1c860c1e758201be40a9c966cb43f1593714e65964bce4bf5d72c86028290ec584321365de36909b6e44e8851f5c2a417b6e38da984ec9c5c30112 WHIRLPOOL 0f2b23fdc64085fffe16b838075d5776268ec72fe8dd5e2a05c091d8c24c395c7def8578fb097804071c612cfd213b203cd583c1da7491fef6b5e438fe805896
 EBUILD HTML-FromText-2.50.0-r1.ebuild 449 BLAKE2B 2b6a8b0e7fe1321cb7c42d7be6f600ee31112b29ea733a59f067505595b42a499c251fe51b11df4d1c9202d19d2a335adc9fbba41345e886d1f9abe3796af47e SHA512 5ff2d4bede8ef276d603a8b062f0967c5a39e7a264f16c5317557534889b837a77c1dee9c706bcb0d36bbef9f4eb8934d2a53ae79c189f11b47801d2d29d905d
-EBUILD HTML-FromText-2.70.0.ebuild 784 BLAKE2B f43aae243c040e4731f50e37209819cb56da506bf7e7af0a64b4502993936c64e259a0c78952024a9d567b6a420fa179bd44ed135f96f8a19083376cace10acc SHA512 f7cc7f2a697cb72c61730dc2e02df9b8320104e1e3acf95c97a6d62b345bcde59fe91155895b3ef71f4e78e0d331894c9b16cc49fb8ae75d1f84ce7d79ff91ae
+EBUILD HTML-FromText-2.70.0.ebuild 789 BLAKE2B 9226b93a74ce9a7b296afcfa8a3ebfaad8f19d3b76d961756de5de331afc01a36ed87990c9904385dc1be192d3f7c57368be4f56eb0ac889cac1f3ae43fc0b56 SHA512 699984561c7d22f188ac6152640993b8f46aea863cbaf1f135c603f535e9862bacd0cad7af079fead19c593590acc5710216ad25ca8de12c319a22c7f18407f1
 MISC metadata.xml 398 BLAKE2B b3bd218856eec071a94e6ea14213b81fdbfc664a37e31b322d69c2a197cd9a7cba9c9b05e0bb1cdbd29c903c252d4ef1b79672b1e86e6e397cca2e59fee22435 SHA512 34d82e7ad99c3e1aea8182f086c82d7f2254e4845e81ce9df5fa57db567d147224a8eec17c0aff7149a270b53748c3fdbf504e5f3d1ff1952a8888d64bbc682f
diff --git a/dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0.ebuild b/dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0.ebuild
index 81ccf97a1a87..98b151d56d40 100644
--- a/dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0.ebuild
+++ b/dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Cache the result of http get-requests persistently"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
 IUSE="test"
 
 RDEPEND="dev-perl/libwww-perl
diff --git a/dev-perl/HTTP-Cache-Transparent/Manifest b/dev-perl/HTTP-Cache-Transparent/Manifest
index f8973e14ad34..b9cefbfc74d5 100644
--- a/dev-perl/HTTP-Cache-Transparent/Manifest
+++ b/dev-perl/HTTP-Cache-Transparent/Manifest
@@ -1,5 +1,5 @@
 DIST HTTP-Cache-Transparent-1.1.tar.gz 9005 SHA256 0abf7b7d972abcd5d77aa4d138ad58406948e7f276f4071e13097b841f7c7eda SHA512 92993728c7803d6b9c2f7cfd8dce12e942df2002081908ebe3277034c1bcd35e3d4822fd246c028dd168229068a8e54b1caaca6f535b497319bd0dd3513c0ff0 WHIRLPOOL a81556aa41ee06ea39d5ff18026e70b52ad55c06c5ce229afb0b1873410af57f651bc1272aef732e667e30ab24ed46813ef109de3aa6a1e0638e714b4192462c
 DIST HTTP-Cache-Transparent-1.4.tar.gz 10289 SHA256 6622e1b5e5af952b1711aea247bdcb1b91c2aac0f11f32f819a2d07e11dd2845 SHA512 bd48290de4aeffe64cc4748d2f4b054abef539770dd8679f88fd24d9478819c31d7201918335404ea5ed0251d4c4f7d19926ccdeb6b4da2cecf251d2618589a4 WHIRLPOOL 223115bcf03c840085b41d73868b15ad75f6f21b3939789b24d6c4b0f7a8fa4b3428baff84fb52de9ee3616e605e51050bd78ac0df4e30c04aecf6cd85745921
 EBUILD HTTP-Cache-Transparent-1.100.0-r1.ebuild 531 BLAKE2B 0f883746d6173e4b1b72b9435076e69c2aae9d063fe517189e0cdeab5148c7f1853a3614bf5b18ffd14c1829e71da7351af52e3fe30857cdf2d73804b464d4b9 SHA512 5297526b64f61cb26cbfb3b761285ab197e9041241c0a90ae3d9e37b27b4a0bf48fc2353b8faef4bdef39f135563259f7f8cffc399f068c2e571dce4610e11d3
-EBUILD HTTP-Cache-Transparent-1.400.0.ebuild 546 BLAKE2B ec92db6a2d24bfd7f0d22f7616584b5ba88f45742e1e4a6f4304b18202030092ae5c6acacf0770f6fc586abf1c752c73de1205bd16c54d396254a428d127ab22 SHA512 c57985fd69385274cdae07bfa75b9b389f97babb8cbf88236e323693ceab1126c1f1cb0cefe0993e91507b29bcf8c5f75f42fda487db87f22f644364fc36831b
+EBUILD HTTP-Cache-Transparent-1.400.0.ebuild 551 BLAKE2B 4cf85ac04da4eecef75164cc099c7f7d561f45769ba84f0a550607cd7648edd6ece0846dd5106c2018a7b59e740e5be5523368b5ad5aa00229f59a70f7d593dc SHA512 f01f29d3d51072959f8ae23611aa2f272a3821a3d839f15e797c1a6289998608a4bd0caf50d8bb884549defbb335370fd33a1f5aa7d236fd8bb66c3f57b478d1
 MISC metadata.xml 417 BLAKE2B 49052781b68ec3c65ad74d64fea3a8f6a3882bc859767e5ddf3cbde99001682c9ef2cca4387c7405b23c20af7a81390ea3d36e8d21e24ef102355e78ffc251ab SHA512 35a17abe4fa79ee41ec5ded2d9d4290a33b7eaeb0b802de27213c5769d3a8d34ec4017187c9ff31aaeba7d078c7f260222b3801680988092d3da7b513a34fa50
diff --git a/dev-perl/IO-SessionData/IO-SessionData-1.30.0-r1.ebuild b/dev-perl/IO-SessionData/IO-SessionData-1.30.0-r1.ebuild
index 180ef9c860d7..efbe516d696b 100644
--- a/dev-perl/IO-SessionData/IO-SessionData-1.30.0-r1.ebuild
+++ b/dev-perl/IO-SessionData/IO-SessionData-1.30.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Session data support module for SOAP::Lite"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-perl/IO-SessionData/Manifest b/dev-perl/IO-SessionData/Manifest
index 5c377b43dd03..b96079b9726d 100644
--- a/dev-perl/IO-SessionData/Manifest
+++ b/dev-perl/IO-SessionData/Manifest
@@ -1,4 +1,4 @@
 DIST IO-SessionData-1.03.tar.gz 5377 SHA256 64a4712a3edbb3fd10230db296c29c8c66f066adfbc0c3df6a48258fef392ddd SHA512 3fe6c9c275c64e4250933f6bc377172ed09d123b5aab3ac981b12b42c571be5638728bdd0d16438f973606da5b6a583aeaf6213008f249ccee7e275383eebd6e WHIRLPOOL 462aded0821b27b64e66e96a16e82103229e2f137825e8415f40ebb7f32e6b5a0ad279ff29cf8ed1ce2a3f529e0c7a2b55553dc819d8178742936560212c354c
-EBUILD IO-SessionData-1.30.0-r1.ebuild 373 BLAKE2B 99d9a455f92390770181c8a28e533468baa1d7f494811bc8bea1c28e08a18995f1cda9a2324c7578ecb1c055229141eb9fd1643726da1f782ca523be267e7cd6 SHA512 1b9f94defe48b1bb3bd6e04f1a06e0d52cbef76c7864c73e11e629365de0559e55018f5a6cb9dc45b36ee51fb4f353c3617033622266d2b373f6a3967a698e47
+EBUILD IO-SessionData-1.30.0-r1.ebuild 378 BLAKE2B 2f92ae54c40dcd42e0a687625e5ab40c31e42388ee89f0307d2c62500135e37fa900e08f5069ca0ddef5ed5c8220802f94a696d8af446d4f7d8de6b728c9de0e SHA512 6f4db93d3674066204cd5fc1573e2e978743f469a81291de0a2780111f9d9bc91e8dd44c70ac9fdb8b543ce7c1c4f0b3516b45d7a9065ec8f28128a2292959c7
 EBUILD IO-SessionData-1.30.0.ebuild 386 BLAKE2B 067696fc6d8efae2ae72ed46aeb082e665d662e95fa6ebede82519ade4b5deb55528b6add566b74d3928e61a6e40aa1cd7a780867cbd3472a1fd795c3a086f48 SHA512 4e4bb9c730e216a7fc245805bcf9d0f3a3e0713aa8fef10e357196e5e78e992195e18837f2c4ef00d529e019900095eba351126cab9b73256fde56ea6805648c
 MISC metadata.xml 447 BLAKE2B e3f8378831dcf5f3ab636e85389f02584fec49c7c320e4dfce83c3d2455dcf395fd6fcc1c42e5bab251f5f667bcccbaaaf087b6800e8b2132fa1b52c090673ab SHA512 d27e71d4ad5e1d61afd764feb4f4c9e6cc77d71f11a8707036ae1d981d9af19c50c4e536b148f3f7a552c45b228812109b4013da7a649c7f64f6ad4779a4a1fb
diff --git a/dev-perl/Lingua-Preferred/Lingua-Preferred-0.2.4-r1.ebuild b/dev-perl/Lingua-Preferred/Lingua-Preferred-0.2.4-r1.ebuild
index af0f7fe4e2b9..974248c58000 100644
--- a/dev-perl/Lingua-Preferred/Lingua-Preferred-0.2.4-r1.ebuild
+++ b/dev-perl/Lingua-Preferred/Lingua-Preferred-0.2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ DESCRIPTION="Pick a language based on user's preferences"
 
 SLOT="0"
 LICENSE="|| ( Artistic GPL-2 GPL-3 )" # GPL-2+
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~arm ppc x86"
 IUSE=""
 
 RDEPEND="dev-perl/Log-TraceMessages"
diff --git a/dev-perl/Lingua-Preferred/Manifest b/dev-perl/Lingua-Preferred/Manifest
index 582ea262191c..e737040bbc1c 100644
--- a/dev-perl/Lingua-Preferred/Manifest
+++ b/dev-perl/Lingua-Preferred/Manifest
@@ -1,3 +1,3 @@
 DIST Lingua-Preferred-0.2.4.tar.gz 6029 SHA256 fa58c4fac6b676f78caad6b472a785dd0c8fa67004a62294fbcfa3a3eb243c83 SHA512 6946b2b8d5978c516688a63bd2126700f8ab0137d51959f0b8c2565c08f25d20dc3fe5f81c6473c3ef5d1faf94a6bd4510959f730cc104b61671bd9436de6353 WHIRLPOOL 2e170aebd7dbee349b5dd269946f45d9adc1c3e9b8e7b8ac9afada8eb606c59bf37b97dfb74c806d1119507e681b462cd5ae5c755fe1176d8cb5e858fa6b459a
-EBUILD Lingua-Preferred-0.2.4-r1.ebuild 388 BLAKE2B 656f69e2c643e99e6a2de63d625474c869d5b2f5fd9620bf7c299ca3a909a190fff370750375fc6f1402cdf5f0a2210c5aa0cab552ae949fd423728603cd7b46 SHA512 f7d5262e29a09c6e9815740df0e78b8ede921e1661b4ea4e38eda18317aeea172a2fceb3f9289fee8e8f01556964ea7134ae490c9a826d667e9342df04868e88
+EBUILD Lingua-Preferred-0.2.4-r1.ebuild 393 BLAKE2B 89cc43f7e65164c366b6731b64a24640a53141622c2c966411b62186e27ed59a9d4f6f9f41cd4432f5b254c45ffd3b7a111f6a849def924b85d933323d075b79 SHA512 9ae9244a6ed2492c6a1e67fd6bf5c084b9c379164847f46b1e4c236889a15209043723e846f4e5150203117c308347dd41a3c1636d2528485e93b4dc40d2cc3b
 MISC metadata.xml 404 BLAKE2B 3df8befcb846cfe9223048a3bb21f9ba412d11feff4a30b595aa435f561e1053ee2f23e6f1c3fd74451219db537c2a0b8a265f4674c1e39a4945eb7c60a3bd0b SHA512 a2743b3742db1d9a22697e4afbdb49efb04919aee18ca10110eb7bfb78c1e76e653c425d6876514696f8c57546e628048b952f49cc220dc29a8f6ff6423e5605
diff --git a/dev-perl/Log-TraceMessages/Log-TraceMessages-1.400.0-r1.ebuild b/dev-perl/Log-TraceMessages/Log-TraceMessages-1.400.0-r1.ebuild
index 533799d8bc65..5ff5fcb4bbd8 100644
--- a/dev-perl/Log-TraceMessages/Log-TraceMessages-1.400.0-r1.ebuild
+++ b/dev-perl/Log-TraceMessages/Log-TraceMessages-1.400.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Logging/debugging aid"
 
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-linux"
+KEYWORDS="amd64 ~arm ppc x86 ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-perl/HTML-FromText-1.004"
diff --git a/dev-perl/Log-TraceMessages/Manifest b/dev-perl/Log-TraceMessages/Manifest
index 530f81595041..35e4d0d46b71 100644
--- a/dev-perl/Log-TraceMessages/Manifest
+++ b/dev-perl/Log-TraceMessages/Manifest
@@ -1,4 +1,4 @@
 AUX Log-TraceMessages-1.400.0-posix-tmpnam.patch 2424 BLAKE2B 23edfdadd5a9652fd6a3d7abacdc5231fe8c85c2bc9a1b0fc6a7693515785fd37574a1fd4009bc234ae403775365a376ba16b0c0f212f1c26f465977800d9725 SHA512 307c6b54a1717664463c7295ea24d5b25bf3ceea0e83b7f6baf74478f273fb23e39b208257f694f2c0786629c1dc7af616a4db3fc40681c133fd4c9a9a888055
 DIST Log-TraceMessages-1.4.tar.gz 5437 SHA256 343ab47c1d69200df6d37bc1dd0127132e6f0a469b77ee6b71eca1146ce6cf8f SHA512 ccd298f7ecc0cb7e478812dbbe20b870baa2f87f19b8adfa003818d70e1118f7a3f59a7f50898ac22751d2dc4b96fe9bd1282b30b72cce7334e645b593a01aae WHIRLPOOL 6f417f5a00df8fe57b669b2ccd1957ba7cc3cf7dcdec1357e31354c4c6bfa474e0629ce437eece306e1f4be18d8cf81400f8a45d44f0058aa03a606405b09cd1
-EBUILD Log-TraceMessages-1.400.0-r1.ebuild 391 BLAKE2B b29942aef4da310456eda475f014f5489a77ae983807607280ad384634732d01c02328ba972354d58230ca53a0160b037fd3441aae8c5d01e472f8203f13d808 SHA512 aac9d6c2788ce1b94ec79bd485643f8d7e5bdefd1d327ffd41d8ed12aeffafe363a2379ac3c34eb5bc92b1c28339ce6e0e5a709834456f0b752a24e99aebd818
+EBUILD Log-TraceMessages-1.400.0-r1.ebuild 396 BLAKE2B c702a02ff9029a42119bafc564da3e802a528a038b8e077282839a763cbf0e1efaef80ea11f9ea6715e2ebe9bea16b3c3dc2bd4562bccf74b6d597ec473c5fd5 SHA512 de2a804b496089e0bb900ea0f014230a4b05a7d61a64ec76e96e56ea781224b15985d464bf9a825e3aec1343e6e26450ef77101cfbb4a342f7c8d0015854391a
 MISC metadata.xml 406 BLAKE2B 4e7e3852d23ee6d62f3f8436eadb921136663e3109bb2d870f3597b876f5c2a7e9d28d59c9743103e37c92e54bc4daab69e1e11b76c0e5a04895497ff24fe206 SHA512 4778efe5353db60500a964dbeb8b5c229b76e59953ff8d4e2b82fddc0ccfd20d86dd8110b1d4903dd52070d0d4f20ee047b6bc72dda88ee4d3e828a6c9f202e9
diff --git a/dev-perl/MIME-tools/MIME-tools-5.509.0.ebuild b/dev-perl/MIME-tools/MIME-tools-5.509.0.ebuild
index 7b894081ef71..d1dafdb5fddc 100644
--- a/dev-perl/MIME-tools/MIME-tools-5.509.0.ebuild
+++ b/dev-perl/MIME-tools/MIME-tools-5.509.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A Perl module for parsing and creating MIME entities"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/MIME-tools/Manifest b/dev-perl/MIME-tools/Manifest
index 47d8d005d339..479e55486605 100644
--- a/dev-perl/MIME-tools/Manifest
+++ b/dev-perl/MIME-tools/Manifest
@@ -1,3 +1,3 @@
 DIST MIME-tools-5.509.tar.gz 423714 SHA256 64579f0c923d81d9a2194586e47c3475519e2646e4b5c102a8920759facf6973 SHA512 0407b09916144eafbee0c75758306e0f44c27db0e8aabf033267f9903f676f0415de99927dcfdb69f9e9d4123d63c280f526dff92e0d97744761c888df90667a WHIRLPOOL fbc4cbed88decd475a0553a83b33b492eaef75384852871483dc88c56ab18d9a827aca37fbac6c30ef289768b89de83e6a9421519da0f137197a5f8da7a8aa72
-EBUILD MIME-tools-5.509.0.ebuild 843 BLAKE2B c19f9c0d3e600f95fb89e5ddd88143fdd435f3b5e1953f866e2003e5aeb0a4dffa8b5670e2bc37e9f0b62dafc79ca4daa1635ff8e51fde4a5c1729d0ab64fd42 SHA512 af0d8b6bcfbd4f3012d16feb44ef8d0201e21e48880909d95899baacf08011c248939a03c10aa584b251805be17f1189ae34d747b8f3571013663fcc17694aaf
+EBUILD MIME-tools-5.509.0.ebuild 848 BLAKE2B 969ab7c43e379ea23a40e5bca8483233a55ee7434ae0bdb86166c2b30bbf489580347c55e2c45aa2d64b30c77ab2da1aab0b2fb448e1e7b8654f436a5f0dc4f7 SHA512 3f6876f41baa9222db597192fd8eb744c04cff8e6cbe40e4f3bee2ace0f72cd73a80b24524ba876f821aa289b71940e70604b52c7db8738a447f0b1b408faa37
 MISC metadata.xml 2236 BLAKE2B 9950d46423e80c5c4120ae914bb365c69a53c6ca2012530395bbe55234043e91cb532cf0e9235a0e42df0d2483aee932863a7e014a57293b14336a05446d2389 SHA512 b4159779927c61b05f0cccadba0261d2be9566abb6fe102deb1003446a2767dc8abc44093df209e379e7ce4e2b976f7c51e1b04cb59b9d6e3e7c01aba9328384
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index ba823047ab78..c608ebabda36 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Net-CUPS/Manifest b/dev-perl/Net-CUPS/Manifest
index b8c1e6157a3c..8ae33c7e5132 100644
--- a/dev-perl/Net-CUPS/Manifest
+++ b/dev-perl/Net-CUPS/Manifest
@@ -1,3 +1,5 @@
 DIST Net-CUPS-0.63.tar.gz 86922 SHA256 a548a34f6258970375d3f5173e070b65a128bbf77ebb0cc6e88ebba55c15a687 SHA512 ac407d1a0ebb686cd1f12f76516581073da90cf129a24ef57f10facf0a879ee9a13bdf0b498163c998030f9ec837fc237f440d24894e997e7e57ad2a13693b8a WHIRLPOOL e5e52e666bd4388ac57da37a4205362a6ea4bb1792b60e90bbd7c686b786fc0d0415893c6601a0916cf9bab4882b442cc588c71b2c4b586c1f314f92fc505606
+DIST Net-CUPS-0.64.tar.gz 87872 BLAKE2B 5711dd36e07911ecb8b6a1c5306e7bfe4004deb3ae2f571094ca4d1273abab506d7b3192d7bb1146e213e8adba645d2259d31e10d375c8635f9d3a0d77007048 SHA512 66ce9d7fbdee7842fab292e301cfdfe7a6bb1dd77732b01fb322499d830e00345a00a74e1c00d09b2db1b57c43d459c3fc447ce97d5a72666a70cfeec1e842ce
 EBUILD Net-CUPS-0.630.0.ebuild 393 BLAKE2B 8ec56d7fd19392c0abb663efc06cac7cbb817b2acad1a52661c27fd6c90602babd752add03523dd780848c1302a79a263fe7c597e019b21dbe19b7aa0643d332 SHA512 2ddeb998cab0cd4cdd38fbb5b4d24e6d88f01c98ae683a18a7e8582ba9b8fa6d974f97966ee3a4d1d0cd993a3a7adb9b25b7827a31c229e60bbc34a68199c561
+EBUILD Net-CUPS-0.640.0.ebuild 426 BLAKE2B 021ad325a096938206d8181cdd0231ddf89a2c982d4fde2749b157a3d30bd53f99ca2c057bd93ef3e8b7bcb315e84577210121797590c7e43340fbdc0d6fc7a1 SHA512 c00fb6c4051e2de7fc8e3c2db72cadaa9f533a84c5aac52d7385fe9cf867da458143624c12f1dd07336f7fbc650ed7b07a4ac00fb576180f573aaaecf340bdd9
 MISC metadata.xml 579 BLAKE2B bb4be41b0670ee5cd8b72af8ec35fbb820298605e1256556add65cc3698f2519f712c0195af1cd567cf31c9bf1bc7a33bcf17082ce04a2512a9de693010da5ec SHA512 4c24920ef1002fbc3454db147da0c935740d28d43e70b6ad166cb34bd1d00ff6f5e879c775c4d927ebf568b579841af85bda65b5b3a3c3db63d9d43d6c6d8671
diff --git a/dev-perl/Net-CUPS/Net-CUPS-0.640.0.ebuild b/dev-perl/Net-CUPS/Net-CUPS-0.640.0.ebuild
new file mode 100644
index 000000000000..c928e6ef716c
--- /dev/null
+++ b/dev-perl/Net-CUPS/Net-CUPS-0.640.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=NINE
+DIST_VERSION=0.64
+DIST_EXAMPLES=( "examples/*" )
+inherit perl-module
+
+DESCRIPTION="CUPS C API Interface"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	net-print/cups
+	net-print/cups-filters
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
diff --git a/dev-perl/Net-DNS/Manifest b/dev-perl/Net-DNS/Manifest
index 364a0a21df02..a6db5ae4d17b 100644
--- a/dev-perl/Net-DNS/Manifest
+++ b/dev-perl/Net-DNS/Manifest
@@ -1,9 +1,11 @@
 DIST Net-DNS-1.04.tar.gz 245064 BLAKE2B 84769e30cfbfb487f26e1b4a552cdfa4de48607822883a33d75a6f5a98a82996ee91252805ce2a962e57dd63c43890cc1ad827b7a5470caf3c337d7745440558 SHA512 ff32c1bf52e553fcd64f8a0f9fcd30f6eae4e1350c4c5c97da3b745f1713acd75533694ec834e1b1e9bee0a13b7a8ee0c347dfaa36433052f020e41e36829d59
 DIST Net-DNS-1.07.tar.gz 256114 BLAKE2B fbb57bfad4158a6af48aee2eefd4d82d478d519f0fad2221591640499f0aa298c4fdcd58db7bda5faa9092694a275d4c36f12ae333f2c6216a0af55c9b5c9ecb SHA512 048cf6c4fb5e8c5721f5c43cc6f3f93189854c54745ab569b2537a1765cbbe4c360b484290d3151a0d0875b8e8a63b15a4ec97cda7f723f5b7be0078f903fb9f
-DIST Net-DNS-1.08.tar.gz 257625 SHA256 56113a5604d1d47a2e0b35e01f5ac0a2af9e5275b815549d032a46195637c7a1 SHA512 a0af812f8a21599070c01a0623f1472da1fffbdcf19fba2debd9bc9d84e59149d3db216da8b26206ce64d305706d78d0c05bb6a8ced1ed8df27813bd0f94d70f WHIRLPOOL 5b9241e17e728e014786d8846207c83a7551f804f8e513dea8b83dfc2bae2001c92a7df58a9545040efdad001eddf6599f93c0781868ffd23ad8842d004ab170
-DIST Net-DNS-1.09.tar.gz 259772 SHA256 fec9b0c74b8fea5e41914339281ffd773ddd0ae3b5cfd532d2ac0c09618b7c0a SHA512 82dbdf9e38992fab34687a204520d7311d688830aadee329039595d0ac52d4c485cc90b1388af3abfa4c16c70aa619b22c6cded264807cd759898de5e3b76273 WHIRLPOOL c3c7e597c6fef46df8affd2cb5890836a544b99f2cff97e28fe4b114293d2cee64ed9d861d79e348004a4f0a51811e474b01b91aba9019d6b4659803a7615798
+DIST Net-DNS-1.08.tar.gz 257625 BLAKE2B 18b43d6e682dfc63b6e00f844989af58d9c0dd4a6eed5ba7cb70392e2a7b98294f57740c799bbf863d902a93000b18e9f13d4d0209e122c906157bbc632ff923 SHA512 a0af812f8a21599070c01a0623f1472da1fffbdcf19fba2debd9bc9d84e59149d3db216da8b26206ce64d305706d78d0c05bb6a8ced1ed8df27813bd0f94d70f
+DIST Net-DNS-1.09.tar.gz 259772 BLAKE2B 99bc77df46d3cb0be5e610e5dd8447417e61362fda506f98998e49d84797f3df21318bc51f72207372680a8005d2307b33939f04edcff3a0b858c37077b159d7 SHA512 82dbdf9e38992fab34687a204520d7311d688830aadee329039595d0ac52d4c485cc90b1388af3abfa4c16c70aa619b22c6cded264807cd759898de5e3b76273
 DIST Net-DNS-1.10.tar.gz 261413 BLAKE2B 99dce8425b0ea2d541fa3a91e9d77ba819f31a3e4f8e53249391b06dadee61a43d60c4c0d72bd5e1b80c2b1d228da49937e7b073ce2201b0cb01b5bc83972418 SHA512 2184b0d35f7002d793b10238582ca80d9d1ee06543f10b287e7cb77e5234efc49865ea6b2a87184c45b002bba0b42ad3fd84ff8743f79e2841ccecb597b98962
+DIST Net-DNS-1.13.tar.gz 251658 BLAKE2B 3ade04bea24455f6a4dc2d3a5b3dd40f19bd1638945d3622b40feb5bf0e6e6fddb5fe5636fce57d3b5ec270dee4c666aa5b4062113a25b7b483eeff93379678c SHA512 ac42d5b5d1849de11813404b9915f2b54cc4d44e2f6a52c8c5c714ae30bab594b2d27701957238c1dbb09544320822c25f19ff50ce33210c289379aa67400636
 EBUILD Net-DNS-1.100.0.ebuild 1389 BLAKE2B 0ba6d76338de5770aa35d23739a93f9e509c836b800e3b33117708b3aea1e49c90cf3bf7de64cd68d87474dd91d570c05bd603cc6805f02cddf66aa845d59874 SHA512 f5e209f1d58ab75c91b67a4285d7593222e43e9038248c7fdc4c9385d4d0c718e81a5768a47fcc86a448c20dada9a3e671163bf3e930bf7430cba40940492119
+EBUILD Net-DNS-1.130.0.ebuild 1537 BLAKE2B 42fc1c50be848c549ec177a68c13a92ff250fda1f0e1f137837c45594ba7102107d3c39059543f94de1f4a2d5d1bfc048806b9769b9dac2c86b077e220d0e769 SHA512 58cdf82c371e72aa4f4baedd683d5de1f984ba24ddbb569fcc54fac957982449065a8df1363e75e91d33afd6690669b45c8389f2d726fbe20a94b5eabf74ada5
 EBUILD Net-DNS-1.40.0.ebuild 1131 BLAKE2B cca499dc39f80850bb330a49306e8e1030df3d99b0bd2b5840be1f134984111251a51aedbd3f77af96468f1551fac9390b2e3da3531e830b34b23d58db7f3888 SHA512 964f709f801a8c4e80a39eb78e185e175fe887005a0d7f337edd760e83e5c415ac1da9cb2951630c767ace7ae0800f7b64be4cb7766e730a7e080ac0522a48c1
 EBUILD Net-DNS-1.70.0.ebuild 1398 BLAKE2B 61842c36b6eeb739bc697d7e6c10a3bb70a393cbefc9a91af198ba9c06490bfec5c3afadc592cc8bae36757f044377c368447dd2928617fa896b23e9dbc7b5ca SHA512 ca8246294b78c4fd1040afcde0298af64193a164cbb74e4c576f992538f2b64357f3a842da5e1dc03a8eb4d6e4819bcc53a94aa8a59d4794d29391b9b136c38c
 EBUILD Net-DNS-1.80.0.ebuild 1378 BLAKE2B f5bcf9a3120a7b78a6d548769770e305cb828855204424ca54e054f18c2f7c5649b03cfe5cfad65ad9d9ee2d760660350e7b669a010349b4aadd1215369ef92c SHA512 ee7f852a84b63bb6552be21018381c45f7ead121998b62323a3730bb97711dae6c35350846cf880cf2c6ed432a2f4108bd38ddefa71fab3473d6f4bf54a8a3f8
diff --git a/dev-perl/Net-DNS/Net-DNS-1.130.0.ebuild b/dev-perl/Net-DNS/Net-DNS-1.130.0.ebuild
new file mode 100644
index 000000000000..33f8be047be1
--- /dev/null
+++ b/dev-perl/Net-DNS/Net-DNS-1.130.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=NLNETLABS
+DIST_VERSION=1.13
+DIST_EXAMPLES=( "contrib" "demo" )
+inherit toolchain-funcs perl-module
+
+DESCRIPTION="Perl Interface to the Domain Name System"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ipv6 test minimal"
+
+PDEPEND="!minimal? ( >=dev-perl/Net-DNS-SEC-1.10.0 )"
+RDEPEND="
+	>=dev-perl/Digest-HMAC-1.30.0
+	>=virtual/perl-Digest-MD5-2.130.0
+	>=virtual/perl-Digest-SHA-5.230.0
+	>=virtual/perl-File-Spec-0.860.0
+	>=virtual/perl-MIME-Base64-2.110.0
+	>=virtual/perl-Time-Local-1.190.0
+	ipv6? (
+		>=virtual/perl-IO-Socket-IP-0.380.0
+	)
+	!minimal? (
+		>=dev-perl/Digest-BubbleBabble-0.10.0
+		>=dev-perl/Net-LibIDN-0.120.0
+		>=dev-perl/Net-LibIDN2-1.0.0
+		>=virtual/perl-Scalar-List-Utils-1.250.0
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-Test-Simple-0.520.0
+	)
+"
+
+src_prepare() {
+	perl-module_src_prepare
+	mydoc="TODO"
+	# --IPv6-tests requires that you have external IPv6 connectivity
+	# as it connects to 2001:7b8:206:1:0:1234:be21:e31e
+	if ! use test || ! has network ${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}; then
+		myconf="${myconf} --no-online-tests --no-IPv6-tests"
+	fi
+}
+
+src_compile() {
+	emake FULL_AR="$(tc-getAR)" OTHERLDFLAGS="${LDFLAGS}"
+}
+src_test() {
+	perl_rm_files t/00-pod.t
+	if ! has network ${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}; then
+		elog "Network tests disabled without to DIST_TEST_OVERIDE=~network"
+	fi
+	perl-module_src_test
+}
diff --git a/dev-perl/Net-Domain-TLD/Manifest b/dev-perl/Net-Domain-TLD/Manifest
index 0c1c6952fc55..667111f3a027 100644
--- a/dev-perl/Net-Domain-TLD/Manifest
+++ b/dev-perl/Net-Domain-TLD/Manifest
@@ -1,3 +1,3 @@
-DIST Net-Domain-TLD-1.74.tar.gz 36300 SHA256 bf936cc20834d5b9497e33dc41c2da6a58536b7a1e0df0b8f6ce7ed5111ca868 SHA512 40e9e4776b078c525e886e6f7c5151aee44ce9187bb348128221927c8c92ae72318328d420a3626c0b5a1c05a742e4fefe8ca1d2eb4fac6a2e74c65ebc1c4507 WHIRLPOOL 7256687b144c19e8bd4543adefb9cb427511ad4d3e8b00fabbb914d5306ddf526498b03dc974f7414616e0c9597c7967ea71cca1a46c3de5f10a032cbcd45aa7
-EBUILD Net-Domain-TLD-1.740.0.ebuild 435 BLAKE2B 99884ae488d82c1ce02f1ddbf30312ca087ed25ceddf14a2c2a2f83446a7daed3c08383b0953d8b3fece76a10754efbdb546202f7573e307c5b2300553fef6ec SHA512 b21fa993bb0151d4096f5e8e120391152e45fb3910eaafaaacef6fffbdffbd03fd6bfe41ad0eb6b925035bc072eb7853cbba5efe72035eac32453a89f4588b6f
+DIST Net-Domain-TLD-1.74.tar.gz 36300 BLAKE2B 7dc4a302b2ed3002dbc40dc6cd1ad1948a8eb53a246eafe7a06f3e0932b61c6f8dddce20a7c6473a8ff48c230c3e8a2de44f1d24fe40c0e45728797ec3ab548e SHA512 40e9e4776b078c525e886e6f7c5151aee44ce9187bb348128221927c8c92ae72318328d420a3626c0b5a1c05a742e4fefe8ca1d2eb4fac6a2e74c65ebc1c4507
+EBUILD Net-Domain-TLD-1.740.0.ebuild 440 BLAKE2B f503def8407e7b5fb4d37136ade6fdc960d047b338f593db5410e5d04f05eb01beb1230d4649050f9f104ef8bf42a4ecf42063c79e11646ec385572a0486d6c1 SHA512 b51396d824c895c27f296be583bafb6ec06bc41f3203cd81a19c2985c04f4fa223d282be4d461c91137a92ced89135b648dc6472a741e30bd6af63855fe3dcbf
 MISC metadata.xml 401 BLAKE2B c448963ce478f79c767b536e41758ff64db2d0976c0f2384571c2edbc2a697d0d5add70aae603946823eb9f5fcb6fe9436a6dd5c7e08319b29cc93db9047c21a SHA512 2843912ba604beb75b986da3e4c24ce959db67bcbd069cd47dfb535f3aeefe9209d4381b705bbe1996617fcb438c432699cab9f85336ea65436e78b174ae1a6c
diff --git a/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.740.0.ebuild b/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.740.0.ebuild
index a098ad140a77..ac590f2f42a8 100644
--- a/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.740.0.ebuild
+++ b/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.740.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Current top level domain names including new ICANN additions and ccTLDs"
 
 SLOT="0"
-KEYWORDS="amd64 hppa ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Net-IMAP-Simple/Manifest b/dev-perl/Net-IMAP-Simple/Manifest
index 7effa54f8829..2a9eddf08444 100644
--- a/dev-perl/Net-IMAP-Simple/Manifest
+++ b/dev-perl/Net-IMAP-Simple/Manifest
@@ -1,3 +1,5 @@
-DIST Net-IMAP-Simple-1.2206.tar.gz 45239 SHA256 759431477fe5f2b9d408c33fd6364264ae3f6b4acce89081d2f6406ba5562991 SHA512 60a23afe3740ee12cf5f997fa14aaa7a3b39cc0ca71bae6420346e05e99cb0ae0ba51f5bd52156bd3cb4f59b17f7558481d70c6dcce497d9da05b1546adc2af1 WHIRLPOOL b583830e6d54fe4bb4a616fe390ca9e11dd6760e5a7534d2df7b48bf99397971c1d0102919ed1db9ee79f66cdd79948c10e7a920e44f66d7fa0dfcb0a5cb54f6
+DIST Net-IMAP-Simple-1.2206.tar.gz 45239 BLAKE2B a4457263f2199c3c792a7bec197682534eae144483ff3978e9de70425ecd7956c832d86b7f05374282ae0833a076d9a9f82ba86c972c0850095c588ffc56232a SHA512 60a23afe3740ee12cf5f997fa14aaa7a3b39cc0ca71bae6420346e05e99cb0ae0ba51f5bd52156bd3cb4f59b17f7558481d70c6dcce497d9da05b1546adc2af1
+DIST Net-IMAP-Simple-1.2209.tar.gz 45728 BLAKE2B ccd3648086d63e6865d83bd6c37e3f61ba536ea2be7771e3a674a0459a7455b21f50ad48a4ec7870a7cf88874e920bfb95a9200dae3ea6066b75fd91f061f508 SHA512 21da11eaa069fa6a9f63696fda8447001f345fb1562d8db74658e95be2dfbded323d7e1eaa2bf2d8909f38f27779a9048d820091600ee5f4b4af9bcf951cced1
 EBUILD Net-IMAP-Simple-1.220.600.ebuild 402 BLAKE2B 4837f00c682b778e61aadd0fa8988173fbab2c8308300bed38cf7b6353de61965227ab39a05358fbc8177ed64203b7f79dd57a1eb781114a80fcb09e2f91b8fa SHA512 e8526074a45bdb294cd62d99af4bd01812a18182a6bd0466b63a4b7975d3deeb47473c7ac2e85823c3899c774726875ee3c3506b2d6049924b7a2d06f5ade395
+EBUILD Net-IMAP-Simple-1.220.900.ebuild 709 BLAKE2B c5ceec1d9ad60d49aa707196260a272fc92bc9a73ffb5bd0b9c68da867e6a56ada3959e33848cc2ca4b80d9201182298c3acd81832f3f926ce6ce65be98710e6 SHA512 e528a0404d9a4331110ddb169c04f75c59f9962fc96254853225b1856007e8cfe1e1c580e4b79ea83205469c7df81dc56591e75210c823ed8aa0cb61abb34965
 MISC metadata.xml 763 BLAKE2B 410e702cacd8d5501a1cdf81d73269862f697f10323f075e375be58fe7a2929d27d0dfdd6f98555302860a36b9b18ed147f0a96d23ea39afe93c0f260ac4a49a SHA512 4876d139e2b3a3395d963cc8a79982cfffbe3ceeffc8955d64d1c429746ae032293ff3e31655f38340615da2e0f66ef9fb6b5ad7dbfddbc66eb6cdc8b64e731d
diff --git a/dev-perl/Net-IMAP-Simple/Net-IMAP-Simple-1.220.900.ebuild b/dev-perl/Net-IMAP-Simple/Net-IMAP-Simple-1.220.900.ebuild
new file mode 100644
index 000000000000..e10efc19fcdd
--- /dev/null
+++ b/dev-perl/Net-IMAP-Simple/Net-IMAP-Simple-1.220.900.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=JETTERO
+DIST_VERSION=1.2209
+DIST_EXAMPLES=( "contrib/*" )
+inherit perl-module
+
+DESCRIPTION="Perl extension for simple IMAP account handling"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	virtual/perl-IO
+	dev-perl/Parse-RecDescent
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+
+src_test() {
+	if [[ -z ${NIS_TEST_HOST} ]]; then
+		elog "Comprehensive testing requires some manual configuration, for details, see:"
+		elog "https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/${CATEGORY}/${PN}"
+	fi
+	perl_rm_files t/{critic,pod{,_coverage}}.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Net-LibIDN2/Manifest b/dev-perl/Net-LibIDN2/Manifest
new file mode 100644
index 000000000000..8a09fa2d61ab
--- /dev/null
+++ b/dev-perl/Net-LibIDN2/Manifest
@@ -0,0 +1,3 @@
+DIST Net-LibIDN2-1.00.tar.gz 23603 BLAKE2B 61d16265263e934c45cbed9427636e73a2abae8f41f7294d4b682b0129c2a7bb2c316f522b5ee36988a0d860b53514f6c44d360c12479f26887a0d2873741993 SHA512 0b0c3bba9b2c8e748fd416ba465e6b4eb76fbdad1ee2d3459be032b7d5bdb0706da97e8ebb9de57a92acae06ce84aed357f5baa516ad40268797abda6d7fb38e
+EBUILD Net-LibIDN2-1.0.0.ebuild 442 BLAKE2B 4d643567d406d68ca9e571c3633038d304c70790f53d54d9a74e027a11ac298decec6ab0e875913daea7dca9ecc6b297c3a31a41ea4da3504b13fecf1bf55f36 SHA512 3e1bd12a39250564a5848a901dfba9fa40c6435211b2730344423c27dbc0f4b5a3771008bd2584ee7b9e03ce07ba63ac237c8cdd08415a8dc546098d847c8e7d
+MISC metadata.xml 394 BLAKE2B 0e04894c656ca9bb0623be50369ef992244fd627478f8e23232fe937123df5e8f136247e6d2708dcaa1e9e475e6967466a756dae6c1b39d243b7777a36eaa81d SHA512 66adec760ee1638b405b6f14878ed1239a4efa0dc3708ae88c6a623138bcf765175cfd8a0a2a7a63ad606cf249e35496371a56e1bc257f7325dffc9fa62cd4a0
diff --git a/dev-perl/Net-LibIDN2/Net-LibIDN2-1.0.0.ebuild b/dev-perl/Net-LibIDN2/Net-LibIDN2-1.0.0.ebuild
new file mode 100644
index 000000000000..f86c6b0ae366
--- /dev/null
+++ b/dev-perl/Net-LibIDN2/Net-LibIDN2-1.0.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=THOR
+DIST_VERSION=1.00
+inherit perl-module
+
+DESCRIPTION="Perl bindings for GNU Libidn2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="net-dns/libidn2"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-CBuilder
+	virtual/perl-ExtUtils-ParseXS
+	dev-perl/Module-Build
+	test? (
+		>=virtual/perl-Test-Simple-0.10.0
+	)
+"
diff --git a/dev-perl/Net-LibIDN2/metadata.xml b/dev-perl/Net-LibIDN2/metadata.xml
new file mode 100644
index 000000000000..ba4ff6908d93
--- /dev/null
+++ b/dev-perl/Net-LibIDN2/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">Net-LibIDN2</remote-id>
+    <remote-id type="cpan-module">Net::LibIDN2</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-perl/Net-SSLeay/Manifest b/dev-perl/Net-SSLeay/Manifest
index 2e660fafd0ba..cd9fba9f0793 100644
--- a/dev-perl/Net-SSLeay/Manifest
+++ b/dev-perl/Net-SSLeay/Manifest
@@ -1,6 +1,6 @@
 AUX 1.72-config-nettest-no.patch 862 BLAKE2B d6227186ffc80151784284ab890b9bee6e05952375ccaa59b7ad720e21eb51b3d3b6d125079634d776163c2123b5d057cf03146e525edced88568ac7c1e300c7 SHA512 94ebff7314acc6be41665e54077a63ce1713f43f9f6be722a51d20363f6b5b069da4ee2a33e9e8559888c61a8ba4ed60c811fd51640ee03d48042584376dd3cf
 AUX 1.72-config-nettest-yes.patch 849 BLAKE2B c44b6f304cbbbba9dccd66517df2b916032222a70c9dba445de30481aea9e23f98d360d4cd91c027788a01e0124a0fb9c193b19b1d8236143e3f2708137208c0 SHA512 478778231cfa6631a356e32d5c9a6f46b8ab02a58008c45c1d9f898e46e9003b556054c9f521c31ec08d95f4c32f8e786bdb1372576ee6a61418f5be9286d4ce
-AUX Net-SSLeay-1.82-fix-libdir.patch 924 BLAKE2B 4848361d4ede61800107bf459e3058a70c557628f5051a99cbf0d88ac75fbd03a74bf9a80a3aa4a218feca5e8712f68333610810d8d038ca2eccb8b58c4a6a7b SHA512 1b57e8a2ab2b1c9c0bea368bb440f82486e49243b8ca61fefd71a0a7da9f70910a1be7a86f07249a729f2af40657bdcde8e39082e53754a01f74b390f3276d16
+AUX Net-SSLeay-1.82-fix-libdir.patch 1060 BLAKE2B d348bc4bbf3b1dcf05b676e3a28c23e04f5331bcca9f03395d78e1ddf5ea2f321dcc9663775ec979d140f66fcffdf3e051deedd382d9bb5026e5c322192f8b10 SHA512 8cd2b57fd5adfe2d624308e823e54426d14418fa394be6030b16e089906718ed9fb5588b8998f7bb0f25216ceb88951cc0608e82eeafbf274be3af9887c56ad8
 AUX Net-SSLeay-1.82-fix-network-tests.patch 1033 BLAKE2B 88978bf64b1f6e0fef97176253aa8f20187f74611d5e6121b8ce538d99c31516d4855bada6ecebf753906c65bb96a4abf37f9057934cfbe143a8185599ba48cd SHA512 caf76f1173ebc00e7a5edba5fa19ce25fd403dc9a35402fe2d399197805eae8e558b57c2bc313f7f1dee16ece03a3ed9146456f884890587488647f9d7c84673
 AUX Net-SSLeay-1.82-respect-cflags.patch 902 BLAKE2B e95a0c49ba70d820ff419a2ef7fe1d5c23477ef5ad075a03111b3431cf7b3cdc22fb26aefe3af886ce6f7d5b0fc309eb01843c2645b98d854759318ae7912898 SHA512 6db7c6549bce36d6a1d41e31805e387ab871271a843a1146de818c3c417b866c2c3e65f58a0e0af1f8a0e80703df8b15b9822502d03ee9aead49cf5620a43f75
 DIST Net-SSLeay-1.81.tar.gz 396631 BLAKE2B dfd0f14bbeb3196009d7e597c0c933dbe9cb7f9d4591ae62adc94a94d1b67d6e108992c7053defcea9b0c6dad90be3b26c1d53cea9e87a09016964d09fe2c5bd SHA512 8d4b72ede74ea22cf2ed681a8441f40965331cd5d4442c19677cf5bc7c1e61ed1e50d0f3a4f1b272428485bcc132ec99b0c75344ca43e8a34a9dd15539719f55
diff --git a/dev-perl/Net-SSLeay/files/Net-SSLeay-1.82-fix-libdir.patch b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.82-fix-libdir.patch
index 43dd224ef2d8..6aff3f85ab22 100644
--- a/dev-perl/Net-SSLeay/files/Net-SSLeay-1.82-fix-libdir.patch
+++ b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.82-fix-libdir.patch
@@ -1,26 +1,27 @@
-From 7beee46a64a9af1a7edf6bb9011327b4a08e353a Mon Sep 17 00:00:00 2001
-From: Torsten Veller <tove@gentoo.org>
-Date: Mon, 16 Jul 2012 05:31:43 +1200
-Subject: Fix libdir
-
 Bug: https://bugs.gentoo.org/416339
----
- inc/Module/Install/PRIVATE/Net/SSLeay.pm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/inc/Module/Install/PRIVATE/Net/SSLeay.pm b/inc/Module/Install/PRIVATE/Net/SSLeay.pm
-index 49913e6..0a3aa24 100644
---- a/inc/Module/Install/PRIVATE/Net/SSLeay.pm
-+++ b/inc/Module/Install/PRIVATE/Net/SSLeay.pm
-@@ -67,7 +67,7 @@ sub ssleay_get_build_opts {
+The previous patch for the above bug report used $ENV{LIBDIR} but this
+wasn't enough to help with cross-compiling. We could use $ENV{SYSROOT}
+but this results in a bogus RPATH entry. It is better to simply trust
+the toolchain, which may have its own sysroot applied.
+
+Cross-compiling Perl modules requires additional hackery but at least
+that hackery will work now. :)
+
+Chewi
+2017/12/03
+
+diff -Naur a/inc/Module/Install/PRIVATE/Net/SSLeay.pm b/inc/Module/Install/PRIVATE/Net/SSLeay.pm
+--- a/inc/Module/Install/PRIVATE/Net/SSLeay.pm	2017-10-13 01:38:01.000000000 +0100
++++ b/inc/Module/Install/PRIVATE/Net/SSLeay.pm	2017-12-03 10:52:27.304861804 +0000
+@@ -65,10 +65,8 @@
+         cccdlflags => '',
+     };
      for ("$prefix/include", "$prefix/inc32", '/usr/kerberos/include') {
-       push @{$opts->{inc_paths}}, $_ if -f "$_/openssl/ssl.h";
+-      push @{$opts->{inc_paths}}, $_ if -f "$_/openssl/ssl.h";
      }
--    for ($prefix, "$prefix/lib64", "$prefix/lib", "$prefix/out32dll") {
-+    for ($prefix, "$prefix/$ENV{LIBDIR}", "$prefix/out32dll") {
-       push @{$opts->{lib_paths}}, $_ if -d $_;
+     for ($prefix, "$prefix/lib64", "$prefix/lib", "$prefix/out32dll") {
+-      push @{$opts->{lib_paths}}, $_ if -d $_;
      }
  
--- 
-2.14.3
-
+     my $rsaref  = $self->ssleay_is_rsaref;
diff --git a/dev-perl/Parse-RecDescent/Manifest b/dev-perl/Parse-RecDescent/Manifest
index 25608d6d07ea..0a899944a755 100644
--- a/dev-perl/Parse-RecDescent/Manifest
+++ b/dev-perl/Parse-RecDescent/Manifest
@@ -3,5 +3,5 @@ DIST Parse-RecDescent-1.967014.tar.gz 176884 SHA256 7041c483431fefd08eb66944fb5f
 DIST Parse-RecDescent-1.967015.tar.gz 176996 SHA256 1943336a4cb54f1788a733f0827c0c55db4310d5eae15e542639c9dd85656e37 SHA512 38adbfc9a88f09d0465d862b845f48c0921ce462ffccaa7ce8b5f1b7090f33f70e7f00f9ee787fd698b5539804412c44f03e7942cf675d53a17a84c3510e5aa4 WHIRLPOOL 70bec820f06feca40abd8683dd94613dba76185841ff1c8ca8a405dab4dfc8264ac25931b1358a7b1fca4d21409cf75540c14acf6d64ec143e355f1de1566d2c
 EBUILD Parse-RecDescent-1.967.13.ebuild 834 BLAKE2B 55e9ca48de19c2053d2d86a7f55373fe32a99097f45819b8a87cadcd64f5c99f078dfbafbd574b958980ae2e36c492151927e207949f2417becabe023cd13601 SHA512 91e019f17b77fd6fb22b9b392b916eb7166e6185a7d9dacdc64d4cf9ce0d337e63d51cf9af0c294f33117e4fc98dad4fcbb6de8da970a94ade5934c1562414dc
 EBUILD Parse-RecDescent-1.967.14.ebuild 844 BLAKE2B c624de504f51f790f0ae741f957b85351300a68e178282106b4c70e49bdc78c1360e1fd1df1b26c602dd6c0e865e490fe26feb2d85c697dd595f3241821edabb SHA512 4575c1126f1d620e034c8e640bf5f270e62867cf53f0eb6657e369c62d397a7656538d9ec3f079a4c085b2dfb0000352261811baed891458398a2ff2cab9b4a9
-EBUILD Parse-RecDescent-1.967.15.ebuild 836 BLAKE2B f9eac40689e14514ca896e8ee2b7b4960996a76eef6ed3ce84b836a56da8defc98f77588c4c84d453e0d230c4b17b4b7b7e6a8672b9831292de3b8887dff242c SHA512 0067b47f27f217eef5339aee37b17ba6eeb3a3422e34bbaab912a1a950d903dcf2192c223bfb8d8b05141e256efb1e11b6582efa6943313e0ccae525d21e058d
+EBUILD Parse-RecDescent-1.967.15.ebuild 835 BLAKE2B 4ca3f2d3eeaf2711fd0f6d26948c4109359548d63721723d709f902616f53768ccf776c960c50366173819e3865bb54f6f1882d0394664f03eec731e73820c40 SHA512 568b1461f6bf3156b91899673f6f13dcdf15efbfde4c752e60bc1dd8e4ec80bc5a02ebd538755d1009e10868053d3bc34327e61bd1731d93cb5fea6d38c0c65c
 MISC metadata.xml 1669 BLAKE2B 4d6de78c4df041e7fb262a850f68c9c3d4a5ac4e30bf98c90b8292743b061a9dca24831ecb3bb6560b79bdf19c362cd6a19e92e8ce487b6565c3202c30c1c7d2 SHA512 5d50c5caa5b710ded5c1655254fd86bd7cc4e8cca9c3b8e8d2cb563028875a7c59955809114daf98c8c5cc34da3c49f67a9b42b591c9b128c929489d7bd1eda6
diff --git a/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.15.ebuild b/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.15.ebuild
index 8b2a0be0e7ea..d84b142603c1 100644
--- a/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.15.ebuild
+++ b/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.15.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Generate Recursive-Descent Parsers"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test examples"
 
 RDEPEND="
diff --git a/dev-perl/SOAP-Lite/Manifest b/dev-perl/SOAP-Lite/Manifest
index fb4877c231dd..97d56c1b6eb1 100644
--- a/dev-perl/SOAP-Lite/Manifest
+++ b/dev-perl/SOAP-Lite/Manifest
@@ -1,3 +1,3 @@
 DIST SOAP-Lite-1.19.tar.gz 271044 SHA256 f56d8d2ea51832a317020f635e584e38515b6d60526fd722aca360b367f23729 SHA512 530deba9011075b65e8eae4c64cac62c374cd17823e1d23b8383af2bc28075aa1e68809eb8b09a98b44c29cbd7398e6d24ffc9808badc39453f6b9e87a2e1a1d WHIRLPOOL c800649d2652835c709bd102e0468054794deab25e5dce68da9b6a28236b0580073828802d7b769baf276d3d4c6f98c6e545214a2378608b4ff81a3a67c7fa27
-EBUILD SOAP-Lite-1.190.0.ebuild 1044 BLAKE2B e2e5f885932b5b012cb6dabd5a7c9295beb7d6a16ce4e7645d1ff09ef241db7b138967eca97867586b4201482a3f7ea258b6cef487e8481297b0c25107c8ac9e SHA512 7b51376713d6adde3cd6c852cff5080c8f657a3ab2cc707bed6dd9102d2bb65abd2b73adad69645bb1dafe1a607e82a09ca12fb71bf3a7dab9a066737b26119e
+EBUILD SOAP-Lite-1.190.0.ebuild 1049 BLAKE2B eba3d4fd64e851c10248f189870891e0f3a37450c282ca9b66cd81904035625d9479365963a4169054b2a93539058be60583935243657ab8cc968623d97f3829 SHA512 f9434e61f6b50f504578c0da98776c202ed9112a5d672066b04c918525be20ad78a509aeaf2a4969e6025ff8b548753f64d1725dae13213e0a0196a7a3a5df0c
 MISC metadata.xml 6095 BLAKE2B 3901b5656c05398855dee8b80509f862a6d61d31e04b0f897d8b3332d42abad7a16ebcef4ea42e5e2e063de3235e19e556dd6ec15e98f0851c42746704f08725 SHA512 d6292dd744f83651e56ff407e231faacd80fc3c9b6521ba5e7108e0adf3d91dc036969848609237465eb78b16818be971580f0e4a4367b9f01dbe584790fe903
diff --git a/dev-perl/SOAP-Lite/SOAP-Lite-1.190.0.ebuild b/dev-perl/SOAP-Lite/SOAP-Lite-1.190.0.ebuild
index 6ba5009df024..92c86852ca56 100644
--- a/dev-perl/SOAP-Lite/SOAP-Lite-1.190.0.ebuild
+++ b/dev-perl/SOAP-Lite/SOAP-Lite-1.190.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Lightweight interface to the SOAP protocol both on client and serve
 
 IUSE="ssl test xmpp"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 
 myconf="${myconf} --noprompt"
 
diff --git a/dev-perl/SUPER/Manifest b/dev-perl/SUPER/Manifest
index 0b5bacaa32b1..efc6a41f0c3a 100644
--- a/dev-perl/SUPER/Manifest
+++ b/dev-perl/SUPER/Manifest
@@ -1,3 +1,3 @@
 DIST SUPER-1.20141117.tar.gz 14477 SHA256 1a620e7d60aee9b13b1b26a44694c43fdb2bba1755cfff435dae83c7d42cc0b2 SHA512 c17fe478fcb9ebc2749c27fc75b839bd77e81c9d0170697b2a697dcebb9f4eef4b954d023b76d33a8b4201b110e5e997b1e0993faf7a04ef2e1191a2f7c516a0 WHIRLPOOL b88b18622f8561653efe16331b7dad6b0b969be57bbbbbb56d96be6ac7c59cc491d69a22090874bc47f66da6fb40b84d7012a083eb3a48036de84b83af5a6d9f
-EBUILD SUPER-1.201.411.170.ebuild 528 BLAKE2B 646580c02db1b5c7ce8b68454b3166c7ad52ef62a1ec7a8cd151240f10f75c62b72b7e65956a268a4fe039b0f8bd0518af3a0fd926ee8ca89681e85b86787af1 SHA512 e2ca5489e4a51663fdb03adf8203d6f65bf50d2ece9856d6af6f530cadd6188e73fe68fa493992c09452131fe3eaee1ee5b26d9f9ad2148fb90e410f56994574
+EBUILD SUPER-1.201.411.170.ebuild 527 BLAKE2B 3bb3f9382357a6f83ac48bdac4937a9dc19a5f6ed05e4b558550e6953765e78928b4d969cba00837042597774ee7cec8690d3e04f95679e1af41a98379e34769 SHA512 5dbf534a95ac4353bf3d4488da251f6ec695b156f8ca71f499e4416b41c7d1e53fd3566d406fe2ad0e2d3cb33cf9a84028671056214b85f01d3e58c8a78582f6
 MISC metadata.xml 381 BLAKE2B af5644e02b2bcf30d7ff75ab9b110e88721714c38b323b91a6bf26ad86458c44055bb7349af9b5c1d9ae1662f57ccb9bd6a0180ad27e7c62549878645bb04ca5 SHA512 3b03f4e5db44029813521bc5433475639c27c32c793c2c9289af95659fc231e1470c05017e9399850f8a79b0da2a3041944f1bb168c19e0fb1bab47db64de6c9
diff --git a/dev-perl/SUPER/SUPER-1.201.411.170.ebuild b/dev-perl/SUPER/SUPER-1.201.411.170.ebuild
index c41a41517d28..7c19aefdb42b 100644
--- a/dev-perl/SUPER/SUPER-1.201.411.170.ebuild
+++ b/dev-perl/SUPER/SUPER-1.201.411.170.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="control superclass method dispatch"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Sub-Uplevel/Manifest b/dev-perl/Sub-Uplevel/Manifest
index 8950a8631c85..4818a142ecfd 100644
--- a/dev-perl/Sub-Uplevel/Manifest
+++ b/dev-perl/Sub-Uplevel/Manifest
@@ -1,7 +1,7 @@
 DIST Sub-Uplevel-0.25.tar.gz 27618 SHA256 2dcca582a7ea5bada576eb27c4be1d1b064fb22175bdbd6d696c45d083560505 SHA512 647667f69621b1e9c17f41f5b5edd2b75a7c84e853b7fe1bd3f3ca74f14539a63843300b88b8245d20f9730a5a1466287770dd09c1ab597574b8da9d77775aec WHIRLPOOL f438b26a960ae5e2133e05e9d280ef876064124728d37ff79e40ff24b2e584a856f8e548e46a766b6de3c22ead53d7899061f7d25bc72c9f0a4ecd3438f71d4a
 DIST Sub-Uplevel-0.2600.tar.gz 28119 SHA256 e833e29b7d6037efee6d7ee2056cbb8aaaa908e4f5451969043093eb2917a166 SHA512 f10c59c0458d9a1d6e832246c8c852bb88c65871b4d24688393985dfc10d982a0db2f2f8805c26ba232a755c88382f327af62390c3ee3ae68e33c90d042654e3 WHIRLPOOL bb73b891806f3d54e51d54a7e48743c4a70ef66e1c3d8cdb63c0e3555f0774fd6113dc6918b250ba55ab9b34221f4049809e593e7859be65667bc43a48b24edd
-DIST Sub-Uplevel-0.2800.tar.gz 28361 SHA256 b4f3f63b80f680a421332d8851ddbe5a8e72fcaa74d5d1d98f3c8cc4a3ece293 SHA512 655bab9441bc81e4002db2e715b5c1f771ee35a03bc643a44d4a279aca55431fe17e64332919311a51db2dc02c16b5f97c5751595e61ad0ab96cd0a10ac2d230 WHIRLPOOL ab027c292f66ae01b6b5ca9cef278674caf68f3e77c0460803dcb09566e842832aca84617e52fff11688cddc594512dbee608774c5e213bbbde91dc777ef9689
+DIST Sub-Uplevel-0.2800.tar.gz 28361 BLAKE2B 04842cf96f5c72e8b8bb52854f73035d93c5620389e41cf495286177988f6abe3d01fae838848bbf427c522f351034754b677a1520cee3ed12cbba8e58fd703c SHA512 655bab9441bc81e4002db2e715b5c1f771ee35a03bc643a44d4a279aca55431fe17e64332919311a51db2dc02c16b5f97c5751595e61ad0ab96cd0a10ac2d230
 EBUILD Sub-Uplevel-0.250.0.ebuild 487 BLAKE2B 62e4846edfa0fae8881a5ab1cf036084e90a9d199006fcdf9c9abbdf86262b78105904810905ef159fb4bb70cc4189790d44060d6d83ab1ac87051de15d683db SHA512 f5f06d66ad49d801aed808754277319949afd444edadbc4e3963c5e99f19079f2861e04122488c1984a1443407384190f3c7cd4931943a6838753bc8054a522c
 EBUILD Sub-Uplevel-0.260.0.ebuild 665 BLAKE2B 9f6d9d7e0d2816082f3719bf012b57d92e53d87ed1ae6c4666d9624036d66be8998b6d567c1e00a2a5e034b9aa82f4fdaa8ac58aa59500c3e1388a953a15ccb9 SHA512 02cce1686eba36a22de8e6d241e885a246d7019cd42193a5a43d181cd7101ed05151fcf3b4db5d6bd220bb4f6bb58340cbcc8c291c459731446e945ec4a9ed68
-EBUILD Sub-Uplevel-0.280.0.ebuild 657 BLAKE2B 8941ea652360c2aecb442109edbda3ca8d67f314e7050462345893c1d6150045d8e80f81e5246cc6347f82f82f2db1341813aacda755035e1b8fd824e67068c5 SHA512 a463cbe48fb3225d1d6fab91bf76c2c54d23ea833a20cea60e74db8e1288fb28862d3f0bc31907f38b412396641d253d6c25f02f16f08ce37fd47a26a344be7a
+EBUILD Sub-Uplevel-0.280.0.ebuild 656 BLAKE2B 84f2886ee92a28a3b016635e37496c80b89e605ead75abdada727c4a53ca9059c04d459033b676d82ef926dd853adfb1a704b0105507a8b14f8de467f35894f0 SHA512 68767ca59ffd7b90e529a01020d5e99472e5dab9e3767296b03277bc250edebdf353e8498776753cc2326e7f04d0aa4be77bdf16a89d499b7b32127db3a87d80
 MISC metadata.xml 394 BLAKE2B 3bc0c8d87c7d638934a3e991c70d6362ad62a56330e16a7b160e19f12ca3d045b6820fb6a1e9abd31cb931b0b93ace30f180f981cea233d7501a6f238e7c02cb SHA512 64c7915f1cb3b8fd3b00ca6bd6b89229cec7c07fb71194bc45befc774463e0bf6c4f53ef0b89620f05291b7aacae6066e83bab1d175dcbd0c861fdeef0aa0fdd
diff --git a/dev-perl/Sub-Uplevel/Sub-Uplevel-0.280.0.ebuild b/dev-perl/Sub-Uplevel/Sub-Uplevel-0.280.0.ebuild
index f5b7670ebe07..5cd687e471f1 100644
--- a/dev-perl/Sub-Uplevel/Sub-Uplevel-0.280.0.ebuild
+++ b/dev-perl/Sub-Uplevel/Sub-Uplevel-0.280.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Apparently run a function in a higher stack frame"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="virtual/perl-Carp"
diff --git a/dev-perl/Term-ProgressBar/Manifest b/dev-perl/Term-ProgressBar/Manifest
index 5fd7a2859bcd..d37c61ba8077 100644
--- a/dev-perl/Term-ProgressBar/Manifest
+++ b/dev-perl/Term-ProgressBar/Manifest
@@ -1,3 +1,3 @@
 DIST Term-ProgressBar-2.17.tar.gz 18711 SHA256 c1e0602c738a91fe54b01bcaa0d1a898b07ef6815c55eb2ebd6da4e3be20f696 SHA512 876490e3158b76aca4d118c03fc7984e1801cda620f23369083edbb4647b134b49eaca427ef790f2cf98a7786055ae777359484b102f1868a6641cc5bdb36d2c WHIRLPOOL 280aeaae14eac18813478b041bb95a1a79a29e8dc603806872ea18a8957c1ceba056c9bacfe6a17200635217b85076b7f8914189dfdfce405bca09c576c0884c
-EBUILD Term-ProgressBar-2.170.0.ebuild 493 BLAKE2B 46d17a574277355cb2c9856a929a9ca0ce8ec9061387bd633332c5f093dbc116e871c5050148c57e0ba330239508740f73c9ab101b9ebb13c79ba96c1af785ba SHA512 0d5d25d8d90e8eca4fa0d0b57be93a605926610554354794b9ab2e0c5557ca5bc14387a3d7a4f0498d54164a6d2496112cea53c6538c95841d312bded1d8b536
+EBUILD Term-ProgressBar-2.170.0.ebuild 498 BLAKE2B e97ef653ee1b9215a8d60d159cb309edbb9d53f799ae45f40d8910882ec35049eee86dd351e230d38f007a9fdbdc2d8f0c33749dec5ac6ef19f65051d73d5a9d SHA512 592c3229208e5d62c96cfeb8fb13c033715af1e969561df2fee721e9c5a93c6b14cc01d1ab97d61354f52ea676a342baea5fc5f605693262a614b52c1e874bb7
 MISC metadata.xml 404 BLAKE2B 07b4ca82e54637bdb459040c355293728e2c337c83406ce723a5e2d9b9f8d245b93efd73a4e7ba612ec85c16c0598aad2e996cbd3a69fcfc18fced084d84da0b SHA512 f901ded755871613484fd3e51f7c5f21b98d2b41fcddd4fc526af20fa4a9a4be3b65be53a11b22dfc721df674dc22544f956a42aebf30400a6d9aee322629f09
diff --git a/dev-perl/Term-ProgressBar/Term-ProgressBar-2.170.0.ebuild b/dev-perl/Term-ProgressBar/Term-ProgressBar-2.170.0.ebuild
index e0c342c79b84..3ef83e7471f3 100644
--- a/dev-perl/Term-ProgressBar/Term-ProgressBar-2.170.0.ebuild
+++ b/dev-perl/Term-ProgressBar/Term-ProgressBar-2.170.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl module for Term-ProgressBar"
 
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Test-MockModule/Manifest b/dev-perl/Test-MockModule/Manifest
index 98722a1aeafb..a47f16f27b3c 100644
--- a/dev-perl/Test-MockModule/Manifest
+++ b/dev-perl/Test-MockModule/Manifest
@@ -1,5 +1,5 @@
 DIST Test-MockModule-0.05.tar.gz 5608 SHA256 67c515258c76780009e58305ec56f195e1b110d0cabb52792d57dd1761396e07 SHA512 8cbd2461dd0d9e9107c48a98be615c10dd77401569065a14cec555cc92f22c7211e7a7fb40149bd98c624bb1da838aa7be22a01391e2b6a70e7e58ec8af24da7 WHIRLPOOL 5d96b2a6050dce8b35a6bf842f10090bdf13b2382ef30877c7fd8db9499b4a7754b7d03be6d61f473aca185088961e1d7b9c2e1d70b0e7a998977e92da3a3fac
 DIST Test-MockModule-0.11.tar.gz 23756 SHA256 05584ba3a67f811e0d563eb9fb68049db0ee81c2cdaf56535067c6df922f14b9 SHA512 417a0de701458e3e26ea194cb2de7756d9a1665b2b7283a375ee95362ee2d7b77996801d4dafd8ead12e97d59c2a57ffd1e98620446d5f47a1836c8ef18983b4 WHIRLPOOL 7ba1cb00938b5d83292870565bcf4cd0502e9599b58ecaef86d422bd0ba7a0a74322aaa69507f2b9a64100aebe26818188d0665b46ff30a8d02c6e0821b11db3
-EBUILD Test-MockModule-0.110.0.ebuild 691 BLAKE2B 6cde74416213aecb424fc24b05f00f89c8ea821fb24bcb30c9e0fb8ad9e2999603df1dc20431c90551e688ac5ab281da0fd872b08e67c05221b686a4a7069347 SHA512 235f486667271d9969ab67dd0c0a808a9ee1078bd4f92afdf5e6025d7763bef6a0e452085b9a2758362d0fcbc0d3b4782989a45ec3b466fe253621fca27299b5
+EBUILD Test-MockModule-0.110.0.ebuild 690 BLAKE2B dc12a4ab2c2d5c852bd742dd2d63f7d26ad4268eea9bb89617145a5c74662d1f890924b7138ff1d870636379da89ba9fe0200002f0f93da481e07f99dcc7851f SHA512 06548739e6bd1689fedcbf95a51a8762996000a7cc6a3ed5edfc6daaeb7cf24027624ba9c66e7594ee23e42052fbd5ce30e6aef8d283e824fb29fef0f49d3638
 EBUILD Test-MockModule-0.50.0-r2.ebuild 651 BLAKE2B 3c39f324496cbfdd644750daf68dedcfc01cf08e3c7d483d6dd230dfad036b20dc73efde9d6d7818016eeee8fc65e9496840a07e7c37d7655f67dbdcfb6732c5 SHA512 bdfa62f5bdc29ae5f187b366573671dfb370ab32113a4c567893cee815c8164baba90a0171b8c8675dd1d9871744051c698d5270c91aba1aaac92dd65adc04cd
 MISC metadata.xml 402 BLAKE2B 61ad5df007d8ce18bb2c8c06b3dea6c52967d70a0956c9af51feea0afc9c5e616c92165540d7eaaa043774ae10d565bd892b48fa825eec37d03816de5e292422 SHA512 1035f23a2b634006eea4e5292fda035b6db107289703d60d71936898242b6f4e819de4081f6e5c2b4820f94ba9562f916a881293acc216742334e935310102a4
diff --git a/dev-perl/Test-MockModule/Test-MockModule-0.110.0.ebuild b/dev-perl/Test-MockModule/Test-MockModule-0.110.0.ebuild
index 7ac25c5da5ed..22dd6131a873 100644
--- a/dev-perl/Test-MockModule/Test-MockModule-0.110.0.ebuild
+++ b/dev-perl/Test-MockModule/Test-MockModule-0.110.0.ebuild
@@ -10,8 +10,7 @@ inherit perl-module
 DESCRIPTION="Override subroutines in a module for unit testing"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
-~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Tk-TableMatrix/Manifest b/dev-perl/Tk-TableMatrix/Manifest
index 63be803c64ee..9a1ece240341 100644
--- a/dev-perl/Tk-TableMatrix/Manifest
+++ b/dev-perl/Tk-TableMatrix/Manifest
@@ -1,4 +1,4 @@
 AUX pTk-1.22.patch 558 BLAKE2B c62d921287899aa542a618168f26ff37f1bdf92373c8d72dd98cc52aed15a8d2741968487fab7d4091817517fb01dc541018c0129d7b781e82c8afea0bd30da7 SHA512 c709c5f6baf326389a794764a4b223c0fc154f0f6157e4696ba2e7af6cc029f1e977558be7a16bcdcd40a3e31cfc30bdd23e319ccd5cb33b227a84a55ab82631
 DIST Tk-TableMatrix-1.23.tar.gz 318954 SHA256 ce9ace8d1c1245b80ea6b2e72ee3e7f75ca4111026e403134b8ecad02ec931da SHA512 115eb2a71c3725392f2bcf5e468bc84844c8a5ad3db221205876d7de6486833a3fd4e98aa32e21f5dcf038a38f9d98721adeebb1f9cd0990359aec7d07f6f32e WHIRLPOOL ce54205cbfc7102fb0000d6520ebc275fcd6f3c81e3eb402acb48e30d1eb3f75a10423c64ab315b455123d6ce7f6d49c4990646726a4f8cd6b7d453c312fee4b
-EBUILD Tk-TableMatrix-1.230.0-r1.ebuild 591 BLAKE2B fad1666c8f05a2786d0311c5e3f75134ceab4601de5be09ca125739a5bd6d42963192eb31e4e13e78a6114adbd36cf9ac652fd67f4c4e785d9ff527c2fb0a935 SHA512 a110215f84bb3537fa7bdecc6346d5d2b2be12e982c90d471a16c4041decffc68559586703a0acfc71278a4cc119b013c2075d967f5167f6f7f9d6090e1e6bb2
+EBUILD Tk-TableMatrix-1.230.0-r1.ebuild 596 BLAKE2B 91897568a7f4decb6104d3425ab4269f273de664caf3e07cc96cfdcc79226c868420f2a99e1640776c45d40edb6e683889ac35a47f57fa1a5c5f9d054a12e5a0 SHA512 22c9ba3618f47654055a7781afb331ea2307a369bbf97e264a494f574a1a491db44f681d093ba54e0b4b36aa80d05d425bbf838ba5d587bf86040438f9434ab6
 MISC metadata.xml 558 BLAKE2B c5083c2c3ded4e3040fa2fbc2c2c0cc8c186239709ecc1d7cd700fe378a2ae0658f773fb7cff9bdd9c3f0e25756f0205526c154bc7156b270d28dd30e3f552c7 SHA512 1ef50a1d3e76c7885c300e68b39dd13d495a947a17da8ae292ba1996292de5647090cd3892c855e610c3557587f1705568562e7d216d85403556be273b05066b
diff --git a/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.230.0-r1.ebuild b/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.230.0-r1.ebuild
index ac36439ab074..fc81ed69911a 100644
--- a/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.230.0-r1.ebuild
+++ b/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.230.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ DESCRIPTION="Perl module for Tk-TableMatrix"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+KEYWORDS="alpha amd64 ~arm ia64 ppc sparc x86"
 IUSE=""
 
 DEPEND="dev-perl/Tk"
diff --git a/dev-perl/XML-Parser-Lite/Manifest b/dev-perl/XML-Parser-Lite/Manifest
index 882cd774d680..c4465a290754 100644
--- a/dev-perl/XML-Parser-Lite/Manifest
+++ b/dev-perl/XML-Parser-Lite/Manifest
@@ -1,3 +1,3 @@
 DIST XML-Parser-Lite-0.721.tar.gz 10303 SHA256 5862a36ecab9db9aad021839c847e8d2f4ab5a7796c61d0fb069bb69cf7908ba SHA512 23c0aa9363e87afc885e40bc92643c355a5e7be85a61b8f1d1e829a970538b2f0a9de6dd652387d4612528274da64e8812faa6328be2283a28675a6da09c707f WHIRLPOOL d6666b542b96bf749c36b0f7b724ab56a0c508b0ce3d19895236b3cb2ab8ff504f4bd30146270853a761cc3bdc1d188f717c294cf4c3f720350d7a6ed083d8d5
-EBUILD XML-Parser-Lite-0.721.0.ebuild 864 BLAKE2B b89333089bdd26e3bed6bed8d6ea07cd5b8c1f7bf591b6c99d7e283a7b3c8608f6260bd4f828b8df58d4b3f89b0f45b5f528b12b61f78289e0ad56b363438bf2 SHA512 17a39a318f369e86e66932d3bdba207ae5b5dd855ce4b3ae10f74b10c5b1d8712e8e0117b17b566ba17fdb2c8ad6c0b6db946c761c3d629128d9570ab8d9d126
+EBUILD XML-Parser-Lite-0.721.0.ebuild 869 BLAKE2B 2fb9e43a90e59d0cf1449d709ae3595c3e4c1df97c77e4b36dbf50f3927098e8cf1f114c4d52007e6053ebc404da91af964422880a82d72fa2e861e1768be95e SHA512 267f9d4680ad7adcc747bf72ba39513c079cbe816dfa8fd229ba946567682bda5e9a0dd769df634f0f7505ddb01d362a9d28fe60e1ce6deba16675e9008c80df
 MISC metadata.xml 391 BLAKE2B e13dcbbd8367f121074f7f7b2bf6fba1dc3bda4d0efe06c8fd58196a2cd826f996d31c343a2cd5fdc318444c63c7a2684daaa55c4561c949e6ae38377f055386 SHA512 e5e6d6e1af6047f9b00216cfe035bd7145d7b14bdc11154b9267ad90298a67056272870e68dd572da92bb67015c9b035bf63647b56e880f7bd30f51cfb4be1bc
diff --git a/dev-perl/XML-Parser-Lite/XML-Parser-Lite-0.721.0.ebuild b/dev-perl/XML-Parser-Lite/XML-Parser-Lite-0.721.0.ebuild
index 5f6a90cb262f..67c4e374c00d 100644
--- a/dev-perl/XML-Parser-Lite/XML-Parser-Lite-0.721.0.ebuild
+++ b/dev-perl/XML-Parser-Lite/XML-Parser-Lite-0.721.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Lightweight regexp-based XML parser"
 
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test minimal"
 
 # Note: Don't try to depend on XMLRPC-Lite or SOAP-Lite with tests,
diff --git a/dev-perl/XML-SAX-Base/Manifest b/dev-perl/XML-SAX-Base/Manifest
index f463aef1f2a6..93e26696faf1 100644
--- a/dev-perl/XML-SAX-Base/Manifest
+++ b/dev-perl/XML-SAX-Base/Manifest
@@ -1,5 +1,5 @@
-DIST XML-SAX-Base-1.08.tar.gz 28197 SHA256 666270318b15f88b8427e585198abbc19bc2e6ccb36dc4c0a4f2d9807330219e SHA512 2149a4772b10d31b6d0f4f0cf8d07145cdb103de518d3055f09ed921748a5b6c8269c9d7c017e865b8c251a3e930cf752eb33780d5291b4287c003af3b6ff47f WHIRLPOOL c42f1ecccf199f212b62e2fd42cd00ba719de37c36a654f65b75d82b36d3784534e1cd62f5b5e5e1ea0f7ee96f40698c87045d4042496d8798dfbe3a450e1a20
-DIST XML-SAX-Base-1.09.tar.gz 28215 SHA256 66cb355ba4ef47c10ca738bd35999723644386ac853abbeb5132841f5e8a2ad0 SHA512 72a34fd2b0375222cad3a42a0e2d92f793d7a2ac27d831a8a8d3322fdc75ba246ca53c33cdc0fbade81f3a96ad977ebf5d4cddc6d75d76be79b2e655f316d532 WHIRLPOOL 576312ecdab50d14bc1ed4867cccaad1303296ebe612ac4089616fdce6fd54419cd0bc9919df411743ed2d567a4b898117cc34866a9951fa46067c829cdf1b19
+DIST XML-SAX-Base-1.08.tar.gz 28197 BLAKE2B af6b718525396654ab6e8bb5d5849d2a6bc2de836a484ef5677161a2d333c5020c013b776333f46fb99963c21168b8ebb606da552ff9d61265c2ea4427edcb64 SHA512 2149a4772b10d31b6d0f4f0cf8d07145cdb103de518d3055f09ed921748a5b6c8269c9d7c017e865b8c251a3e930cf752eb33780d5291b4287c003af3b6ff47f
+DIST XML-SAX-Base-1.09.tar.gz 28215 BLAKE2B a723958c23cbc81fde872bc29d9ccdc021952331460161f873360d94743af6ad68ed1eb061ebceb1100a26e1a47cb2884688820a735f15439de81fbf22fb6910 SHA512 72a34fd2b0375222cad3a42a0e2d92f793d7a2ac27d831a8a8d3322fdc75ba246ca53c33cdc0fbade81f3a96ad977ebf5d4cddc6d75d76be79b2e655f316d532
 EBUILD XML-SAX-Base-1.80.0-r1.ebuild 520 BLAKE2B ccc0ad01effb90f8d60a5011f8b5cda09a73ea8dcbb5acd644780917e5aedfda5c61c28846165a92763bd24ab87b6f96d862962d0eee098d37456c7fb3b02c9d SHA512 93505b51086f1d53f157aeb779a9e69f618d85186a33a7b655ea67e85724c0a8c49c9e98e64055136cad920d606109516ffafc1e81575dc7d26cc25c678c430a
-EBUILD XML-SAX-Base-1.90.0.ebuild 604 BLAKE2B c3c1a547b925d977f56ec1155d8ab819e257d4a50b679b9d2b5857a1a29729e66a780711754c75dbd9c54452b99ec435eef7bbee7fc352c68d768159b6c181b6 SHA512 4841bef00ef6841392c92548b9910995b47bdf7886ab984298393f8a66bad7344883dafdb669e53cf4769096fefa929acc956d6271123ffbd01c20d6b05e3fe3
+EBUILD XML-SAX-Base-1.90.0.ebuild 603 BLAKE2B 9c2c0e73c8b2d9c8b6377c1ab2ddc8ba668c9bcfb446f81d20400590a4710740096e53562d107734c35b23ea8e8ea8f0ca4d1f86e8d9884b80be55b1a8aecfcc SHA512 1b9b2a3c7e43b1b8882a13f89c21f0811432902666f603262acd14033c46619d172c9d0347ce9fbe0ccc3b63816307a292b622beaf186e5db5fce3d279828729
 MISC metadata.xml 519 BLAKE2B 04fd038b73042cdd0e7dd7ca09b4a34e36d298382f2423ab8308005986ec405309950187c0201755b1e0cf05932008163003ee998f532295cacc7866643172c4 SHA512 f8f58cc6e6d0f5299464cb2806226e8a7d63f3a981968fd18f5f49569baba98bf42459a0482d2c799fa3af9481fe7a4bc42cbce9fbbb6cdd1542a4d1fff88c3c
diff --git a/dev-perl/XML-SAX-Base/XML-SAX-Base-1.90.0.ebuild b/dev-perl/XML-SAX-Base/XML-SAX-Base-1.90.0.ebuild
index 2bf5d3f9d117..d02ba30f80ca 100644
--- a/dev-perl/XML-SAX-Base/XML-SAX-Base-1.90.0.ebuild
+++ b/dev-perl/XML-SAX-Base/XML-SAX-Base-1.90.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Base class SAX Drivers and Filters"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/XML-TreePP/Manifest b/dev-perl/XML-TreePP/Manifest
index 6c1a2ad4854c..b4d183032925 100644
--- a/dev-perl/XML-TreePP/Manifest
+++ b/dev-perl/XML-TreePP/Manifest
@@ -1,3 +1,3 @@
-DIST XML-TreePP-0.43.tar.gz 91382 SHA256 7fbe2d6430860059894aeeebf75d4cacf1bf8d7b75294eb87d8e1502f81bd760 SHA512 4289a0a8100ef15f62f0e303f13094371ac6f1b54d887be1ed7e2ea31d7f1f6fc28d4234cf96458074137f756db3fe452ded170d3ee576f7eb2cfc9996cc31d1 WHIRLPOOL 63add11a445320891f235d3f920d4220055afaa9ed5297fa8a028edca075ccef80080b9f3fab1d96f8d27d8484e76beebf4f98a0f2a38887eef1c73fa3d9322f
-EBUILD XML-TreePP-0.430.0.ebuild 450 BLAKE2B 8e234908b1b7689b44822f5b43d2a65f5190ddc8228f01936f33e3b64d0446a60330cdd3b8c363b0393cd69d43d1f4d34937ae7abf1daef5276d7d94458be806 SHA512 4d778790c6866dc119fccb121bc04647a22b9335fb50e57488e5e9ff1f29bfb0ae5b56d134e140e5b84e734d33b7136ffddce27d70b246213845e87993206272
+DIST XML-TreePP-0.43.tar.gz 91382 BLAKE2B 2a7d89d6d5e3bcf965b001cf8e18465b1cdfdeb94cd96c77008beb16b559fc072bd24a5c954a12965e2a03d9707c372c779ac7ca1e2938807055e64f9e7ed077 SHA512 4289a0a8100ef15f62f0e303f13094371ac6f1b54d887be1ed7e2ea31d7f1f6fc28d4234cf96458074137f756db3fe452ded170d3ee576f7eb2cfc9996cc31d1
+EBUILD XML-TreePP-0.430.0.ebuild 460 BLAKE2B d8bdd19c61f7026cc24842c58bed6b174e09dd31f64f9431e57c59a6496a7edd3692f1beb8297277c307016f152357be3f98105f72625cade69690fb50d97b5c SHA512 54afbe53ede5530b0ffb2a61a102bd4b2fd347825da9a7977a70e22b3b3290ac57067a0b6159c90367a87cad01db034a840da75132759f8ee397fb6b1bd9c0a0
 MISC metadata.xml 464 BLAKE2B 08cb87d6a9682641c50be91f1d89cbc7bfb5f114f799bce0aaeff908675a7b3f2f559070597242bf9c2bc58408391be543adcb281999e8d159046312c54a743c SHA512 d5aeaa43384401788f7d1aa589615a31e6ce678a54b6bf960b7fb6740fa548cb0bfa69928ca6ff19c956920a83729409060b2c42dbb576bc7ce58fdc30134350
diff --git a/dev-perl/XML-TreePP/XML-TreePP-0.430.0.ebuild b/dev-perl/XML-TreePP/XML-TreePP-0.430.0.ebuild
index a1cb55b433b5..37fa2c9df9f5 100644
--- a/dev-perl/XML-TreePP/XML-TreePP-0.430.0.ebuild
+++ b/dev-perl/XML-TreePP/XML-TreePP-0.430.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Pure Perl implementation for parsing/writing XML documents"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 4f3eb3160288..96567d6b001e 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/composer/Manifest b/dev-php/composer/Manifest
index 9adbac7c7c8b..79410201bd0a 100644
--- a/dev-php/composer/Manifest
+++ b/dev-php/composer/Manifest
@@ -1,4 +1,4 @@
 AUX autoload.php 965 BLAKE2B 5f9137a431f59e640b3d120ecafc1f7449890ff16c104899ae3d6d238756ac9c07dcfe49535cd59236cf92a9d242754a8a92a22ddc31609c3a72de8a8a258abd SHA512 c3ea41e0bc11b249b5b39e0fd3366e9f5a75e816ce7db0b11a223c4a4aeb6a3e031d2824e062ff26f5d1e75c01e023ebf9dfd3a1d5fc8b8e0f18168b79d3061c
-DIST composer-1.5.2.tar.gz 1100976 SHA256 e8af65669563890364ec73ed57f589b1200f03fd86edc925a9961235aff5f54d SHA512 929b054dc2742f0043fe82374d0fdcd3ff073fb4fb1dc7eedca0e9a2c90dc00ab11b6a20ab2c549c0429fb3d0836f5590a3970a3bfbde5795fe5a665ea286dbb WHIRLPOOL 05f18eead21dc02a20a274ce4dd11805cd7e95228492a7c17dd8e09d56daa577620f12b68e5983daf6df3b6d952b44ad77d49338692fe05601ca699ac57c0824
-EBUILD composer-1.5.2-r1.ebuild 1157 BLAKE2B ee64e916ba5a78f935b9a7bb6e68582048b8386b8aa14a768062adfddb01ef138683da9c5615303f66ea153188f3eb5ecddd96327c4815ec660ac5c556e9036c SHA512 57fe4fbeded645a0e08184a5d2aad81638a59a3cd138390abd59d2f919208a0eb92435e19d1e5572f4d0b71a041eb8b26ae870940ed43f19da90958addd18ccd
+DIST composer-1.5.5.tar.gz 1102418 BLAKE2B b8a29ab7473e439d0ff71ba5eb21a63a1c10a3f805c076c3af4f0fd46f5fe7a216085e999d3dd23ca78d769661d1bbfdf04ecf3c353428f6326735ddc564945a SHA512 c1021d1fb5ef992ea16023b982aa8ccdfddf7bce5da0945847ed28c555e795e7d23d4f0892e98d745784ab702e332217ea240ae6297bb18638b5161b6d7c84f0
+EBUILD composer-1.5.5.ebuild 1157 BLAKE2B ee64e916ba5a78f935b9a7bb6e68582048b8386b8aa14a768062adfddb01ef138683da9c5615303f66ea153188f3eb5ecddd96327c4815ec660ac5c556e9036c SHA512 57fe4fbeded645a0e08184a5d2aad81638a59a3cd138390abd59d2f919208a0eb92435e19d1e5572f4d0b71a041eb8b26ae870940ed43f19da90958addd18ccd
 MISC metadata.xml 774 BLAKE2B 8a1f75c0c7da6f0d193a981c6db3888d62e2223b6368c4a7dece62ae33cc9a2a8c0b34714170462f262569954e70cc9b976012ff864ccfa36a46da3c719169ae SHA512 1a17bfae65923a3bea593c57d7ecf4fb2aeef43d0537636105e52294de295cbfeaed4b3c36ffb8675a563f657f4f969e62096cee20b9ab178c962acf2f68ac3a
diff --git a/dev-php/composer/composer-1.5.2-r1.ebuild b/dev-php/composer/composer-1.5.5.ebuild
index 7e9f959246d2..7e9f959246d2 100644
--- a/dev-php/composer/composer-1.5.2-r1.ebuild
+++ b/dev-php/composer/composer-1.5.5.ebuild
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 0020904943aa..5425484d621d 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/contextlib2/Manifest b/dev-python/contextlib2/Manifest
index a069145d6b0c..30998af43fb2 100644
--- a/dev-python/contextlib2/Manifest
+++ b/dev-python/contextlib2/Manifest
@@ -1,5 +1,5 @@
 DIST contextlib2-0.5.4.tar.gz 28523 BLAKE2B ada08a83e968f58caba5851b0f6ea0eedf8242d5e4b0d4e9c036ed0576c4ce8300669fd09d4ab3b019d8d49bdb79dfcdd03668d5af8519119013c931f037daa8 SHA512 c8bb5bf9dbbf5bfd882663813f2a456d82215be7ace55aed1d5047ce7f21f26d5518982ec26344b1e950d3aea27cd8a5c48627730bb28f8b3cfb6a331fd7ba66
 DIST contextlib2-0.5.5.tar.gz 28755 BLAKE2B 4fa16a0591c5e2138123b4f6d539bae8993bf826bc92b9ba08d335efd142b5e20c53e0d4e3cf5d7ac5d8b43cff45a19e170a7d97a9300fe385fa53d042cbfa38 SHA512 d5c97ff8eef7d8b14da0bfdc3515f8019bcc05e24cb922ce08ca2366d5182b029d873bbf172e9e6791297df05e24f6faf40868550063dcdb54f451b14c9e505d
 EBUILD contextlib2-0.5.4.ebuild 615 BLAKE2B f3020ab69487a87067ce7148f7833665ff3d81bf04f07b1dead69e2e12d307dee6319bfffdf80ac18427a5e98a8cd7759bdfb6a7a14082380e8260a137cca116 SHA512 79df172750eb66c1137916eaf2a09d5cbb9b2601f0608c1c57c463d14544d5847da6fa5b4af22cdea763cb4b00aa2c95a58dd1420da53f4f6d302f97939ed20c
-EBUILD contextlib2-0.5.5.ebuild 639 BLAKE2B b88f667c9ecdc65e8b29b35b2c54d56bd8055abdee9aaf9cbf5799ffe72e0fea4511a47d8eca5957fe582e244b4346cf55d873c601d2839fdd438d42f8d25cbc SHA512 7ef0d9e8fd69fadadcd544d1059372c7ecb7c71f45e96e97f52a91ee92e5f60ba902f8ac37c9df36064336a28a14948a58c31e23197d1e4d79274a8dca5b1af6
+EBUILD contextlib2-0.5.5.ebuild 645 BLAKE2B 6076684f064aeb1288f81ac40ca76c8e183ab48550372d95f3852f98faa2c8cd571ad4c5c3f846b0975fd4005609f0497c0ebd6cd8934ebee8e1801bb533b09d SHA512 ca8d334bda62a3af492142fd8ea6d5baca7821e44247d74139d1674385d02bd87cd4aa644b00e8f1839aefd56108759a12d910150ac5b74bfd4ba6bf4cebae7b
 MISC metadata.xml 324 BLAKE2B cfd3b05583ab0f14acf1057ac34124525ffd63c1855689ac19fb10fa9f998f477d1c070226c9e5798dd68c8629b2564e2112d24f38306a0f3958526179c4caf5 SHA512 616fe24d7cf8c1e1c52add7d9a8fc15d6e41cf20c116e73997b1e3a732110f6305e5ec50de9a4be75d58c588f55da30980bbdcbd65078c05a6da0dccd89cb36d
diff --git a/dev-python/contextlib2/contextlib2-0.5.5.ebuild b/dev-python/contextlib2/contextlib2-0.5.5.ebuild
index ae2aa414dae0..31ddaa1df2d3 100644
--- a/dev-python/contextlib2/contextlib2-0.5.5.ebuild
+++ b/dev-python/contextlib2/contextlib2-0.5.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2.4"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index 3a416864d77b..f3755f06690a 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -1,5 +1,5 @@
-DIST denonavr-0.5.3.tar.gz 60941 SHA256 8904bda0f6de1d40f602a26f909b592c33a82df4f22963f908168f6e031af585 SHA512 709f1eb2c51ba193ec17d3dc20d43d1f632a6e8b387b962e15b9b573c4d539357b3fd48cc177dd701b4b7043afdbab7a06a808b34b44e8c971f2f72ef6383d9b WHIRLPOOL 519f46898e1af12be5733c8d4cf2c0d65ecb191c283ac9b77f467680076b12f2749b5c183f823fda879e2f5ec855a36b67af3a95fd01b61a28a60e4092a16d19
-DIST denonavr-0.5.4.tar.gz 58307 SHA256 c9e7d9e6847565481f38fe3dd6fdd57277fcd20c9023729b360da55769cd738d SHA512 10242193bd93fc4465d51f7fa856be558932eb3610ed0e239b0758d657ed176d08bd9c53424040e4e12b58f87cb65d44ccc804e90cdaf17d9d34b64876a67b91 WHIRLPOOL 96298a59a52de9534b9d13fb95a049ed4f56ce358a8632cc711e54d0cc3dddd239fc866e9a295f89cba55f23bdd6783448768582f45035d2e048c21d629c0429
-EBUILD denonavr-0.5.3.ebuild 850 BLAKE2B 91d1f1562af1fa95ff5fc3b34e19435c23a8a54a74a70ab90a4b1d3b2216feb56af0fb98eaa68edf5435a378abd0873b833ffb32d5e1b9e620cced7d5786e250 SHA512 d72f4c5747c6133b0cc205877e2c7aa1f67d05633c757b7df89a0bee38e9e7a35033a7f4c5cf116e1f93f94590e1a106f848cc5e82a470d6341dad23bf55fdad
+DIST denonavr-0.5.4.tar.gz 58307 BLAKE2B 923eba058332c0d09112823bd64f62755c05ec735d0f068b7f829095dd0e1e9740c2ca7eb347939f35978529366b943c6940f6b366b919098966943773172e03 SHA512 10242193bd93fc4465d51f7fa856be558932eb3610ed0e239b0758d657ed176d08bd9c53424040e4e12b58f87cb65d44ccc804e90cdaf17d9d34b64876a67b91
+DIST denonavr-0.5.5.tar.gz 58367 BLAKE2B 15c7c770f80e01a1ad7c051cbdf22eafb12b32c95204bd9d5e402bfd46451893f76febbed5ee6d9bfc0d3cb1b63c4e9a0633046a137e73adee4d972e45c0d68b SHA512 2fd4434ed73be379f54312418aca715c50345361d5e36e11c95fd25513e40cd8a2b3ee59d8cccb2977a14edade456a4e1a03b94403a5cfa61d4de319c012ec61
 EBUILD denonavr-0.5.4.ebuild 739 BLAKE2B 9a63092a979d2861d6d7c604a64885695d3c31da646f250035169a402fa76d3895434d16a5bec3856a6c50e438ee944e2eb1d4d3498aa0412467a26e1844cd00 SHA512 557aec9a04955dac993f9625ba39006ab88f6cb58a5a73f198acfc20f05394278c5d248e5f27679bb22250e650f706107c4ae97052460cb4ccb7a4bc8009005c
+EBUILD denonavr-0.5.5.ebuild 739 BLAKE2B 9a63092a979d2861d6d7c604a64885695d3c31da646f250035169a402fa76d3895434d16a5bec3856a6c50e438ee944e2eb1d4d3498aa0412467a26e1844cd00 SHA512 557aec9a04955dac993f9625ba39006ab88f6cb58a5a73f198acfc20f05394278c5d248e5f27679bb22250e650f706107c4ae97052460cb4ccb7a4bc8009005c
 MISC metadata.xml 572 BLAKE2B b3696f4f0b4a4b22a38a0b6d310f044490a088b7e2b3644b00ad2457218ecf9b40c2331e8cafc5bc1335cb3af6c13ea9149bed8602f8c4fe1b419b975d98fd9d SHA512 009f44bf923f227dde48e3304ef2a3164f664b8736c872dd6e3fbf27a99ac67905e312a64c2389b9845295c164fcd0fe6125337ac6aa1c77097eb864b4cf3857
diff --git a/dev-python/denonavr/denonavr-0.5.3.ebuild b/dev-python/denonavr/denonavr-0.5.5.ebuild
index 8c66944fef00..4812f7dd0c58 100644
--- a/dev-python/denonavr/denonavr-0.5.3.ebuild
+++ b/dev-python/denonavr/denonavr-0.5.5.ebuild
@@ -10,8 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="Automation Library for Denon AVR receivers"
 HOMEPAGE="https://github.com/scarface-4711/denonavr"
-# PyPI tarballs lack tests: https://github.com/scarface-4711/denonavr/pull/31
-SRC_URI="https://github.com/scarface-4711/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/detox/Manifest b/dev-python/detox/Manifest
new file mode 100644
index 000000000000..4031da05bae9
--- /dev/null
+++ b/dev-python/detox/Manifest
@@ -0,0 +1,3 @@
+DIST detox-0.11.tar.gz 8406 BLAKE2B c8ad67bdcf69a6a6f558b893be4e6da66dde3ac4a092445ed73e9200d2e80179f42e168ba3b639e59cc5a7b8c6a8f5edbeb327953c1bb91c1de267ddde28208d SHA512 326219669934f75886532920e2e1f0a887a5efa7f1efc1dc7549f5824254a6b354599fa058370ac235f1df6a6b4016fa207108b04368c8ec8dbe91e758ee559d
+EBUILD detox-0.11.ebuild 766 BLAKE2B 561ff671a7425a48953b7105838cc1aaa13e4118cf27154b080d549defbf0a48d3439add44ffe449739228be558ee1f2211be1dd392cdc3c686c1459e4e480d3 SHA512 92b2471d87027271cdc76c55780179a52f17bfbd4adc342e8ad9185dcdf9c0bba9b3261d28d84f8f9770eb6a19481ce3d8107d36dcb66dc0da4353d4207a1d69
+MISC metadata.xml 361 BLAKE2B 8e7c8790db91aaf75579a7430176f99b85a5572a03e9a6ae113bd131a434590b9fae5e0aebd18c3e5da8490ee246ec660dd6537df85b73772e648e8a5e23a74a SHA512 138ef583238329892e538f7b903f43391f63ec8669794c16536959dd4a1d5a1f3a269ad9062d6dab7df2363c7bc0d65c1d735cdcf27f6ef139b16add46b61971
diff --git a/dev-python/detox/detox-0.11.ebuild b/dev-python/detox/detox-0.11.ebuild
new file mode 100644
index 000000000000..79444a13712a
--- /dev/null
+++ b/dev-python/detox/detox-0.11.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="distributed tox"
+HOMEPAGE="https://github.com/tox-dev/detox https://pypi.python.org/pypi/detox"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/py-1.4.27[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/tox-2[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	py.test -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/detox/metadata.xml b/dev-python/detox/metadata.xml
new file mode 100644
index 000000000000..84721a9a110a
--- /dev/null
+++ b/dev-python/detox/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">detox</remote-id>
+		<remote-id type="github">tox-dev/detox</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/libzilla/Manifest b/dev-python/libzilla/Manifest
index 423dad1fd683..6a26bae16502 100644
--- a/dev-python/libzilla/Manifest
+++ b/dev-python/libzilla/Manifest
@@ -1,3 +1,5 @@
-DIST libzilla-1.3.zip 17384 SHA256 0b365586ff5249389357ca37f8d346801cf3b61c5cab9a4aa0fc4ee7e13e4035 SHA512 cb38edbf71642b3358417247a62208bf865a6ea62f94eb5c3f4ee46b33ed90c53c8c3483ea3eea031e301d693d77ed65a221e7bd13a4c2dc4e436f8c2d92b66b WHIRLPOOL 0a6fc193f8c843abb87980625be2edf3df382b4fa957bdfc36ce025258537de3dd5d228551bd3a389478658d1170c42571e82598ee4846df87b4250039eaf18d
-EBUILD libzilla-1.3.ebuild 572 BLAKE2B b8d332a67592b6bc697824022d58ba733ca0d0ebfef08b66a2eb47cf594a05ec1f1ec1bf97f2e080f52b2c25595da6add39045b88db4a877decc8d2c526017a5 SHA512 9a20f69144024f0c98feed616b558a0a934f672843fe20d81ffca3bc3a75831931fa453e4b1c61c40141033f37dded3eae6d19362d0d5ceb9d29422fc1130a97
+DIST libzilla-1.3.zip 17384 BLAKE2B 380bcdd0edab1accc516bd9de12de93b9075ba5d0a8a9a8e12911b491eb30d593313d741c07e3020985762cc17f22ad73992ee6838255b7d5c1af896c676d8ca SHA512 cb38edbf71642b3358417247a62208bf865a6ea62f94eb5c3f4ee46b33ed90c53c8c3483ea3eea031e301d693d77ed65a221e7bd13a4c2dc4e436f8c2d92b66b
+DIST libzilla-1.4.tar.gz 12052 BLAKE2B 83549c14f226abfb15986d17b047465f2f2e565ad07d9ca62078b83acb91aaf8fd3b9a1f2c930a6e1dce97bba04c5425da2fc40212c705140a297a7cc7a26aea SHA512 ac3370603133c2f557597cba9030bf0d5f5b833b867c84cbea58d667ec791d68af42f98559c5a1093f20b3a5993481f9cea8c89dceeb5a734bdcca44bfa1b44c
+EBUILD libzilla-1.3.ebuild 570 BLAKE2B 083e1050dcb4d5c0a3a0702b7941bd22fd342155af587745aca9c2ff2cbd2d9835a1c1b58c60d99d5afdc1539429996a872e8c63c3115b097d6dae6d16f88b8c SHA512 13986ad25af5f288cc43cfef899de4b15f7965ccbd6057be173de377df84b2fed31bdccdf3cb6356a5121b745dd9587210518ef23b0a434b12ed9c365f53018c
+EBUILD libzilla-1.4.ebuild 569 BLAKE2B b5633f12bd4b811422536e1abdc3f675d39fa2fc0d2124ee54c604e47cfd1e79d9d53b6ef0ca5a4d465129f3188ad1c3d34145df1aab367b460f1b06e0ad5421 SHA512 7afbfbb7674f441bc01b970c15898d305c0ef6e1ea4551c3e37dd8ebc1d23c0f43b59edec7af69632a1a085f660615c7ebf8c18099a49ced0514e400ccf8c55f
 MISC metadata.xml 418 BLAKE2B e908aeaf977f735946a52f7c9dad369a4787e19793af639e12eea821c52a27827ab48d3fb3496e304241962cc1c97829da0c9aa7359654708fc6013003c2f471 SHA512 e382a0185c2c4f2968395ef7aff65364c0523f529b6003ab135285cffd13f80c718953090d6c845b31aefcdd4c8c38ebaadbb9a4fd44cb557586185e4a7f023e
diff --git a/dev-python/libzilla/libzilla-1.3.ebuild b/dev-python/libzilla/libzilla-1.3.ebuild
index e1ce63c71c89..0e317f053e01 100644
--- a/dev-python/libzilla/libzilla-1.3.ebuild
+++ b/dev-python/libzilla/libzilla-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Library for managing Bugzilla bug reports from the CLI"
 HOMEPAGE="https://github.com/monsieurp/libzilla"
 SRC_URI="https://github.com/monsieurp/libzilla/archive/v${PV}.zip -> ${P}.zip"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE=""
diff --git a/dev-python/libzilla/libzilla-1.4.ebuild b/dev-python/libzilla/libzilla-1.4.ebuild
new file mode 100644
index 000000000000..cd4bc3e6f2cf
--- /dev/null
+++ b/dev-python/libzilla/libzilla-1.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for managing Bugzilla bug reports from the CLI"
+HOMEPAGE="https://github.com/monsieurp/libzilla"
+SRC_URI="https://github.com/monsieurp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/docopt[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytables/Manifest b/dev-python/pytables/Manifest
index 02a43eeb6292..638ee7268306 100644
--- a/dev-python/pytables/Manifest
+++ b/dev-python/pytables/Manifest
@@ -1,10 +1,5 @@
-AUX pytables-3.1.1-blosc.patch 418 BLAKE2B 34fd40b5ae9ce1f05950e1c1c6e3baccd9362679e8f76135139cf4a63fc651cf7ee414ad395be55f46fe6749ac4d018500ac0478bfa518600019e911d850120c SHA512 fa60a3a5c60faa07b64fa5f0241e8d81a4c86287b86808cd39a5a861f5de91d6c83da7d774c25643e2591e8a04731f10c6b188a6854a9bf4c0bea7a94d51ac35
-AUX pytables-3.1.1-cython-backport.patch 2472 BLAKE2B 7d5aafe3466412bddc0b8fdd177659b6dbfb63306c853951d29477d4890ebef85da54b27a79492cd66242afd40b8f5a1f565b59be4f5c83c32e9882ac3fafaed SHA512 c8f235ab3765410e4c0e488e30e00050d6bbc0f8b6874d4e794fc5edf69ad1877c4290a35c111d44a5626c567bc4fff35213ee6b3005a6bb25d5879489c49a63
-AUX pytables-3.1.1-numpy19-backport.patch 1636 BLAKE2B e378d0614392278e9e5f0703908d0e0bfc43fb6703f3ec31c20ddc7f360e50939bee7ff34a3399d84b58bbf62c0e59d09a7f1e3a865b3c4c620b84394045b04e SHA512 6553229186b6007b67f79c63cf4bcb168f7fe77c62478fcfa29bb27402decb30ec36a2df4f0794bab19d7fb7d77dcd5072caaa88ae2a7aa4025608f610efde75
-DIST tables-3.1.1.tar.gz 6715786 SHA256 39b9036376f1185599771c19276f13b5b9119d98f9108f58595745ded3fe2da3 SHA512 b5b2052dd81c4748c5e26c1f61f9f92891f48335b0a553f7602ab11c9029dd673d27b91e24cac0da21a81df0c26dbcd9a438214fa58af1ae831c5f04dfa212a6 WHIRLPOOL 86fd6dc9e12503fdbd23013b75f33a41eadbbac0e6dd5ac9a91476d073195077fc6b3d5ad24b1dd4b4c18ae7ed8abc8ea1708262e52240f4c2c3b1153f8c9e91
 DIST tables-3.3.0.tar.gz 7004337 SHA256 8383ccf02e041a5d55494a09fc5514140b4653055a2732c981b5fd0f7408822c SHA512 e19445f0f5f2530d49ce55f258931babb7b05df2366637ddbc306323a1f75b7f7dcf91d70a8cc1f41b182d4cdd9c83872873168592bdcce7bd5acae9f3274f36 WHIRLPOOL f270f741d6886775cc730fbcb79de215fbbe2d9b7b2b6efc6b5b3fa7d141046e7c69daad140ad7cc533b439bfae801ea0e1567939dc4258e5c3b6a88f27cd86c
-DIST tables-3.4.2.tar.gz 7593471 SHA256 fdbbea4edb6bad0ac0e53fc7bc6970e78e12eef4944aa4146bcdcb573201676c SHA512 8c3bb9113e5082f8b44866b04728a04dae37fbd576c3259309fc305fd4cc0c4f74925557e74f6bd1bd1fc5150d8091648139c4c702e5ed9f53e0ace11c2ac58b WHIRLPOOL 392e117a3ad372ee91a02ee66994f3c03e67b4ae7473f5761e13215ce33084fc3ac8e9e371ca9b59f374066523bcd3ebbced01c49faaa84d4af75a26811ee35f
-EBUILD pytables-3.1.1-r2.ebuild 1609 BLAKE2B cd4aa43fe82a2194b44b2f59144eb3620d3f18d37d5d1e843c1eaee9d54985f0a1fd7fcf00a86650b0f336078c6183e1b0b8fa2cfd1d3c18c122b8961d253b2b SHA512 a0cd26ad7a2191ffe573ec9cd6e327264d2d61690eace3955efc90a244f3f7bf594a987a5c34a9aa8d5a5bf2cddde111004613e917100a01a308440a3c18f702
+DIST tables-3.4.2.tar.gz 7593471 BLAKE2B 1a011a2a910a25d4e7cad68b5a1a267482f5ed958aa824dfba5a6c902200c56253c7d5609cd674dfcb288f6ebf2ecb76f4324e53b852f70d0cfc60d6b222510a SHA512 8c3bb9113e5082f8b44866b04728a04dae37fbd576c3259309fc305fd4cc0c4f74925557e74f6bd1bd1fc5150d8091648139c4c702e5ed9f53e0ace11c2ac58b
 EBUILD pytables-3.3.0.ebuild 1576 BLAKE2B 284a5c4a14d6705f464ae82943e15ffd2abfae5a607651c0e4fcfe2d4bede9b4e672636a8e92b849b2fc69777b8e395b7f3f3d163b13fe1ebf57b6b2c4e5df6b SHA512 245b0b83df781420beb759ffcd1e66106739e4a56fdc524f1f9ddb0a65c5c91442b17775e123ec474f55a5ad7d6b26993dc4453c2afb8522507f0ec2f66997f6
 EBUILD pytables-3.4.2.ebuild 1645 BLAKE2B 9259dab0ffc95b4ad11a395562bbc5439621d22d389dad3aedbc6da9351bb6f4b6104aed86b82657728d738b9bf52526bb0c63aad24baf1724bc4eb05427355a SHA512 c6d226ba1c1233e6ab02268109fdb363d43e23df114dc9fec407770fd01026f5964c16f29d5e024ec3de371c32af8622f30d460eade6b7e47ffd033f809ea545
 MISC metadata.xml 894 BLAKE2B 279b64a5124a6471b3ea6ed8d2f82b8d62e5d8bc809168fb2ae1c3bfd8cfa07428c2ff7f07deb5042a6ccb5ba7af43bc45d0db82b9cfc79fa5d19c090d0500a3 SHA512 88dd752e6014f6f133b5df7db6c2aafce0b9da8cdbc057493916dbfbe1da4bf52e0ed43d570d68035fc8f12302794a381a54f5b07b9726b52601724163bc672c
diff --git a/dev-python/pytables/files/pytables-3.1.1-blosc.patch b/dev-python/pytables/files/pytables-3.1.1-blosc.patch
deleted file mode 100644
index 3a4ba18e5e73..000000000000
--- a/dev-python/pytables/files/pytables-3.1.1-blosc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 2c0c126..1448eb1 100755
---- a/setup.py
-+++ b/setup.py
-@@ -768,7 +768,7 @@ if 'BLOSC' not in optional_libs:
-             print("Setting compiler flag '-msse2'")
-             CFLAGS.append("-msse2")
- else:
--    ADDLIBS += ['blosc']
-+    ADDLIBS += ['blosc', 'blosc_filter']
- 
- 
- utilsExtension_libs = LIBS + ADDLIBS
diff --git a/dev-python/pytables/files/pytables-3.1.1-cython-backport.patch b/dev-python/pytables/files/pytables-3.1.1-cython-backport.patch
deleted file mode 100644
index 7db41d2e1a62..000000000000
--- a/dev-python/pytables/files/pytables-3.1.1-cython-backport.patch
+++ /dev/null
@@ -1,65 +0,0 @@
- setup.py               | 13 +++++++------
- tables/req_versions.py |  2 +-
- 2 files changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 0f2f3f7..52cda49 100755
---- a/setup.py
-+++ b/setup.py
-@@ -25,6 +25,7 @@ from distutils.core import Extension
- from distutils.dep_util import newer
- from distutils.util import convert_path
- from distutils.ccompiler import new_compiler
-+from distutils.version import LooseVersion
- 
- cmdclass = {}
- setuptools_kwargs = {}
-@@ -106,7 +107,7 @@ def check_import(pkgname, pkgver):
-             "You need %(pkgname)s %(pkgver)s or greater to run PyTables!"
-             % {'pkgname': pkgname, 'pkgver': pkgver})
-     else:
--        if mod.__version__ < pkgver:
-+        if mod.__version__ < LooseVersion(pkgver):
-             exit_with_error(
-                 "You need %(pkgname)s %(pkgver)s or greater to run PyTables!"
-                 % {'pkgname': pkgname, 'pkgver': pkgver})
-@@ -122,21 +123,21 @@ if not has_setuptools:
- 
- # Check if Cython is installed or not (requisite)
- try:
-+    from Cython import __version__ as cython_version
-     from Cython.Distutils import build_ext
--    from Cython.Compiler.Main import Version
-     cmdclass['build_ext'] = build_ext
- except ImportError:
-     exit_with_error(
-         "You need %(pkgname)s %(pkgver)s or greater to compile PyTables!"
-         % {'pkgname': 'Cython', 'pkgver': min_cython_version})
- 
--if Version.version < min_cython_version:
-+if LooseVersion(cython_version) < min_cython_version:
-     exit_with_error(
--        "At least Cython %s is needed so as to generate extensions!"
--        % (min_cython_version))
-+        "You need %(pkgname)s %(pkgver)s or greater to run PyTables!"
-+        % {'pkgname': 'Cython', 'pkgver': min_cython_version})
- else:
-     print("* Found %(pkgname)s %(pkgver)s package installed."
--          % {'pkgname': 'Cython', 'pkgver': Version.version})
-+          % {'pkgname': 'Cython', 'pkgver': cython_version})
- 
- VERSION = open('VERSION').read().strip()
- 
-diff --git a/tables/req_versions.py b/tables/req_versions.py
-index 2c9ca01..bd498c3 100644
---- a/tables/req_versions.py
-+++ b/tables/req_versions.py
-@@ -17,7 +17,7 @@
- # Minimum recommended versions for mandatory packages
- min_numpy_version = '1.4.1'
- min_numexpr_version = '2.0.0'
--min_cython_version = '0.13'
-+min_cython_version = '0.14'
- 
- # The THG team has decided to fix an API inconsistency in the definition
- # of the H5Z_class_t structure in version 1.8.3
diff --git a/dev-python/pytables/files/pytables-3.1.1-numpy19-backport.patch b/dev-python/pytables/files/pytables-3.1.1-numpy19-backport.patch
deleted file mode 100644
index c2f0c2280f01..000000000000
--- a/dev-python/pytables/files/pytables-3.1.1-numpy19-backport.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 854d5798ca9fd78c00e18710de2e93202f675f3e Mon Sep 17 00:00:00 2001
-From: Antonio Valentino <antonio.valentino@tiscali.it>
-Date: Sun, 6 Jul 2014 21:21:39 +0200
-Subject: [PATCH] Fix a compatibility problem with numpy 1.9 (close: #362)
-
----
- RELEASE_NOTES.txt | 6 ++++++
- tables/table.py   | 6 +++++-
- 2 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
-index f219eb3..1da20e2 100644
---- a/RELEASE_NOTES.txt
-+++ b/RELEASE_NOTES.txt
-@@ -19,6 +19,12 @@ Improvements
-   requiring strict access alignment.
- 
- 
-+Bugs fixed
-+----------
-+
-+- Fixed compatibitily problems with numpy 1.9 (closes :issue:`362`)
-+
-+
- Changes from 3.1.0 to 3.1.1
- ===========================
- 
-diff --git a/tables/table.py b/tables/table.py
-index 235f599..ffe8fd6 100644
---- a/tables/table.py
-+++ b/tables/table.py
-@@ -3406,6 +3406,10 @@ def _getindex(self):
-                      associated with this column (None if the column is not
-                      indexed).""")
- 
-+    @lazyattr
-+    def _itemtype(self):
-+        return self.descr._v_dtypes[self.name]
-+
-     def _getshape(self):
-         return (self.table.nrows,) + self.descr._v_dtypes[self.name].shape
- 
-@@ -3529,7 +3533,7 @@ def __iter__(self):
-         table = self.table
-         itemsize = self.dtype.itemsize
-         nrowsinbuf = table._v_file.params['IO_BUFFER_SIZE'] // itemsize
--        buf = numpy.empty((nrowsinbuf, ), self.dtype)
-+        buf = numpy.empty((nrowsinbuf, ), self._itemtype)
-         max_row = len(self)
-         for start_row in xrange(0, len(self), nrowsinbuf):
-             end_row = min(start_row + nrowsinbuf, max_row)
diff --git a/dev-python/pytables/pytables-3.1.1-r2.ebuild b/dev-python/pytables/pytables-3.1.1-r2.ebuild
deleted file mode 100644
index f22a4f0c61e9..000000000000
--- a/dev-python/pytables/pytables-3.1.1-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-MY_PN=tables
-MY_P=${MY_PN}-${PV}
-
-inherit distutils-r1
-
-DESCRIPTION="Hierarchical datasets for Python"
-HOMEPAGE="http://www.pytables.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-LICENSE="BSD"
-IUSE="doc examples"
-
-RDEPEND="
-	app-arch/bzip2:0=
-	dev-libs/c-blosc:0=[hdf5]
-	dev-libs/lzo:2=
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/numexpr[${PYTHON_USEDEP}]
-	sci-libs/hdf5:0="
-DEPEND="${RDEPEND}
-	>=dev-python/cython-0.14[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( ANNOUNCE.txt RELEASE_NOTES.txt THANKS )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cython-backport.patch
-	"${FILESDIR}"/${P}-numpy19-backport.patch
-	"${FILESDIR}"/${P}-blosc.patch
-	)
-
-python_prepare_all() {
-	export HDF5_DIR="${EPREFIX}"/usr
-	sed \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		-e 's:"c-blosc/hdf5/blosc_filter.c"::g' \
-		-i setup.py || die
-	rm -r c-blosc/{blosc,hdf5,internal-complibs} || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib* || die
-	${EPYTHON} tables/tests/test_all.py || die
-}
-
-python_install_all() {
-	if use doc; then
-		HTML_DOCS=( doc/html/. )
-		DOCS+=( doc/scripts )
-	fi
-	distutils-r1_python_install_all
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-		doins -r contrib
-	fi
-}
diff --git a/dev-python/pytest-fixture-config/Manifest b/dev-python/pytest-fixture-config/Manifest
index d7348f39425c..8c3dc99f2175 100644
--- a/dev-python/pytest-fixture-config/Manifest
+++ b/dev-python/pytest-fixture-config/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-fixture-config-1.2.11.tar.gz 6525 SHA256 6d4c064b614e4afbcd93b56d4ca14c44a295370e7843daf69925ff5c0fbe94a0 SHA512 9d335621c7aec41ce769f450fb618ca1611a0e97bf3bd3bdaf43bb827dde62af28fb255a36643c4e6e9c958e7f7efe3f4fc308b3129fe7625c0504c0c46f1518 WHIRLPOOL 9386794f00575efbc06fcf212f132cf11a91df942e5807ecaad7651b67298dad577a8831450ae462c185732101262278e92a208f08fd11af2d15ae3664290485
 DIST pytest-fixture-config-1.2.2.tar.gz 4995 SHA256 5df71da68709a233a7a9f1aa262091ac17ddfd4c170912d07030801fd360b781 SHA512 c2d2346c50c8a73e37ce217e240eabdecf872700c9f4b020f1ca7532a06e6a5dc6b140356d96b1bf8c83f1cf737d95775abaa206c3dcf7e02555b26aa995f12d WHIRLPOOL 97488a31b1b39f5964df34900e4ff8209e425746a7791172cdc6804c98561fa73a7d28d668bbea4fa55082d81c07a50387891a60c8503eedd761bc8f9639673d
-EBUILD pytest-fixture-config-1.2.11.ebuild 710 BLAKE2B 65b18fba3892d2191bb52fe68e267a1d89ceaada3d1c57d6c265de1b84f9fd9e43389b62bb9df4c98807ccd06254974c6cef4ef13e35bbbb6071f9ad2ed61a62 SHA512 df62a566209db25b36156ed81c4d0ca3c59da6d3754f194b4fba74c6d74ee295021393585ef051eec6084fdfe20e19d5bee7444863733931a6975975082bc515
+EBUILD pytest-fixture-config-1.2.11.ebuild 716 BLAKE2B 66b99eb52a7163325c8de01881008509cd008eb4c3a877dd99cb05e02579b46ee1e3a34813f6d7a4d82d758476f0a96e71bec2ba2dc2ad60589da81ffa6d0f7c SHA512 f6fe7fceb9c4496c6747e85ba024c00aef7cdb85e3a8ea71f1d7dbae30218f480f3abbc6757df92332edc8cf9c2f0fe4eb22652ed8450b66b06c31da33064810
 EBUILD pytest-fixture-config-1.2.2.ebuild 707 BLAKE2B 50cb74b0a9b4cc1ea33c850762f2f1dde94497e47f99808323b9cf2fdcf8b9817cfb657881e256a7aa638b5bd8ce40ae5c33cec56a3547da88aabe2bc3010aaa SHA512 e1554212104ddce7d35730af725f612cf646e469b7f154e5af843d555c4e3e8d45d3081a413b4db69deb11f124503d2a4ba75820a7a2cfdb804c2bea23068316
 MISC metadata.xml 676 BLAKE2B 7f3622c69e6d371d1ab8d57d06d3aa045bcb21829a2ff0d4f160941cb804fcbf2c0540a460e50e3ca6286b6a31e2e6b8791f92fd711fbcc9eaf1186b7cb37ed9 SHA512 9e4cc39afad13c0cdce47c59c42c4d71436422d37d4f113a446238036b1f05d38eb8fa6d53b9001ca630483492dd315090062efe221339e63776f126d964620d
diff --git a/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild b/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild
index b5fc191522f5..c065b7f1f9bb 100644
--- a/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild
+++ b/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~mips ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-shutil/Manifest b/dev-python/pytest-shutil/Manifest
index 963fdd5a8692..d8f31ea5904e 100644
--- a/dev-python/pytest-shutil/Manifest
+++ b/dev-python/pytest-shutil/Manifest
@@ -1,7 +1,7 @@
 DIST pytest-shutil-1.2.11.tar.gz 18310 SHA256 ace5250c09377f01e62bd50d33bc959fc66ee0123f7b0b10bc440b35d1644494 SHA512 2a998218bb997a6ceb277965e2f150b2d7722ba518f579154f804568f552e2c41ced9a491c1745382dc119d0b92f3ea993ae77a61851809aae59a1e17501bde8 WHIRLPOOL 9deba2d3d1c0ce708ce4ad2aea7e5a918752df2ac80c87b9852ff5930ef3f99e464634073c6cb9c3e905800ae2450ef20fcbe878ff49debee31408c5e025ac37
 DIST pytest-shutil-1.2.4.tar.gz 16327 SHA256 a3fc464033dc39396a67eac9e228a0682e866654b8017819b2511bdbd8ed751f SHA512 9ec6baa3cf53bb80103b1dfbf6c26794090c26dd74b29cd19e76b1037c6939538c7b05ea16368a76cce6969216c291e27b00833a990268239bfd2222f69ddfb4 WHIRLPOOL 5f52535feadf11c5aa33b69cc8d35d361d7345611b9239a8282a94d58bfb4163c1207a60cb3d38998ba777e8b9912a3a63cfa0b820962ce84dba8a5ba8068642
 DIST pytest-shutil-1.2.8.tar.gz 17051 SHA256 924accaec3f3781416139e580386ab4f849cb8662bc1072405a81d3a5e56bf3d SHA512 de73b2c350709e356810f58d2a8a4c7668144701639c45a0690081e707e7147762f650af2e9f826429d0488655dae0e3366611da5e8e3ecd0c6382e215170b2d WHIRLPOOL 433fb2ec4db71cb958f1f7b8278c1fb88de5e56369dec04910947d611f779dea9fb4e5282adeac5014fe601ca19046733039b6cc6733504f94c0503ff57b9ec5
-EBUILD pytest-shutil-1.2.11.ebuild 992 BLAKE2B 47e4efb448f31e5acd5754d8fa8cad928a5f4b0cabd321b82ef7b9d459bf1682ffbc7f12cc576a7c1a21816a9e30cb5d9daf94964cba94af83ce5928df00c498 SHA512 093ad3b15b3e5e2a9daa3c95e8626ea207c1b41e6340f1ef712a365234c68f27f99ee1e92720a97170f988975d8022728ada844ea229daa66b98f5419e41855d
+EBUILD pytest-shutil-1.2.11.ebuild 998 BLAKE2B 261ad7d79c177ebdd128ac631a0b3b08c63460eaea9073bb04ca3de56b2a8aa4316381bb4d7659ab97e32745802e3a01004c19a9471d9363e25dc06ef61c11da SHA512 e7b44c01d734e12057f90f3a29b68afbb158c90056e10c0f487a2a56a7ef28d7172690eb09e7049bcdd558fa0188fd540fdd4764a545d3cd5d31bf2c9714bcee
 EBUILD pytest-shutil-1.2.4.ebuild 872 BLAKE2B cab69c456f8db4a45fdc6af7a992cd5f4e160ad522ecc23a4327a5ee447ab82147bccf0d3d0a104b2bda58451e10b2d2626ff163d3c7880595aafe35df6a5409 SHA512 148ca3da3d06f2d26a9799cc2cc8eba28a99cef29de0dbefd2e0957527655cf53c623fe4bf5ea1a542fdc48ddb9f56608521913b9837cb1c352af8523f62691c
 EBUILD pytest-shutil-1.2.8.ebuild 872 BLAKE2B cab69c456f8db4a45fdc6af7a992cd5f4e160ad522ecc23a4327a5ee447ab82147bccf0d3d0a104b2bda58451e10b2d2626ff163d3c7880595aafe35df6a5409 SHA512 148ca3da3d06f2d26a9799cc2cc8eba28a99cef29de0dbefd2e0957527655cf53c623fe4bf5ea1a542fdc48ddb9f56608521913b9837cb1c352af8523f62691c
 MISC metadata.xml 730 BLAKE2B d12c0e9355407f6bb2a942bd03b56e4c516a0deac0d0e1f246749c21c330778808a0b30c34e50df39dda8e591680e947bd64f7a09063f2c2fdb55657418c57d7 SHA512 c775452390ffa0666b23f3f78bc96fbfbbbd94796ef9bfb79fcf251b97ca94f96b0c2980b2ca1828104499c78da15fbb198eeb000e55006debe9ed03ebebb0ca
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
index 93b17e4a2f69..b0e7df2027af 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~mips ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-virtualenv/Manifest b/dev-python/pytest-virtualenv/Manifest
index ea52d3cedfac..a00cbf423853 100644
--- a/dev-python/pytest-virtualenv/Manifest
+++ b/dev-python/pytest-virtualenv/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-virtualenv-1.2.11.tar.gz 9528 BLAKE2B 2ddcba76f89d207e8efaac8d59c6c1209fb9557fcfad586e1226b70d49ed8093aab602149335d23d497b0674e606d00d289fc291dd721aa7470f12ec221b5f61 SHA512 317ef8717f0ad4da6d38167f1f0dd65b6f1b3bd08bd1361fe6a27e6e422cd9fab62f3fac3848082bb24411505ecd41495fc1cbedb970d43945c8f6f8cfbbdf41
-EBUILD pytest-virtualenv-1.2.11.ebuild 844 BLAKE2B be0f14a637df8957fd2edc1fed7f76609d91421a2efd81033e37b8b82b897c2734eb0e33fdb24b5e3a3dbae3af0581c45243d5eb28125d0c504dfdbb25460eb1 SHA512 842d3d7858e7e169f160eac702efdb2ce4634906ac2bb3d4b3f8f25b9ddbc42287a0d76290bf8e1832389b8aaef38027a03d52aacc8fc84867827940a31434b2
+EBUILD pytest-virtualenv-1.2.11.ebuild 850 BLAKE2B 9bee8b8c5aa293d496b97a30e9575edf44cb9b0a2fe7eb1874c0cbe2a5883f6515fb4e0b6c64a264552f84c0d0d5d02e76efd0d50feb21c1b4c6eed710661f14 SHA512 36a8c9bc6ccdfae551889b715263e33831d702949096f83fdb467f6f4d0ebe95d12581718b18920d060bd0f69f35a02d80e7a0813f7d3c47fea43d773629b288
 MISC metadata.xml 704 BLAKE2B 5def8fc368efcb89f29107dead2b04bbae8f868d94f7d95396292e35933e556f1f0cdaace88e9063beb890999d2db384da85ba44e61fe5d48fb660f9f0f220fa SHA512 856c8ea08f2f1f4f2e1be19e2a2cb2aaad2a143f270417a2632685b44432c36a947d7d98b51bb87cd6f32943e814a39790943e0c4799dac97d84b92103b759d9
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
index dedd83bb30ab..02383c002c7d 100644
--- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
+++ b/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~mips ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index 37083c251efb..2770f396adb1 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,5 +1,5 @@
 DIST regex-2016.01.10.tar.gz 574017 SHA256 02a77606e3f4a0a16a2727ed8f067681635a56221e8fca863ff64b196d5d79e0 SHA512 4f4700ca746763f857449003d32d56b5aa8069e3b71b160e719633b0cf00f80efc0766d8e1e193977278f91bd3e73c87aab31bee23aec77557ac9b3652ff6a2f WHIRLPOOL 9d493c0695b5920dfa71d94636d9f2952cbd5db97f60ae68c30fdf81fdbdab05c4726a41dae036541de694ec1ca688acdb20eaa48e514865da26c9a9569e30a0
 DIST regex-2017.04.05.tar.gz 601638 BLAKE2B a7c094887b602f24e68c51c92098604c462d506b13f064beaebdec081fd28d39dac9934fface0de0444dc6145af5f4c0e8ab2cd3b65ecfc2c1ca522682b3bf95 SHA512 4c3e440e11f57e2323892e10fbed7f2c89b35771fdc970164ba69bb154dde535f6edb51a0997c924eb776c61e5efd1d04001abd343110518a89b5b7bf148ae49
 EBUILD regex-2016.01.10.ebuild 1154 BLAKE2B 4f4270fd08b90a31de9186fcb448f822db9ff5635f88b514e3368bce6e4f81c06254137e30ea512c9db6eec580fe26bc4a9b18dd79b9853d845d84a52798c107 SHA512 aebd29d84c8a237ef3d544ef777be950232aedcb9b9a6c48482eb03cb4c991e56dc911f75c1da1849cc42239eea06f2e968573aaf03f405f60a50daea11e0d39
-EBUILD regex-2017.04.05.ebuild 1200 BLAKE2B 3a845714b0e18aeeba8b4b89c17d50c43dc5baa9ca17bbf9f671544a9534f2fddc8c21b2fc27a6bd7b324ca0787b7c11794524003ada965b0983c691d70b0fac SHA512 5f0195cd92838305d8c75de035b6ecd04b712639259fe2fea78355ef8be5a81a8fb69de1e322380cb69ef3b50abf3c19878e2d273bb8720ba89cebf31bce812a
+EBUILD regex-2017.04.05.ebuild 1199 BLAKE2B 34f1aedc06f02a308c437211c49e1010c5cab04fa8cae7229ce8e7b27c0c19d878627d1e8bd1128b4e83770a72468a8493613fff433c71eb1421dc5d4936dbf8 SHA512 d83a3fc94f7c30ae63b754695709cf935b11ce1af90f33abdc73cd80cc06473e2e7d65a449ee740d899b32e8e9071a134d887e9d5fe55024b89f9a07bffa3a6f
 MISC metadata.xml 384 BLAKE2B 4928f66b54b5e4de6a8b913207ec6e46c124e55510eac304a7fd46c6ca63cce60704757e9289bf35d2d58e9ddcd4aa98d751a079c79f09dda9206553096e0561 SHA512 3db0a8abe7036cd9d0fd8b1450598436dbb30581806380ad51c3d0f49d129325aba1bad9700d14adffc7cfd199c4ec3377e6eb0225244bfc82368bbb50548e07
diff --git a/dev-python/regex/regex-2017.04.05.ebuild b/dev-python/regex/regex-2017.04.05.ebuild
index 442e2e6e0aba..1df9a69b052b 100644
--- a/dev-python/regex/regex-2017.04.05.ebuild
+++ b/dev-python/regex/regex-2017.04.05.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
 IUSE="doc"
 
 DOCS=( README docs/UnicodeProperties.txt )
diff --git a/dev-python/rfc3987/Manifest b/dev-python/rfc3987/Manifest
index 917897f8345c..078d2260d860 100644
--- a/dev-python/rfc3987/Manifest
+++ b/dev-python/rfc3987/Manifest
@@ -1,3 +1,3 @@
-DIST rfc3987-1.3.7.tar.gz 20701 SHA256 91a7826b0a26c246a5a91bef09c2c0809c713a689be689b9571e78a13f6557a4 SHA512 c5fa8eb36358f7f42d12adc305031bfff7bd77e83316ad4458ed07acc6094c7d9109b95848b9296dcbc6677ce34aa59b1be8fd57dfcdc6be47eb92aeda51c518 WHIRLPOOL 5c4051d3192edb8124e0350c9cd489f74ec88929f1447c533a5ba6f3105fa937b9b789776a43e762ae4373a83cf92a114bd7f54d970bda2fe72b3ed61c724c1a
-EBUILD rfc3987-1.3.7.ebuild 784 BLAKE2B 00a031f336604e4a19942885db97e21048082ec7e03807999dbd486fb5dd5809e9d3339439b0e1c5882c2816849c856e1b23d35e4545c0aee7c3a62c890e44bf SHA512 b3f6fad4e446f6c4bb1be2ff85ce992d6b9c352101edcceaca6a74482bd125c5e9bfbe0288df7dcd51c407302ed0ecac79002569a49117f42b674f92e42df96c
+DIST rfc3987-1.3.7.tar.gz 20701 BLAKE2B 234f3dc60d83e5615ae9fbbc14d063f9a993a532f5e7042144a8f5e995d44a27d88c284f7e12ff1f3f92d2440333438b3e1a0804ab43ca229305ce20ec4cb4f2 SHA512 c5fa8eb36358f7f42d12adc305031bfff7bd77e83316ad4458ed07acc6094c7d9109b95848b9296dcbc6677ce34aa59b1be8fd57dfcdc6be47eb92aeda51c518
+EBUILD rfc3987-1.3.7.ebuild 783 BLAKE2B f39116ebd0e221510531c2b9f2410105e08f2b6ad6fa3e3e9f5ba62e5422af66306e8220ca34b16dfd08e748b9fe7131e40ba8cfb66101a5572a5938ce164ee5 SHA512 b7570d2a6a6bf2ed427a48cb212398b5516e2fe809f766b57fe27de31f788941f2789ab41f334015bb8df078bc1282d987691738af40f1a749971cb84e162cf3
 MISC metadata.xml 571 BLAKE2B c366d3c4f3cb52d43bf469e77610cb6cfdd57b82ef0f46e8f1dbc739637bae6805edf5086deb4779738be7d29c4c73f7d658050112e9f5be62debc22a735f61c SHA512 2ced33f8245fc320ca1795072d9e63b5cc910b90f368306112316dcb444ee24f292e39ff76dfb027edcaf2c7a6dbfa636414ab8f9cfe777b0a2aeed17143e8c0
diff --git a/dev-python/rfc3987/rfc3987-1.3.7.ebuild b/dev-python/rfc3987/rfc3987-1.3.7.ebuild
index 6697e1a9c082..c290f019fa75 100644
--- a/dev-python/rfc3987/rfc3987-1.3.7.ebuild
+++ b/dev-python/rfc3987/rfc3987-1.3.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="$(python_gen_cond_dep \
diff --git a/dev-python/rst-linker/Manifest b/dev-python/rst-linker/Manifest
index 8daaf81b28e0..9d4b7a9ed657 100644
--- a/dev-python/rst-linker/Manifest
+++ b/dev-python/rst-linker/Manifest
@@ -1,6 +1,6 @@
 DIST rst.linker-1.7.tar.gz 6798 SHA256 59038b0dce170f7d6459132a1b7358b01f71f372afbf5b1c07d0862ba4a5042e SHA512 380cd1b36a1153a6512144b7c83be75dfa95ce397437d34cb76c4c41de6266c77cf1f811f4fb0576838e10bd78e1f46394df11b0f7dc5e3fafeef36b6e8c9ba0 WHIRLPOOL 7d323528ed0c7bba5db1159eb18063a4b191d81d400c1e8d02d0dcff3265183ca4ca0d56de5c674883dc1d02ea77eb7ec83c1b08d4622f4d820f5a1702a5833b
 DIST rst.linker-1.9.tar.gz 7618 SHA256 4de05e547d14ac16599d6379a73d394b8eba03afb1f16b6bdb400013957d9999 SHA512 b3e39b025f75bb6ff670f23ee7abd48dcc4e19343626c1ffadd2304a7e3285fe0b7369ace96e47094606e864672c8aeea967a02217b110762e53498dde64b8a7 WHIRLPOOL 15cef12c451a8bffec7303f2909e173993819bdb3d214c07f2b606464fa0ff6d222b33bff3df44a2a1652f2b144f85a11e8dbb4b9a82257bca6123f1944eb828
 EBUILD rst-linker-1.7.ebuild 1200 BLAKE2B ca7f649fd76bb08cc7122d237cae9f977f415ecc03028bbf200fe40d37082b30c65a8a98581ed97f525ac8df39949779c67e7f62f1f027925021832b146ced7f SHA512 e0946205ec855c47207e25223cd60b8b41545a22cc57ff1db55c2a06d3bcc68e4435ce142836dd4c270761cf3e829a108b81e7d2d454312b40934d68d150fed4
-EBUILD rst-linker-1.9-r1.ebuild 1382 BLAKE2B 8a45239fd2bf60c595ebf2e8da35a5e1c3fb86ab397dda00c162b91be1c6ef142ac4ad26d006c1b882cde9de45d72233c70d70530ba6c107ce0ed9ed71e301de SHA512 cf23915be6e38d956674e8980ba825a6fcbd830b35f9fc9fb8ff0735d725664a40340fe97b22a5efa0a65710172e8331fe3273a4a53a3268ab8f953ea33b42e2
+EBUILD rst-linker-1.9-r1.ebuild 1388 BLAKE2B 0c9ccabab1af70d6ebd7c7dd144fec983feda9e4cf3f4182966992bf6b6ab932e07ebf3ef90082509a16420ad6465aaf121f452b1d2eeb5f55edec27364aa005 SHA512 4b765dfc83d495930105374534c3f9b317d85bf42695472db7c6c32072c7b7a38020086a17f398bdcdcff0257dec42abe6608e4725331cd3d9d4223662b16d63
 EBUILD rst-linker-1.9.ebuild 1212 BLAKE2B 228c9a5950824db8f05e068316043538d1558b85dd01e96b6c1ae9b1d6db073d71b53cc0bf9a162a97919f4db5498e212ad05873a74fb345e0bf2c50e734f512 SHA512 ae2b09ff33aa50441528eeed10bb62a2a6d69a746fcd73462e133ea2b7a2bf0944880066511bf3167cf3ec416c8df9333222ffa25265bc81871edceb161612e6
 MISC metadata.xml 564 BLAKE2B 1d04c02d9c845bf6b6d1a69d1ee34dd4835b3f8ae8662b8fec9ba17d33f10a307293b78da6223e0385c35ce9d716c5f0545bbeeda89cc3d0925b454b1c0c7943 SHA512 c3fbcb945acb81c57e91ea8b26c797b71e959c2f3d9f0eb7db696e4ae26b9004bb3b6f554740169b9a2c96cde3fbe8b30721b285b82e07ed193a2117e0436f36
diff --git a/dev-python/rst-linker/rst-linker-1.9-r1.ebuild b/dev-python/rst-linker/rst-linker-1.9-r1.ebuild
index 609035b9825a..138f18e9a53d 100644
--- a/dev-python/rst-linker/rst-linker-1.9-r1.ebuild
+++ b/dev-python/rst-linker/rst-linker-1.9-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/setuptools-git/Manifest b/dev-python/setuptools-git/Manifest
index 77e00666bfce..db75bc084a5c 100644
--- a/dev-python/setuptools-git/Manifest
+++ b/dev-python/setuptools-git/Manifest
@@ -1,5 +1,5 @@
 DIST setuptools-git-1.1.tar.gz 9450 SHA256 047d7595546635edebef226bc566579d422ccc48a8a91c7d32d8bd174f68f831 SHA512 39e19c107f6398aaa1b78961c3b0d9d7b57b181d8ce0d93780460867fb7535ce45d266b93af43f45aa7afb89299199df22b0fdea61e9090932aeb4bd69c5f1f0 WHIRLPOOL 76a1ff0944c233655c6966fb8e0787d89b8ceb40a09fedb729d67d15905dd82dead4ed88a682db1b4a9ff664f354963b110339f4d96706e19451058dbe870483
 DIST setuptools-git-1.2.tar.gz 10546 SHA256 ff64136da01aabba76ae88b050e7197918d8b2139ccbf6144e14d472b9c40445 SHA512 c070911618b6b92c862fb0bd40f1daeaf79e2ba10389fa1e69e4c50cfdd39c8e57a612082cbc7d932f8cea12a769e13451e35e1c8fe34f170d4817fd0d44f156 WHIRLPOOL 7015b734c7d5acf3623ddb04351ff268608eb1ac3da051e80fec94cff920c2cb43240055dbb9a71118d9b2da91c97e43025e0fbe3b1bf36507e83d90dc891aec
 EBUILD setuptools-git-1.1-r1.ebuild 631 BLAKE2B 3a9bcb27ca70dd491d8d90d9d4704c2a2b03775d3b15a55b11c440612ec1c9da42c4f7f797d78aa608be9be977feb8aac32fc2e35dd936e270a0384591729d38 SHA512 00a140936e3adf214b3ddb0d67eb6bc84588d7b245711c43cb1ca47c9db05aa19e605e98b9e4317300e899f00c211e21e0841a5199bcd8d5bfb0a5d715fb0eb0
-EBUILD setuptools-git-1.2.ebuild 660 BLAKE2B 753105dff8580295cb125aeaf5991e71efa15361c11d89101dd3727067b536167b2768e359c8eaa0bbbd0bc1330d26136d3fa5a2ccc8901d004ef0cdbb511991 SHA512 d1eef71ea15b535ba724c01b9a74ab2076404bc62f4090e11eb11030a78a9b6686322f8fd8058b1848ed210a511a654f42c618bb38eec85b9149c1ebf8d1fbe3
+EBUILD setuptools-git-1.2.ebuild 666 BLAKE2B f0f2b439b0cf6d99e4fb6f62641bda1173caa4b72746b149ed5feddf513bbc72df8919e1d1474ae64df240241e82bb1556f63a8414ff2ace129d67a6bc77840e SHA512 5584099ac09a6bcc3e0890c979d89b1181fd105203b1f4bbdb2b433964da062246c3f4f5833def5488598196e7c696fdd38987b5ca692b85d8a213379ddca13d
 MISC metadata.xml 617 BLAKE2B 6a8553d2d3deaa7eedae6706e516b6cab014df33acf8a4589084ce2ddc8b3bdc619253ccc176cfa28a7092efe9044ab171b585fc87d933ec5e833303ad2b6dc1 SHA512 057677807a316be80d26eb8aa9b07a87a60251a6185c85ac1042db7040849ef4e9554be1d9ac15d1b8ff212df2f39446f3c56208fe83d12581fb0ba283d1ebff
diff --git a/dev-python/setuptools-git/setuptools-git-1.2.ebuild b/dev-python/setuptools-git/setuptools-git-1.2.ebuild
index 62308224c09d..7d8887f0b080 100644
--- a/dev-python/setuptools-git/setuptools-git-1.2.ebuild
+++ b/dev-python/setuptools-git/setuptools-git-1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~mips ~ppc ~ppc64 ~x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		 dev-vcs/git"
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 71f8fa7ac338..6baf3786c42f 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -13,6 +13,6 @@ EBUILD setuptools-35.0.2.ebuild 2035 BLAKE2B 33e913654fc4d814a01c118c115163db856
 EBUILD setuptools-36.0.1.ebuild 1902 BLAKE2B 35f16b636fe826c5dc788549b3e24922ad2009fc11ba060e2a99250bffb383091447e7096dcef8c7dc35fe092f7f5d3ed428e1562bea5bf5ce30e5a22920e5c1 SHA512 b205802dbfe7a2c0962b3399b4cae6fce1437f3922f2f138c5055497e514dd49a52d1513dad9d2323eb2360c4d59f37607f24dfe17176cd1c6f136875198827b
 EBUILD setuptools-36.5.0.ebuild 1791 BLAKE2B 1af27895f3764195595f2674ec4cdcbb697dabbef7be50d4c64ce86a58eb3d714c023ff3301aa2c4c45098d1ae3ff89fbe05e5cfea68ef3ef54a6249bac67d0e SHA512 3b85d8349146d3f82e0c589934784c96b6f24cf3a1f4ad09eb05cb07ad18ae250dd2daf01816fbbbe2e7c285534a58690e8f5f359baa1c0ea9557acec142fe03
 EBUILD setuptools-36.6.0.ebuild 1828 BLAKE2B 24067d8da779d29d821819cb7b620f69150ab580e4438232a94f8b335c07ee5fb383b3b52db8a7fa53086af9813157204f816b3d4e8e322c9b210d0aa6df385a SHA512 fe855fbf0f1012ae83b82c138d1fb8f2822d09285b0dcfe5a31e430922878da217549943e868c0a96493f83d4b26d9e47312de7639edb329eacaf9e13d9d532c
-EBUILD setuptools-36.7.2.ebuild 1830 BLAKE2B b10c4f7154c2689a3d88f665efb72bd7e6aa398c82369bcccc00fa70996aee9980bfab580c99258896357e65a5c67514ed4c2a72892bb131e78ce067a482a78c SHA512 e9a7271c020e25d310865256e9f6bf632a13bfc8d84fd4869cc4b5d289f93426e182163842a6db7bffbb5fe83038c5634d784cfa44dbee8e957155c913d73c0b
+EBUILD setuptools-36.7.2.ebuild 1836 BLAKE2B b388313057f0ac00da53fbcd7943d804a8cb3024d4c4c562b641c5a01d8bd4b761c71f3da5f73fac4a97c86965d13cabad5d7eb9631ede6e84ac9371ce77b181 SHA512 154ab77a8c77fe7b39b15454e2cdf3fb44451300a0f988ed2879f778ce7bbc863b6f6fcfef73c876a0a120efa4715a0c4845da3b62287e3735741165ec088db2
 EBUILD setuptools-9999.ebuild 1828 BLAKE2B 24067d8da779d29d821819cb7b620f69150ab580e4438232a94f8b335c07ee5fb383b3b52db8a7fa53086af9813157204f816b3d4e8e322c9b210d0aa6df385a SHA512 fe855fbf0f1012ae83b82c138d1fb8f2822d09285b0dcfe5a31e430922878da217549943e868c0a96493f83d4b26d9e47312de7639edb329eacaf9e13d9d532c
 MISC metadata.xml 380 BLAKE2B e6c532ce30c0def7dde2f2ca91e1663f290954f1f099fc837247540c31979a215be5550bc42d4d841f62d3a81554ae5377c148ec34dc2e92bbca3daaa1021fb1 SHA512 70bfa11a90dc1bae499e235e01c05ff1b0ed2960062fcef46ed07095b59309c4a0c3adcd47f7b0131ff1035c8e77c5bdf75975ac1eaccaa1a9fbd06a3f868f94
diff --git a/dev-python/setuptools/setuptools-36.7.2.ebuild b/dev-python/setuptools/setuptools-36.7.2.ebuild
index 4665a12e802c..1640ad8aa965 100644
--- a/dev-python/setuptools/setuptools-36.7.2.ebuild
+++ b/dev-python/setuptools/setuptools-36.7.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~ia64 ~mips ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 2b937697e882..69150cafca54 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/multi_xml/Manifest b/dev-ruby/multi_xml/Manifest
index 02b6622f2b80..9602349cb06a 100644
--- a/dev-ruby/multi_xml/Manifest
+++ b/dev-ruby/multi_xml/Manifest
@@ -1,7 +1,7 @@
-DIST multi_xml-0.5.4.gem 20992 SHA256 6365ba9aced7eb993b6237a5a6d8c854be5cd84ad2ea1aad4de63ee0bf3bfd53 SHA512 d78ae3c401741c4d396bed6074efd24e8712cd70d9b9ef7008abb3ff662edc2292be42dfbd101be384aaf2ce207271004eb7b7cadccba746b9afe385a9fbdb7a WHIRLPOOL 5aaefe9e3db22e0fa4b0922d35acc19370bb9866701d1761c6ed45142548d6ad67585a9323ef382019a0be239b11fb474c0461af2153cdfcc6c678a8f704b0e2
-DIST multi_xml-0.5.5.gem 20992 SHA256 08936dc294586ee1d178217cce577febe26315d7880e01e4f8e97cf2753b1945 SHA512 692f55908ec5e9ee27bec858325ff9a0b15037a6563d5a21bd742ec3c959f3dbc04f1a232782f20827c9af49f3dd14fd725a0c19dbacb3708067c19dedf427ba WHIRLPOOL e21f6239983c9f88d32f5f90266e18d1d533bc4c5735bf0d8ea5f1fb32ec2b2f2814305bf86809ae6f2098560e5ed8fa774a879ee9c337b6663933b1100f924d
-DIST multi_xml-0.6.0.tar.gz 16571 SHA256 cc80d979f0540e1b585cb42c416b05c4b597269da409c5e9cd7cc00f8ca8f3e5 SHA512 67e280d838ba07373a6ad5cbe4658b32655102906d8e0ed5429d21220475c21e07ea2ec0d2729df4d30a1bf7d0a5e6ff2d4482342098873135cb12e18c53194a WHIRLPOOL 9e60d01a46999514c91a9326af8b6193387a6e8bb24ffe54f47901005931561a5171967afdeab2fa2791f9a4f32489e438f062f425bf7b8fc21ed4f06c6593f1
+DIST multi_xml-0.5.4.gem 20992 BLAKE2B 2ed4fd154a44ff7717e702c03d29ab06cd688d6950861bd02b6f57a1b78daae94ab6b3c6d30f15cfa9f6516758a29df5d35d1b31427188378203e7c0ea8e0b76 SHA512 d78ae3c401741c4d396bed6074efd24e8712cd70d9b9ef7008abb3ff662edc2292be42dfbd101be384aaf2ce207271004eb7b7cadccba746b9afe385a9fbdb7a
+DIST multi_xml-0.5.5.gem 20992 BLAKE2B 8dbd35ca1cf2209850e2c694c435e7bddfc204a15663091d005c6f45faf85c91e8331b2b1fc37ead4f28732a5f73d878c50f13ec7d4681c3ac598a230d4f34b2 SHA512 692f55908ec5e9ee27bec858325ff9a0b15037a6563d5a21bd742ec3c959f3dbc04f1a232782f20827c9af49f3dd14fd725a0c19dbacb3708067c19dedf427ba
+DIST multi_xml-0.6.0.tar.gz 16571 BLAKE2B 1492eab7782823915167ebdb529b6d4699b31f3b66c48eee5acf7857dc25caae62b63a0da10a0bd862ade22865432bc6c4290a3f6ff8e99a889fcf09b56f6b7f SHA512 67e280d838ba07373a6ad5cbe4658b32655102906d8e0ed5429d21220475c21e07ea2ec0d2729df4d30a1bf7d0a5e6ff2d4482342098873135cb12e18c53194a
 EBUILD multi_xml-0.5.4-r2.ebuild 702 BLAKE2B 75d7cc40c71f5a779bfbd7ab7c97237d051be17cdc3a0b76c6f6b504a3743670f0a24ddaecafc7854f5b89d90347b0a4408ee43a9fd282dbe01dbb6e3998502a SHA512 6780f4a6962474000b3e05f9bc69e6031f060f89bb97789dc53216cc1f13ebfe7d02d861e8644585d1126e673a6282d12724fce45bdb7dc927813ca68829d356
-EBUILD multi_xml-0.5.5.ebuild 746 BLAKE2B 9c8186443752a5c5de2ba10523d8608ba1fe57d8a1289f317caf5b119e090e099580211ec1c46dd7d7f618341e573b2a17eabb1a1f8ef1469cb4bb45421e8972 SHA512 8510f268729757ad9c957d136d0881a5474014d714c5136942d21f2d0fa651a815242a2b80891c4c7af17d51af1b23f7b3f3a8a510453fddc52b72faf79cf41d
+EBUILD multi_xml-0.5.5.ebuild 745 BLAKE2B f55d89d13c5b497f3b6e62bd89b2eb62afac93cb19331dac7eeacd434a6103738b2d859b8c73e8541b41b9cc52b1ef25c4d710f42e9265529ce2544b48654ffc SHA512 5631174dfc19f5e492752bdc8dd63ab5ed8e624a49074072c2ef07a4aa7a49f3b59f9768013a129c17fb7636c270e948fb4f4a82f627ff5955ee00f30cd6f31d
 EBUILD multi_xml-0.6.0.ebuild 887 BLAKE2B 6f1d208c684cb16d2e5a973a85c33e22702cead0d56cd0d05b730bc652213e0d859eb1d98d1098d024bc6eb53800152553ea9a93cd3d9b26cac517e624b714a9 SHA512 73fa7f1d63a050b60de4ea41178147a68dd7c802437de2f1ec304fed45f3f3ad7b9767300fb739db994233375bd19f2538f8d42d4bc4b132cb003c7b394ca1c9
 MISC metadata.xml 332 BLAKE2B fc83aa0e31b636d7abd190715ebdb0e7b205444f571344bbddd7d9b130d7ea566c38ce12caf4429b54db3415181f229ba5e012408596b6dff701f34e7e5b3a6f SHA512 53ff80596848fb984f23e66f1eae8bbe9e844de4760fbea929405d6515a250a710dc9a05f61cc7bf84afb069b2bc52a7304a1c15fa1a109bc7d6494fb5e1ef93
diff --git a/dev-ruby/multi_xml/multi_xml-0.5.5.ebuild b/dev-ruby/multi_xml/multi_xml-0.5.5.ebuild
index 80b187bc3bc1..306f842813c4 100644
--- a/dev-ruby/multi_xml/multi_xml-0.5.5.ebuild
+++ b/dev-ruby/multi_xml/multi_xml-0.5.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ DESCRIPTION="A generic swappable back-end for XML parsing"
 HOMEPAGE="http://rdoc.info/gems/multi_xml"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/ox/Manifest b/dev-ruby/ox/Manifest
index 502bb3726433..fd363b17421b 100644
--- a/dev-ruby/ox/Manifest
+++ b/dev-ruby/ox/Manifest
@@ -1,12 +1,8 @@
-DIST ox-2.5.0.tar.gz 191422 BLAKE2B 6dabb9914a2717cb11496bcb75a369796094eb57b334aefc85964256d48305fdac3a9a2c3145f58acb76e2f19730ea17f19411d4b175c08a620b47ebeb8ce80b SHA512 470c3b281e44423ab4197989f5b6fdb85e979a13dbcb9add192b4b36de1e768add4768f8cb4bee798aac424b9fe453e925f24af5a13c4cde4157e7fcebd0a3a2
 DIST ox-2.6.0.tar.gz 191979 BLAKE2B 744d00262e3f33ea6b11c2b38417ca26dfd61c115847b115c0999d9d9edae3befc5a088f54ce53bf6324505c9444d4b2c72479167691b962a0ab749b4c032ea2 SHA512 8765fc3bfd10e52a05d59dab9e9ec973f933976c3511a91d6c84f120e2cac6abccc8ccb7ea9d301882198049b37823a392520464197a791cddf79ba9ce252f37
-DIST ox-2.7.0.tar.gz 193355 BLAKE2B 1d6844b74c782e424fb6340b427c47e785665f3fce44a17183120ead885de706f4601d11daf7a1dd87d50fded2bcc2b691fbbad2bd3f48b9971f2e1a2d9bf90f SHA512 3c77fe8fee38a35ffb6317873d90f618f39215ce652dc48b6671a85960fbc1705f3d26c9100bd4e891620afe46f19e714acde79faecbe4393e429879017e8f24
 DIST ox-2.8.0.tar.gz 193494 BLAKE2B aa1e3aad052b19a9aa5a38002fd4e1972a291bf8c13f9120809a38d193e529e9415e64595a96dfafb8e10351ba37336796ca0440b0a4949ea7c20723b1d6b4b4 SHA512 e1f2e37f3c3c8e6bb550c656b483012f3eb829dc6c60f9caf252a0d12a5f211a4b11e3de4f2443553570fa4b545dca565f27119520db3113ecf5707a712ce900
 DIST ox-2.8.1.tar.gz 193614 BLAKE2B 0bab46e17ad8e254dd3cd47e39d44b4a3801ab9824bda90ed7f19724088a3bcf1f795ad82c6107851869d4c96cedacf911636ed623e04acd48db605962bd1843 SHA512 0dd314027739bf3da5cb8e6b66d1bfe6e254809d718e17d17df8cbcb7e8ed5d98e541df7c6be13c72e690a5ecbbac0c9a88a1fceec71fcf251dcf991dd0040c0
 DIST ox-2.8.2.tar.gz 193670 BLAKE2B 70e38754594a40ed35aa43aad32806d5c9eec7d3f60ee18a846a99f28b558173ea99b554f7f3a4f2b848686536d194035fd345ab33b9d7b5e12a246a472463d4 SHA512 18a887db70962a1dd1c6ea18461eca0efbcffdb231f934c3603e63537e9911e820465ce5e4ab86cbedd65b396a9a12b0ad7e60ea7ae687c4ebe8436e0c37988c
-EBUILD ox-2.5.0.ebuild 707 BLAKE2B c83d2e860f6c3ce4ed0ef9191c9228ee9aee52d115f619613ce29fec683565223f31ff817c39f5e1563f70312a0cc9f6301c452134e6179d8b3695db5ddd8ea7 SHA512 930302b49c292089e7356f0d92a36d212f8c24429f82e97ad501b12cb9367c9cd57648fa1db11a1aa92ca724f6ae32ee5cac2d8f6a2715fff2a751482e5344ad
-EBUILD ox-2.6.0.ebuild 707 BLAKE2B c83d2e860f6c3ce4ed0ef9191c9228ee9aee52d115f619613ce29fec683565223f31ff817c39f5e1563f70312a0cc9f6301c452134e6179d8b3695db5ddd8ea7 SHA512 930302b49c292089e7356f0d92a36d212f8c24429f82e97ad501b12cb9367c9cd57648fa1db11a1aa92ca724f6ae32ee5cac2d8f6a2715fff2a751482e5344ad
-EBUILD ox-2.7.0.ebuild 693 BLAKE2B cc2689654c95d67507df770194d6f32c873319bd5c5b605dac38f8d6e8cfce62ffe4584b3e63c4e521342e62a112b7759f4fb1e50175398f0447a5e3f6ffeb76 SHA512 09cd7a31693d2fbfd937c4d21db00e701104545dc9f5f635d28c62aa907fe701ab36f96f963fcf838b8389b97389a11e49d5b1676fb3032e733256861c56850f
+EBUILD ox-2.6.0.ebuild 706 BLAKE2B 6e0c9d7838d5abd253f0d88a78757e62db1444ffaeb1181b5aa5dc822d6d40adc9722ef0a9c7d1ae45f692e92ba2c9fa8116270e54873a8f0261d1ba7082d662 SHA512 f6c0b22612c2b119afe4153d7611896fff59a2f5105c2f5ca96962eea8aa7c333ee54cda34ea4521306e7e8cb49afa5555771e004f034a66cb82f61677f99117
 EBUILD ox-2.8.0.ebuild 699 BLAKE2B 0bb8616bf9d6c00d027e535d9f8bb79adcb2e170eb70ef396bbbc56124f655368db0f8418a6f76cdffe0db96cc50ae00f72c3b39d1fa2eca3a8781c00b15054a SHA512 834248508f9937d618d9fec8b8a81c93eeacfc2eaa64a93fd1c169650e0c77b84e15bbe3279b49764df3c74fc77248e9305831e9605ed2cc4220f62bb7a3beba
 EBUILD ox-2.8.1.ebuild 699 BLAKE2B 0bb8616bf9d6c00d027e535d9f8bb79adcb2e170eb70ef396bbbc56124f655368db0f8418a6f76cdffe0db96cc50ae00f72c3b39d1fa2eca3a8781c00b15054a SHA512 834248508f9937d618d9fec8b8a81c93eeacfc2eaa64a93fd1c169650e0c77b84e15bbe3279b49764df3c74fc77248e9305831e9605ed2cc4220f62bb7a3beba
 EBUILD ox-2.8.2.ebuild 699 BLAKE2B 0bb8616bf9d6c00d027e535d9f8bb79adcb2e170eb70ef396bbbc56124f655368db0f8418a6f76cdffe0db96cc50ae00f72c3b39d1fa2eca3a8781c00b15054a SHA512 834248508f9937d618d9fec8b8a81c93eeacfc2eaa64a93fd1c169650e0c77b84e15bbe3279b49764df3c74fc77248e9305831e9605ed2cc4220f62bb7a3beba
diff --git a/dev-ruby/ox/ox-2.5.0.ebuild b/dev-ruby/ox/ox-2.5.0.ebuild
deleted file mode 100644
index 4149119fa08a..000000000000
--- a/dev-ruby/ox/ox-2.5.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fast XML parser and Object marshaller"
-HOMEPAGE="http://www.ohler.com/ox/ https://github.com/ohler55/ox"
-SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-IUSE=""
-
-each_ruby_configure() {
-	${RUBY} -Cext/ox extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/ox
-	cp ext/ox/ox$(get_modname) lib/ox/ || die
-}
-
-each_ruby_test() {
-	${RUBY} test/tests.rb || die
-}
diff --git a/dev-ruby/ox/ox-2.6.0.ebuild b/dev-ruby/ox/ox-2.6.0.ebuild
index 4149119fa08a..3bbef8256d75 100644
--- a/dev-ruby/ox/ox-2.6.0.ebuild
+++ b/dev-ruby/ox/ox-2.6.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.ohler.com/ox/ https://github.com/ohler55/ox"
 SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/ox/ox-2.7.0.ebuild b/dev-ruby/ox/ox-2.7.0.ebuild
deleted file mode 100644
index 060f1807bc96..000000000000
--- a/dev-ruby/ox/ox-2.7.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fast XML parser and Object marshaller"
-HOMEPAGE="http://www.ohler.com/ox/ https://github.com/ohler55/ox"
-SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-IUSE=""
-
-each_ruby_configure() {
-	${RUBY} -Cext/ox extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/ox
-	cp ext/ox/ox$(get_modname) lib/ox/ || die
-}
-
-each_ruby_test() {
-	${RUBY} test/tests.rb || die
-}
diff --git a/dev-ruby/rb-inotify/Manifest b/dev-ruby/rb-inotify/Manifest
index b04929aaba6a..93ee0f69d540 100644
--- a/dev-ruby/rb-inotify/Manifest
+++ b/dev-ruby/rb-inotify/Manifest
@@ -1,9 +1,5 @@
-DIST rb-inotify-0.9.10.gem 14848 SHA256 e140f7ad14cd91e001c7e0bfa32458dd29995e70932765fcf477de630b7fda79 SHA512 ee1aecfebea11655450776013d8d2fa3fb2af784285db3c32b5a452241f9cd48a8f9a10cb2f1ff96b191c0dcd43ec4f78e8a363447abf97a8cd4ccb778de4889 WHIRLPOOL a75055105f5ee7f346ebe532bb9c472bcb8cd9815397d81902865e5cbd53e0baf06874fa02226ef200d7227f1329dfc50c0462abc63d3b0ffaea7f8210750f9e
-DIST rb-inotify-0.9.5.gem 14336 SHA256 69559fc3d790c275b90f55f8c76cde94a999e3400f5a51f2e0d463a0a2e8ad4d SHA512 1ecc0142ed44358a2f51403736533e9854b5fc13cb81b552eb866310b60535b14e2ac6bfb6ee53bc1ee65ac14e51fc5a981e52f843607dbb3d8390c1d6c13e60 WHIRLPOOL 19d7d1f7ca8e65a297de94fae3311c1bc8d9942aa47dc2c92202ce0adb8f04d62ac94f0c51c76a6bd263e773df2481b2337b6576f818cff7bf4fd2ccaa30fd27
-DIST rb-inotify-0.9.8.gem 14336 SHA256 e9492784d99c75aa818b523d49f97a1bd8c568cac0bdfe2600d596568723012f SHA512 9fecf48c7ca20bd8edcf616980bcebe5bd124a0c0a59a2166790cc57c4e43e1bd4b499c58ebc2a573f2c2e140c8aeabc08c8cf6ef2a9a594b207e78ee63d80c5 WHIRLPOOL 4e416aa3a4327b4d8c2dc870dd17de9e71d673b36c3e4fdd8fc14f79ae3f5d894d7abdb769ebba27defdc3bf00c7f95aa949cffb2cac76443360a802f4b8b180
-DIST rb-inotify-0.9.9.gem 15360 SHA256 1ef0ceafb745c2c050a7e5a89b78e1f23b23dc26a0a20eba7ca963ca01726ec5 SHA512 0b635508682dd32c623416e620666df848443e53d17c98180d0e7b6d3752cca94f59f193413711f1e5a6093fac18f5adccb030e37d9c0e3cb87162914dfd783c WHIRLPOOL 545d9ba8a4e82fbd00bb13d976e25f092d403e9f6ca5968e9000219fec54bf46398fb877f35b79b60c5b7b10b684e32a4a762eb6d85062f1dc11eb370a66256c
+DIST rb-inotify-0.9.10.gem 14848 BLAKE2B 35eb00dfe1e7e76fddda080499275c053e82431af520170362354984cb2af3c90e3ba803ef82fe50f1451d3fdb0ddb7ef9c1dc648836403a6865396987d6d9c2 SHA512 ee1aecfebea11655450776013d8d2fa3fb2af784285db3c32b5a452241f9cd48a8f9a10cb2f1ff96b191c0dcd43ec4f78e8a363447abf97a8cd4ccb778de4889
+DIST rb-inotify-0.9.5.gem 14336 BLAKE2B ad43d1da83addc34128b324c2b190e30889ca3ae7cb04181c9cd67b716e1192e9b5e5fe648212e98f670cd953b700c3b5f704c989ac4ff38e6ceeb95f2521d51 SHA512 1ecc0142ed44358a2f51403736533e9854b5fc13cb81b552eb866310b60535b14e2ac6bfb6ee53bc1ee65ac14e51fc5a981e52f843607dbb3d8390c1d6c13e60
 EBUILD rb-inotify-0.9.10.ebuild 966 BLAKE2B 838df8230ec9434bd3de939fa16201bcfc77e3f0383db2aafd1600355b53b8568aee6a3ad4bb3a6c92cc320ac544147fc7ce5c54f4fc4f19588d8a8877bd7141 SHA512 8051a98533f9b8a7409b254560b4b9e0e1c5107cb7d0accb03e0349282328fb354dee432ec198a6ee3465cee6eb99c646313d399227f72bd8ce4b61a043f6215
 EBUILD rb-inotify-0.9.5-r1.ebuild 959 BLAKE2B 7e55fe401ea8d9e73921a1b0505584a23e31e389eba47d378ccc19ee848a13290e6d4e52b4dc096f4b48ffc2fbf5e16e42c7c867b9655304873fddaa7e5b4e81 SHA512 411c85891d605fe40032af3cdefcdb18f223bcad0b609ae0bc450351b2620bf34b2e5db2f05ad102c656122fb7a9aa9039bd9e044a1faef0426fc0f59453e68f
-EBUILD rb-inotify-0.9.8.ebuild 973 BLAKE2B 652c29a4c15247633dc942d47d934bd645cf19a075cfcec07ba7e9a32c7336a8d1a5121a5f6f814cb533c3569c7ae2b63095b0aa67b5a194958f8538fc52525b SHA512 b6bf206f92770e67a3235e8d0deeb8e9707ef0ae33803973052bedd9b432e06636887a273754e7d95fb6c620243f573bb8cb5bd43ff59dca913a28cc62efed7e
-EBUILD rb-inotify-0.9.9.ebuild 959 BLAKE2B 7c3887364b5c05832ed5aa8cd507d57bc902bbb610c10af59400fd95857f91f430d046d1f4b3965fd04cd23490a2a37de20984a189dc0ef21f59e8a56bc8be13 SHA512 d8eda8d1ba4e1c37098794269762436fd46b1940a67a323be3f7c3d9e5a06154311868f9d71f4f22d30effdff5ae83afc9de44d6e2ca459f56271d8cb5dfa489
 MISC metadata.xml 341 BLAKE2B 9b7d043d113a1bfd0bb07588615f04762e5d4334763055dcf818969aa98c543c19b1e1005d3f8e0ad5d6c0dfed342b3ee8f2bfd9a49eb133b34f5cafd6f7f91d SHA512 0449efdf61caad416c9b68e1b5de20c46d29a8961f462dd7f1971e3723b8b0b3567507cc99cfeb2151e0c8c14caa28947dc23906281b20771251b3b47823b4a4
diff --git a/dev-ruby/rb-inotify/rb-inotify-0.9.8.ebuild b/dev-ruby/rb-inotify/rb-inotify-0.9.8.ebuild
deleted file mode 100644
index 8a55e3b8c000..000000000000
--- a/dev-ruby/rb-inotify/rb-inotify-0.9.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="VERSION"
-
-RUBY_FAKEGEM_GEMSPEC="rb-inotify.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A thorough inotify wrapper for Ruby using FFI"
-HOMEPAGE="https://github.com/nex3/rb-inotify"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "virtual/ruby-ffi"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on jeweler.
-	sed -i -e '/:build/ s:^:#:' -e '/module Jeweler/,/^end/ s:^:#:' -e '/class Jeweler/,/^end/ s:^:#:' Rakefile || die
-
-	# Remove mandatory markup processor from yard options, bug 436112.
-	sed -i -e '/maruku/d' .yardopts || die
-}
diff --git a/dev-ruby/rb-inotify/rb-inotify-0.9.9.ebuild b/dev-ruby/rb-inotify/rb-inotify-0.9.9.ebuild
deleted file mode 100644
index 407ac93665ea..000000000000
--- a/dev-ruby/rb-inotify/rb-inotify-0.9.9.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A thorough inotify wrapper for Ruby using FFI"
-HOMEPAGE="https://github.com/nex3/rb-inotify"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "virtual/ruby-ffi"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on jeweler.
-	sed -i -e '/:build/ s:^:#:' -e '/module Jeweler/,/^end/ s:^:#:' -e '/class Jeweler/,/^end/ s:^:#:' Rakefile || die
-
-	# Remove mandatory markup processor from yard options, bug 436112.
-	sed -i -e '/maruku/d' .yardopts || die
-
-	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/tins/Manifest b/dev-ruby/tins/Manifest
index 033f5927da5c..f06c7cc44cec 100644
--- a/dev-ruby/tins/Manifest
+++ b/dev-ruby/tins/Manifest
@@ -1,9 +1,11 @@
-DIST tins-1.14.0.gem 303616 SHA256 e0bb2d44c6ab89057f38ee0fd1434a66c2eb9a5e0d7ae5c44d916a5b645af0b1 SHA512 9bce95b5d6aa663902a8d9fe5badc029db97658d6bf4fe574ebef670e7041ee882ed8b110d906c0f8dbd506bfbeb2092634d607281260db3a40e310881d4154a WHIRLPOOL c3c400d1282f3e605de9ee110726b50db6dddd0a7e37e7dd9de6bf0eacfc40ba1c54e2667f6f7e24be41140327b27cdc4111647d8268cb8a2f219a857a8f90ea
-DIST tins-1.15.0.gem 304128 SHA256 fab8025041474faf4f182e5d608a811e4f136e957ce67fd0319ac5a34a8f9027 SHA512 c4b69357f4f89c75b8aea713c122bd83759678ab9aac8553f25fbe867dc7dc55c72e54673fe2a17e818c089a4517f62ac20e40597fe40945c742cc6f153460bb WHIRLPOOL 0af17656cb534524544f7fab901597e5c6e66f444ab304a17532099dc4e7c1cec44ac41f852eadf5f25938faa693038958de54a3e0080e8e0a9f54089b8d829a
-DIST tins-1.15.1.gem 304128 SHA256 f11e408b334701eebbfeacd86e37f68587fc18ba649c56fe976a107e5c34f24f SHA512 13182f31a23c80618fdf24fc8ecc8d165eca1c07489c55399224943bb393a1483bd82e5000baf67c8c9f8985e93154e73e3e1c3b53f9a02b0f1bfaac44eb275b WHIRLPOOL 73831c7c767d65010bceb7b629ca3efe13f507df9528d666606c503dd8e5236776a13f3399bf12aa12edb553a1ebe729c1c86838586f91dd7c4178eeaa1f30e3
-DIST tins-1.6.0.gem 299008 SHA256 1f82e41851f343147e8acda8b02a67e990e38d4755e1e7a8de7cd913fcce0a0b SHA512 33d576a0960d841f72a3f3c9017f873d0445fd569ded852d614b4a2b32e59ae784a47246b584bc4e0d16d5be4d63c1d7834b32c2bea2129a75dde9b1723ccd01 WHIRLPOOL 257e019636565081197c3d353396db2937043886696bb6be294b0930a6e1f7ada1a21fd863d1ac29b649bba3875d7d4b868ded70480a0dec0ba27a6764debac1
+DIST tins-1.14.0.gem 303616 BLAKE2B 3ead5751b4b9c79bdd366c37fd0d7366246a3f9ba65a87cd032526819e9a44ee5bcef83c97d7657b7de4d9d3918b1d71eac7fada2e98bb5451e3b1ed8c33dca1 SHA512 9bce95b5d6aa663902a8d9fe5badc029db97658d6bf4fe574ebef670e7041ee882ed8b110d906c0f8dbd506bfbeb2092634d607281260db3a40e310881d4154a
+DIST tins-1.15.0.gem 304128 BLAKE2B 8eb53ded77629ed8366eddf955fde750a95a720c8ed2882c3ad953b3dd4bccbb4aa5490036901464f0beaf1f6c8436451b3aa83a298beca058349a88515c746a SHA512 c4b69357f4f89c75b8aea713c122bd83759678ab9aac8553f25fbe867dc7dc55c72e54673fe2a17e818c089a4517f62ac20e40597fe40945c742cc6f153460bb
+DIST tins-1.15.1.gem 304128 BLAKE2B dc0308ad474d46fdb0828e5c8441e55666ad0ccd413631261684f9c44f774a7805c26c5a3123af4b7805647efcef22eeed4f84079d4648aa04ba7eb1c4407a25 SHA512 13182f31a23c80618fdf24fc8ecc8d165eca1c07489c55399224943bb393a1483bd82e5000baf67c8c9f8985e93154e73e3e1c3b53f9a02b0f1bfaac44eb275b
+DIST tins-1.16.0.gem 304128 BLAKE2B 663845a1d7cdacc3bdd632faf237b0c6f517a4d623fd3667ad9445f570ac5a10a93ef2133285cdbe792e92bb3371ef2d800c466520b1f3581cf36b13de3a5b6e SHA512 689c8871d929cf019a3b0938da29fbb9a7bd49ed5839c067f9f2053c2223234a1d380cfef0352670cdcc2178b3602ff0e907ba3cbddbfd1c0b0711eccee9ed25
+DIST tins-1.6.0.gem 299008 BLAKE2B 8f5d52c4272bfe751cbe44429d09db7324eb82ebb5d415d2e529dcf5990af3a285570a694d6253b982083afd7bf2ab41d8060e0a6c4bcbcee6de1396149ae2e8 SHA512 33d576a0960d841f72a3f3c9017f873d0445fd569ded852d614b4a2b32e59ae784a47246b584bc4e0d16d5be4d63c1d7834b32c2bea2129a75dde9b1723ccd01
 EBUILD tins-1.14.0.ebuild 632 BLAKE2B 441f04010ddf736f421db682cc787c64b4efbeb6b9df81c84722147e27bd44b89b0d682f6acb4867dd3d9135c36e8b12925c7969424abb5a311cbfb73d1d45fe SHA512 7f699acd28e99825416faed2c1d25d03240cbb5607e26b5aa1a9e86b8bdc51de6a3b007c7fd0fda9e1c27b2fca1684006b3da43e178e15f7e1cd5de43d33399f
 EBUILD tins-1.15.0.ebuild 639 BLAKE2B 15f659b442ca6238b51ad77ac380fd1196cc9a9898cfc3f24f1a75a1f64bb986a9f7e42fdf6348e5b73b096a455ff45f8c3878d9418b099ba6474e1a8754d683 SHA512 cf2c36314b7e9a7e37bfefc83ebdfed9d3e68992275714d94ab00ca66e8c7f762d2e1921640dff4401059f6f64d9c991c26d7363a8f4a35029cb1b0942809c01
 EBUILD tins-1.15.1.ebuild 632 BLAKE2B 65e866d56142cd7e8ebd4e59200caea901b615fd507820d3709e204b1f2cf1a22cce2812c689f857cf3f99eb3b85d6928e9eb78a774970a9c73c3d4ccf3c0cdf SHA512 b21a158ed081c54b920ad7e27a9daf674bafb7d662ccc3146e185291e4e38806bc4b3fa088320ba0d74f2a77eb1c49e2923e220f9525aa30407ceb3ad2135ed4
+EBUILD tins-1.16.0.ebuild 632 BLAKE2B 65e866d56142cd7e8ebd4e59200caea901b615fd507820d3709e204b1f2cf1a22cce2812c689f857cf3f99eb3b85d6928e9eb78a774970a9c73c3d4ccf3c0cdf SHA512 b21a158ed081c54b920ad7e27a9daf674bafb7d662ccc3146e185291e4e38806bc4b3fa088320ba0d74f2a77eb1c49e2923e220f9525aa30407ceb3ad2135ed4
 EBUILD tins-1.6.0.ebuild 644 BLAKE2B e4f1590c6d7ac5ead0a1b2398b18c5f87e2befc7717bca8a4c7ed8d6a103eaf133aab26bd17f951d4af43ec7057eb551b7efe6c1de06bf05ca368fae8050eede SHA512 9bca2773d10f248db1fffc4cd0598de240d852bb552e33e5e5724fac8c60e33cc6d15f22b882f9ccadcc1f6e749d300cf53cc9956b9f2a625f8c953bbbd2dcbc
 MISC metadata.xml 336 BLAKE2B 00b8e1ea737e7431865357c6f52ec454afa14e9e22e130b6ae286a4bbddc2813c2f34ddbe492897c19683ce329bb146be74b994955efab2799d23f81fbca4eca SHA512 fe0912b4e761404c8d0d5860e663270bb47610ce4bee99569588e2c2300b80bd8e5df2bbdbb91afcdec1df178d605acd61635695eff0e7696e04b673a3e14c46
diff --git a/dev-ruby/tins/tins-1.16.0.ebuild b/dev-ruby/tins/tins-1.16.0.ebuild
new file mode 100644
index 000000000000..9a51da89a888
--- /dev/null
+++ b/dev-ruby/tins/tins-1.16.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="All the stuff that isn't good enough for a real library"
+HOMEPAGE="https://github.com/flori/tins"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib tests/*_test.rb
+}
diff --git a/dev-ruby/uglifier/Manifest b/dev-ruby/uglifier/Manifest
index 1e7381093303..e54986aa05d8 100644
--- a/dev-ruby/uglifier/Manifest
+++ b/dev-ruby/uglifier/Manifest
@@ -1,7 +1,9 @@
 DIST uglifier-2.7.2.gem 84480 BLAKE2B a446f21f9b8682ba7ec020d355ec5b6eb573649116fddfe2d4d74849c59f6697065ca2837fb040a91a3f43264a71280660b947b138fd0fe67806f2c18631f498 SHA512 03c8fffbd385db9ee0fa8f422bf571ba99803f810828d536f1b00bc99a21108ac0ed232015d39f1ab88441fef0a3371df10944873fbadae6c8bd2624e3e1a65d
 DIST uglifier-3.2.0.tar.gz 169273 BLAKE2B b0263853c882859db8cc04c19e7f7f4bcbcef9d0b4080e414c9e1c86b691307c59d694abb33582485ea432b787f36445a49c39ece298d90806838bc56a4b7360 SHA512 5bc577753c175cddd7b3241f7343b75f593141c3bfa9ffa1325f7ade4a9acaf3b47e711007b5708f7cea1a7e9e768cbc3bc845d9eb362f877fe2fc83c047bb57
 DIST uglifier-4.0.0.tar.gz 183935 BLAKE2B 355081d2aebcd6e40081564397b7ae121922d33ead6942f15fc92b9743c575756513a1125810900edcc9a327ff3011e64e539d1bbadb02a06db5a5099dadf0d5 SHA512 b4bd78ea20ed3eefa9bb8d2645da9d3a1898c2715084c47ad8f3d5d0bbeae68ac84f59a449a68dee9c9eda158a2c3e8bff23507d06fc489f00ba53057911bcd1
+DIST uglifier-4.0.1.tar.gz 184457 BLAKE2B bc922057d42868f56d3755f51b9bc39460369ee32d76b97222ef3fb05dbf0c84752236a545ffe9fcd17c1a529a429b9591bcf7d4623255e85cc9ebeb693dd595 SHA512 966a7a5c0c15146feba8633f247b9ec5d7a895c8e2a993b784836c13f3d88077e4ba701c1809588463da78d894508cb35e4d958b86c4801782f9449a93963d05
 EBUILD uglifier-2.7.2.ebuild 598 BLAKE2B 866212993ed0781517edb9b12f37ec7c449f42dc7361aae98dd01ef31a40bd2936111446bfd17590a5b96f2a49d969641754b9aa7aff13d93d3e31614fc42fdf SHA512 6f6a691d0f60f9469080b8bf0840277424ea956b2cd509a1b7889c4798e90bd104a33c70c1511ea183391daa88f2a3cbc657614d1c9124d3e333e584d4a9a8de
 EBUILD uglifier-3.2.0.ebuild 795 BLAKE2B a8b1153f7e009847cdc8993be7bca0a42e897cb842c705a399b401dd27f128decd95b84b2e320a8b5489680879dd95769652ee9fccc746a0b7f42e85d989d852 SHA512 05ee6ae5dda25687496fec88c4e073ea3b7a54a833b8658787e8851222157a53c077d09c70aa4fb45262eb966e11021f2a97fac077c6f366e366f002f4b2c112
 EBUILD uglifier-4.0.0.ebuild 788 BLAKE2B fa880d98f5e28680df44f3b2c92b5cf282037326d002772b4e881ab25a220848fc4b3a030fe70e20ac4a797f882ef71f63228b1ce393a309906be7db99418411 SHA512 e4c2855b456360ede9d3003f4f42fd65f5c3d2672628af5eeb1952fcd558785d48276c7d4cf3dd61679b4173ee3af998f26cd1a2fbef582d7a7b6514b797e4f1
+EBUILD uglifier-4.0.1.ebuild 788 BLAKE2B fa880d98f5e28680df44f3b2c92b5cf282037326d002772b4e881ab25a220848fc4b3a030fe70e20ac4a797f882ef71f63228b1ce393a309906be7db99418411 SHA512 e4c2855b456360ede9d3003f4f42fd65f5c3d2672628af5eeb1952fcd558785d48276c7d4cf3dd61679b4173ee3af998f26cd1a2fbef582d7a7b6514b797e4f1
 MISC metadata.xml 341 BLAKE2B 07cb7ce323751f520c38158ef006374652e317e5809b4fbc729c264f3b44e99fc8e1d75916d858ba50361c2d3cff389b33cba7c7f863300ae8da8002de4a8d24 SHA512 0747fa6ff0d695b149915495d5242dec8541231e0e72a2157e3b4412301d8f0767c1eab17ea72a0d9f8c1afc9107c4f55b261018744e43823c8140de38ebb0b4
diff --git a/dev-ruby/uglifier/uglifier-4.0.1.ebuild b/dev-ruby/uglifier/uglifier-4.0.1.ebuild
new file mode 100644
index 000000000000..40301044c9ee
--- /dev/null
+++ b/dev-ruby/uglifier/uglifier-4.0.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby wrapper for UglifyJS JavaScript compressor"
+HOMEPAGE="https://github.com/lautis/uglifier"
+SRC_URI="https://github.com/lautis/uglifier/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~amd64-linux"
+
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/execjs-0.3.0:*"
+
+ruby_add_bdepend "test? ( dev-ruby/sourcemap )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/yard/Manifest b/dev-ruby/yard/Manifest
index f5a80b53404b..07a9c5980a96 100644
--- a/dev-ruby/yard/Manifest
+++ b/dev-ruby/yard/Manifest
@@ -1,11 +1,7 @@
 DIST yard-0.9.11-git.tgz 916355 BLAKE2B e9f27fe129cf93c51dbf83f4a7d5745d385252ba63c90f85223f2e9436c22a55aaba296f263072069d39e4beaca3e0830775a8be121c64cdc2a15afd3539a73f SHA512 375a4878e61888cf73aaa06e9300195ae48b9898d8cd639fa796a067e5fa0b89d6ef62d327a388ee83953e80177515f4d8c070042188e3a1e597f48b82b3a72e
 DIST yard-0.9.12-git.tgz 916462 BLAKE2B 905f0e4408f7829ca599b578344d695e4c7b68d46b982f39277dcd69ee726a9ac283910e1031d635917b149f182fb302cae537ff8a8a81960fa27965fda82a0c SHA512 f987da7e46bb3dafb9ba8c761b51345ee67102e21d05181c3090f31ff37179505134c93e83efdd39bb35cf6fe6dfa530d0017ce4680a08f858e78cbb073b239f
 DIST yard-0.9.4-git.tgz 884608 BLAKE2B 9d17d7cdfa0432d769026f6bc12354be236b5d07d65bc510bfd6bdd5add12d87f77808832f9f011d327f13b495d499e395c232a3d77c7e779dd0ed40a676d911 SHA512 2255c56498dc147ee5ede5e4898ce7aad78e9350f317e5d5c942f6b12262e9e1d0893ffd985a6bf3822d6af902e8ff555c489e1d847049ba51a472ad3c4aa140
-DIST yard-0.9.8-git.tgz 897925 BLAKE2B 55179a3adcdcbb59f3e6eacf5a946aa28a0d13de0b9e0c5e0844deacbcbe91142927a4ab1ed0e385696cd5e2e484bd8c20fe1656515114d4d55e14c2f1d9e257 SHA512 f2e340bb90e5da456f622aadbc12278a6db486ed8b5a2f9a7b4408d6201cb6388a1f4fe0f3ca7584fdab9d73533e49015f465fb39b5049fe2c27c18e1d6cd41e
-DIST yard-0.9.9-git.tgz 898576 BLAKE2B 04abc3d72f87666ce7c636202621a4ae88ed8809e79fe748fca98a0f980b9dad4a719e0ac709494a63406aef8d1621f535f59c3400f7bce0c96d29f3d58892d3 SHA512 1ca970c9a1207fd12855659b98f3fc233bad76cc6afb8a7524d98c67b9190d0469173ab911cf813b6e7817e6c95da518fe4e285b72a48e09fd8ab12db84dfc98
 EBUILD yard-0.9.11.ebuild 1285 BLAKE2B 73feeb381e397653ebd2361ca4e4d3c1f7d056fc73059a691f7c166d8b7c8517d1c5fae67fed15646757460e9cc4984bb977fb06de93125b887bc8b3a96ad5ce SHA512 11950cd03ff8d582b6c8ea0ca82276ae35f4af83c1302d7c7f9fbfec9f240a3be4e92c23a39910d498473efc68b2916d77a1d3ff3fb932a00ec876991ffa7ae0
 EBUILD yard-0.9.12.ebuild 1285 BLAKE2B 73feeb381e397653ebd2361ca4e4d3c1f7d056fc73059a691f7c166d8b7c8517d1c5fae67fed15646757460e9cc4984bb977fb06de93125b887bc8b3a96ad5ce SHA512 11950cd03ff8d582b6c8ea0ca82276ae35f4af83c1302d7c7f9fbfec9f240a3be4e92c23a39910d498473efc68b2916d77a1d3ff3fb932a00ec876991ffa7ae0
 EBUILD yard-0.9.4.ebuild 1316 BLAKE2B c1f9b2e880648300b34516c4a3ae7f63a51dcfb245be4237be7c4ec582a276f333231d79d50b5720c332d5d0c31f06ed3e4ae40c7c7fc700c3401788a5c26ed1 SHA512 999695d04608dd86062574814e1c02ddbf5c1a6ce3727c3da3c1137805e05a28c0b373f6c3eae13b94f398c99ac67978ae2f82a5d65550d27712755ffa0e14eb
-EBUILD yard-0.9.8.ebuild 1297 BLAKE2B 3f61f7f3347c942a35c8f4a80c3c83473c8beddc708e247a60851b73895adc661e864c958f755bf009c807261d365b7d34d7b0296ef6f938d2fe85a3307fd917 SHA512 1f5ac270bd5e97c2f693055824dc245fac219593bda8bee8d500f7816d96a6c51ccaf894ae60579e1abc181fa58e70b116535e74961ffe6faceb42df9f692ad1
-EBUILD yard-0.9.9.ebuild 1324 BLAKE2B eb86633cfc79564cb0cbe82f771921b36da5ff521af95f69753a9ec88fbc4fd177856b39cc897c930010db698db50b965553ebd94617138dd167941d218c4ca5 SHA512 fdfa5eaa6e6086919d03272143a6f0048da970d23d16ce4be027de0555aacb0d3d57292a5ddbdfd99dbf8f68bee052a0e6bc4ba83a90e635e74f555ae65d172d
 MISC metadata.xml 337 BLAKE2B 1aedede1271d1f9a566743dd25b1fd9961e429b78bb5f9f36bd6ea66f631f376a273d7a094fba7121d099f3a4a3f0e7738753078e2a1a554cfe6cf32acc6e2b6 SHA512 0de30cc9c4a9d08649f141cb6df0ee9c05703831603c77a0605f0bf8e2f49b8324a782d092aaa690581e23d6d948fda9781b98770a3ba89ed6bfc0de351c11bb
diff --git a/dev-ruby/yard/yard-0.9.8.ebuild b/dev-ruby/yard/yard-0.9.8.ebuild
deleted file mode 100644
index e41b4e3e4030..000000000000
--- a/dev-ruby/yard/yard-0.9.8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC="yard"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_DOCDIR="doc docs"
-
-RUBY_FAKEGEM_EXTRAINSTALL="templates"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Documentation generation tool for the Ruby programming language"
-HOMEPAGE="http://yardoc.org/"
-
-# The gem lakes the gemspec file needed to pass tests.
-SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/bluecloth dev-ruby/kramdown ) )"
-
-USE_RUBY="ruby21 ruby22" ruby_add_bdepend "test? ( >=dev-ruby/ruby-gettext-2.3.8 )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/ s:^:#:' spec/spec_helper.rb || die
-
-	# Avoid specs that make assumptions on load ordering that are not
-	# true for us. This may be related to how we install in Gentoo. This
-	# also drops a test requirement on dev-ruby/rack.
-	rm -f spec/cli/server_spec.rb || die
-}
diff --git a/dev-ruby/yard/yard-0.9.9.ebuild b/dev-ruby/yard/yard-0.9.9.ebuild
deleted file mode 100644
index db9a557642d7..000000000000
--- a/dev-ruby/yard/yard-0.9.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC="yard"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_DOCDIR="doc docs"
-
-RUBY_FAKEGEM_EXTRAINSTALL="templates"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Documentation generation tool for the Ruby programming language"
-HOMEPAGE="http://yardoc.org/"
-
-# The gem lakes the gemspec file needed to pass tests.
-SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/bluecloth dev-ruby/kramdown ) )"
-
-USE_RUBY="ruby21 ruby22 ruby23" ruby_add_bdepend "test? ( >=dev-ruby/ruby-gettext-2.3.8 )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/ s:^:#:' spec/spec_helper.rb || die
-
-	# Avoid specs that make assumptions on load ordering that are not
-	# true for us. This may be related to how we install in Gentoo. This
-	# also drops a test requirement on dev-ruby/rack.
-	rm -f spec/cli/server_spec.rb || die
-}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index e0d710a8ab6e..80393be9139c 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cpptest/Manifest b/dev-util/cpptest/Manifest
index ce7e1391c293..168e74a7ce67 100644
--- a/dev-util/cpptest/Manifest
+++ b/dev-util/cpptest/Manifest
@@ -1,3 +1,3 @@
 DIST cpptest-1.1.2.tar.gz 458982 SHA256 9e4fdf156b709397308536eb6b921e3aea1f463c6613f9a0c1dfec9614386027 SHA512 da1030c69a5886e752b9ae08b65c501334c7d2d4abd2174190209ce11ed351239a615b9f7c5019ee601289523b2c21a1205d2042e59aea6c2882d77d636fc57a WHIRLPOOL f68e7b3c3a3944f5d41792ddd0dcc2d521ed0ec25b0aeae7cba7fb2c6c82bbd7a6d3a96981d3df885ef730ac1c3a7fc46a97386b984de1be08b7f1f1d39eab48
-EBUILD cpptest-1.1.2.ebuild 580 BLAKE2B ad53fb94516964496a8dc74abf6de476a0722a6a72c0709f86b96c77bd182a0d313d0cf9a56c4e5bed5cf384835cb99db81bf888c42a0fbdad14153c6d6c34a6 SHA512 b0bdaece8a05ccc1b5ca6510daf7570260cd4c618abed59f2f765e5067328ac99ddc13068f4709112c765b3ecc0759f2fcc18a70835ecdfdd2a68eb87c17d7d5
+EBUILD cpptest-1.1.2.ebuild 585 BLAKE2B 88751b5235040b917f4c0b84064c3e6db41cba60c4daca8405140874359906c8c623008ae88b337e57c27f4e213ba00fd3c56df9819821f5e8c28adb93452763 SHA512 52b488314d202a8e067fa7dc0c6e67c7ff70981109031795288e21aec233c38d5531d79a1ab7b17ca40667b4bbfbb5e5dac11a729e092d1662ef5040b2f5a60d
 MISC metadata.xml 604 BLAKE2B 2d0f5d155ead0d2035142bd395d1d057a4473d6d724b287bf6429a0c120eb340c16e5626929400acde2377b4c34de6fbb3016021f0b759b6fd16265ed67be017 SHA512 7df99419d82f5c714e2c941f810e3a930569045299b63dd9c2eb851628124c410afd30cc1aeac52ddb651e1e48ae8f41727f02c856b0f5a01d16aec318aa82dd
diff --git a/dev-util/cpptest/cpptest-1.1.2.ebuild b/dev-util/cpptest/cpptest-1.1.2.ebuild
index 4dce91f1de21..b7fa89f0e8d1 100644
--- a/dev-util/cpptest/cpptest-1.1.2.ebuild
+++ b/dev-util/cpptest/cpptest-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE="doc"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/dev-util/intltool/Manifest b/dev-util/intltool/Manifest
index 3d56fbe0b2e7..312da8ca5f57 100644
--- a/dev-util/intltool/Manifest
+++ b/dev-util/intltool/Manifest
@@ -3,5 +3,5 @@ AUX intltool-0.51.0-perl-5.22.patch 2184 BLAKE2B 8655ee9b830828a9a0fa8841b02f1c3
 AUX intltool-0.51.0-perl-5.26.patch 586 BLAKE2B bc79617f7cd22794a06c93a63a3fa9ef2e3337c8b1488207ed08e11e340a726f3979703450b580bee2f5b482366843f44fc0e4d710da2eb4fa4f98b60e3b2eaf SHA512 86fe1b795118975f1930535d9bb7d01564852546fb234bddadbc4a5ac66ccf6a43c9944ede1ea72dc6c4296dc8db3dfff4ebd1989dce57e623689be444c8e591
 DIST intltool-0.51.0.tar.gz 162286 BLAKE2B 98fe40e4d669fdf65a777152ddee0a9656412b9cf5d1e682d1b4b7bd666f3e5aa623a50481b6df47e16a935550836c66c666229b0bb7ef143f7cde6893b97a69 SHA512 4c93cb26592ed0b1622d3b7800b5d6622ffa36f58ac73f2ef0bddfab522565fdfb8fa73d81914b9a202f1d62bc995a08960f8adb9f62c86918e75498e85fbfdf
 EBUILD intltool-0.51.0-r1.ebuild 1012 BLAKE2B 1216428c6114b24670c9a8d97fc439be021b851a9081ddf371f188bf8c4e2e2ece04d85e64aabdf8a7c8c9f62faf19ab34c0d4703157a92c370271a35e043840 SHA512 4e437718701d259bf927c568e3829c0d7c4fb8c175c9b51d844f400fbcbd076793eda5ed924845c77952ab6a4efd0a99059eadad0828b6819c26bbf2741cda5b
-EBUILD intltool-0.51.0-r2.ebuild 1016 BLAKE2B 576229c6bdd7675008745f3481f5291b58995e85fdb19ba5023706660b237eae67fc742461126ddcbe21c8cca1fbcca3f5f42008a2c2adde7fb7a9c44b8155ac SHA512 40f3659ea892cf06163cbc6bb55a5e1ec2954f47f0fdb47250ad648535cc88aad87fd6306567797df36132f8ad99d39420cab928f55e4b570b3c329e239bb52b
+EBUILD intltool-0.51.0-r2.ebuild 1015 BLAKE2B d131cccff93d2332e30784f736f66344ba9e7d5b7b1cbefbddbd994da25e1b3e11c52e33c55057f549a22facddaf2e6bfdf2dab1b69b5e7068c718c001b97d29 SHA512 72e71cc04b77c14b94b4298f90179895031ac7866c4fe09bbb7a99c5a75ccbb0f770e57ba8d142b66f4a7967e78169ed102ad29bc63ad8bb500aac2a4314cb40
 MISC metadata.xml 304 BLAKE2B 87e449f29a87153e258fe194afc64202ff133f6a8bdf333cee64d907246348f504133bc8195e005039647deb28680f5762068770bb09126328aa9d9b7e76bde9 SHA512 e9f0bede4c5ab13dda61ae7ea0f5d39988373388f78a05b08f4099204154160ab0d88d21989a8bf8249aa98448744969643e118883c418968c9030a6919a9727
diff --git a/dev-util/intltool/intltool-0.51.0-r2.ebuild b/dev-util/intltool/intltool-0.51.0-r2.ebuild
index d52d2aa41ac6..2047e25cd5fd 100644
--- a/dev-util/intltool/intltool-0.51.0-r2.ebuild
+++ b/dev-util/intltool/intltool-0.51.0-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/dev-util/patchbin/Manifest b/dev-util/patchbin/Manifest
index 93457f8020c6..be4361bccd55 100644
--- a/dev-util/patchbin/Manifest
+++ b/dev-util/patchbin/Manifest
@@ -1,4 +1,4 @@
-DIST patchbin-20160208.tar.gz 9713001 SHA256 40bb69a6c7c46e59082b22224195dd5f8dedcb67fb5220eb646c06fa5dc60e6a SHA512 eeb5c4bc708cfc3a065568ef233297586c3bb3d497c6bf3ace52b8337b5a5d127e607f668a6f74e3be892e8cfac96a046dea3646735c4404efedd8760572353a WHIRLPOOL 384b44d127adcf4674f2e237fd502d55e8829535397789c31d1ef119a4bdaa1d2f33e3377bbf80077539f8bbd7664c9679658b673edc73ece043c8eba0f7e941
-EBUILD patchbin-20160208.ebuild 1144 BLAKE2B 337fc9f9f5887c4dd8032bab6e60cf7cdc400e4b901cd3395395c2fed9678399f9fd2aae19f9b9368b697363e4f0dd79e9bbbb74e3347d36cac2d0ce0e1781da SHA512 d34f4d8edaf8c0c5856a2968015bad0b50507d4264fdfcfee95e126188e9731f14079f0783ea6b6679bdd11c70e809aa4cbc23f09593c980f732df165c47a9ba
+DIST patchbin-20160208.tar.gz 9713001 BLAKE2B 4ce3c5d43f7b0a909b5058b3877cecef68f703d803bcb6a4e4b7e907dedaab98cbe87f33a5211a318f8146e9ef4753da18d58b3cbc8e4ff715b58d82227ad7b6 SHA512 eeb5c4bc708cfc3a065568ef233297586c3bb3d497c6bf3ace52b8337b5a5d127e607f668a6f74e3be892e8cfac96a046dea3646735c4404efedd8760572353a
+EBUILD patchbin-20160208.ebuild 1142 BLAKE2B 41aeb9d2165fd3489e80b4c7a01c2cb5542ee74ff1d4ed22bc98135166d4813fcea75983295ad5c78910fbec3b1fd1d8c2c7cfeb789700bf96241bebade90d14 SHA512 e02e8b850bee5ff497b89a0d649a751752d44a6a7074986104f95c38e5557acede7bf21bda50395ca29562ab817f4f8b249706ba463a4effdd7fe93ecb13e49b
 EBUILD patchbin-99999999.ebuild 1144 BLAKE2B 337fc9f9f5887c4dd8032bab6e60cf7cdc400e4b901cd3395395c2fed9678399f9fd2aae19f9b9368b697363e4f0dd79e9bbbb74e3347d36cac2d0ce0e1781da SHA512 d34f4d8edaf8c0c5856a2968015bad0b50507d4264fdfcfee95e126188e9731f14079f0783ea6b6679bdd11c70e809aa4cbc23f09593c980f732df165c47a9ba
 MISC metadata.xml 528 BLAKE2B 566d71b86021dba9948978378279d2a4c95d50e4402c31c3da9bb3e1ab50d1d6148e104e3e3ea4c688a2bf1f720f3c4379d3eefc2eb57d316d9952d3f1e04409 SHA512 d15966f28c81025fd34bc247fc2f3f4ceda3c7dadd23f28487c80fe3155666665b9dd451e59356cd6bdcd30197be9a0439ab5c0b9383ab655870aa9033d58d94
diff --git a/dev-util/patchbin/patchbin-20160208.ebuild b/dev-util/patchbin/patchbin-20160208.ebuild
index 8da830cccac7..8fa59483c5c5 100644
--- a/dev-util/patchbin/patchbin-20160208.ebuild
+++ b/dev-util/patchbin/patchbin-20160208.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 99999999 ]]; then
 else
 	SHA="4ffcf184bb71c6c3512b3a8c144dcf4a3a76d23c"
 	SRC_URI="https://github.com/wine-compholio/wine-staging/archive/${SHA}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+	KEYWORDS="amd64 x86 ~x86-fbsd"
 	S="${WORKDIR}/wine-staging-${SHA}"
 fi
 
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index d268a5e2d97b..225ef75ed2d3 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/higan/Manifest b/games-emulation/higan/Manifest
index fdab5a1a7c11..5e6902bab1b7 100644
--- a/games-emulation/higan/Manifest
+++ b/games-emulation/higan/Manifest
@@ -3,6 +3,6 @@ AUX higan-099-QA.patch 2597 BLAKE2B 0737dd216f1dc63620c43478e372a41736d47da6df5e
 AUX higan-wrapper 124 BLAKE2B 3b87ba7212551d8c5b4814ff41e2ecd647589dafe8abfac6f354970e1093cf2ef53e885c9f88f6755c8e2a72c08c61491da073819a19494dbb6a75f8ba413f8e SHA512 af3163d06f3bc14b14ec38cf84d11cc706eb6359727743eea35670b4f1ac120af40102ee5409695eba00ead70fcf964073c24d2f47d6824776391927ebbf3f45
 DIST higan_v094-source.tar.xz 882732 SHA256 5e149df9d50c1066eb97c0d66665428d75304da782bba5a87078b87fc311151b SHA512 e7e48c76cdc93d2d66db1fa0c71e64903cf4188571b2d5ecb8066dd4e2172a67da4dee68bed6fd0a532b6fd397fa4f537b97de58cc5043a9e970d48d0b66b0da WHIRLPOOL 42e2b628e83b6cb8d87ce82c2e91105b0be06790a1927aa7d52f0b1a181af5d627f467009d15daffd470e3c38a2bb7d67ba84919fb1aa9c8d06ad88ca3163641
 DIST higan_v099-source.7z 1012348 SHA256 1c62f2f1ec98da9d098c2df5c8b539a192b5a70eff0896c3e27d541fb4d28e86 SHA512 567f0c9841fb3fed1c78f2afcd9865cbfe06d04b995d4dc468269e459249b758daed949b461b5b8645ebab40edc1f4f28a566de5795325dae4f604190ca9eae6 WHIRLPOOL 096b4da32f9f030a402690e81dc64e0a242072fd7cb3aa1520783a3a69bd76ff73d3fbcfb3624ad9cf9396e5123777a9cd4fd13f04191fe7faf9ec385c1a929e
-EBUILD higan-094.ebuild 3596 BLAKE2B 0c1afa01465c4cfe8b7b72cf8d6aa80f99426116ee96598ed4f30a5694885f377b030fb06f13be82b0240b497548764a05ab302cb8065b54916adb7a12e01a94 SHA512 96b4c27f7a217c36476a1ab90891f151e124ca40b2e96042c9d5530f75742613c939311e71f57497368e3ad993e072684f64001a79fba19bb0903a904ea045c0
-EBUILD higan-099.ebuild 3321 BLAKE2B 7422c6bc6a36cb0bf824e2fdeed43a2de631c065ea6ab43ea8299fd8ea1fb9439960e371d460709350165e74d54690e1791fe7e5a626ac723d755980da6ef0ee SHA512 826e888abda2b7f5340277b0b6d2b470b553449cf36a1e7ff748b559df0ad69079ebff49770155529b8c314429d43ec15a03f3be69c599f407fa9782ddb270ca
+EBUILD higan-094.ebuild 3357 BLAKE2B eb354f770e0881677cca6aaa659b520b05e7f98afb1e83d5083d8d2b41b8b6f589ee9793239b31c521faa4101f3daad438d4eb4d09e649a9a7d036e931ea5ed1 SHA512 eae543c1705a3d7e2af1b0425a1839d3121cf3ff22c0b15a8a3564be6c088d7cf16798f5a74133b2b1681b0f2ba6009f8e456c0737ce102fba8faa6545002a38
+EBUILD higan-099.ebuild 3081 BLAKE2B ff75470da256db5e49f8313d87135af2def1d6bd185effa328bb49b97c783d23cc517e46160888707724a56c73ec1303fd2fd98638197e8f62c28f95ffac6e3b SHA512 3e7eff25fc8649bf2181eba3f383e824230c4d574643c5ef0c986fadcd1464f2db0c5db0b3fcb22ae2d26ebdc5504b24916ee5f91025d7fcdc2e0c9ba64f35d9
 MISC metadata.xml 636 BLAKE2B 445ca6a449f6972817e33eb020450420cee9af2f27d605e08764d43d9265d06ba8bb059936c5597f362032964631ffc3fe1b01c3970b23c29e6a988c00448187 SHA512 a835b9cb4fa482754349eaddee279a6bca17cbc070806c0a59c923502159375bbfb481964faae23bbee8379fdbe7e9f0e070cbc783e3c2e62ddd2d88f511170b
diff --git a/games-emulation/higan/higan-094.ebuild b/games-emulation/higan/higan-094.ebuild
index ec815cc3da6f..1401fc403ff3 100644
--- a/games-emulation/higan/higan-094.ebuild
+++ b/games-emulation/higan/higan-094.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,12 +14,13 @@ SRC_URI="http://byuu.org/files/${MY_P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ao +alsa openal opengl oss profile_accuracy +profile_balanced profile_performance pulseaudio qt4 +sdl udev xv"
+IUSE="ao +alsa openal opengl oss profile_accuracy +profile_balanced profile_performance pulseaudio +sdl udev xv"
 REQUIRED_USE="|| ( ao openal alsa pulseaudio oss )
 	|| ( xv opengl sdl )
 	|| ( profile_accuracy profile_balanced profile_performance )"
 
 RDEPEND="
+	x11-libs/gtk+:2
 	x11-libs/libX11
 	x11-libs/libXext
 	ao? ( media-libs/libao )
@@ -30,8 +31,7 @@ RDEPEND="
 	opengl? ( virtual/opengl )
 	sdl? ( media-libs/libsdl[X,joystick,video] )
 	udev? ( virtual/udev )
-	!qt4? ( x11-libs/gtk+:2 )
-	qt4? ( >=dev-qt/qtgui-4.5:4 )"
+"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
@@ -69,12 +69,6 @@ src_prepare() {
 	use sdl || disable_module input.sdl
 	use udev || disable_module input.udev
 
-	# regenerate .moc if needed
-	if use qt4; then
-		cd phoenix/qt || die
-		 "$(qt4_get_bindir)"/moc -i -I. -o platform.moc platform.moc.hpp || die
-	fi
-
 	for i in profile_accuracy profile_balanced profile_performance ; do
 		if use ${i} ; then
 			cp -dRP "${S}" "${S}_${i}" || die
@@ -85,11 +79,7 @@ src_prepare() {
 src_compile() {
 	local mytoolkit i
 
-	if use qt4; then
-		mytoolkit="qt"
-	else
-		mytoolkit="gtk"
-	fi
+	mytoolkit="gtk"
 
 	for i in profile_accuracy profile_balanced profile_performance ; do
 		if use ${i} ; then
diff --git a/games-emulation/higan/higan-099.ebuild b/games-emulation/higan/higan-099.ebuild
index 2a660f3b6e1e..7bea4f56b144 100644
--- a/games-emulation/higan/higan-099.ebuild
+++ b/games-emulation/higan/higan-099.ebuild
@@ -14,11 +14,12 @@ SRC_URI="http://download.byuu.org/${MY_P}.7z"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ao +alsa +icarus openal opengl oss pulseaudio qt4 +sdl udev xv"
+IUSE="ao +alsa +icarus openal opengl oss pulseaudio +sdl udev xv"
 REQUIRED_USE="|| ( ao openal alsa pulseaudio oss )
 	|| ( xv opengl sdl )"
 
 RDEPEND="
+	x11-libs/gtk+:2
 	x11-libs/libX11
 	x11-libs/libXext
 	icarus? ( x11-libs/gtksourceview:2.0
@@ -39,9 +40,7 @@ RDEPEND="
 	opengl? ( virtual/opengl )
 	sdl? ( media-libs/libsdl[X,joystick,video] )
 	udev? ( virtual/udev )
-	!qt4? ( x11-libs/gtk+:2 )
-	qt4? (  dev-qt/qtcore:4
-			>=dev-qt/qtgui-4.5:4 )"
+"
 DEPEND="${RDEPEND}
 	app-arch/p7zip
 	virtual/pkgconfig"
@@ -77,22 +76,12 @@ src_prepare() {
 	# input modules
 	use sdl || disable_module input.sdl
 	use udev || disable_module input.udev
-
-	# regenerate .moc if needed
-	if use qt4; then
-		cd hiro/qt || die
-		 "$(qt4_get_bindir)"/moc -i -I. -o qt.moc qt.hpp || die
-	fi
 }
 
 src_compile() {
 	local mytoolkit
 
-	if use qt4; then
-		mytoolkit="qt"
-	else
-		mytoolkit="gtk"
-	fi
+	mytoolkit="gtk"
 
 	if use icarus; then
 		cd "${S}/icarus" || die
diff --git a/games-emulation/mupen64plus/Manifest b/games-emulation/mupen64plus/Manifest
index f82f4329b949..8cfb51c92be6 100644
--- a/games-emulation/mupen64plus/Manifest
+++ b/games-emulation/mupen64plus/Manifest
@@ -1,14 +1,3 @@
-AUX README.gentoo-patches-20091123 1355 BLAKE2B 0923cd2f7f8bde730e9e472835d177911626ba16a10316f79eae8f4c99bb49a22b28c01a678abb852f8c61b0595baba83d0b25373506f1bc666b93d5945785b9 SHA512 a8c5783a44a631acfa33d6e534baa67f542b820a0d9bf48b3696f0188326c01c9061c5cc504f08e2d25abe8923043fdd4931c3feb6931ebd8bb31c0f8a5ea1bd
-AUX README.gentoo-patches-20100507 1521 BLAKE2B 878f72db26a4147cf2369a3beef3850b769f761adf59ef6093eb6c899768fda887791c413097a804c5918cdbd0109939c50859e04e3f1ed2c823c62c93bd1c4d SHA512 0808fb35ad32ec5747391de5e41cd49c381a0fefa0ba2d980ed6a7d786bb5b8d8bc4d51b383209d1003fa5b0f4275544f4348d5de89961a602474abc0d76f465
-AUX ftbfs-gvariant-type-conflicts.patch 828 BLAKE2B 4b670da8ba1d2319fcc4a7ec7664fd1d82eabe57f53b75446acfaa6018ecece2c6dcb6e1fc09aa565cd5e203eab8451ba878466cbd07b5a5f7853e178f93721b SHA512 a0f559276ae3251500bdcb8c30745d089e91628b73e09b8ef0cfbe15ed29d53197f4e87b8ae8038e1b238788cdd5e60e445a60c6372c2e859175b824a1767a7f
-AUX mupen64plus-1.5-gcc46.patch 335 BLAKE2B 7b531f33598ff919179d1458e1ed9085564f507e9b99d4ef41c53e8fdc15f1e245c100ff07eab745ffea8dd23d6f6dc54aea80f1d432462c3ef6ad4554de7fba SHA512 4a51e8aa654a1d17cbe45ebc22d80e5e43e140d98935e7d3b0b67baf500bde493a7fd3bed27afdcc36150863b78b112028b777e337f8f1a9191cfdcece4f0671
-AUX mupen64plus-1.5-libpng14.patch 1404 BLAKE2B ab76ec6125a12c4e85e781264510a9265fe6669469cf2725b7e02457bda0fb0abe0b51abfc751c392566395ab5f453d157624f4867b4b3552f12f675de6379be SHA512 92986174f22c8af493c2ad7d1052d6ab45e56c85fb0c2c6f8900c9061b33b21d95883225a1e1e547e7c2d648f0c81310b7b959687b519e02146d0176bc2cd5f1
-AUX mupen64plus-1.5-minizip.patch 806 BLAKE2B f00d66ff1ef9ee2065ea39301206c3533d0aca28dcc2e4e60bdacd9b288813df3366f600884e63eedf8945717fa68a042093df2ecd22eee21a7dfb8c783ee074 SHA512 d2831daba45c7431cc62acbcd4e3c55a4c112a48611f739966387a41b3ba9f91d3e73fb96d14166184f084dfe37bb17ff1d0ceea454ea9d219c44dd2c5c01190
-DIST Mupen64Plus-1-5-src.tar.gz 2348443 SHA256 58b2da6095ed8f3bcdcb5d7612bb0f1ba81cda1861ca784ef7e46991fd73cf3f SHA512 548be341e69eee543288a0a347ee117341847a032cc0a668a75ab7aaa881e876b6d143d2da9f8ec7580e4b1bbd2b36a3c8f99a0cb8c2301e4b03b593cdee5eb4 WHIRLPOOL fe5e63f07cc50676ef796a96d19e51eef38744f40e1626fd59471a65e530ac78109253ceb4f25cb9df2b4d33f4eecd47be1b9c7fa1a5d7a2304b98bdab0ef137
-DIST mupen64plus-1.5-patches-20091123.tar.bz2 25579 SHA256 b4bebb8105d7ca083b1e3d96d23dea9f2170703d53b0ea75e09b428e73e43187 SHA512 1fccfaed0d0a6d4bc3382a21b1529a173faa4fc718fd4dc6d94a850f5ad3788103041a202774c09f6db9a409b4de256a8b4a746f58860f13c8f69cc6243a9c3f WHIRLPOOL 5ed3fa14eb8a9c0b4fad71d70495125ebfe2313d23edf6155b7056fe9b583ceaeb860cf6b6df574caca315db54af786fda66871621bc1547f929f8f6e6161193
-DIST mupen64plus-1.5-patches-20100507.tar.bz2 33484 SHA256 372e437ab9d53eda23fd63cede33be38114efe527f239ef41b0c904fe208e2ce SHA512 f0265cbcc2e60bac906611a74bb7f5ea94a625d3abeee127fa105a308e9388258e2854ad91256fe14343f9b8837dfe43cb4eca16176a375f07c1259729045213 WHIRLPOOL c3fa3562bda7bd8a01fbc1644fbc7caa511bffec0efde7da479e40066bb8e31952bf98c718ab96b12211429835c458a9ab94c8fe8da540c301c83806e3bb1af1
-EBUILD mupen64plus-1.5-r1.ebuild 3241 BLAKE2B 6c8db5dc7a409b149282f8b3fce48b48cf3a80075f905a63f3c152182e91f500c09f4afa2fe264515f433b88f4c1fc9a9d81c51502f9b396538a42edb254dffb SHA512 e4d14dd20916e04abd47f2cd8472f06d6fc3b362cfad3ddde603620607c285298436f5449e9aed2e7865e4136629ed8f4a7ac9de52196927c30ee8fec7752c83
-EBUILD mupen64plus-1.5-r2.ebuild 3452 BLAKE2B c4723228ddd91ef27a56070d78379b7441fd104f00ccb060f22c1068c832ea858b6ac644cc91cd9fbd1f03bf2357c1e27c39ed4f9357dde9e4c844516d368352 SHA512 627aa5cd441909c24a458513c1c586636ceea58d4c62e4c76fd9dd66c6ae0b9bcb277d80e2b928bef782ec1e3cf836d3d756951f26d79998a99ddeb13cad49b3
 EBUILD mupen64plus-2.0.ebuild 797 BLAKE2B 9562f4b9d54e80dd5a20154318a41433c31082f71c334edf4ec0cc439380b0103db796fc380d13663a953799c1d9f48428e4165d4ccfb72911cf45a51c937df5 SHA512 6e2018392dd18c315b2b98aa329206630189df1121cc837c31e65d7a47c587262fa9f688dfeb0cff13b440f6728f7128ee39582c038119b8866d31d739ccb214
 EBUILD mupen64plus-2.5.ebuild 850 BLAKE2B c1079b7f95589a9d06483223ff372c2c48a2bf1324b961b537bef75b38339c40969b29f5c252e81c5bd5d7dfebba25c94a73eda1ff535e02e52a5c06c5193e22 SHA512 db172c94bc00f77f37ec07ef03b02f44185c6cd9506d989851a1a7decabe560187eaf460968f60482ec7e8a82e5e7f9ebf4aebf7fec4fdc17d3c360773d8d820
 MISC metadata.xml 1214 BLAKE2B 07743bcedcaa0fefd3758db77a7aef127fb984ca4e43d11fbd3a22bd58e82b2ef6e662096d58350a4c285d2e844d4b5a9b94c7a0ee489bf106d7dfdca3eb451f SHA512 769d0957ce40eca186ef3f2ac1fa85722c0a1ed510150a6cd9f48250b2662468bf6c1280959388f79070eb28a39353c46580057f8f1fd2e5d47a58291dacd1c0
diff --git a/games-emulation/mupen64plus/files/README.gentoo-patches-20091123 b/games-emulation/mupen64plus/files/README.gentoo-patches-20091123
deleted file mode 100644
index 96994d798b7a..000000000000
--- a/games-emulation/mupen64plus/files/README.gentoo-patches-20091123
+++ /dev/null
@@ -1,55 +0,0 @@
-All patches below 500 are from the Debian git repository (Nov 23 12:35 CET 2009):
-
-http://git.debian.org/?p=collab-maint/mupen64plus.git;a=tree;f=debian/patches;hb=master
-
-Patches included:
-=================
-
-fix-desktop-file.patch
-destdir.patch
-dejavu-font.patch
-as-needed.patch
-system-libpng.patch
-system-zlib.patch
-system-libbz2.patch
-remove-gln64.patch
-remove-nondfsg-icons.patch
-glide64-noasm.patch
-rice-texturepack-crash.patch
-rice-screenflickering.patch
-static-binutils-libs.patch
-fix-7z-subfolder.patch
-ftbfs-dynarec.patch
-ftbfs-kfreebsd.patch
-ftbfs-debugger.patch
-debian-archs.patch
-ftbfs-glibc210.patch
-version-string.patch
-default-optimisations.patch
-gtk-open-filter.patch
-noexecstack.patch
-fix_readpng.patch
-jttl_fix_romclosed.patch
-rice_nodebug.patch
-interpreter_x86_fldcw.patch
-correct_fpr32_mapping.patch
-load_aidacrate.patch
-load_vistatus.patch
-fix_r0_override.patch
-resume_on_start.patch
-osd-pause-crash.patch
-system-liblzma.patch
-- system-liblzma got changed to work without the droped xdg-basedir.patch
-
-Patches excluded:
-=================
-
-plugin-searchpath.patch
-xdg-basedir.patch
-- Because Gentoo uses different locations like /usr/games/lib(64) and /usr/share/games.
-  The usage of xdg patch location standards would ne nice though.
-
-A big thanks to all the authors of the patches.
-
-Have fun
-Christian Birchinger <joker@gentoo.org>
diff --git a/games-emulation/mupen64plus/files/README.gentoo-patches-20100507 b/games-emulation/mupen64plus/files/README.gentoo-patches-20100507
deleted file mode 100644
index e6b857a07d48..000000000000
--- a/games-emulation/mupen64plus/files/README.gentoo-patches-20100507
+++ /dev/null
@@ -1,59 +0,0 @@
-All patches below 500 are from the Debian git repository (May 07 2010):
-
-http://git.debian.org/?p=collab-maint/mupen64plus.git;a=tree;f=debian/patches;hb=master
-
-Patches included:
-=================
-
-fix-desktop-file.patch
-destdir.patch
-- dejavu-font.patch adjusted the font path to the font location on Gentoo systems
-as-needed.patch
-system-libpng.patch
-system-zlib.patch
-system-libbz2.patch
-remove-gln64.patch
-remove-nondfsg-icons.patch
-glide64-noasm.patch
-rice-texturepack-crash.patch
-rice-screenflickering.patch
-static-binutils-libs.patch
-fix-7z-subfolder.patch
-ftbfs-dynarec.patch
-ftbfs-kfreebsd.patch
-ftbfs-debugger.patch
-debian-archs.patch
-ftbfs-glibc210.patch
-version-string.patch
-default-optimisations.patch
-gtk-open-filter.patch
-noexecstack.patch
-fix_readpng.patch
-jttl_fix_romclosed.patch
-rice_nodebug.patch
-interpreter_x86_fldcw.patch
-correct_fpr32_mapping.patch
-load_aidacrate.patch
-load_vistatus.patch
-fix_r0_override.patch
-resume_on_start.patch
-osd-pause-crash.patch
-system-liblzma.patch
-ftbfs-gvariant-type-conflicts.path
-rsp_ucode2_reset.patch
-rsp_hle_bigendian.patch
-rice-crash-vendorstring.patch
-- system-liblzma got changed to work without the droped xdg-basedir.patch
-
-Patches excluded:
-=================
-
-plugin-searchpath.patch
-xdg-basedir.patch
-- Because Gentoo uses different locations like /usr/games/lib(64) and /usr/share/games.
-  The usage of xdg patch location standards would ne nice though.
-
-A big thanks to all the authors of the patches.
-
-Have fun
-Christian Birchinger <joker@gentoo.org>
diff --git a/games-emulation/mupen64plus/files/ftbfs-gvariant-type-conflicts.patch b/games-emulation/mupen64plus/files/ftbfs-gvariant-type-conflicts.patch
deleted file mode 100644
index e76da1707285..000000000000
--- a/games-emulation/mupen64plus/files/ftbfs-gvariant-type-conflicts.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Fix FTBFS due to glib gvariant type definitions
-Forwarded: not-needed
-Bug-Debian: http://bugs.debian.org/577329
-Author: Sven Eckelmann <sven.eckelmann@gmx.de>
-
----
-diff --git a/rice_video/typedefs.h b/rice_video/typedefs.h
-index 4cded542b06445f043fa1fabf77e4d20c9d52920..b7e16e9c4ba3248f9fed9762f79349c137ee2026 100644
---- a/rice_video/typedefs.h
-+++ b/rice_video/typedefs.h
-@@ -20,10 +20,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- #ifndef _TYPEDEFS_H_
- #define _TYPEDEFS_H_
- 
--#define uchar  unsigned char
--#define uint16 unsigned short
--#define uint32 unsigned int
--#define uint64 unsigned long long
-+#include <stdint.h>
-+
-+typedef uint8_t uchar;
-+typedef uint16_t uint16;
-+typedef uint32_t uint32;
-+typedef uint64_t uint64;
- 
- typedef unsigned char               uint8;
- 
diff --git a/games-emulation/mupen64plus/files/mupen64plus-1.5-gcc46.patch b/games-emulation/mupen64plus/files/mupen64plus-1.5-gcc46.patch
deleted file mode 100644
index 2608fcd32a77..000000000000
--- a/games-emulation/mupen64plus/files/mupen64plus-1.5-gcc46.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pre.mk.old	2011-04-14 20:39:21.000000000 +0200
-+++ pre.mk	2011-04-14 20:39:57.000000000 +0200
-@@ -319,7 +319,7 @@
-   # tweak flags for 32-bit build on 64-bit system
-   ifeq ($(ARCH), 64BITS_32)
-     CFLAGS += -m32
--    LDFLAGS += -m32 -m elf_i386
-+    LDFLAGS += -m32 -Wl,-m,elf_i386
-   endif
- endif
- ifeq ($(CPU_ENDIANNESS), BIG)
diff --git a/games-emulation/mupen64plus/files/mupen64plus-1.5-libpng14.patch b/games-emulation/mupen64plus/files/mupen64plus-1.5-libpng14.patch
deleted file mode 100644
index 8d0b447fe96b..000000000000
--- a/games-emulation/mupen64plus/files/mupen64plus-1.5-libpng14.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=308753
-
---- rice_video/liblinux/pngrw.c
-+++ rice_video/liblinux/pngrw.c
-@@ -136,9 +136,9 @@
-         if (end_info != NULL)
-             png_destroy_read_struct((png_structp *) &png_ptr, (png_infop *) &info_ptr, (png_infop *) &end_info);
-         else if (info_ptr != NULL)
--            png_destroy_read_struct((png_structp *) &png_ptr, (png_infop *) &info_ptr, png_infopp_NULL);
-+            png_destroy_read_struct((png_structp *) &png_ptr, (png_infop *) &info_ptr, NULL);
-         else if (png_ptr != NULL)
--            png_destroy_read_struct((png_structp *) &png_ptr, png_infopp_NULL, png_infopp_NULL);
-+            png_destroy_read_struct((png_structp *) &png_ptr, NULL, NULL);
-         if (rows)
-         {
-             if (rows[0])
-@@ -162,7 +162,7 @@
- 
-     /* check the signature */
-     fread( signature, 1, 8, file );
--    if ( !png_check_sig( signature, 8 ) )
-+    if ( png_sig_cmp( signature, 0, 8 ) )
-         longjmp( err_jmp, (int)errUnsupportedFileFormat );
- 
-     /* create a pointer to the png read structure */
-@@ -199,7 +199,7 @@
- 
-     /* extract the data we need to form the HBITMAP from the PNG header */
-     png_get_IHDR( png_ptr, info_ptr, &Width, &Height, &BitDepth, &ColorType,
--        &InterlaceType, int_p_NULL, int_p_NULL);
-+        &InterlaceType, (int *) NULL, (int *) NULL);
- 
-     img->width = Width;
-     img->height = Height;
diff --git a/games-emulation/mupen64plus/files/mupen64plus-1.5-minizip.patch b/games-emulation/mupen64plus/files/mupen64plus-1.5-minizip.patch
deleted file mode 100644
index 9ed3d7a0b256..000000000000
--- a/games-emulation/mupen64plus/files/mupen64plus-1.5-minizip.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-use minizip from system zlib
-
-https://bugs.gentoo.org/383845
-
---- a/Makefile
-+++ b/Makefile
-@@ -101,8 +101,6 @@
- 	main/plugin.o \
- 	main/rom.o \
- 	main/savestates.o \
--	main/zip/ioapi.o \
--	main/zip/unzip.o \
- 	main/7zip/7zAlloc.o \
- 	main/7zip/7zBuffer.o \
- 	main/7zip/7zCrc.o \
-@@ -229,7 +227,7 @@
- # set primary objects and libraries for all outputs
- ALL = mupen64plus $(PLUGINS)
- OBJECTS = $(OBJ_CORE) $(OBJ_DYNAREC) $(OBJ_OPENGL)
--LIBS = $(SDL_LIBS) $(LIBGL_LIBS) $(LZMA_LIBS) -lbz2
-+LIBS = $(SDL_LIBS) $(LIBGL_LIBS) $(LZMA_LIBS) -lbz2 -lminizip
- STATIC_LIBS =
- CFLAGS+= $(LZMA_FLAGS)
- 
---- a/main/rom.c
-+++ b/main/rom.c
-@@ -27,7 +27,7 @@
- #include <limits.h>
- #include <zlib.h>
- 
--#include "zip/unzip.h"
-+#include "minizip/unzip.h"
- #include <bzlib.h>
- #include <lzma.h>
- #include "7zip/7zExtract.h"
diff --git a/games-emulation/mupen64plus/mupen64plus-1.5-r1.ebuild b/games-emulation/mupen64plus/mupen64plus-1.5-r1.ebuild
deleted file mode 100644
index cda3eb2b2121..000000000000
--- a/games-emulation/mupen64plus/mupen64plus-1.5-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils flag-o-matic games
-
-MY_P="Mupen64Plus-${PV/./-}-src"
-
-PATCH_VERSION="20091123"
-
-DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator"
-HOMEPAGE="http://www.mupen64plus.org/"
-SRC_URI="https://mupen64plus.googlecode.com/files/${MY_P}.tar.gz mirror://gentoo/${P}-patches-${PATCH_VERSION}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+gtk libsamplerate lirc qt4 cpu_flags_x86_sse"
-
-# GTK+ is currently required by plugins even if no GUI support is enabled
-RDEPEND="virtual/opengl
-	media-libs/freetype:2
-	media-libs/libpng
-	media-libs/libsdl
-	media-libs/sdl-ttf
-	sys-libs/zlib
-	x11-libs/gtk+:2
-	libsamplerate? ( media-libs/libsamplerate )
-	lirc? ( app-misc/lirc )
-	qt4? ( dev-qt/qtgui:4
-		dev-qt/qtcore:4 )
-	app-arch/xz-utils"
-
-DEPEND="${RDEPEND}
-	dev-lang/yasm
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if ! use gtk && ! use qt4; then
-		ewarn "Building ${PN} without any GUI! To get one, enable USE=gtk or USE=qt4."
-	elif use gtk && use qt4; then
-		ewarn "Only one GUI can be built, using GTK+ one."
-	fi
-
-	games_pkg_setup
-}
-
-src_prepare() {
-	EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" \
-		epatch
-
-	epatch "${FILESDIR}"/${P}-libpng14.patch
-
-	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=577329
-	epatch "${FILESDIR}"/ftbfs-gvariant-type-conflicts.patch
-
-	sed -i \
-		-e "s:/usr/local/share/mupen64plus:${GAMES_DATADIR}/mupen64plus:" \
-		-e "s:%PUT_PLUGIN_PATH_HERE%:$(games_get_libdir)/${PN}/plugins/:" \
-		main/main.c || die "sed failed"
-
-	# Fix 010_all_fix-desktop-file.patch instead of using sed on the next major bump
-	sed -i \
-		-e "s:^Icon=mupen64plus-large.xpm:Icon=mupen64plus:" \
-		mupen64plus.desktop.in || die "sed failed"
-}
-
-get_opts() {
-	if use amd64 || use x86 ; then
-		echo -n "CPU=X86 ARCH=64BITS$(use x86 && echo -n _32) "
-	fi
-
-	use libsamplerate || echo -n "NO_RESAMP=1 "
-	use lirc && echo -n "LIRC=1 "
-	use cpu_flags_x86_sse || echo -n "NO_ASM=1 "
-
-	echo -n GUI=
-	if use gtk; then
-		echo -n GTK2
-	elif use qt4; then
-		echo -n QT4
-	else
-		echo -n NONE
-	fi
-}
-
-src_compile() {
-	use x86 && use cpu_flags_x86_sse && append-flags -fomit-frame-pointer
-	emake $(get_opts) DBGSYM=1 all || die "make failed"
-}
-
-src_install() {
-	# These are:
-	# 1) prefix - not used really, printed only
-	# 2) SHAREDIR
-	# 3) BINDIR
-	# 4) 'LIBDIR' - where to put plugins in
-	# 5) 'MANDIR' - exact directory to put man file in
-	# 6) APPLICATIONSDIR - where to put .desktop in
-
-	./install.sh "${D}" \
-		"${D}${GAMES_DATADIR}/${PN}" \
-		"${D}${GAMES_BINDIR}" \
-		"${D}$(games_get_libdir)/${PN}/plugins" \
-		"${D}/usr/share/man/man1" \
-		"${D}/usr/share/applications" \
-		|| or die "install.sh failed"
-
-	# Copy icon into system-wide location
-	newicon icons/mupen64plus-large.png ${PN}.png || die "newicon failed"
-
-	# 'Move' docs into correct dir
-	rm -r "${D}${GAMES_DATADIR}/${PN}/doc"
-	dodoc README RELEASE TODO doc/*.txt "${FILESDIR}/README.gentoo-patches-${PATCH_VERSION}" || die "dodoc failed"
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	if use lirc; then
-		elog "For lirc configuration see:"
-		elog "https://code.google.com/p/mupen64plus/wiki/LIRC"
-	fi
-}
diff --git a/games-emulation/mupen64plus/mupen64plus-1.5-r2.ebuild b/games-emulation/mupen64plus/mupen64plus-1.5-r2.ebuild
deleted file mode 100644
index da9baaa2206d..000000000000
--- a/games-emulation/mupen64plus/mupen64plus-1.5-r2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils flag-o-matic games toolchain-funcs
-
-MY_P="Mupen64Plus-${PV/./-}-src"
-
-PATCH_VERSION="20100507"
-
-DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator"
-HOMEPAGE="http://www.mupen64plus.org/"
-SRC_URI="https://mupen64plus.googlecode.com/files/${MY_P}.tar.gz mirror://gentoo/${P}-patches-${PATCH_VERSION}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+gtk libsamplerate lirc qt4 cpu_flags_x86_sse"
-
-# GTK+ is currently required by plugins even if no GUI support is enabled
-RDEPEND="virtual/opengl
-	media-libs/freetype:2
-	media-libs/libpng
-	media-libs/libsdl
-	media-libs/sdl-ttf
-	media-fonts/dejavu
-	sys-libs/zlib[minizip]
-	x11-libs/gtk+:2
-	libsamplerate? ( media-libs/libsamplerate )
-	lirc? ( app-misc/lirc )
-	qt4? ( dev-qt/qtgui:4
-		dev-qt/qtcore:4 )
-	app-arch/xz-utils"
-
-DEPEND="${RDEPEND}
-	dev-lang/yasm
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if [[ ! $(tc-getCC) =~ gcc ]]; then
-		eerror
-		eerror "Compilers like clang and icc are not supported at this point"
-		eerror
-		die "You need gcc to build ${PN}"
-	fi
-
-	if ! use gtk && ! use qt4; then
-		ewarn "Building ${PN} without any GUI! To get one, enable USE=gtk or USE=qt4."
-	elif use gtk && use qt4; then
-		ewarn "Only one GUI can be built, using GTK+ one."
-	fi
-
-	games_pkg_setup
-}
-
-src_prepare() {
-	EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" \
-		epatch
-
-	rm -rf main/zip
-	epatch "${FILESDIR}"/${P}-minizip.patch #383845
-
-	sed -i \
-		-e "s:/usr/local/share/mupen64plus:${GAMES_DATADIR}/mupen64plus:" \
-		-e "s:%PUT_PLUGIN_PATH_HERE%:$(games_get_libdir)/${PN}/plugins/:" \
-		main/main.c || die "sed failed"
-
-	# Fix 010_all_fix-desktop-file.patch instead of using sed on the next major bump
-	sed -i \
-		-e "s:^Icon=mupen64plus-large.xpm:Icon=mupen64plus:" \
-		mupen64plus.desktop.in || die "sed failed"
-	epatch "${FILESDIR}"/${P}-gcc46.patch
-}
-
-get_opts() {
-	if use amd64 || use x86 ; then
-		echo -n "CPU=X86 ARCH=64BITS$(use x86 && echo -n _32) "
-	fi
-
-	use libsamplerate || echo -n "NO_RESAMP=1 "
-	use lirc && echo -n "LIRC=1 "
-	use cpu_flags_x86_sse || echo -n "NO_ASM=1 "
-
-	echo -n GUI=
-	if use gtk; then
-		echo -n GTK2
-	elif use qt4; then
-		echo -n QT4
-	else
-		echo -n NONE
-	fi
-}
-
-src_compile() {
-	tc-export CC CXX
-	use x86 && use cpu_flags_x86_sse && append-flags -fomit-frame-pointer
-	emake $(get_opts) DBGSYM=1 CC="${CC}" CXX="${CXX}" LD="${CC}" all || die "make failed"
-}
-
-src_install() {
-	# These are:
-	# 1) prefix - not used really, printed only
-	# 2) SHAREDIR
-	# 3) BINDIR
-	# 4) 'LIBDIR' - where to put plugins in
-	# 5) 'MANDIR' - exact directory to put man file in
-	# 6) APPLICATIONSDIR - where to put .desktop in
-
-	./install.sh "${D}" \
-		"${D}${GAMES_DATADIR}/${PN}" \
-		"${D}${GAMES_BINDIR}" \
-		"${D}$(games_get_libdir)/${PN}/plugins" \
-		"${D}/usr/share/man/man1" \
-		"${D}/usr/share/applications" \
-		|| or die "install.sh failed"
-
-	# Copy icon into system-wide location
-	newicon icons/mupen64plus-large.png ${PN}.png || die "newicon failed"
-
-	# 'Move' docs into correct dir
-	rm -r "${D}${GAMES_DATADIR}/${PN}/doc"
-	dodoc README RELEASE TODO doc/*.txt "${FILESDIR}/README.gentoo-patches-${PATCH_VERSION}" || die "dodoc failed"
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	if use lirc; then
-		elog "For lirc configuration see:"
-		elog "https://code.google.com/p/mupen64plus/wiki/LIRC"
-	fi
-}
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 449f0a8add56..2711d545fdf8 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/ut2003-demo/Manifest b/games-fps/ut2003-demo/Manifest
index 4d27580d2302..3b7f9477d1d8 100644
--- a/games-fps/ut2003-demo/Manifest
+++ b/games-fps/ut2003-demo/Manifest
@@ -1,5 +1,4 @@
 AUX benchmark 1180 BLAKE2B d1b909ae5aba80656f777ec53250c004e5b9ceaf9c330ebda057ac2109545daba5c711c85dfe6241292cbd7b0e3325df0c7900b95e6c3b742082ab97404f6b5f SHA512 4da05b170e3b8a983d264c83e094a8084a9a9b9b58c6f7fce30ea7273f625f8e6c03794a519cdaab5cfba64fb4b5047ab73eb3190c6a076a5fde4eb0399c1785
-AUX results.py 1461 BLAKE2B a83715d7ddd202280d6b8e392d14de5d50ad547e6761ba9db846e98b1764760bf20e1ada1eb223716e10ea2bed936584b642dc01d485ab4c5bca1b2dee07dbb9 SHA512 6b0e21638acda24e37105b33aaa979e18acbdd75f061a16a7a8d5109404bc1478988cad142167afe27a7ce5901e492178d2eda04c293d027048f6d873a56873a
 AUX results.sh 2107 BLAKE2B 97c8a2f835608d99fd2d0382d43088835743dc8f0cd1693a15efa06604e7f370671d0876aff0ec3a0fa4f2b7dc502503cd1fa824850261d39f38dcd7c0ba29b4 SHA512 749ccf70249d848605437da43f99f0fc881ee58edc85535d6ee0bf2bf57c5642a985979d5bc048a64363f711af35cafcd53d438974a13e62f705551ba6ec3d51
 AUX ut2003-demo 692 BLAKE2B c9eef6a5ee06c4c9619ca29c7cdafab5763a3cb63a8b060ac4c2da94935a63aff3276d6045eed24b6152df19bc0aab84db8e5264b6abea8a62289ac7d95280be SHA512 50b927c70865ca808cd060fc1a3e1bc7549f85acdeb18e90343108823db858e3580db5e584cad2e41358e205e4b5375c4deba6990aff4227a9b7e5333dcf51a8
 DIST UT2003CrashFix.zip 2764 SHA256 df1a6fdf81f388486b20abf301ef86fb72b0b12d96bec789d7cb7103da579813 SHA512 24fdaac873b08a0860c23f66b9bd93922fc4f64486adbe9bfefeb340f9d9374778b5e7bacd0e12cc79d819fb340e007ab2a7f1f45c9e4f27ab3ab6b11033d444 WHIRLPOOL ddea25bf472d5ca7f9c9dca1346820045504c10be90e914cd0c000a04c48ad4765e4b283a35cd91c2cb9f4cd8e1d2cabac660c2bfeccff05ecc42b1379242ff5
diff --git a/games-fps/ut2003-demo/files/results.py b/games-fps/ut2003-demo/files/results.py
deleted file mode 100644
index 3e626239129d..000000000000
--- a/games-fps/ut2003-demo/files/results.py
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/env python
-# Written by phoen][x <phoenix@gentoo.org>, Sep/19/2002
-# Modifications, enhancements or bugs? Mail me.
-import sys
-
-def help():
-	print "Usage"
-	print "  results.py logfile"
-
-def stats(data,mode):
-	print(
-""">> Score for %s
-MinDetail: %f (%d tests)
-MaxDetail: %f (%d tests)
-Average  : %f (%d tests)
-""" % (mode,data[0][0]/data[0][1],data[0][1],data[1][0]/data[1][1],data[1][1],
-       (data[0][0]+data[1][0])/(data[0][1]+data[1][1]),data[0][1]+data[1][1]))
-
-args = sys.argv[1:]
-if "--help" in args:
-	help()
-else:
-	if len(args):
-		file = args[0]
-	else:
-		import user
-		file = "%s/.ut2003/Benchmark/bench.log" % user.home
-	try:
-		myfile = open(file)
-		date = myfile.readline()
-		print(">> Results of the UT2003-demo benchmark")
-		print(">> created on %s" % date)
-
-		botmatch = ([0,0],[0,0])
-		flyby = ([0,0],[0,0])
-		
-		for line in myfile.readlines():
-			results = line.split()
-			category = results[0].split("-")[0]
-
-			if results[2] == "MinDetail":
-				detail = 0
-			elif results[2] == "MaxDetail":
-				detail = 1
-			else:
-				assert "Neither MinDetail nor MaxDetail?"
-				
-			if category == "botmatch":
-				botmatch[detail][0] += float(results[13])
-				botmatch[detail][1] += 1
-			elif category == "flyby":
-				flyby[detail][0] += float(results[13])
-				flyby[detail][1] += 1
-			else:
-				assert "Neither botmach nor flyby?"
-
-		stats(botmatch,"Botmatch")
-		stats(flyby,"FlyBy")
-		
-	except IOError:
-		print("Unable to open file %s" % file)
diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index d002860fc305..15b61479325c 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/arx-libertatis/Manifest b/games-rpg/arx-libertatis/Manifest
index be53f34e1688..1b102ebdfd6f 100644
--- a/games-rpg/arx-libertatis/Manifest
+++ b/games-rpg/arx-libertatis/Manifest
@@ -1,4 +1,3 @@
-AUX arx-data-copy 3090 BLAKE2B 5c5bb83784d3fda8c0250ae894d48ab0fc9fe52f7e964a53be3592f4c8f5283c7903140095fbaaa31103c12a36a3e1e72d482aeab3fa5d671a373f5f6155f6ef SHA512 dfbe8c97b9c7562062eb83f6558d23833a70ab8ca5e42f6cbadbdb97fd3e1cd4f568c415203e7c7aae36522187453f38304afac8a7e2cdc6f3288f76f915ffcb
 AUX arx-libertatis-1.1.2-cmake-3.5.patch 888 BLAKE2B 4294247d6ee5f24c7619e9b4cdfafa3efa5d5caf89d5c639a7083b4d408debfa985b95985eb0adfa680d4e2dd49f5afce0f295219eb31fe3762eca8487bff223 SHA512 c1da4981c407bc94ce87b520e2b6288fd6bac437a14dc3b54e8c2c7b01cbda0938b6995581938a2381d1f035ace95df58f3d894e8f7c6070986a5bc43f5e54c2
 DIST arx-libertatis-1.1.2.tar.xz 970608 SHA256 82adb440a9c86673e74b84abd480cae968e1296d625b6d40c69ca35b35ed4e42 SHA512 d4cb8187e7f63934408e38a51a44b7da03c8628820d43139507ff97ebd463b9cd7baf6cc4e85a3d4191d6e5f56850d77d07cfffc33d8f5a51378dfb41f719fb8 WHIRLPOOL 8408189dd184ce692962fb157e89048e96f9a29f47cd16163f0194e5ccb5c8a3c8bbac33fabd253d11eb07fd74b5598ccf98a94383c656c0686aff5485f4bb0e
 EBUILD arx-libertatis-1.1.2.ebuild 2435 BLAKE2B a6211c361a124d47544c02d04b3e6a9cec18f6b60a315b7175dee67162c6fee966f9d20ae4046f962381463b3de54748d2e270a398b8b6fec667f296d7e4eeb3 SHA512 40bf47db0ae3fff9e1bd21306d6f81590d9ca11ca35d9963bc2880ea79828a8a0b271b00dc71e4c4e8ae363658223a6eddd91372e7207aec08759df36aac0280
diff --git a/games-rpg/arx-libertatis/files/arx-data-copy b/games-rpg/arx-libertatis/files/arx-data-copy
deleted file mode 100644
index f11fc05eb2c1..000000000000
--- a/games-rpg/arx-libertatis/files/arx-data-copy
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/sh
-
-die() {
-	echo "$@" >&2
-	exit 1
-}
-
-# Handle arguments
-if [ "$1" != "--help" ] && [ "$1" != "-h" ] ; then
-	SOURCE="$(readlink -f "$1")"
-else 
-	die "\
-Usage: arx-data-copy path/to/ArxFatalis/ [output_dir]
-
-This script can be used to copy the game data from a fully patched
-Arx Fatalis 1.21 install (for example a Steam download).
-Files will be renamed as needed by Arx Libertatis.
-
-You can get the 1.21 patch from http://www.arkane-studios.com/uk/arx_downloads.php"
-fi
-
-if [ "$2" = "" ] ; then
-	DESTDIR="$(pwd)"
-else
-	DESTDIR="$(readlink -f "$2")"
-fi
-
-cd "$(dirname "$0")"
-
-echo "Installing Arx Fatalis data from \"$SOURCE\" to \"$DESTDIR\".
-"
-
-# Check for required files
-[ -d "$SOURCE" ] || die "$SOURCE does not exist"
-
-# files
-set -- \
-	"data2.pak" \
-	"graph/interface/misc/arkane.bmp" \
-	"graph/interface/misc/quit1.bmp" \
-	"graph/obj3d/textures/fixinter_barrel.jpg" \
-	"graph/obj3d/textures/fixinter_bell.bmp" \
-	"graph/obj3d/textures/fixinter_metal_door.jpg" \
-	"graph/obj3d/textures/fixinter_public_notice.bmp" \
-	"graph/obj3d/textures/item_bread.bmp" \
-	"graph/obj3d/textures/item_club.jpg" \
-	"graph/obj3d/textures/item_long_sword.jpg" \
-	"graph/obj3d/textures/item_mauld_sabre.jpg" \
-	"graph/obj3d/textures/item_mauldsword.jpg" \
-	"graph/obj3d/textures/item_mirror.jpg" \
-	"graph/obj3d/textures/item_ring_casting.bmp" \
-	"graph/obj3d/textures/item_rope.bmp" \
-	"graph/obj3d/textures/item_spell_sheet.jpg" \
-	"graph/obj3d/textures/item_torch2.jpg" \
-	"graph/obj3d/textures/item_torch.jpg" \
-	"graph/obj3d/textures/item_zohark.bmp" \
-	"graph/obj3d/textures/l7_dwarf_[wood]_board08.jpg" \
-	"graph/obj3d/textures/l7_dwarf_[wood]_board80.jpg" \
-	"graph/obj3d/textures/npc_dog.bmp" \
-	"graph/obj3d/textures/npc_pig.bmp" \
-	"graph/obj3d/textures/npc_pig_dirty.bmp" \
-	"graph/obj3d/textures/npc_rat_base.bmp" \
-	"graph/obj3d/textures/npc_rat_base_cm.bmp" \
-	"graph/obj3d/textures/npc_worm_body_part1.jpg" \
-	"graph/obj3d/textures/npc_worm_body_part2.bmp" \
-	"graph/obj3d/textures/[wood]_light_door.jpg" \
-	"manual.pdf" \
-	"map.pdf" \
-	"misc/arx_default.ttf" \
-	"misc/arx_russian.ttf" \
-	"misc/arx_taiwanese.ttf" \
-	"misc/logo.avi" \
-	"misc/logo.bmp" \
-	"sfx.pak" \
-	"data.pak" \
-	"loc.pak" \
-	"speech.pak"
-
-# Install required files
-ret=0
-for f in "$@" ; do
-	DEST="$DESTDIR/$f"
-	DIRNAME="$(dirname "$f")"
-	FILE="$(basename "$f" | sed 's/[^[:alnum:]_-]/\\&/g')"
-	FILE_DEFAULT="$(echo "$FILE" | sed 's/^\(.*\)\(\.[^.]*\)$/\1_default\2/g')"
-	
-	# don't screw permissions on existent folders
-	[ -e "$DESTDIR/$DIRNAME" ] || { mkdir -pv "$DESTDIR/$DIRNAME"
-		chmod 755 "$DESTDIR/$DIRNAME" ; }
-
-	find "$SOURCE" -iname "$FILE" -exec cp -fv '{}' "$DEST" \;
-	find "$SOURCE" -iname "$FILE_DEFAULT" -exec cp -fv '{}' "$DEST" \;
-
-	chmod 644 "$DEST" || { missing_files="$missing_files
-	$f" ; return 1 ; }
-
-	ret="$(($ret + $?))"
-done
-
-[ "$ret" = "0" ] || die "
-$ret errors and following files not installed:$missing_files
-
-You either have incorrect permissions on \"${DESTDIR}\"
-or don't have patch 1.21 installed. Fix it and rerun this script."
-
-echo
-echo "Now run:
-	arx --data-dir \"$DESTDIR\""
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 12a36ce2cb60..fbce94635e72 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index 7af6d9773131..306756c55f2e 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1,5 +1,6 @@
 AUX freeorion.envd 70 BLAKE2B a893f14754bfb7617f4a250dce8d64ea3de6c0ed3ad51fb62d46baf39ac3e4ead44a51e22e934d206eeef77b5bbdb2e4240178e856def0280ed38607647b4909 SHA512 ed9e2adf837cd381241dacf4da446a8ded1486c51a011eaf0cdf84b62831cd005f3e210b8f31847f9aba1d54ddd5f352fde6b33eefb215ab264ff53c3e3be74b
-DIST freeorion-0.4.7.1.tar.gz 105942075 SHA256 924a88464e92c14aa8f6722b57f702e07d43c7257cf272150c98bc3c1124a87e SHA512 9c8d0437ee827a1104a541e1123ce6b5d229bd6253bfe275028805a4c34de882ca3a9d5361e3f64098f935d0926a656a64fe468690c8d195e05de86cd1b2699d WHIRLPOOL 87b328364320221715b1dc16154a40299229990b8726a4053ba875ca4fdc6838c354cae7d93036fbe92003e2f2158b9325715e20488e8af7c22723924ce3eec1
+DIST freeorion-0.4.7.1.tar.gz 105942075 BLAKE2B f75940ac79e329fd7e03e85b1cd712ff6dcf06583ad8feff43f8b2d6e28a53c9029724d1450d26d2367bafd1d04858e3659b8e47986df96657d91526f594eb5e SHA512 9c8d0437ee827a1104a541e1123ce6b5d229bd6253bfe275028805a4c34de882ca3a9d5361e3f64098f935d0926a656a64fe468690c8d195e05de86cd1b2699d
+EBUILD freeorion-0.4.7.1-r1.ebuild 1681 BLAKE2B f663fafd8bdb7e5c7150bef483de54ad3d216f19542b2895ceb478ab3b28c517a4344df3f894eb5d395816f6d1976bb0c57ed3fe39981f7b70435b60b1e48254 SHA512 ec33cb54a450c2ea11fc17b20d4abd27cefac3a61618e30372baf75b793536ef38b9a489a8a60468f9735c4ed78d199ebe64a1b917bcb1cfdc7f71f5a043a819
 EBUILD freeorion-0.4.7.1.ebuild 1679 BLAKE2B d60e8dca3465f700cc629f8df45b4f92efbfa1814e6d4dd2c23b40c13684cc614c947c40e931810095487cf3070077dc8ba36b36a3fcf51e5b3c657f6b6f4607 SHA512 88f9d3905770f0a97a3938d58bad1c6698c5d8b651718a19cb634aaef857582023051700bc692ae59a2b8ee83b1da6841fff1a576078f7df1705e388b6faca7b
-EBUILD freeorion-9999.ebuild 1679 BLAKE2B d60e8dca3465f700cc629f8df45b4f92efbfa1814e6d4dd2c23b40c13684cc614c947c40e931810095487cf3070077dc8ba36b36a3fcf51e5b3c657f6b6f4607 SHA512 88f9d3905770f0a97a3938d58bad1c6698c5d8b651718a19cb634aaef857582023051700bc692ae59a2b8ee83b1da6841fff1a576078f7df1705e388b6faca7b
+EBUILD freeorion-9999.ebuild 1681 BLAKE2B f663fafd8bdb7e5c7150bef483de54ad3d216f19542b2895ceb478ab3b28c517a4344df3f894eb5d395816f6d1976bb0c57ed3fe39981f7b70435b60b1e48254 SHA512 ec33cb54a450c2ea11fc17b20d4abd27cefac3a61618e30372baf75b793536ef38b9a489a8a60468f9735c4ed78d199ebe64a1b917bcb1cfdc7f71f5a043a819
 MISC metadata.xml 684 BLAKE2B 1c415c0258973d2953f7ee0a9ff5811b17cff7000a499e2568c56b09f6c7ca40aedd345c1f377822bb0d30d50638fe76eb1e12da19da0a86b76bba9919633199 SHA512 e569a1bb722ad194a47292a6c67670fef05f5f1ac390245c81140e8fcc57f2699eec4e8037e3cae31d46d7e62eac8504d69971dc7db76226f2a31f85bb531bb1
diff --git a/games-strategy/freeorion/freeorion-0.4.7.1-r1.ebuild b/games-strategy/freeorion/freeorion-0.4.7.1-r1.ebuild
new file mode 100644
index 000000000000..d0d5447656d7
--- /dev/null
+++ b/games-strategy/freeorion/freeorion-0.4.7.1-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils python-any-r1 gnome2-utils
+
+DESCRIPTION="A free turn-based space empire and galactic conquest game"
+HOMEPAGE="http://www.freeorion.org"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/freeorion/freeorion.git"
+else
+	MY_PV="${PV/_/-}"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/boost-1.56:=[python,threads]
+	media-libs/freealut
+	media-libs/freetype
+	media-libs/glew:*
+	media-libs/libsdl2
+	>=media-libs/libogg-1.1.3
+	media-libs/libpng:0
+	media-libs/libsdl2[X,opengl,video]
+	>=media-libs/libvorbis-1.1.2
+	media-libs/openal
+	sci-physics/bullet
+	sys-libs/zlib
+	virtual/opengl
+	!dev-games/gigi"
+	# Use bundled gigi as of freeorion-0.4.3
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	# build system is using FindPythonLibs.cmake which needs python:2
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -e "s/-O3//" -i CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_BUILD_TYPEE=Release
+		-DRELEASE_COMPILE_FLAGS=""
+		-DCMAKE_SKIP_RPATH=ON
+	)
+
+	append-cppflags -DBOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc ChangeLog.md
+
+	newenvd "${FILESDIR}/${PN}.envd" 99${PN}
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild
index 1be8614838d4..d0d5447656d7 100644
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ b/games-strategy/freeorion/freeorion-9999.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	>=dev-libs/boost-1.56[python,threads]
+	>=dev-libs/boost-1.56:=[python,threads]
 	media-libs/freealut
 	media-libs/freetype
 	media-libs/glew:*
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index bdb2256752bf..dcfb75324766 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/kdelibs/Manifest b/kde-frameworks/kdelibs/Manifest
index 9abe5c3ff008..bec4349605e8 100644
--- a/kde-frameworks/kdelibs/Manifest
+++ b/kde-frameworks/kdelibs/Manifest
@@ -13,5 +13,5 @@ AUX kdelibs-4.6.3-no_suid_kdeinit.patch 963 BLAKE2B 19df42a9b0ba3f0ab1b6a5d990b4
 AUX kdelibs-4.8.1-norpath.patch 788 BLAKE2B cdf6f6cd3df45f53782d81be09ea85051e90e1a9925972b608cec1a9324c2a5d364821b2ef63076c50140f0558ffe46e1f13b7f1754c4c2e3da2c805c3c49e1a SHA512 6c8b3bfb9e468ec05508919ef7aca04421334c99dac0b8f1550efc2fb04554b8af97b3da52050102417db3d46884f5f4e677fd42ecb3b768b3b7a77d413c3d89
 AUX kdelibs-4.9.3-werror.patch 1525 BLAKE2B cf48f41c843ef00493c0cfe99dc97c63ff09446f8822ba17d73de40dd09561c07f6b0020d8318a3fb7df8393315b8f7bacb0f1fda158ed869701c526ccf37692 SHA512 d2df35a0330bc98745cedb0dba1733969198cb3024de8b1b70bc552b4abd0bcf42c8f17a40519189b29f4ab2d054ba7ee28436e274c8ed674c9b12620b07814f
 DIST kdelibs-4.14.37.tar.xz 11642272 SHA256 4e9e4a1bf32f28427899b01bf19db01acee974e2e008ca659102a01cc0f3e430 SHA512 b25a845b7c1edae0c66b0a0881801dd3c57febc4cb57186ddddfd32c3253e492b7ff866fb38a10e4fb489233ecee71e80f3a1806f293a29607ea5f68d60ab6e1 WHIRLPOOL 4c0d6cb48d61eac89ad410b0555741809bcbb5adf2f1ecd53763fae04e79dc478104ad05db8dd4fcd43052a63d6b62db0f33e0d845a8d2c9d09f85c92e9233e1
-EBUILD kdelibs-4.14.37.ebuild 6704 BLAKE2B 446b6dc0abdbd7379502367ca6e9e114523d354ab037069c94bcc49d06cd8d56533535c2fdcd7a997efb2d1c6cae81ed3ac323647473f4c69e5a1d3bb805965a SHA512 532cb2ef5230dcc4387bc344c2a1b25ee6006c173952717753601b76bffaf4ed0325ca0429337472b223841f354021057539a6f11e228bbdb743b2055f99acb1
-MISC metadata.xml 426 BLAKE2B 921963f19d64d864e3a0163071e24445c9b8635ef8279c4a87263595576d2fcb94ff0dfbf56695a78b82624592f50f3d38b743fdf40d317207dfbf6dd88cc83a SHA512 ea96586720b37b26dd5f95225ec84a53cc2ef8732343ae882e1ea5ca20a077a2ca3b7d9f94a7a075f3a1f01858b70f7a4a933036f826c0c2d681bc63abfda2ee
+EBUILD kdelibs-4.14.37.ebuild 6627 BLAKE2B 17450c636b00b392a44bf4485fdf34db46885d5ffca881ad2ca19d1b3feed9a52964b1a43d24f86e81aefb4d555ca18daa47ff4fc32705e3d837cd153d5c1d69 SHA512 8273fdbc5fda2a731c90dd271e850b4de27b85bba6d2f1f9db764d3e371820b7f66fc0a4fdbc7323919b657985f2f0c6de4917c624170623385a257d3676ea09
+MISC metadata.xml 353 BLAKE2B 3048f8a7581ac3c5f1178e2d17aba931887ea4542e529ec098af1b1f61b369d407613bfb2b4cb8ff931cf486475246c52cdaa4362ee16e8d7449695849faeb46 SHA512 6dae9e92d4f396fec1c208d028b9590cbc3b874a8c5e5968488b236e93d99fa763a87ce3ff22383721f7cbc76949c79e1e1bfe85c4ebdd7266ed986fda782587
diff --git a/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild b/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
index e02222c8285a..c7a824f98618 100644
--- a/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
+++ b/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
@@ -6,7 +6,6 @@ EAPI=6
 CPPUNIT_REQUIRED="optional"
 DECLARATIVE_REQUIRED="always"
 KDE_HANDBOOK="optional"
-OPENGL_REQUIRED="optional"
 inherit kde4-base toolchain-funcs flag-o-matic xdg-utils
 
 APPS_VERSION="17.08.2" # Don't forget to bump this
@@ -22,7 +21,6 @@ libressl lzma cpu_flags_x86_mmx nls openexr plasma +policykit qt3support
 spell cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf"
 
 REQUIRED_USE="
-	opengl? ( plasma )
 	udisks? ( udev )
 	upower? ( udev )
 "
@@ -134,11 +132,9 @@ src_prepare() {
 	sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \
 		-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."
 
-	if ! use opengl; then
-		sed -i -e "/if/ s/QT_QTOPENGL_FOUND/FALSE/" \
-			plasma/CMakeLists.txt plasma/tests/CMakeLists.txt includes/CMakeLists.txt \
-			|| die "failed to sed out QT_QTOPENGL_FOUND"
-	fi
+	sed -i -e "/if/ s/QT_QTOPENGL_FOUND/FALSE/" \
+		plasma/CMakeLists.txt plasma/tests/CMakeLists.txt includes/CMakeLists.txt \
+		|| die "failed to sed out QT_QTOPENGL_FOUND"
 }
 
 src_configure() {
diff --git a/kde-frameworks/kdelibs/metadata.xml b/kde-frameworks/kdelibs/metadata.xml
index 0c83fe5f7802..ed16b85b6d74 100644
--- a/kde-frameworks/kdelibs/metadata.xml
+++ b/kde-frameworks/kdelibs/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<flag name="opengl">Enable OpenGL support for Plasma (GLApplet)</flag>
 		<flag name="qt3support">Enable kde3support/qt3support for very old applications</flag>
 	</use>
 </pkgmetadata>
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 205dd799489d..7b916ca58c8c 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 7b8f819dbb07..f286900f35b8 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -13,5 +13,5 @@ EBUILD neomutt-20170912.ebuild 2873 BLAKE2B c1d8f2746fc0b4db7b118fa5b45ee72ecebf
 EBUILD neomutt-20171006.ebuild 2785 BLAKE2B 2bfd22e3165a509db8ac7620388cfdd18fd254461da69838ab52dba127ef999f2a8ac90dd4b8cbcf8f4827b1fe4ed81f500bb6957ed57d297d3236fdfeb14d03 SHA512 c7576ab061c3b6726f06dbb584145751a573c5ff19a3e6157d96a7a22d54980fbe70682a37d00003e872b854b658b284a37bb7bda7913023cd8bb7fc3387a4e4
 EBUILD neomutt-20171013.ebuild 2709 BLAKE2B 03ef87a76af095aa61d2b0630979ef74d2bab16b00cf023c18bef7276fe56565021390a200f29544089b9111f025f32f8c9b8f3dd4ec3e62d9651e346f43515a SHA512 e4ba14fc7d2415419c91cfff4b6f5d633179e53d8dcb43b71786c8b63b97832f45fd0506debbfc763b77496ca075d13d3f941cd20e029f28a505cb28b4dfc78e
 EBUILD neomutt-20171027.ebuild 2709 BLAKE2B 03ef87a76af095aa61d2b0630979ef74d2bab16b00cf023c18bef7276fe56565021390a200f29544089b9111f025f32f8c9b8f3dd4ec3e62d9651e346f43515a SHA512 e4ba14fc7d2415419c91cfff4b6f5d633179e53d8dcb43b71786c8b63b97832f45fd0506debbfc763b77496ca075d13d3f941cd20e029f28a505cb28b4dfc78e
-EBUILD neomutt-9999.ebuild 3286 BLAKE2B 41c39525cfc3774d6c0672f86ce0fedfe817c20da301e1acd6645ec523efcab933337179a9a1cb28e237bf9768e69ca9caf2347ed796cdc6eeb2c8079dafd64e SHA512 072bfd48cee94c00b24393b2e1dcd06284d752510f8273bb66becee40fd58e7c0a792a651f5bbfaaa1eb9bc3a1300964ee60e74b26a655f2408fad88bcb8ba3c
-MISC metadata.xml 1332 BLAKE2B 0a89334063778b8eabe6e3e3e73005a70c83d362cc874db715cb6c41ccd06f9ac95e358fa75352a4f5b5ec85a73b74084cc0d819dc615cccae29d824a99bd150 SHA512 06bfe8a9dde4a0ba25eef156e6b39552ab9dc7b1ad68a3dcbdb102e4416ded8ab536cf6ef4737e61561117eed21ebe0ce2aaf6ee3463b252f0a02177561a3c3e
+EBUILD neomutt-9999.ebuild 3274 BLAKE2B 231f9bff37d1cb6bd6f6dde94e9943adf7835301f917baf95d1ca5d399337719d677cd7dc187cc373b24d92b5f1fd58cf12b9ae87088d94675079567552a8f29 SHA512 fc039a384d5815d5e8b19d66a2236dd2cd006ce09f32d6dfaaebdea4c22c0294e1cb877c9fdc7657fbd7ef243e8c3387b30a178fb13c953b8f60486e6a76d97f
+MISC metadata.xml 1430 BLAKE2B cde0fee81787af5d8401b456deafc66ac9427a88b25866abbecbf874c30a6acc69375f4c7705916985b79e052ca2c07e2a0c7ab853dbc562e53230ec11c15e28 SHA512 e19508e8851160c14d2bab48f54b3cf959411b3b0ccfe3555414bc563e8300daf03cf328379569fc516576d0065fb440f3f6426509b599d70555282426163cc3
diff --git a/mail-client/neomutt/metadata.xml b/mail-client/neomutt/metadata.xml
index 9810e2b83198..380ec81eb0cc 100644
--- a/mail-client/neomutt/metadata.xml
+++ b/mail-client/neomutt/metadata.xml
@@ -10,7 +10,6 @@
 			caching</flag>
 		<flag name="gdbm">Enable GDBM (GNU dbm) backend for header
 			caching</flag>
-		<flag name="gpg">Enable support for <pkg>app-crypt/gpgme</pkg></flag>
 		<flag name="kyotocabinet">Enable Kyoto Cabinet database backend for
 			header caching</flag>
 		<flag name="lmdb">Enable LMDB (Lightning Memory-Mapped Database)
@@ -19,13 +18,16 @@
 			<pkg>net-mail/notmuch</pkg></flag>
 		<flag name="qdbm">Enable QDBM (Quicker Database Manager) database
 			backend for header caching</flag>
-		<flag name="smime">Enable support for smime</flag>
 		<flag name="tokyocabinet">Enable Tokyo Cabinet database backend for
 			header caching</flag>
-		<flag name="gpgme">Build gpgme backend to support S/MIME, PGP/MIME and
-			traditional/inline PGP</flag>
+		<flag name="crypt">Add support for encryption -- using mcrypt or gpg
+			where applicable</flag>
 		<flag name="pgp_classic">Build classic_pgp backend to support PGP/MIME
 			and traditional/inline PGP</flag>
+		<flag name="gpg">Enable support for <pkg>app-crypt/gpgme</pkg></flag>
+		<flag name="gpgme">Build gpgme backend to support S/MIME, PGP/MIME and
+			traditional/inline PGP</flag>
+		<flag name="smime">Enable support for smime</flag>
 		<flag name="smime_classic">Build classic_smime backend to support
 			S/MIME</flag>
 	</use>
diff --git a/mail-client/neomutt/neomutt-9999.ebuild b/mail-client/neomutt/neomutt-9999.ebuild
index 8a0f8bb25dd2..406bc5c0cc73 100644
--- a/mail-client/neomutt/neomutt-9999.ebuild
+++ b/mail-client/neomutt/neomutt-9999.ebuild
@@ -5,11 +5,10 @@ EAPI=6
 
 inherit autotools eutils flag-o-matic
 
-if (( ${PV} == 9999 )); then
+if [[ ${PV} =~ 9999$ ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index c4b9540210d0..9b2b58f9ff5f 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/kuickshow/Manifest b/media-gfx/kuickshow/Manifest
index 7e5edd962ad1..0da9481db7db 100644
--- a/media-gfx/kuickshow/Manifest
+++ b/media-gfx/kuickshow/Manifest
@@ -1,4 +1,4 @@
 AUX kuickshow-0.9.1-gcc6-compile-fix.patch 408 BLAKE2B ef6450d7f9b0feebed096c04bcf409a1a93c5fc1189c917fee14dd691d9ca421e547f7197f676bb23a1bb21b8e0abba3db474ddaa033de9408ab65deed35502b SHA512 0b64ebefab7aed4b9a42457f3782a7f36ab61fee96d281ee1d42c6315e25a1afd97a92d9d847862eaa2a5cee5fe3190ddd74c3cfcaa92ca5e1718390c48104f1
-DIST kuickshow-0.9.1-kde4.4.0.tar.bz2 915108 SHA256 fa849380e8c5b628551510f6bf3d6c59e7d68bf437f80d0414ef2b73c826a40e SHA512 394b95c6b7c3b655a96729559271cd837ff5995aefc7e229f3bc7905f7e64f3fb05d34a67c9a9ba584c1cdbc459b7349d0e134a16afe9e0505b5a494e85ab87e WHIRLPOOL 3b2766833d86acd861d424054e73124287d3c2ceddeff0c9b5165d2aacae9cccb2e9c51d9092bf70bc4f3c979855ae3ee34c1e38e0928dc364b37045c59d773f
-EBUILD kuickshow-0.9.1-r2.ebuild 838 BLAKE2B 2da38229fdd696872679e9f044533d1d2a672e79c2d32c4796e10f3da2f82d184e502f646d55bff7205d63673a381ef78d6003ba4802205e1fb3f1d5aa468b49 SHA512 96d735bbce1adde8b05ec638b4687a14f553b9f856b2ff1e1fe6a6255b59dd2e442edec59bd0f5693264520526cc03209c04e6e8d09de51adde42202620d8df9
+DIST kuickshow-0.9.1-kde4.4.0.tar.bz2 915108 BLAKE2B d6ba91bd737ced19c4dbd8320da553b0212a60b6f98aa2188d1d8068856182b2b61a186ed02d29bf88649fc6bd7a6db16fb825c3711b26ac4ac37b7eee0e1071 SHA512 394b95c6b7c3b655a96729559271cd837ff5995aefc7e229f3bc7905f7e64f3fb05d34a67c9a9ba584c1cdbc459b7349d0e134a16afe9e0505b5a494e85ab87e
+EBUILD kuickshow-0.9.1-r3.ebuild 599 BLAKE2B 5dbd0e2403140574560650c0ea844a3eba21aae1e5a62947225d2e1670b6ebfea19a92131b83846c73391b164840a9a1ebc1879e96e4c4a7dd2aa710bb1f1744 SHA512 6fcf79f99ff3ba88be85cafacb363973860b70623bff265d9256fd0f84c4a505d32c373d3ae10b4b9d7033ebaf931a2942c42925fae93a1f9f07f5d722f3322f
 MISC metadata.xml 368 BLAKE2B 2e35a817f35b6cd1371efcbc8c9f178d378d9951a7f72068020fb27e5aeb7de5e903e20c65355780ab66ba08c0655b16fdbf48aa8f02cba8a66cf706c813b730 SHA512 9396698295f746c83f4fe1cc56396093feedb617a0a8cd1fa750b9f3099d9db014329d021af1021b0a22e73a3a8190b10ba5b80c0e753ea526094382e7495d20
diff --git a/media-gfx/kuickshow/kuickshow-0.9.1-r2.ebuild b/media-gfx/kuickshow/kuickshow-0.9.1-r3.ebuild
index 81ffeba74aea..16158579a72e 100644
--- a/media-gfx/kuickshow/kuickshow-0.9.1-r2.ebuild
+++ b/media-gfx/kuickshow/kuickshow-0.9.1-r3.ebuild
@@ -3,10 +3,6 @@
 
 EAPI=6
 
-KDE_LINGUAS="af ar be bg bn br ca ca@valencia cs cy da de el en_GB eo es et eu
-fa fi fr ga gl he hi hne hr hu is it ja km lt lv mai mk ms nb nds ne nl nn oc
-pa pl pt pt_BR ro ru se sk sl sv ta tg th tr uk uz uz@cyrillic vi xh zh_CN
-zh_TW"
 KDE_DOC_DIRS="doc doc-translations/%lingua_${PN}"
 inherit kde4-base
 
diff --git a/media-gfx/sam2p/Manifest b/media-gfx/sam2p/Manifest
index 7529690b02d3..6e50162be44a 100644
--- a/media-gfx/sam2p/Manifest
+++ b/media-gfx/sam2p/Manifest
@@ -9,5 +9,5 @@ DIST sam2p-0.49.2.tar.gz 562733 SHA256 0e75d94bed380f8d8bd629f7797a0ca533b5d0b40
 DIST sam2p-0.49.3.tar.gz 2184864 SHA256 687210c3ccd12da646db2a6e53f2de5a3a7639a7bcb0c381a61789eca50a824d SHA512 9e9c91a2cd692e49bf73e7c197a0fcbe7df96c685636d1d00456eb8b4b847de3f4848d9bb3d9246340c479c62900ddd4e0a248257aa5e6ec6e16683c5dad54f8 WHIRLPOOL 5362348d1955f67ae6f64b72ec0d53e88e21c46d281e3e844329059f7d0f2c4a1ac2b2faeca48c1a923fbbbcff1c9732bb016192c001a2de1970197a17051f9b
 EBUILD sam2p-0.49.1.ebuild 943 BLAKE2B 6259783a2e7619beb2eae5b43c1849dc1618018e15b3217d56395750f370faa826c90615a3d6913397b9de664e59ab9c22411aa30a471acc893f169a72981ee5 SHA512 c90d0c231a6521de2d02d3b6a1963d11d096ac632428d23eeb1cae77cf3665f19032a97b62eced9fe5cd0ecf0a6c9d142582924b718f57e423ecfb2bfdab5b77
 EBUILD sam2p-0.49.2.ebuild 911 BLAKE2B 64dac29a79eb410e855a2df6dfd5d3b5737c7e345e1ecf3c617bd2542562c8c4ba1ca906e3f6a08a498df5bcb3487e20e9c8cc6031946d79295b20c98fd4986d SHA512 de9cb80aa6a45f5417daf63a2862d81effd51ed09d4851381399e8b6edb42ed5facb16790c1c6987cd8b2157d394f1f07ae462292be4a1ba00f1d05a0daddc49
-EBUILD sam2p-0.49.3.ebuild 994 BLAKE2B adab9435d32382e3b34d0febe7ecb633f3ed41988a011e0c3a7e27f64f998b6f6b73c19b0f3088c3d821277b8a14fc7d338fb0a9b453f591eec117c8b3bde454 SHA512 6774363be58fffdee1aa94384962b29ead42e5d27dde82422d3c9ada8a50c9ca1134fa3d06228252b2452b6adbb5e11d0a8c2a18229f219953d9edac30b48e38
+EBUILD sam2p-0.49.3.ebuild 993 BLAKE2B bd0e101e462d245df3ae6a5c93d7b07f35246a3659168b752459b59e474c598f6ce3c27223959c394120299acaf9c6df92bde275e7aae6f738d70508b595f738 SHA512 3441b947397675ef63665b0e59531b4a55a770c17f7e4d3f010ba3852989752b77b5112b16d9e4b31213a2a7d28c56efb5dee868844d05198a1c78a4e5666e5d
 MISC metadata.xml 373 BLAKE2B a0a62fca7fbcd916d83a6d7fa8f020c333b529ed06492cd8f52a8e04d228714bd53d1283e0b43f5a0c399aafdaf99b5caa5534a0ba54e1bff4958b4f28e899f7 SHA512 2bac0bb931232d7b994f24551d0fedccfcaf69932e4900264857e9ba09a9c32495ab743c1fe930e63adca3b7bc11efdea526982e6e27869033bc17731fa5c7fa
diff --git a/media-gfx/sam2p/sam2p-0.49.3.ebuild b/media-gfx/sam2p/sam2p-0.49.3.ebuild
index b135825759b9..c6eb44f5fa9b 100644
--- a/media-gfx/sam2p/sam2p-0.49.3.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pts/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="examples gif"
 
 DEPEND="dev-lang/perl"
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 1d9ad3afbd05..4e27f17e5ee1 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libdvbcsa/Manifest b/media-libs/libdvbcsa/Manifest
new file mode 100644
index 000000000000..26cad0709d2d
--- /dev/null
+++ b/media-libs/libdvbcsa/Manifest
@@ -0,0 +1,3 @@
+DIST libdvbcsa-1.1.0.tar.gz 345487 BLAKE2B ff5d9347f4255ca2c4e62477771715a7d8fcfca6eeb3a2e6cfdfcd903c9927a35d9049d18ec5a9d458328d6a3712d6cf81633e7ddc7c67d1a8099b8d56b2fd68 SHA512 f336bc90711261bb86bb42f897d5207a71da5a384bfb7d641de7e1fb3a43d20aeec250e9a5ceaf0b20f1e4335ccda70055675256c6889873bf1bfff55005a015
+EBUILD libdvbcsa-1.1.0.ebuild 804 BLAKE2B ca1b12f28e02ceaf199a0d3fb4da1596dbc49a9bfb7a7a276255858496bf3c96913b4544c835c313ccccc538d42233e2eb564541a00c614714719360134c0944 SHA512 18f56aaea857d6dd5466ae59c1782f70275373581c3d689ab42c412f0c197e1e3f925d38dc9cfaae0a993d3b034833498351b91c5f43c7813c5a55b17932faf7
+MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/media-libs/libdvbcsa/libdvbcsa-1.1.0.ebuild b/media-libs/libdvbcsa/libdvbcsa-1.1.0.ebuild
new file mode 100644
index 000000000000..8c96eb334aa0
--- /dev/null
+++ b/media-libs/libdvbcsa/libdvbcsa-1.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Free implementation of the DVB Common Scrambling Algorithm - DVB/CSA"
+HOMEPAGE="https://www.videolan.org/developers/libdvbcsa.html"
+SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug cpu_flags_x86_mmx cpu_flags_x86_sse2 static-libs"
+
+src_configure() {
+	econf \
+		$(use_enable ppc altivec) \
+		$(use_enable debug) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable static-libs static) \
+		$(use_enable x86 uint32) \
+		$(use_enable amd64 uint64) \
+		--enable-shared
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libdvbcsa/metadata.xml b/media-libs/libdvbcsa/metadata.xml
new file mode 100644
index 000000000000..54be7ff7e5d6
--- /dev/null
+++ b/media-libs/libdvbcsa/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 059ce15e7448..9b908610f02a 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -11,7 +11,7 @@ EBUILD mesa-13.0.5.ebuild 13605 BLAKE2B 31f0f37632ef1a0e11ca1dfb7f084ab0070e0f77
 EBUILD mesa-13.0.6.ebuild 13553 BLAKE2B 30614f1f5201caf6c4a701e08a70809a2f0ccb405a63d386c62f5999ae6df379020d3ef138fa72512e65d8bcd2ff4b228b2a603b2b84197ed0399472620ffbe2 SHA512 715a50c81cd752dd46b24b41da5e964cfffe13d6870ef9a9f6f18c22adfedd516ffb42845735fb52fe40d4e6ffc7507ee96c569ff3dae89503f3dece72b2647c
 EBUILD mesa-17.0.6.ebuild 13560 BLAKE2B fd2dbce008cadca8141e16dd7f2cc8660aa4a167c888d7728c9061021fe4c090d9d71ca701d8c43715f29c6412aa098312c974ffe5a10d7539d961e043bf71cd SHA512 7caefbaed248f2dffd5cc9bb8fe769d3e412c71659f462b9fabed173766b7dac449707d7e80caaed1f3e81ef01c169c6b366376bbf33b8bd4dfc8771f5e6d334
 EBUILD mesa-17.1.10.ebuild 13436 BLAKE2B 33d0bdb9de92460a682ca5089df1842a0c6ea485724cf684e778993cc0cc47e751fa042f68fb4b47c0aa6d0d952e163cc04806d130c4cd20e65014a82eef66a2 SHA512 b29bb8f80706f2bdf5602951b346901c0357e81e3e73afab1ca6ccdf1c1037660f6b66d05c999563bc22d0da68416c68368b8d741e1c961164161d8b5dd41170
-EBUILD mesa-17.1.8.ebuild 13429 BLAKE2B b3042ec0a019be66e1924106b7ae84c285bcffc10f76a3b7e29f0b17ad4a01a6a1158fed3a276fae1f2743531f7177d1885158c318e698be553f73e80e92e8cc SHA512 1c6cb318a27a53efc52e83d0c09f28ca69e533c69047bcda1a226cfdfd644786c2ebb942ee2b1299947e0b955de87c04c5879671a2cd9392eda07876c97920c1
+EBUILD mesa-17.1.8.ebuild 13428 BLAKE2B a532f672adae2e3d84ca72ff5d05fb7fa7b2a8b614b145093c02788fee49cb82274186bd522006d53797c60510adcd4cbce0d67372368f29b2973d1a67a7b51e SHA512 e804fb805f3ed7b7580eceae0cddbeaad478aa3266d529616c185d9d4c90b44f629a974bdc9564f62057038991c82a9b7a6478855dfc973b73bd1b6d06685d0b
 EBUILD mesa-17.2.6.ebuild 15006 BLAKE2B afff4eb4640402b2fd36d86cbae220e956c4a09917d6081c304779124ba86a4373ca37cbbe8610396ee7c2a0a24659432689e70fde79b4a355c122b61b4d2caa SHA512 9d1e62aca188b73dbfc63434934f1202060945320e35805f519bc85c22f7765057d594b095874f12f04f0f9ebe3be0705a92392c7deb52711dc232c2ca93739f
 EBUILD mesa-17.3.0_rc5.ebuild 14892 BLAKE2B e3fb731721a648981bc901a4b96a0d76d6e0a1d9393d515bff62c808c700626052983a5d0ec29b2f584da70246fb53eba99abb9403eccb62fd74e289b9113d11 SHA512 57ac595432a400c8435ba4e60d4a64e2333e33cd5f2c0ad8292a30677fbcd85ebe60c913f8d47b66cb79ed06b42f4da3e288675514ecefaed8c74d1f98553087
 EBUILD mesa-9999.ebuild 14910 BLAKE2B ff2479202876410dcf8404adff9a68732c65f72346395e912a0c90efb61ce7bb33f91e48e8b373902678f8627a2424f64d1152397b20e08f665f68688fbf7996 SHA512 1103851cbfef5e489213c0513f562759f3232d193cd72319bca65f5ea84e2cf04c9b9cd56288b07607648c0939e6cb9a5c5a7b2bece108309fe318bdac774da1
diff --git a/media-libs/mesa/mesa-17.1.8.ebuild b/media-libs/mesa/mesa-17.1.8.ebuild
index 0366bb61c356..87dfd2135cd6 100644
--- a/media-libs/mesa/mesa-17.1.8.ebuild
+++ b/media-libs/mesa/mesa-17.1.8.ebuild
@@ -25,7 +25,7 @@ if [[ $PV == 9999 ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/t1lib/Manifest b/media-libs/t1lib/Manifest
index 8b727fef5f33..4bc4240a39f7 100644
--- a/media-libs/t1lib/Manifest
+++ b/media-libs/t1lib/Manifest
@@ -4,7 +4,6 @@ AUX t1lib-5.1.2-CVE-2011-0764.patch 1224 BLAKE2B fcdf9669e28210d465143ea4a6fbe3f
 AUX t1lib-5.1.2-CVE-2011-1552_1553_1554.patch 5085 BLAKE2B aa10c8ceaffe6d827c38d3e6a98d8478ef6e6753150e556142eb07ea44275307e5974416c81fc02ee4d24906e19ad6813a76c4c93a0dabaae7c04a5e845c771f SHA512 c7438ca5bc3778a21e2f522870b4af43fb69b04ebe4b0912addebc070fd5bde075f96bb4f6584072aa0a2da2e9d66f56bfa625424f409392eda1fb027298c198
 AUX t1lib-5.1.2-format-security.patch 1357 BLAKE2B ba340f40284dd24b5e49ef9aca1a8fa3773d547e382cf5abd5e600ee696e615d050f69d1b974a7e442f70cc3cf80fedce6d55c6e40d12170a60376a3ebdb0a47 SHA512 7c7ecc3851c675780b15b185db1b6c0b412fc1eef7505c822b75163ebdf14762ba999486db3238adbefe1571b762e9014669a585a886e537068b8a38bdb85ec1
 AUX t1lib-do-not-install-t1lib_doc-r1.patch 522 BLAKE2B 37989b16132d84d67b5692fc7c15654f28156fb3162ba4c545ab01e238e95c60e422aa1b86d34d2c160600f0f55728ed637094a2b8fc951b7d338594510c104a SHA512 d77beebb581739f5646137d5c1aa5cf3d9906a010f07e3822040812822782db7712d4d18d6235dc22da6e4531daf81fa891db4c1047ad95ee702da88cb01688b
-AUX t1lib-do-not-install-t1lib_doc.patch 514 BLAKE2B 269cb7a83962c33baf0d23eb4532457bef928bfdaba77cc1e023b47fb5051eed39e5b07fda8f2ffededbcbc0bc4990139adc7282de97017231c066d9e6932be6 SHA512 9c6301385fcf21d9700a3c8c986d56d6831aead53c99438a473c89b48e7bdec6e95d49118100e9b24c2dc8fd2d53fec55592308c0e8fc703bb4407339e96a099
 DIST t1lib-5.1.2.tar.gz 1872534 SHA256 821328b5054f7890a0d0cd2f52825270705df3641dbd476d58d17e56ed957b59 SHA512 9f424b19c6f35cc4f194ff7351a4c2352216462c7d1b1d9650ad3a05cf48c6e90c89ccbcda5ecc47a4169a39a850cf84a1fcbf88b3b15614860c27364b631ae3 WHIRLPOOL cc819ac6bbef0d961e1d24d29e4fc748b1a9b9549f8409098ab7b01d0a8613b409fc833a5cfe13596e18faac98cb9f1cdc823581442c1d587a1b723aa96d9050
 EBUILD t1lib-5.1.2-r1.ebuild 1878 BLAKE2B 330e8a56757dcabdd13710012edf464de81d5241685c970cc27fb240486bd3d2425ec11f427b80f24679832671b41a7a0fc089efd9db5d2f33c7d4149aa883f1 SHA512 433f75e85787ec7235d9bb191f95ec484578bb96cefbcdefd99c3ea0077ac2be18f111b94512409f2789a705c36dc355744bf383bc13884d0c85c64f9def0b53
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-libs/t1lib/files/t1lib-do-not-install-t1lib_doc.patch b/media-libs/t1lib/files/t1lib-do-not-install-t1lib_doc.patch
deleted file mode 100644
index e8dc5585e23a..000000000000
--- a/media-libs/t1lib/files/t1lib-do-not-install-t1lib_doc.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- doc/Makefile.in.orig	2008-05-04 17:55:52.000000000 +0400
-+++ doc/Makefile.in	2008-05-04 17:55:58.000000000 +0400
-@@ -89,16 +89,6 @@
- 
- 
- install: dummy
--	if (test -f t1lib_doc.ps) \
--	then \
--	  $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \
--	  $(INSTALL_DATA) t1lib_doc.ps $(DESTDIR)@T1LIB_DATA_DIR@/doc; \
--	fi;
--	if (test -f t1lib_doc.pdf) \
--	then \
--	  $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \
--	  $(INSTALL_DATA) t1lib_doc.pdf $(DESTDIR)@T1LIB_DATA_DIR@/doc; \
--	fi;
- 
- 
- uninstall: dummy
diff --git a/media-libs/vamp-plugin-sdk/Manifest b/media-libs/vamp-plugin-sdk/Manifest
index 038427fcaaff..42aa3bea8d8d 100644
--- a/media-libs/vamp-plugin-sdk/Manifest
+++ b/media-libs/vamp-plugin-sdk/Manifest
@@ -1,5 +1,5 @@
 DIST vamp-plugin-sdk-2.6.tar.gz 174908 SHA256 aa533266e35f866292c30eeac126d2d4abdf2028f1340c0e02354057013728e9 SHA512 0de0eee37629b86c664d42837eb4dbac8bb311af71082b3d0a880c6b475a8de1ab7ac42daf7c1a234dc29690e5788b70011fa01a956941cf414347011e9c27d3 WHIRLPOOL 566afe1c020515325f3641f3dc053fcbe7d6a444c74987484e30677e5df288e7abbc0b6630b9c93425b6463bc0705325be783a39c203760277662aeaf05bb03b
 DIST vamp-plugin-sdk-2.7.1.tar.gz 306956 SHA256 c6fef3ff79d2bf9575ce4ce4f200cbf219cbe0a21cfbad5750e86ff8ae53cb0b SHA512 91dd7cae72334718dcbdac06b1ffa3f3ba76e977b82b928ab634d9982aa15ca4e30978a7778215753c61e56831077d7634d24e65e468ab6a8a87a5957fb09bf3 WHIRLPOOL 3f64fb07712e178642a24b6a2985fbc7e278003639d2f06f2ad9a6f34028c25e55345f867b29930d5728200c9248fd8c033ee0e93b83e1294086e6910aac12f2
-EBUILD vamp-plugin-sdk-2.6-r1.ebuild 1481 BLAKE2B 2ba833d36e94839634df954fdcd49c694203163b2cbc31341427c144bf384767ff70d00530b66a0b49dabbe703118959dc2588a4d7866ec9d772201c3f129dd7 SHA512 ba875b0ab3e2ecd51aea2bc88873fe8e92ab2bbfbcab56f8a5c49bbad0184675d38200eb2a87c96f4f037ab922e494b75b446927ea7f5214f5a2c07b8324c9ed
-EBUILD vamp-plugin-sdk-2.7.1.ebuild 1529 BLAKE2B bc6540bbdfed9d8aaa14ebc7f9f634c77462a738323eb3efe9006b1504f057c099c323116d1ab64ba7df38a47597ae6ed74980d54cb79547288fe8534ac31d96 SHA512 f177492acc3a4e3a3e7273a98f6c2ff19a8de1a9bc02690a22e2e9029bcece7d1fe476da157fd173f4bcfe81235282a5323c0a0fdaef005b536948d3311b5c92
+EBUILD vamp-plugin-sdk-2.6-r1.ebuild 1460 BLAKE2B 15583af61cf497b94f59c8024c7c2795b4121c6e5212855fec9bdeec6f47681de03cb4776f916b6c2b2990e8e610b9d8253756bfaa2cb8ae6669837303cc51d3 SHA512 9f61715b8e6bf5448ba3984198bcb042e1d8063ee30571ec44d6b6a0ca8cf15f0d3e6697d03081eed6c063103fea87d783e314aa9e8d91a84c1b73624fa39407
+EBUILD vamp-plugin-sdk-2.7.1.ebuild 1508 BLAKE2B 3dc3166f52dbd465b525127493551089010b06df2e18d4644da004c421a9b635709e24a1c99743d1d6c3ed1a51f76933f55b5e770360aad043a283227442fe65 SHA512 989c2c198d19461a6a1f3bd8cbced2fe3895a45e83e3d7bb8c3f17013ef5d6cb56c1d58119cd2d5af60763bf4611a57fc9ebffa7ab685a74f952db7eb10453bf
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.6-r1.ebuild b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.6-r1.ebuild
index 565ce5238c4b..066f98e9fa8d 100644
--- a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.6-r1.ebuild
+++ b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.6-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit toolchain-funcs eutils multilib multilib-minimal
 
-DESCRIPTION="Audio processing plugin system for plugins that extract descriptive information from audio data"
+DESCRIPTION="Audio processing system for plugins to extract information from audio data"
 HOMEPAGE="http://www.vamp-plugins.org"
 SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/1514/${P}.tar.gz"
 
diff --git a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1.ebuild b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1.ebuild
index 0e041f251367..456c03c4d4e1 100644
--- a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1.ebuild
+++ b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit toolchain-funcs eutils multilib multilib-minimal
 
-DESCRIPTION="Audio processing plugin system for plugins that extract descriptive information from audio data"
+DESCRIPTION="Audio processing system for plugins to extract information from audio data"
 HOMEPAGE="http://www.vamp-plugins.org"
 SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2206/${P}.tar.gz"
 
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 24395fd816bf..d6045819813d 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/tap-plugins/Manifest b/media-plugins/tap-plugins/Manifest
index 83cfd353d415..74ad7867ed00 100644
--- a/media-plugins/tap-plugins/Manifest
+++ b/media-plugins/tap-plugins/Manifest
@@ -2,6 +2,6 @@ AUX tap-plugins-0.7.0-cflags-ldflags.patch 5001 BLAKE2B 10d5586fc49815f28b034cbd
 AUX tap-plugins-0.7.3-cflags-ldflags.patch 901 BLAKE2B fac21c62373310ec7a9a1ab067cbeaa8d202f4cc54c84c11757122786f24a2a811a3a032b6d7eb37d43261946160f74ab33c58d50d777a45a152dfe9535f9803 SHA512 f345e823400b7ea3dcdc8a880cc16d476dc4f55662eb041d2ec40de6763c52c05019990a762fd623c257c870874940c974b628e7ce315d6e4cc4babc70e28a90
 DIST tap-plugins-0.7.2.tar.gz 70961 SHA256 1a484bd8084260448ed3ea6a8edeb61b9e70df9e88036f4b35741fc23be79ee0 SHA512 3cd7605b03c2732f22d7ff79c889b50db4514d232c639cf964d65b2428b8ce6193824e26622ded662cae74351daa38a321bc1b1590035e5fa0fb79bb4620edd0 WHIRLPOOL d965972b45326eddf8a4f33790c6168a1df052949e9ddff08e120ff465c31385a70db7ffbdf99d6f54a3c5d6999d365f08341e05fdd240947419c3be8107ca69
 DIST tap-plugins-0.7.3.tar.gz 70495 SHA256 23ff6b7f5e0968c6afa77bbf3dce74841c1de4a3badfcfad6ccc4c27665b7c2e SHA512 c4e9c93b9fd8afb82067cf3a48ae665843da775c3af6124147ff1f8651d96734a4b961c4c5ea48877b32770e6d0b5a793af32a5cbb6e3b9afd5b59c8b3cc2621 WHIRLPOOL 9f6441b24e5f4d46e4ee22e36a91a39c3931538b1ba6d7886223e0101fe1f87209b9e4c464f21a9e956e9fba76d3bbac11ea2fe78dc200ab4b00718ecc99c94b
-EBUILD tap-plugins-0.7.2.ebuild 804 BLAKE2B ffd568a3e4bb23728ac5bddf152ae383cd7862f76fb48e4312da195229b1fa399b4fd1def64e9ed8f5799ab81675a9e883cbc78dad9d6f14c72d332831c9e824 SHA512 876e7a45a8a948bf7b32f95f1d7c54465cdd240abed353a3259d9a18afa598ede4e996014716c1d7d751abc0d6e70296b88c9dc589324ec017baea1d2a5b21c0
-EBUILD tap-plugins-0.7.3.ebuild 804 BLAKE2B 9923a9e85ac7c2f0c768fd1df4d29d6547799fe1ed3f04bf22ef1eb8a41669db878ac7630f2b84dcc6555b64a2d55b93bc8ac7d6db1e6e6b9c93703bb1c5dd8d SHA512 22102957be40a0315bd77d9e80120a9bd8f24ac3bb61efa2be8e082b3eb06cd92f2bb72453936526e85ed68fc42b73629c5fb4285c1d82dc9ad1fc358f0b46e3
+EBUILD tap-plugins-0.7.2.ebuild 755 BLAKE2B 0f8c8aea556962456a2bdba5dfd5daaac181d10edafb915788fc0b52f540742e8aef8064979596b8c785b320018aa3f71322c29fafd0ef4914e886f540783cf0 SHA512 c63eb868fc859000d79d76f5dc47f99063344aeee8908dc50916936eba5e4738beedd404946ab295c007f332844c3933922dd073e141af202be0c6981fc0d172
+EBUILD tap-plugins-0.7.3.ebuild 755 BLAKE2B 4d3ef2ecd86d55e8011976ba053631f5557a45dcfbc368dd827359a7697a444518f5bec7e2b9ec0ea4158feabc1be119f58c66b5e1c5a367fb0362d8da81ee17 SHA512 e1d3f77ea092490cea8c64f14031253f73e67db7d378e76794fdcc8384a4ddad75aa19459600052c19eb47bedbeb9326b20ac76aee1e02fa49686a9b8cdeedca
 MISC metadata.xml 1616 BLAKE2B 55ad5ec5fb9218329bd3454b553115c4139d71d6d31a182e0e35750e99963b8b83de92b9c82df3928f7a570395b9bfdf8d5a171a1ff33c7c8443875dca7af9e7 SHA512 876598a8cda8a0331c5fd97d04984a222b2e6a9c0aeffe780f5e970dc1914c75c7e56701fcfa42ef318b0aa88183149f498346a23c5990d6bd7383199c875e01
diff --git a/media-plugins/tap-plugins/tap-plugins-0.7.2.ebuild b/media-plugins/tap-plugins/tap-plugins-0.7.2.ebuild
index 890cce0f4877..3f5724473fc9 100644
--- a/media-plugins/tap-plugins/tap-plugins-0.7.2.ebuild
+++ b/media-plugins/tap-plugins/tap-plugins-0.7.2.ebuild
@@ -7,7 +7,7 @@ inherit multilib toolchain-funcs eutils
 
 IUSE=""
 
-DESCRIPTION="TAP LADSPA plugins package. Contains DeEsser, Dynamics, Equalizer, Reverb, Stereo Echo, Tremolo"
+DESCRIPTION="A bunch of LADSPA plugins for audio processing"
 HOMEPAGE="http://tap-plugins.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
diff --git a/media-plugins/tap-plugins/tap-plugins-0.7.3.ebuild b/media-plugins/tap-plugins/tap-plugins-0.7.3.ebuild
index 6a6c453f570e..70f61a49299c 100644
--- a/media-plugins/tap-plugins/tap-plugins-0.7.3.ebuild
+++ b/media-plugins/tap-plugins/tap-plugins-0.7.3.ebuild
@@ -7,7 +7,7 @@ inherit multilib toolchain-funcs eutils
 
 IUSE=""
 
-DESCRIPTION="TAP LADSPA plugins package. Contains DeEsser, Dynamics, Equalizer, Reverb, Stereo Echo, Tremolo"
+DESCRIPTION="A bunch of LADSPA plugins for audio processing"
 HOMEPAGE="http://tap-plugins.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
diff --git a/media-plugins/vamp-libxtract-plugins/Manifest b/media-plugins/vamp-libxtract-plugins/Manifest
index 59cd3c23468c..a57f848c8430 100644
--- a/media-plugins/vamp-libxtract-plugins/Manifest
+++ b/media-plugins/vamp-libxtract-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST vamp-libxtract-plugins-0.6.6.20121204.tar.gz 20891 SHA256 dfe462a6cba64eacf368cd2f56ad29c747850fbfcde775465aacacebb395495a SHA512 227b848409e4b57be042350ad1dedc8c02c0358239eaf530a0955a4b19ec2c4788e61c7b53b43de5ec1f051a33241e7a4c878584da1480b384756268b501c4c4 WHIRLPOOL 6e603c5e6c47206b370a6a790ae9ef33c9c6c8c9c681c14187cbc30459e328ef1b00047b743c9278c75f9ac411409eab7ba94e456d4eb2ffac3e575ac2dc506e
-EBUILD vamp-libxtract-plugins-0.6.6.20121204.ebuild 849 BLAKE2B c355de7694d1de073106a094b468f47a3beda13ad4e4f4ae3f663317e1f53b044b1d0ca318787781d1e715eaa75490958329ea239c60fc2fb37e1f10084e6149 SHA512 8a966b2fd1a7abf40dd70119fc85940a7b143c9e58d75985fbee6ce882562875bd1abfe4eea3fdf91348c4e2f1b402996a4f706c17fcddda72fd12f38767a9c1
+EBUILD vamp-libxtract-plugins-0.6.6.20121204.ebuild 796 BLAKE2B 67e06a531a56ab4396fd0233c276c73f6c61c21f7661bf03a537bac1d99822d00f709f8d2aae665bce4b9b283aac94bc841476e1d41725ef4161f7ee85ab67f4 SHA512 dfb1d5c82fcf37e103b6f79504a856893d43ffa206d51cf65cb7d08497eedfbc56c3d7fa4cd3c8ac3eeba0ca5250788cc6a56613cdc6ddda1944e10bc52963fb
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-plugins/vamp-libxtract-plugins/vamp-libxtract-plugins-0.6.6.20121204.ebuild b/media-plugins/vamp-libxtract-plugins/vamp-libxtract-plugins-0.6.6.20121204.ebuild
index 84bca7090175..c6fb88e8947c 100644
--- a/media-plugins/vamp-libxtract-plugins/vamp-libxtract-plugins-0.6.6.20121204.ebuild
+++ b/media-plugins/vamp-libxtract-plugins/vamp-libxtract-plugins-0.6.6.20121204.ebuild
@@ -4,7 +4,7 @@
 EAPI=2
 inherit eutils multilib toolchain-funcs
 
-DESCRIPTION="Low-level feature extraction plugins using Jamie Bullock's libxtract library to provide around 50 spectral and other features"
+DESCRIPTION="Vamp plugin encapsulating many of the functions of the LibXtract library"
 HOMEPAGE="http://www.vamp-plugins.org/"
 SRC_URI="http://code.soundsoftware.ac.uk/attachments/download/618/${P}.tar.gz"
 
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index b539c5fccd8f..518acc1df961 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index fdba1eadfcb1..dd5ffefa4078 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -2,7 +2,9 @@ AUX abcmidi-2016.05.05-docs.patch 614 BLAKE2B f9071f832d49d8dcb679843c5724c3a554
 DIST abcMIDI-2017.11.08.zip 556065 SHA256 b66904f5c14ad43da32a8e0956e0dadc2e4f4ff49cc0bb6337703de773661aaa SHA512 c89a49c9a3b3f6d462acd09cc26b2720cbd9cc9525e38b1c9cce41052c01167a66f284854e3cc468737eefdaee321db294edca3a4b3b8c6d93d249330913d630 WHIRLPOOL 973ab1f8d56591fe4eb8c37c4dcf759d35bada828a47984e9390fbfcbb23dd63edd1fc337ff94411970e25e2ff2de221817772caa7698abb008433ed159caafd
 DIST abcMIDI-2017.11.10.zip 556044 SHA256 050f11d6309e944244b6ba4c709549e6e10fe38bb831f148e78b083645a4022c SHA512 6a80109849370994a74f71e358bf3225ca750736648e45d16fc5c039106c3f3da9444f509c87c3c55faabbc60db6e468a83d1fcffab788cfbd74b6255ea0cfc4 WHIRLPOOL f5449647c58d9bcdafa378f530f915af242fc62f7eb3011fbee2fc90e9d93fc2fcc48486c82031b7f6f5803570a8540a6517200b1035832bcb2ff527f317995d
 DIST abcMIDI-2017.11.19.zip 556185 BLAKE2B 01ec71e17357b3d6050d26c909e06556f5209f1aaddbb0f85031199070dbe93a7980b7b2e238dd7ad8a7a5f4f07683ccbeff1b44942e691286fb75fe1a075e34 SHA512 8e76a55bf699e69425ef51cc4c77f17b952798cd83e620d88781d209bb4f00a9c80b47ad0a40df2a64c2595d94174a2cba44f3e436d7cf066f9126f4fc548dec
+DIST abcMIDI-2017.11.27.zip 557045 BLAKE2B 8f341f7217c1a98732bdfe5e4383c6718476714a4f37f629852f46a40c5e50711194d281dafde16293d45bd0c70c9b7506f5d426db03249ba2358b0c76142941 SHA512 006313ef9fcae652996339a682d308a6e931da9692b4662e3272c8bee73a3803dd9aeb54189cb464c68593473339201b20af6b291524ea2f096567053131e7b6
 EBUILD abcmidi-2017.11.08.ebuild 794 BLAKE2B 16c0fd26186c80200100e38964d5c6afc7f3e92a78dbf32e8b8ae50ceffa5ca862c1de6fbb8aaedcfebaba2c6e9bfbdf76faf782f18cbbfbf488fa4c2f0e5177 SHA512 74e4869499ab64922e7e5431dfbe640bc0af1d9502953aa7186128f0d3df6243d0944a74e4cdea76c9a1bb53b5d24fad130119f76f5af865d0b65b43cf2cf001
 EBUILD abcmidi-2017.11.10.ebuild 794 BLAKE2B 16c0fd26186c80200100e38964d5c6afc7f3e92a78dbf32e8b8ae50ceffa5ca862c1de6fbb8aaedcfebaba2c6e9bfbdf76faf782f18cbbfbf488fa4c2f0e5177 SHA512 74e4869499ab64922e7e5431dfbe640bc0af1d9502953aa7186128f0d3df6243d0944a74e4cdea76c9a1bb53b5d24fad130119f76f5af865d0b65b43cf2cf001
 EBUILD abcmidi-2017.11.19.ebuild 794 BLAKE2B 16c0fd26186c80200100e38964d5c6afc7f3e92a78dbf32e8b8ae50ceffa5ca862c1de6fbb8aaedcfebaba2c6e9bfbdf76faf782f18cbbfbf488fa4c2f0e5177 SHA512 74e4869499ab64922e7e5431dfbe640bc0af1d9502953aa7186128f0d3df6243d0944a74e4cdea76c9a1bb53b5d24fad130119f76f5af865d0b65b43cf2cf001
+EBUILD abcmidi-2017.11.27.ebuild 794 BLAKE2B 16c0fd26186c80200100e38964d5c6afc7f3e92a78dbf32e8b8ae50ceffa5ca862c1de6fbb8aaedcfebaba2c6e9bfbdf76faf782f18cbbfbf488fa4c2f0e5177 SHA512 74e4869499ab64922e7e5431dfbe640bc0af1d9502953aa7186128f0d3df6243d0944a74e4cdea76c9a1bb53b5d24fad130119f76f5af865d0b65b43cf2cf001
 MISC metadata.xml 326 BLAKE2B eff21376d5e8fdf74ead04fc307726b50c8d86faaaebdbb8aa748c9fc0025ed9ccbdbf90f6bbafb515d576cd837f72f44991b329eb56f003cfbe3b0ee9cac7d5 SHA512 aad9a108325a4a1a827ba64b96ef8410017ea1f3c8db6b51660f987df26b42ce4a6f034c6df3be5c58d44fc40e80b7f4dd3900fb4ba45c448764265273741a7a
diff --git a/media-sound/abcmidi/abcmidi-2017.11.27.ebuild b/media-sound/abcmidi/abcmidi-2017.11.27.ebuild
new file mode 100644
index 000000000000..adf33138050d
--- /dev/null
+++ b/media-sound/abcmidi/abcmidi-2017.11.27.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+MY_P="abcMIDI-${PV}"
+DESCRIPTION="Programs for processing ABC music notation files"
+HOMEPAGE="http://ifdo.ca/~seymour/runabc/top.html"
+SRC_URI="http://ifdo.ca/~seymour/runabc/${MY_P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	local PATCHES=( "${FILESDIR}"/${PN}-2016.05.05-docs.patch )
+	default
+
+	rm configure makefile || die
+	sed -i "s:-O2::" configure.ac || die
+
+	eautoreconf
+}
+
+src_install() {
+	default
+	dodoc doc/{AUTHORS,CHANGES,abcguide.txt,abcmatch.txt,history.txt,readme.txt,yapshelp.txt}
+
+	if use examples ; then
+		docinto examples
+		dodoc samples/*.abc
+	fi
+}
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 5f1eaabd6082..aae28f63a0d8 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -5,6 +5,6 @@ AUX amarok-2.8.90-mysql-embedded.patch 1224 BLAKE2B acc4b0abb2a7e000c76e0a07a109
 AUX amarok-2.8.90-mysqld-rpath.patch 573 BLAKE2B d56b77592e73d624269b8611751f7595e05aad139e65357c004e748f7edf3f41af54c5e3c823904dd4e44c4c2f92c6fc8db0087856967cba699206143f05f9a0 SHA512 724ee90912883baa374bdf8ceca77e1d8ec809279f2254705624fb3966e8300ed02a0ddfc4613e8b9add2b7b20eed333619b3c1d1426e14e5f8ce60bdff39be5
 AUX amarok-2.8.90-no-webkit.patch 1126 BLAKE2B 14b1fc1b3a5c20437896256a6692430934f351754c33b07c8eb61073c75577e70853834dc995474beb8b57464e04a66b143fafb405a451950a5add61f98f8620 SHA512 1c45e9d3f4d8cd9fe6adc1a10b78f7b439a0dddb09ccff399bc3ded62207d6862d61dd5bfaccceb7044f4740f59824a6c8eae34d2e9b2de9a400ffb3305a0707
 AUX amarok-2.8.90-scriptconsole.patch 1272 BLAKE2B 7483f7d7cbe3351d0ccca3c593ec49641076755f38d3cfcabd426c321957fddae7855016d2ff0ecfccb03b6b8e21017c769bd1717bdcb961b3789877538942cc SHA512 3bc31284faa45c717342917f220f7ae078e1f6b0afd313bf8f2ba28b97badb4d56dafcc1a319655b2ae01dee37e09ff34978af95d1743105be8f118be2c61c9d
-DIST amarok-2.8.90.tar.xz 48890580 SHA256 b057369ab70d192b669ee6c2c11e9e7d4140663f6a60d6175ef0bb56b4bef9a7 SHA512 1ff5f43100dbe027c8676946a4e82e914927b03ac0bb9e95bfc7e9e03fcc1cad81d9ea2a343bc4f644a025242e224ea9ae3cae7423d68b0b3c68f346922537fc WHIRLPOOL 22da35ea61dcda04d882f4c0da7327cab10edf50140b3ae891738d10e1b9e5062eb541e35e817fd04a7f0284eb085b5ccf3edfa20438b764a9ce3615de35ca8c
-EBUILD amarok-2.8.90-r3.ebuild 3574 BLAKE2B cf88754088472335c20674252e6dbfba14c9c0a7455bc30d736acc2f910be242b2b7e7be5b9e27352461cc4f0dad47d9578214cf0887a0f2cf68ec1b28e598b0 SHA512 cbc17f61a90484f93ccb604ddb4928ac5de0036134cca4d3065d80d8a0c95aa64d9df638dd12d530be0460e96b22ecc91efb53e7e82687171bfd45e05fd984b7
+DIST amarok-2.8.90.tar.xz 48890580 BLAKE2B 81367b491237abd7a6201d94ea39412a7a69867553c688d9c691749102ac8eb6e59ab5ff17d3b74718211e4975e1daacb15ef3bc1bc35d82954de890213eb544 SHA512 1ff5f43100dbe027c8676946a4e82e914927b03ac0bb9e95bfc7e9e03fcc1cad81d9ea2a343bc4f644a025242e224ea9ae3cae7423d68b0b3c68f346922537fc
+EBUILD amarok-2.8.90-r4.ebuild 3352 BLAKE2B cc0d968babc2bcb1fc440caa30438a1e86c25d5443a068aaba1cca653cf19330d3940c2aa3396894e1a9cedee29425b6f8003d20bfda03c3d48f775d2ce60e02 SHA512 dce046da09c14af58a7f63505516e9618a46577f861dd8c62a7144c42ef455123f032bc97742bbcdb2319deb5965f6f697e0b1b6899695cae6c6214c571721a9
 MISC metadata.xml 1159 BLAKE2B b986025a8d81ead2cc821ebc5a9bc6f447d4356615127b1795b337068f0457c1a5ee15b380822ef7fcf5eea6f24ef9e48d93329df0947c500a519978db6b1b31 SHA512 0b4a4a1f388183923ce0d9f31bd622194165421c6db388fa4091b41aec8a343d6fb19c3bbac9dd288102bebf66c74df5ce81b14270dc954d8a68f7e0f76d318e
diff --git a/media-sound/amarok/amarok-2.8.90-r3.ebuild b/media-sound/amarok/amarok-2.8.90-r4.ebuild
index 9165fb8d31e0..4ea07c89b53e 100644
--- a/media-sound/amarok/amarok-2.8.90-r3.ebuild
+++ b/media-sound/amarok/amarok-2.8.90-r4.ebuild
@@ -3,9 +3,6 @@
 
 EAPI=6
 
-KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr ga gl hu it ja
-lt lv nb nl pa pl pt pt_BR ro ru sl sr sr@ijekavian sr@ijekavianlatin sr@latin
-sv tr uk zh_CN zh_TW"
 KDE_REQUIRED="never"
 KDE_HANDBOOK="optional"
 SQL_REQUIRED="always"
@@ -22,7 +19,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="4"
-IUSE="debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
+IUSE="debug +embedded ipod lastfm mp3tunes mtp ofa test +utils"
 
 if [[ ${KDE_BUILD_TYPE} == live ]]; then
 	RESTRICT+=" test"
@@ -30,19 +27,19 @@ fi
 
 # ipod requires gdk enabled and also gtk compiled in libgpod
 COMMONDEPEND="
-	app-crypt/qca:2[qt4(+)]
-	kde-frameworks/kdelibs:4[opengl?,plasma(+)]
 	$(add_kdeapps_dep kdebase-kioslaves)
+	app-crypt/qca:2[qt4]
+	>=dev-qt/qtcore-4.8:4
+	>=dev-qt/qtdbus-4.8:4
+	>=dev-qt/qtscript-4.8:4
+	>=kde-frameworks/kdelibs-4.14.37:4[plasma]
 	>=media-libs/taglib-1.7[asf(+),mp4(+)]
 	>=media-libs/taglib-extras-1.0.1
 	sys-libs/zlib
 	>=virtual/mysql-5.1[embedded?]
-	>=dev-qt/qtcore-4.8:4
-	>=dev-qt/qtdbus-4.8:4
-	>=dev-qt/qtscript-4.8:4
 	>=x11-libs/qtscriptgenerator-0.1.0
 	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-	lastfm? ( >=media-libs/liblastfm-1.0.3[qt4(+)] )
+	lastfm? ( >=media-libs/liblastfm-1.0.3[qt4] )
 	mp3tunes? (
 		dev-libs/glib:2
 		dev-libs/libxml2
@@ -53,7 +50,6 @@ COMMONDEPEND="
 	)
 	mtp? ( >=media-libs/libmtp-1.0.0 )
 	ofa? ( >=media-libs/libofa-0.9.0 )
-	opengl? ( virtual/opengl )
 "
 DEPEND="${COMMONDEPEND}
 	dev-util/automoc
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 10d39fb1582e..0dfd8cd69cd0 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -9,5 +9,5 @@ DIST clementine-1.3.1_p20171113.tar.gz 8467904 SHA256 d0393deefe4cf385ef79393527
 EBUILD clementine-1.3.1-r5.ebuild 4962 BLAKE2B 061ffdab9f81560d33ba90271056824999d17b3219f3cd4fbea6e4cfa08435045172f3bd4f10bce3a98d4b89c647ee66fb63209fed2826d914494d45231603a6 SHA512 f1815b573a1e921d257a7f64579bb42f7cdf1e6d67075d4b490c71c4fe508c579ba3aedbd7a4e54df96dcdcdcf5e2e4de87067cf56433574ae7ba19e21d0785c
 EBUILD clementine-1.3.1-r6.ebuild 5297 BLAKE2B 656fcbfaec471e5adb07bd569be65e721142cc81e4b20d1defb177477b21b9edb9dad2cdf7a2b20284c4602996184002e4d397646da7205708ddbb133df6381d SHA512 1edef30b329ad8b40c2b1ac53311fc02cb3e98f435cb8a412398f3484ae7bc897c691b4238685f19e75969bb6511d5193091644d9fdb25226775e4fce92f3370
 EBUILD clementine-1.3.1_p20171113.ebuild 4799 BLAKE2B 62f5799342dadfcce6fabca227d870e815c17e1b5e17227a699474b12fbbe6825b84ea1d8b03e4b44acbbaa0ecf022923ec80ee3b996688c494635f35cc74a7d SHA512 f34627e95778005ccc7b70827a2b5b87225e662c7034c242569e31a1bca0627dae6dc2817ff9921346f357f3b91507012979c2cf9b74a685d253d3a066017f6c
-EBUILD clementine-9999.ebuild 5254 BLAKE2B ca7185e8348af0263f160d6f927e6c6c018ba6e91d9c0f2614a4977ee56c27aafb05fcb274f348e7a1b464591d8a02596886c35af70095f51f44f6e4419c8e94 SHA512 6bbf92baa8ee8fc51efaaf362af0ec20f71007596c5b356ba5ad2e87874985e56c27846e6f330ac1bcab678c7c9b794ee35ca06a89c4f9ba0948cbd72a8a46ce
+EBUILD clementine-9999.ebuild 5193 BLAKE2B aad0efc0d126ff29ccf3211db65be57bcba02fa24d8b4c682ad95e6001d9aea33ca12e47e52d66a7cdb627930545cb72f35416b50c7110aeb66c8843da721119 SHA512 6ec8c6e0a28f53326752500fbd4a1e247127d0ac720df94e93c15868ee5a7ce25e51651a58126b8acb57bb0b6c3150c0d38be202644648dae9d054c49bfe881b
 MISC metadata.xml 1537 BLAKE2B e63db763bbd9c013dd426a710bfb042335faf01f5cc8b3321a4e698e41313ba6994c059502e3f2113eaa3216d519c9f1a0b5a7467cecb27da94cd59d21bbe453 SHA512 cf5beb80417c4099a43e7f19bb06112159af557f17ce9c0da1226f5ee41cebc8e94c2c2aa6349d140ee291608d39511477a0aa54e586d11a52bc3f697283da3f
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index b0f63f84244e..a2fe1ad85c4b 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -20,7 +20,7 @@ LICENSE="GPL-3"
 SLOT="0"
 [[ ${PV} == *9999* ]] || \
 KEYWORDS="~amd64 ~x86"
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote +X"
+IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote"
 
 REQUIRED_USE="
 	udisks? ( dbus )
@@ -41,6 +41,7 @@ COMMON_DEPEND="
 	dev-qt/qtsql:5[sqlite]
 	dev-qt/qtwebkit:5
 	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
 	dev-qt/qtxml:5
 	media-libs/chromaprint:=
 	media-libs/gstreamer:1.0
@@ -50,6 +51,7 @@ COMMON_DEPEND="
 	sys-libs/zlib
 	virtual/glu
 	virtual/opengl
+	x11-libs/libX11
 	cdda? ( dev-libs/libcdio )
 	dbus? ( dev-qt/qtdbus:5 )
 	ipod? ( >=media-libs/libgpod-0.8.0 )
@@ -60,10 +62,6 @@ COMMON_DEPEND="
 		media-libs/glew:=
 		>=media-libs/libprojectm-1.2.0
 	)
-	X? (
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-	)
 "
 # Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
 # Libprojectm-1.2 seems to work fine, so no reason to use bundled version; check clementine's patches:
@@ -156,7 +154,6 @@ src_configure() {
 		-DENABLE_LIBPULSE="$(usex pulseaudio)"
 		-DENABLE_UDISKS2="$(usex udisks)"
 		-DENABLE_WIIMOTEDEV="$(usex wiimote)"
-		-DCMAKE_DISABLE_FIND_PACKAGE_X11="$(usex X)"
 	)
 
 	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
diff --git a/media-sound/gmorgan/Manifest b/media-sound/gmorgan/Manifest
index 73b8cb044d6b..7a30b38b30d1 100644
--- a/media-sound/gmorgan/Manifest
+++ b/media-sound/gmorgan/Manifest
@@ -3,7 +3,6 @@ AUX gmorgan-0.79-manpages.patch 1199 BLAKE2B 6989a057f92e75e5dc607e3483408446423
 AUX gmorgan-0.79-remove-dirs.patch 760 BLAKE2B 34b638a52d737ecc87219d59560449da339d5467ca6a1ba31551036610ff3fc62a7466ee33db6c073aaecc5e58646227a4e64f2c54044c44ac91ec96fde55148 SHA512 23300349241ea9dfa0b8a6ad9504a51c15ecf2a3dd23baed5a163888f9bb0208e96d728a41ad5f5388b6ffa5d4e691b7a7b6f92cd7f6a140d840393a473a231f
 AUX gmorgan-0.79-remove-gettext-version-check.patch 855 BLAKE2B d1bbce53fe0b17682fe1f08bc5eeca04d909a52dd26f1033aad37a3437436bd6f7b7cf630ffd4b2c74b92ea5d9a19d4f5d168d2202286320ac55613b88989551 SHA512 1119f8a6aaa20d81d6138f912fa13caaa4593519389094963503c0974a97f8b35d65ce0ad54d66efcc862ce092bca4e1f141fa5e62f0e4b579bbeabe535d6ab4
 AUX gmorgan-0.79-remove-old-docs.patch 736 BLAKE2B 584fe41e8f2c227fed77da87699b799090a52415a1acf193446462cac103475a8fe58edc1837b15febba8fb0119991548562268329582743f79db48b6181994e SHA512 55ba54cd3410fe70ad5e2d1f2d60c56e30b335bc90e730e0a9a6265c7e0cc688e5aa15f0e9109af7c61db217e39fbf245ab08a54ae46cbc52f6deda5be769108
-AUX gmorgan-cflags.patch 597 BLAKE2B f42348de7b6ac4cc97c71a6e583bb38b5bc8ea61d984bce8dacf1df7cc9615be3c41b988be6f939893efa0da822b24be868842a8abf449e681bb112ea8f80a79 SHA512 d33092eb45f1716d78902045a5ce1609e6264dd95ed079c05b02c19935f4686598352aeb6007b3d4a3a77215a7663b06865771419ad319c2f583dddb57d9c1b0
 DIST gmorgan-0.79.tar.gz 8055701 SHA256 eccdff6d0de745f469e45220de2b41764c0e591eb894695c24ce07cc2a65b1cf SHA512 17fadbe2c8b2b4c7e18816a6f866e4406c005fda1ca3ded628c9497aa46abacd06417d68296c500a2d108e9364eae3702f990f5c1b1b1d83328ed553aa453be0 WHIRLPOOL 96a20bc79ee9a8b62ad1061995fda5542450b5e0faee9677f548d05884e13791af79617bf1ad0546028db2a1f38b7e3882b9dd4778e7a912b6ebcb02efefa7f1
 EBUILD gmorgan-0.79-r1.ebuild 859 BLAKE2B 3a2b5b3fd35384c6856daf9a65031123bd189dbc3afe654ec6390841b0d8aa00feb674218890c2dcadf80dab5c3b77c922de45ecf2f97c86c7a0f204418e4aed SHA512 232d5250ac1b88594f116bfdc6a9da1cfc991693dc26c3bf19109cdbaee70a54c67e182defffae58a16e98bb753c8f97d33832053786934066c07d87e7a263db
 MISC metadata.xml 336 BLAKE2B 2d754b8db2a3d7f4f6c1c30393e407bdd60a1ee1a4b555b18bb12707369ad151d906ffbf3e3ebcaa816e119ccfddc682ce227f0685702fa647a4c6d25495de8a SHA512 3d5245a06c576d8a4f5fdf07ddb0a6cbc9cf0f64799da9e7e58a67fdd23a5fe082d0bc557575914ec7fba42923d8503587b327ad31f270f46710084fb7cba5f8
diff --git a/media-sound/gmorgan/files/gmorgan-cflags.patch b/media-sound/gmorgan/files/gmorgan-cflags.patch
deleted file mode 100644
index 83c2c01a5745..000000000000
--- a/media-sound/gmorgan/files/gmorgan-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gmorgan_0.39/configure.in
-===================================================================
---- gmorgan_0.39.orig/configure.in
-+++ gmorgan_0.39/configure.in
-@@ -15,7 +15,7 @@ AC_FUNC_SELECT_ARGTYPES
- AC_CHECK_FUNCS([bzero memset select strdup])
- AM_GNU_GETTEXT([external])
- LIBS="`fltk-config --use-images --ldflags` -lasound"
--CXXFLAGS="`fltk-config --use-images --cxxflags`"
-+CXXFLAGS="${CXXFLAGS} `fltk-config --use-images --cxxflags`"
- AC_CHECK_HEADERS([unistd.h])
- AC_CHECK_HEADER(alsa/asoundlib.h, true, AC_MSG_ERROR([Alsa is required]))
- AC_PATH_PROG(FLTK_CONFIG, fltk-config, no)
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 6e629c6eabcf..78aace983dad 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,5 +1,6 @@
-DIST jack2-1.9.10.tar.gz 6415555 SHA256 88f1b6601b7c8950e6a2d5940b423a33ee628ae5583da40bdce3d9317d8c600d SHA512 0bee815356e9e572224e7cc484c402f38797d70257c4bc79a47552ae30a25a4600c61f712a73cbbede52cd8cb8dc144c9334e28c10e23354a11b7223ee0bb0ca WHIRLPOOL a7b4e14fb1e0490955a363fe0680558d89f80c3cdf18a840991b636518ecf55d872d91d9024770874b5d28494e2cbadc0f21ce4b73ee7873f62842fb0339b0c5
-DIST jack2-1.9.11-RC1.tar.gz 6481650 SHA256 730eee0de2136e62b358f4b65d9e30109d706d2627eb2998e43763b47b17474f SHA512 4fd7d82ab6536b8c6061023858ae5b978903608b149498818971481da75c6e9e0e7e7aef5e1343730c259f4378aebfbf25916b9736e0ad8aa19584a44f894436 WHIRLPOOL 6401f16b5ef5331602c6b3c14c709adf17f765700959d87494738960c8e1407cc894789ef8b11452ca9621a9e18e93407d81ede0846118efbb81560bbe9435e6
-EBUILD jack2-1.9.10.ebuild 2344 BLAKE2B 9ee2922ed0fdfe21c65e7d7d89fcb0ba5940f558ce4b42c770c11fc5806445fb374e2c373509d8b791970d91e87289d59cca90068e9cf32f7d369f06598a856d SHA512 5a9ab02ab4e9e8cdf1bcf558b90d1d5f890548492058cb679685e700ba3c538d694e7506ccdb2f44c81d98e90c3d3caf7fe72e60b6b24cbee6664c9f4efa2ae3
-EBUILD jack2-1.9.11_rc1.ebuild 2233 BLAKE2B 0c793894a69139616658360df0259017d22db32e756d53de902e5121a3c4108f47950345c5c518994065592a6e8a7c4d4e2e438704abb62b9e3cc76569156c08 SHA512 e029d81ff459bfeb080c190189f99ebedf3c87ee266eef54a1c9d8fc3bcc2b4d8bb05822c1269bbb374e6f752c7673f44f36ef4bfbaf1cde79168ebabd87a43f
+AUX jack2-1.9.11_rc1-gcc7.patch 889 BLAKE2B e5c31c6688dbcd2cbba44993cff03e612b364a88cac146415471564f983ba07e7d822f2baf38ee0be4eabaf6369fc1f4f3640ea1a5eab51192a782b44b6dec1f SHA512 7cae070880af90bd7ee68dbfae0ea4421a5cb2cfaaf7b1228a4668767e541b263b965bed4b572053678c7dd81f380e6759a46cd97a0a5cfc95921286739e1791
+DIST jack2-1.9.11-RC1.tar.gz 6481650 BLAKE2B b9497efdb72f2e3894a062a3ffdffc3ebf67f5ea7372d993c13581202202e0f0ba7b21563768a984201d8e5eb2854add67fb5c377e2b4ddb23806a38ddddb0f9 SHA512 4fd7d82ab6536b8c6061023858ae5b978903608b149498818971481da75c6e9e0e7e7aef5e1343730c259f4378aebfbf25916b9736e0ad8aa19584a44f894436
+EBUILD jack2-1.9.11_rc1-r1.ebuild 2298 BLAKE2B 917029b1de9c87f141e7828f7cbd7d508d2015197f88f4dd8fa1201c9b75f861cc709425eead75132f81f147b4e8e8254f4d6eef1e65fb40bc626a8ae278591b SHA512 dfe3a1abb3e5807949ba53911def098695b3e3d497ad6ce915c41b698b335826f8cdf656897e0b16152ddd42bc3502d75f23363441d3e0328759168ce89f77f4
+EBUILD jack2-1.9.11_rc1.ebuild 2231 BLAKE2B f5960181f2eb1bea4f56dc01ed8314490869d4ba549f79dcf9edc31f10b7495b6cf878a1470311e7ba0c833518c8847066a6af9aba80d9a7656a3c64d4632267 SHA512 a7a7af2ca48fe233acd04ac8933910de0e4a6d37e24d411ea0e02d5898f9333dcc9af0ef36893cfd8d2c2332ab86285bbd83e8085afa8a0719fda2dd20fefe6f
+EBUILD jack2-9999.ebuild 2254 BLAKE2B 6ec064096706b262db4719ca5c68fa8a0a34c541600046dc4ed57c9f3aa058ca333110ebfdde7867d47541ebd80e21b195571a7ee34627f16175468eeca6e098 SHA512 ef3dffd92f1778e3649840268c9a96b10f3512eecd00416da00228c678b25b8e8600416e00afc7a5a8c8448b1d29c1651ba60aedf68660449d2cff8a0a5767b1
 MISC metadata.xml 679 BLAKE2B 9808048dac5d2d936aa7f6a05f66b0a98a428aa81275b5528684ba2312c49a1212ee38afac0d466e5ed87b91c253f8b973670928dd21b13470208bc84a2ff48f SHA512 8c6fc8ce9dc151cdc8adc2092a661a76ef0fd12fc8f2c922be3e7a75215e40ed5b352f8099906ae6a883fd3a3edb674d0a6784831d2cd9b881b474cf6c419152
diff --git a/media-sound/jack2/files/jack2-1.9.11_rc1-gcc7.patch b/media-sound/jack2/files/jack2-1.9.11_rc1-gcc7.patch
new file mode 100644
index 000000000000..dcde5fb422f8
--- /dev/null
+++ b/media-sound/jack2/files/jack2-1.9.11_rc1-gcc7.patch
@@ -0,0 +1,19 @@
+commit f7bccdca651592cc4082b28fd4a01ed6ef8ab655
+Author: Kjetil Matheussen <k.s.matheussen@notam02.no>
+Date:   Sat Jul 15 13:21:59 2017 +0200
+
+    Tests: Fix compilation with gcc7
+
+diff --git a/tests/test.cpp b/tests/test.cpp
+index 8a8a8117..d2ef9a05 100644
+--- a/tests/test.cpp
++++ b/tests/test.cpp
+@@ -479,7 +479,7 @@ int process4(jack_nframes_t nframes, void *arg)
+ 	jack_nframes_t delta_time = cur_time - last_time;
+ 
+ 	Log("calling process4 callback : jack_frame_time = %ld delta_time = %ld\n", cur_time, delta_time);
+-	if (delta_time > 0  && (jack_nframes_t)abs(delta_time - cur_buffer_size) > tolerance) {
++	if (delta_time > 0  && abs((int64_t)delta_time - (int64_t)cur_buffer_size) > (int64_t)tolerance) {
+ 		printf("!!! ERROR !!! jack_frame_time seems to return incorrect values cur_buffer_size = %d, delta_time = %d tolerance %d\n", cur_buffer_size, delta_time, tolerance);
+ 	}
+ 
diff --git a/media-sound/jack2/jack2-1.9.10.ebuild b/media-sound/jack2/jack2-1.9.11_rc1-r1.ebuild
index e14f43d964f7..de3d58d89ad7 100644
--- a/media-sound/jack2/jack2-1.9.10.ebuild
+++ b/media-sound/jack2/jack2-1.9.11_rc1-r1.ebuild
@@ -1,37 +1,38 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads(+)"
-[[ "${PV}" = "2.9999" ]] && inherit git-r3
 inherit eutils python-single-r1 waf-utils multilib-minimal
 
 DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
 HOMEPAGE="http://jackaudio.org/"
 
-RESTRICT="mirror"
-if [[ "${PV}" = "2.9999" ]]; then
+if [[ "${PV}" = "9999" ]]; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
 	KEYWORDS=""
 else
-	SRC_URI="https://github.com/jackaudio/${PN}/archive/v${PV}.tar.gz -> jack2-${PV}.tar.gz"
+	MY_PV="${PV/_rc/-RC}"
+	MY_P="${PN}-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/jackaudio/jack2/releases/download/v${MY_PV}/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~ppc ~x86"
 fi
 
 LICENSE="GPL-2"
 SLOT="2"
-IUSE="alsa celt dbus doc opus pam"
+IUSE="alsa celt dbus doc opus pam classic sndfile libsamplerate readline"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( classic dbus )"
 
-# FIXME: automagic deps: readline, samplerate, sndfile, celt, opus
-# FIXME: even though sndfile is just used for binaries, the check is flawed
-#	making the build fail if multilib libsndfile is not found.
-CDEPEND="media-libs/libsamplerate[${MULTILIB_USEDEP}]
-	media-libs/libsndfile[${MULTILIB_USEDEP}]
-	sys-libs/readline:0
+CDEPEND="media-libs/libsamplerate
+	media-libs/libsndfile
+	sys-libs/readline:0=
 	${PYTHON_DEPS}
 	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
 	celt? ( media-libs/celt:0[${MULTILIB_USEDEP}] )
@@ -48,17 +49,11 @@ RDEPEND="${CDEPEND}
 	pam? ( sys-auth/realtime-base )
 	!media-sound/jack-audio-connection-kit:0"
 
-[[ "${PV}" = "2.9999" ]] || S="${WORKDIR}/jack2-${PV}"
-
 DOCS=( ChangeLog README README_NETJACK2 TODO )
 
-src_unpack() {
-	if [[ "${PV}" = "2.9999" ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc7.patch
+)
 
 src_prepare() {
 	default
@@ -67,24 +62,31 @@ src_prepare() {
 
 multilib_src_configure() {
 	local mywafconfargs=(
-		$(usex alsa --alsa "")
-		$(usex dbus --dbus --classic)
+		--htmldir=/usr/share/doc/${PF}/html
+		$(usex dbus --dbus "")
+		$(usex classic --classic "")
+		--alsa=$(usex alsa yes no)
+		--celt=$(usex celt yes no)
+		--doxygen=$(multilib_native_usex doc yes no)
+		--firewire=no
+		--freebob=no
+		--iio=no
+		--opus=$(usex opus yes no)
+		--portaudio=no
+		--readline=$(multilib_native_usex readline yes no)
+		--samplerate=$(multilib_native_usex libsamplerate yes no)
+		--sndfile=$(multilib_native_usex sndfile yes no)
+		--winmme=no
 	)
 
-	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_configure ${mywafconfargs[@]}
+	waf-utils_src_configure ${mywafconfargs[@]}
 }
 
 multilib_src_compile() {
 	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
-
-	if multilib_is_native_abi && use doc; then
-		doxygen || die "doxygen failed"
-	fi
 }
 
 multilib_src_install() {
-	multilib_is_native_abi && use doc && \
-		HTML_DOCS=( "${BUILD_DIR}"/html/ )
 	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
 }
 
diff --git a/media-sound/jack2/jack2-1.9.11_rc1.ebuild b/media-sound/jack2/jack2-1.9.11_rc1.ebuild
index 4f0738fc56c4..fdf94f71e711 100644
--- a/media-sound/jack2/jack2-1.9.11_rc1.ebuild
+++ b/media-sound/jack2/jack2-1.9.11_rc1.ebuild
@@ -10,7 +10,7 @@ inherit eutils python-single-r1 waf-utils multilib-minimal
 DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
 HOMEPAGE="http://jackaudio.org/"
 
-if [[ "${PV}" = "2.9999" ]]; then
+if [[ "${PV}" = "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
 	KEYWORDS=""
@@ -18,7 +18,7 @@ else
 	MY_PV="${PV/_rc/-RC}"
 	MY_P="${PN}-${MY_PV}"
 	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/jackaudio/${PN}/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	SRC_URI="https://github.com/jackaudio/jack2/releases/download/v${MY_PV}/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~ppc ~x86"
 fi
 
diff --git a/media-sound/jack2/jack2-9999.ebuild b/media-sound/jack2/jack2-9999.ebuild
new file mode 100644
index 000000000000..2794517a02e4
--- /dev/null
+++ b/media-sound/jack2/jack2-9999.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+inherit eutils python-single-r1 waf-utils multilib-minimal
+
+DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
+HOMEPAGE="http://jackaudio.org/"
+
+if [[ "${PV}" = "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
+	KEYWORDS=""
+else
+	MY_PV="${PV/_rc/-RC}"
+	MY_P="${PN}-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/jackaudio/jack2/releases/download/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="alsa celt dbus doc opus pam classic sndfile libsamplerate readline"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( classic dbus )"
+
+CDEPEND="media-libs/libsamplerate
+	media-libs/libsndfile
+	sys-libs/readline:0=
+	${PYTHON_DEPS}
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	celt? ( media-libs/celt:0[${MULTILIB_USEDEP}] )
+	dbus? (
+		dev-libs/expat[${MULTILIB_USEDEP}]
+		sys-apps/dbus[${MULTILIB_USEDEP}]
+	)
+	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+RDEPEND="${CDEPEND}
+	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+	pam? ( sys-auth/realtime-base )
+	!media-sound/jack-audio-connection-kit:0"
+
+DOCS=( ChangeLog README README_NETJACK2 TODO )
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local mywafconfargs=(
+		--htmldir=/usr/share/doc/${PF}/html
+		$(usex dbus --dbus "")
+		$(usex classic --classic "")
+		--alsa=$(usex alsa yes no)
+		--celt=$(usex celt yes no)
+		--doxygen=$(multilib_native_usex doc yes no)
+		--firewire=no
+		--freebob=no
+		--iio=no
+		--opus=$(usex opus yes no)
+		--portaudio=no
+		--readline=$(multilib_native_usex readline yes no)
+		--samplerate=$(multilib_native_usex libsamplerate yes no)
+		--sndfile=$(multilib_native_usex sndfile yes no)
+		--winmme=no
+	)
+
+	waf-utils_src_configure ${mywafconfargs[@]}
+}
+
+multilib_src_compile() {
+	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
+}
+
+multilib_src_install() {
+	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"
+}
diff --git a/media-sound/meterbridge/Manifest b/media-sound/meterbridge/Manifest
index b5a40f82dd23..90a256fdded9 100644
--- a/media-sound/meterbridge/Manifest
+++ b/media-sound/meterbridge/Manifest
@@ -3,5 +3,5 @@ AUX meterbridge-0.9.3-cflags.patch 483 BLAKE2B 02233f99771bdf233e374bedc0f965fa0
 AUX meterbridge-0.9.3-gcc41.patch 488 BLAKE2B 379e5d1967a78c53b112a7dbb8ea41d561d5517879a91335468345f56ab90c0bb438dacc69a308fcd03f1df46f1ca617bd47deb0b4329991a4b9dea8cbc5d0a8 SHA512 df259114e25efb486ad980b44449b8c33b3afe87a726a5c40641831810d0de30a56c671bbcc5fdbe2fec05b860a3b2ed1439947240c967f938c6771e91d5907e
 AUX meterbridge-0.9.3-setrgba.patch 547 BLAKE2B 5b2aa5a2701615dfd034c710faa6e75ffba3f5b03517bba4f880b53c17faa248c9e4dae8b2d7a598cd93aa213add78307a5978189c29df688f7ab6f364e37724 SHA512 2bb8e4c26d33a0383f3867459dcc15f5d7500adbbb5cdc230d7fba1d45c9ba4f0ba46731770c5ef25f6adc8121efbef9ecd0ecdac53ed3c3ced840010e3164d4
 DIST meterbridge-0.9.3.tar.gz 610566 SHA256 3feef0e52d68333c97f32393aff73f2c4d963bd974c5d3f42689c6eb3e1bf668 SHA512 19c49a584ab71a4fbe4a0d3f05382ce464c3c5f3e37a6dbd42b4920a18577d66464d8e1277d32c34cf9248a945da05fda17a3ecd35e770fdd8af6e9f691ab52a WHIRLPOOL 84cf915e64f0a93c452cb8e1ae0e3852d34610daf333a7e9f804ad1dabca82a98a5659b774cbb141bd13d95dfc6e2c71deb76edc311ff823ce99d13e4654c120
-EBUILD meterbridge-0.9.3.ebuild 826 BLAKE2B e865ac2a00c9c7226efa8691f2479c93c899bab99f97258fa16b7ce837b57436b2121dedabf53e0ff0a8e897280df1a987a9ac77f7d0a8fff09c87850e5e3ca9 SHA512 1d8dc9fb3717b7bf2a03041c025dc4a747380ea0415d14edadd80bc0b9efb17b0615512d4ab09348fb38e14999864ec1235d46565253b0543825f0aac8fcb62d
+EBUILD meterbridge-0.9.3.ebuild 807 BLAKE2B d7b4d29b312a81c962dd23874b3d32275a216d08a97fc3fbb6f6cab3dd8b1778f0b9ff9e5d16c4ff0dcbed87449c7606899343ee91e5e6d9e581d9162febbfdb SHA512 532fcd9473911c4b8284cd9e69fbefcd7d7d1eb04da0b3e78f7f4df3b585bb66f81c75aaa8cd6763261027018d4824f917c1a5ef1df0322ab1a0d5d9c6c295e2
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/meterbridge/meterbridge-0.9.3.ebuild b/media-sound/meterbridge/meterbridge-0.9.3.ebuild
index 2b51532ddda7..83bb62c55f3d 100644
--- a/media-sound/meterbridge/meterbridge-0.9.3.ebuild
+++ b/media-sound/meterbridge/meterbridge-0.9.3.ebuild
@@ -21,12 +21,15 @@ RDEPEND="media-sound/jack-audio-connection-kit
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}/${P}-gcc41.patch"
+	"${FILESDIR}/${P}-asneeded.patch"
+	"${FILESDIR}/${P}-cflags.patch"
+	"${FILESDIR}/${P}-setrgba.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc41.patch
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-	epatch "${FILESDIR}"/${P}-cflags.patch
-	epatch "${FILESDIR}"/${P}-setrgba.patch
-	eapply_user
+	default
 	eautoreconf
 }
 
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 42e1c5eab82c..90c0f642a9e4 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,9 +1,3 @@
-AUX mixxx-1.10.0-cflags.patch 573 BLAKE2B 15bb22bd2ae0c1f805a6279d6a488e81ed6aa5889ceceb0c03962c782e49422625337c3432b5528b857702ddabf0a296d5ae796b51e6ec2736fdafacaf9f4232 SHA512 1157161dc85314da07c47f5b42b654d5391ca3b84412f10915b5d15a9fe6cc0dbbf06f7e3156cb2f9cf21f0233ee50ae7e54cb10855332f0292b3bba915f857a
-AUX mixxx-1.10.0-docs.patch 327 BLAKE2B a40531618e0b51543c3f18f14c71b328cbb577a8172a8b42e40f0cc1fcbb5f8f6a78bbcaad812ee09ea252ba8ff28fc300486265f270ad9ad0f8d80aa2f42e9a SHA512 c785cab9ba558d5f4df04e6f89515a2056e2db84767061d0f0e1fa140fd419c384d49d78dae913e31663da4b8680a0ea966414be2c9309d4da5c2ba0dddadcc1
-AUX mixxx-1.10.0-no-bzr.patch 1503 BLAKE2B 50780142ca9611fa107fbd70627b9ab43d147f330ed3319aa0bc7f98ce22a5b1183a49841b33cda4115e4232ee81f407e311a0ad10ebbddca699ce68de295364 SHA512 faeedcdaa29ed6939b22ed6e60a8493c8d76f45904287667b4c7aa1b2e9acaa43810b005ad5d31eafb466e1717d18f773929ee41a9ab0e6c5c39b33fd07d8d59
-AUX mixxx-1.10.0-system-libs.patch 7152 BLAKE2B 9cacbf25c1919c3bc01d97bdb8b38d77760d65ffee40f8950fe226afcd1fb3bec0c419f39124b425800eedc244381d09d4e9ac6fda3ea892f2bec74e6fd1220a SHA512 18d47f0a68c9cd333ebd719e58421db27df15e9babd913750907d2a725236c6a7ad90b7c2a67b6b746d14f94676e746db0f2dcce80af09c02b0d762d6eb7d2b8
-AUX mixxx-1.11.0-no-bzr.patch 1390 BLAKE2B 2cf4ac3097c96d1f51f5623e8d0550cb58ecc45ce00cca801e76163eb7e80ec31929c6df15700b86ba29314606d1d619cd086f8c4f4c21d52ef9145c8b9c0bf5 SHA512 65f78fcb4c653b93d5ff0a308bca5ec16d0ccdd367e0ac8b15ca1d908aaee332316770cf6b11b2452b2ef8dfe44babd20fd60d58d2fca4cf794073601f6667bb
-AUX mixxx-1.11.0-system-libs.patch 8877 BLAKE2B 70bc82a5396abc6192f438ccd5278deca2e83c15d26dc60bfbe6c4a44228a0ffb8d7f6c2044b62a0c45fa6b72eb063cfc21771c0ff679de6f3be93f553d1084b SHA512 baabba8c7c873bfe5da4230f13787133b69ee72b83328b41e7eb4ade5d81350765309ae9be8154d93aeb9e7e1f90ef0ac2d8a20153d0600d41173d876d51331f
 AUX mixxx-2.0.0-chromaprint-1.4.patch 1518 BLAKE2B ead525e69d7c031b81aa00f969a1e569182eb958d794a6715d809d46dc8d5789b71e7d4dbd8a6ce8987013d614f3fd1b4b0a63fa488c7e2f48136614c3bafea8 SHA512 31da87b64646188be144611fc6f601d58edfcf9e63b5382060f5088797c24d61ff4b48a4e80c5c3b919b7291287d3977c0f61829ddfe7a43f9fbae7db3b735c0
 AUX mixxx-2.0.0-docs.patch 435 BLAKE2B c2e9b09abb293e59b2af49527eccf07c9488ae5e30e29e6c4d6330cc298a568ee7dd7014af6b9c1f1c4d98b8c11c96da7f74660eb4b3b522f449e7a6a431addc SHA512 01ab76466f782f538c894e460f7694553ae12804651f68aabb6aaa0dbdc89e2ff7e2b51529b0f112cee42c8053b75fc64241a9c8898def8cf1c76231b1ec5d59
 AUX mixxx-2.0.0-eliminate-unnecessary-heap-allocation-of-qtime.patch 1615 BLAKE2B 08a41664f1941ac100b8fbee0c92e064813f0eb549cfd17e766541034954c73ea8b5ca9c759d98edb1f3513447719313790000c92f47c53ef54e0b74fe8c7f6c SHA512 825599d1bdfbcc673c64226bde25f2ae56b046d32139c3347cb2aae698aa27158b17609dd097ce772e62bcd58b7f711d352386069683239541f3f4160dc6d915
diff --git a/media-sound/mixxx/files/mixxx-1.10.0-cflags.patch b/media-sound/mixxx/files/mixxx-1.10.0-cflags.patch
deleted file mode 100644
index b6c8655a73a6..000000000000
--- a/media-sound/mixxx/files/mixxx-1.10.0-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- mixxx-1.10.0/build/depends.py
-+++ mixxx-1.10.0/build/depends.py
-@@ -623,10 +555,8 @@
-         if build.toolchain_is_gnu:
-             # Default GNU Options
-             # TODO(XXX) always generate debugging info?
--            build.env.Append(CCFLAGS = '-pipe')
-             build.env.Append(CCFLAGS = '-Wall')
-             build.env.Append(CCFLAGS = '-Wextra')
--            build.env.Append(CCFLAGS = '-g')
- 
-             # Check that g++ is present (yeah, SCONS is a bit dumb here)
-             if os.system("which g++ > /dev/null"): #Checks for non-zero return code
diff --git a/media-sound/mixxx/files/mixxx-1.10.0-docs.patch b/media-sound/mixxx/files/mixxx-1.10.0-docs.patch
deleted file mode 100644
index c9205179881c..000000000000
--- a/media-sound/mixxx/files/mixxx-1.10.0-docs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mixxx-1.10.0/src/SConscript
-+++ mixxx-1.10.0/src/SConscript
-@@ -219,7 +218,6 @@
- 		env.Alias('install', keyboardmappings)
- 		if int(flags['ladspa']):
- 			env.Alias('install', ladspapresets)
--		env.Alias('install', docs)
- 		env.Alias('install', dotdesktop)
- 		env.Alias('install', icon)
- 		env.Alias('install', promotracks)
diff --git a/media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch b/media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch
deleted file mode 100644
index 40f32266bb5e..000000000000
--- a/media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- mixxx-1.10.0/src/SConscript.env
-+++ mixxx-1.10.0/src/SConscript.env
-@@ -19,21 +19,6 @@
-     print "Deleting deprecated build file: %s" % defs
-     os.remove(defs)
- 
--#env.Append(CPPDEFINES=[('BUILD_REV', '"%s"' % getBZRRevision())]) #doing this forces a rebuild of everything whenever a commit happens -- not much fun
--## instead, embed BZR version into build
--## Put version info into a file, so it doesn't force a rebuild of everything :)
--f = open("build.h","w")
--try:
--    branch_name = util.get_bzr_branch_name()
--    modified = util.get_bzr_modified() > 0
--    # Do not emit BUILD_BRANCH on release branches.
--    if not branch_name.startswith('release'):
--        f.write('#define BUILD_BRANCH "%s"\n' % branch_name)
--    f.write('#define BUILD_REV "%s%s"\n' % (util.get_bzr_revision(),
--                                            '+' if modified else ''))
--finally:
--    f.close()
--
- #Check for dependencies if we're not doing a clean...
- #if not env.GetOption('clean') and not SCons.Util.containsAny(os.sys.argv, ['-h', '--help']):
- conf = Configure(env, custom_tests = { 'CheckForPKGConfig' : util.CheckForPKGConfig,
---- mixxx-1.10.0/src/SConscript
-+++ mixxx-1.10.0/src/SConscript
-@@ -12,8 +12,8 @@
- from build import util
- 
- mixxx_version = util.get_mixxx_version()
--branch_name = util.get_bzr_branch_name()
--bazaar_revision = util.get_bzr_revision()
-+#branch_name = util.get_bzr_branch_name()
-+#bazaar_revision = util.get_bzr_revision()
- print "WE ARE IN:", os.getcwd()
- 
- plugins = []
diff --git a/media-sound/mixxx/files/mixxx-1.10.0-system-libs.patch b/media-sound/mixxx/files/mixxx-1.10.0-system-libs.patch
deleted file mode 100644
index d2e21f3e005b..000000000000
--- a/media-sound/mixxx/files/mixxx-1.10.0-system-libs.patch
+++ /dev/null
@@ -1,172 +0,0 @@
---- mixxx-1.10.0/build/depends.py
-+++ mixxx-1.10.0/build/depends.py
-@@ -21,7 +21,7 @@
- 
-     def configure(self, build, conf):
-         #Check for PortTime
--        if not conf.CheckLib(['porttime', 'libporttime']) and \
-+        if not conf.CheckLib(['porttime', 'libportmidi']) and \
-                 not conf.CheckHeader(['porttime.h']):
-             raise Exception("Did not find PortTime or its development headers.")
-         if not conf.CheckLib(['portmidi', 'libportmidi']) and \
-@@ -189,25 +189,10 @@
- 
- class FidLib(Dependence):
- 
--    def sources(self, build):
--        symbol = None
--        if build.platform_is_windows:
--            if build.toolchain_is_msvs:
--                symbol = 'T_MSVC'
--            elif build.crosscompile:
--                # Not sure why, but fidlib won't build with mingw32msvc and
--                # T_MINGW
--                symbol = 'T_LINUX'
--            elif build.toolchain_is_gnu:
--                symbol = 'T_MINGW'
--        else:
--            symbol = 'T_LINUX'
--
--        return [build.env.StaticObject('#lib/fidlib-0.9.9/fidlib.c',
--                                       CPPDEFINES=symbol)]
--
-     def configure(self, build, conf):
--        build.env.Append(CPPPATH='#lib/fidlib-0.9.9/')
-+        if not conf.CheckLib('fidlib'):
-+            raise Exception('Did not find fidlib library, exiting!')
-+        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/fidlib'])
- 
- class KissFFT(Dependence):
- 
-@@ -226,68 +211,15 @@
-         build.env.Append(CPPPATH="#lib/replaygain")
- 
- class SoundTouch(Dependence):
--    SOUNDTOUCH_PATH = 'soundtouch-1.5.0'
- 
-     def sources(self, build):
--        sources = ['engine/enginebufferscalest.cpp',
--                   '#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/TDStretch.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/RateTransposer.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/AAFilter.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH]
--        if build.platform_is_windows and build.toolchain_is_msvs:
--            if build.machine_is_64bit:
--                sources.append(
--                    '#lib/%s/cpu_detect_x64_win.cpp' % self.SOUNDTOUCH_PATH)
--            elif build.machine == 'x86':
--                sources.append(
--                    '#lib/%s/cpu_detect_x86_win.cpp' % self.SOUNDTOUCH_PATH)
--            else:
--                raise Exception("Unhandled CPU configuration for SoundTouch")
--        elif build.toolchain_is_gnu:
--            if build.machine == 'x86_64':
--                sources.append(
--                    '#lib/%s/cpu_detect_x64_gcc.cpp' % self.SOUNDTOUCH_PATH)
--            else:
--                sources.append(
--                    '#lib/%s/cpu_detect_x86_gcc.cpp' % self.SOUNDTOUCH_PATH)
--        else:
--            raise Exception("Unhandled CPU configuration for SoundTouch")
--
--        # TODO(XXX) when we figure out a better way to represent features, fix
--        # this.
--        optimize = int(util.get_flags(build.env, 'optimize', 1))
--        if build.machine_is_64bit or \
--                (build.toolchain_is_msvs and optimize > 1) or \
--                (build.toolchain_is_gnu and optimize > 2):
--            sources.extend(
--                ['#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH,
--                 '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH,
--                 ])
--        if build.toolchain_is_msvs and not build.machine_is_64bit:
--            sources.append('#lib/%s/3dnow_win.cpp' % self.SOUNDTOUCH_PATH)
--        else:
--            # TODO(XXX) the docs refer to a 3dnow_gcc, but we don't seem to have
--            # it.
--            pass
--
--        return sources
-+        return ['engine/enginebufferscalest.cpp']
- 
-     def configure(self, build, conf):
--        if build.platform_is_windows:
--            build.env.Append(CPPDEFINES = 'WIN%s' % build.bitwidth)
--        build.env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])
--
--        # TODO(XXX) when we figure out a better way to represent features, fix
--        # this.
--        optimize = int(util.get_flags(build.env, 'optimize', 1))
--        if build.machine_is_64bit or \
--                (build.toolchain_is_msvs and optimize > 1) or \
--                (build.toolchain_is_gnu and optimize > 2):
--            build.env.Append(CPPDEFINES='ALLOW_X86_OPTIMIZATIONS')
-+        if not conf.CheckLib(['SoundTouch','libSoundTouch']):
-+            raise Exception('Did not find SoundTouch library, exiting!')
-+        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/soundtouch'])
-+        build.env.Append(LIBS='SoundTouch')
- 
- class TagLib(Dependence):
-     def configure(self, build, conf):
---- mixxx-1.10.0/build/features.py
-+++ mixxx-1.10.0/build/features.py
-@@ -665,25 +659,15 @@
-         test_env.Append(CCFLAGS = '-pthread')
-         test_env.Append(LINKFLAGS = '-pthread')
- 
--        test_env.Append(CPPPATH="#lib/gtest-1.5.0/include")
--        gtest_dir = test_env.Dir("#lib/gtest-1.5.0")
--        #gtest_dir.addRepository(build.env.Dir('#lib/gtest-1.5.0'))
--        #build.env['EXE_OUTPUT'] = '#/lib/gtest-1.3.0/bin'  # example, optional
--        test_env['LIB_OUTPUT'] = '#/lib/gtest-1.5.0/lib'
--
--        env = test_env
--        SCons.Export('env')
--        env.SConscript(env.File('SConscript', gtest_dir))
--
--        # build and configure gmock
--        test_env.Append(CPPPATH="#lib/gmock-1.5.0/include")
--        gmock_dir = test_env.Dir("#lib/gmock-1.5.0")
--        #gmock_dir.addRepository(build.env.Dir('#lib/gmock-1.5.0'))
--        test_env['LIB_OUTPUT'] = '#/lib/gmock-1.5.0/lib'
--
--        env.SConscript(env.File('SConscript', gmock_dir))
--
--        return []
-+        if not conf.CheckLib('gtest'):
-+            raise Exception('Did not find gtest library, exiting!')
-+        test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gtest'])
-+        test_env.Append(LIBS='gtest')
-+
-+        if not conf.CheckLib('gmock'):
-+            raise Exception('Did not find gmock library, exiting!')
-+        test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gmock'])
-+        test_env.Append(LIBS='gmock')
- 
- class Shoutcast(Feature):
-     def description(self):
---- mixxx-1.10.0/src/engine/enginefilterbutterworth8.cpp
-+++ mixxx-1.10.0/src/engine/enginefilterbutterworth8.cpp
-@@ -20,7 +20,6 @@
- #include "engine/enginefilterbutterworth8.h"

- #include "engine/enginefilter.h"

- #include "engine/engineobject.h"

--#include "../lib/fidlib-0.9.9/fidlib.h"

- 

- /* Local Prototypes */

- inline double _processLowpass(double *coef, double *buf, register double val);

---- mixxx-1.10.0/src/engine/enginefilter.h
-+++ mixxx-1.10.0/src/engine/enginefilter.h
-@@ -20,7 +20,7 @@
- 
- #define MIXXX
- #include "engine/engineobject.h"
--#include "../lib/fidlib-0.9.9/fidlib.h"
-+#include "fidlib.h"
- #include "defs.h"
- 
- enum filterType{

diff --git a/media-sound/mixxx/files/mixxx-1.11.0-no-bzr.patch b/media-sound/mixxx/files/mixxx-1.11.0-no-bzr.patch
deleted file mode 100644
index b89d7f92f76e..000000000000
--- a/media-sound/mixxx/files/mixxx-1.11.0-no-bzr.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- mixxx-1.11.0/src/SConscript
-+++ mixxx-1.11.0/src/SConscript
-@@ -12,8 +12,8 @@
- from build import util, depends
- 
- mixxx_version = util.get_mixxx_version()
--branch_name = util.get_bzr_branch_name()
--bazaar_revision = util.get_bzr_revision()
-+#branch_name = util.get_bzr_branch_name()
-+#bazaar_revision = util.get_bzr_revision()
- print "WE ARE IN:", os.getcwd()
- 
- plugins = []
---- mixxx-1.11.0/src/SConscript.env
-+++ mixxx-1.11.0/src/SConscript.env
-@@ -20,19 +20,6 @@
-     print "Deleting deprecated build file: %s" % defs
-     os.remove(defs)
- 
--#env.Append(CPPDEFINES=[('BUILD_REV', '"%s"' % getBZRRevision())]) #doing this forces a rebuild of everything whenever a commit happens -- not much fun
--## instead, embed BZR version into build
--## Put version info into a file, so it doesn't force a rebuild of everything :)
--
--if os.path.exists(os.path.join('..', 'build.h')):
--    # If a build.h exists in the project root mixxx/ directory then use that
--    # instead of writing our own. This is mostly since when we build Debian
--    # packages we don't have any of the Bazaar metadata so we can't write one
--    # ourselves.
--    shutil.copy(os.path.join('..', 'build.h'), 'build.h')
--else:
--    util.write_build_header('build.h')
--
- 
- #Check for dependencies if we're not doing a clean...
- #if not env.GetOption('clean') and not SCons.Util.containsAny(os.sys.argv, ['-h', '--help']):
diff --git a/media-sound/mixxx/files/mixxx-1.11.0-system-libs.patch b/media-sound/mixxx/files/mixxx-1.11.0-system-libs.patch
deleted file mode 100644
index 2f6b62c3440a..000000000000
--- a/media-sound/mixxx/files/mixxx-1.11.0-system-libs.patch
+++ /dev/null
@@ -1,223 +0,0 @@
---- mixxx-1.11.0/build/depends.py
-+++ mixxx-1.11.0/build/depends.py
-@@ -179,8 +179,8 @@
-         # times.
- 
-         qt_modules = [
--            'QtCore', 'QtGui', 'QtOpenGL', 'QtXml', 'QtSvg',
--            'QtSql', 'QtScript', 'QtXmlPatterns', 'QtNetwork'
-+            'QtCore', 'QtGui', 'QtOpenGL', 'QtXml',
-+            'QtSql', 'QtScript', 'QtNetwork'
-             #'QtUiTools', #'QtDesigner',
-         ]
- 
-@@ -298,25 +298,10 @@
- 
- class FidLib(Dependence):
- 
--    def sources(self, build):
--        symbol = None
--        if build.platform_is_windows:
--            if build.toolchain_is_msvs:
--                symbol = 'T_MSVC'
--            elif build.crosscompile:
--                # Not sure why, but fidlib won't build with mingw32msvc and
--                # T_MINGW
--                symbol = 'T_LINUX'
--            elif build.toolchain_is_gnu:
--                symbol = 'T_MINGW'
--        else:
--            symbol = 'T_LINUX'
--
--        return [build.env.StaticObject('#lib/fidlib-0.9.10/fidlib.c',
--                                       CPPDEFINES=symbol)]
--
-     def configure(self, build, conf):
--        build.env.Append(CPPPATH='#lib/fidlib-0.9.10/')
-+        if not conf.CheckLib('fidlib'):
-+            raise Exception('Did not find fidlib library, exiting!')
-+        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/fidlib'])
- 
- class ReplayGain(Dependence):
- 
-@@ -327,7 +312,6 @@
-         build.env.Append(CPPPATH="#lib/replaygain")
- 
- class SoundTouch(Dependence):
--    SOUNDTOUCH_PATH = 'soundtouch-1.6.0'
- 
-     def sse_enabled(self, build):
-         optimize = int(util.get_flags(build.env, 'optimize', 1))
-@@ -336,30 +320,7 @@
-                 (build.toolchain_is_gnu and optimize > 1))
- 
-     def sources(self, build):
--        sources = ['engine/enginebufferscalest.cpp',
--                   '#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/TDStretch.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/RateTransposer.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/AAFilter.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH]
--
--        # SoundTouch CPU optimizations are only for x86
--        # architectures. SoundTouch automatically ignores these files when it is
--        # not being built for an architecture that supports them.
--        cpu_detection = '#lib/%s/cpu_detect_x86_win.cpp' if build.toolchain_is_msvs else \
--            '#lib/%s/cpu_detect_x86_gcc.cpp'
--        sources.append(cpu_detection % self.SOUNDTOUCH_PATH)
--
--        # Check if the compiler has SSE extention enabled
--        # Allways the case on x64 (core instructions)
--        if self.sse_enabled(build):
--            sources.extend(
--                ['#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH,
--                 '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH,])
--        return sources
-+        return ['engine/enginebufferscalest.cpp']
- 
-     def configure(self, build, conf, env=None):
-         if env is None:
-@@ -367,13 +328,10 @@
-         if build.platform_is_windows:
-             # Regardless of the bitwidth, ST checks for WIN32
-             env.Append(CPPDEFINES = 'WIN32')
--        env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])
--
--        # Check if the compiler has SSE extention enabled
--        # Allways the case on x64 (core instructions)
--        optimize = int(util.get_flags(env, 'optimize', 1))
--        if self.sse_enabled(build):
--            env.Append(CPPDEFINES='SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS')
-+        if not conf.CheckLib(['SoundTouch','libSoundTouch']):
-+            raise Exception('Did not find SoundTouch library, exiting!')
-+        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/soundtouch'])
-+        build.env.Append(LIBS='SoundTouch')
- 
- class TagLib(Dependence):
-     def configure(self, build, conf):
---- mixxx-1.11.0/build/features.py
-+++ mixxx-1.11.0/build/features.py
-@@ -48,7 +48,6 @@
-                 'controllers/midi/hss1394enumerator.cpp']
- 
- class HID(Feature):
--    HIDAPI_INTERNAL_PATH = '#lib/hidapi-0.8.0-pre'
-     def description(self):
-         return "HID controller support"
- 
-@@ -64,9 +63,6 @@
-     def configure(self, build, conf):
-         if not self.enabled(build):
-             return
--        # TODO(XXX) allow external hidapi install, but for now we just use our
--        # internal one.
--        build.env.Append(CPPPATH=[os.path.join(self.HIDAPI_INTERNAL_PATH, 'hidapi')])
- 
-         if build.platform_is_linux:
-             build.env.ParseConfig('pkg-config libusb-1.0 --silence-errors --cflags --libs')
-@@ -86,19 +82,17 @@
- 
-         build.env.Append(CPPDEFINES = '__HID__')
- 
-+        if not conf.CheckLib('hidapi-libusb'):
-+            raise Exception('Did not find HID API library, exiting!')
-+        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/hidapi'])
-+        build.env.Append(LIBS='hidapi-libusb')
-+
-+
-     def sources(self, build):
-         sources = ['controllers/hid/hidcontroller.cpp',
-                    'controllers/hid/hidenumerator.cpp',
-                    'controllers/hid/hidcontrollerpresetfilehandler.cpp']
- 
--        if build.platform_is_windows:
--            # Requires setupapi.lib which is included by the above check for
--            # setupapi.
--            sources.append(os.path.join(self.HIDAPI_INTERNAL_PATH, "windows/hid.c"))
--        elif build.platform_is_linux:
--            sources.append(os.path.join(self.HIDAPI_INTERNAL_PATH, 'linux/hid-libusb.c'))
--        elif build.platform_is_osx:
--            sources.append(os.path.join(self.HIDAPI_INTERNAL_PATH, 'mac/hid.c'))
-         return sources
- 
- class Bulk(Feature):
-@@ -455,19 +449,6 @@
- 
-         build.env.Append(CPPDEFINES = '__VAMP__')
- 
--        # Needed on Linux at least. Maybe needed elsewhere?
--        if build.platform_is_linux:
--            # Optionally link libdl and libX11. Required for some distros.
--            conf.CheckLib(['dl', 'libdl'])
--            conf.CheckLib(['X11', 'libX11'])
--
--        # FFTW3 support
--        have_fftw3_h = conf.CheckHeader('fftw3.h')
--        have_fftw3 = conf.CheckLib('fftw3', autoadd=False)
--        if(have_fftw3_h and have_fftw3 and build.platform_is_linux):
--             build.env.Append(CPPDEFINES = 'HAVE_FFTW3')
--             build.env.ParseConfig('pkg-config fftw3 --silence-errors --cflags --libs')
--
-     def sources(self, build):
-         sources = ['vamp/vampanalyser.cpp',
-                    'vamp/vamppluginloader.cpp',
-@@ -725,25 +706,15 @@
-         test_env.Append(CCFLAGS = '-pthread')
-         test_env.Append(LINKFLAGS = '-pthread')
- 
--        test_env.Append(CPPPATH="#lib/gtest-1.5.0/include")
--        gtest_dir = test_env.Dir("#lib/gtest-1.5.0")
--        #gtest_dir.addRepository(build.env.Dir('#lib/gtest-1.5.0'))
--        #build.env['EXE_OUTPUT'] = '#/lib/gtest-1.3.0/bin'  # example, optional
--        test_env['LIB_OUTPUT'] = '#/lib/gtest-1.5.0/lib'
--
--        env = test_env
--        SCons.Export('env')
--        env.SConscript(env.File('SConscript', gtest_dir))
--
--        # build and configure gmock
--        test_env.Append(CPPPATH="#lib/gmock-1.5.0/include")
--        gmock_dir = test_env.Dir("#lib/gmock-1.5.0")
--        #gmock_dir.addRepository(build.env.Dir('#lib/gmock-1.5.0'))
--        test_env['LIB_OUTPUT'] = '#/lib/gmock-1.5.0/lib'
--
--        env.SConscript(env.File('SConscript', gmock_dir))
--
--        return []
-+        if not conf.CheckLib('gtest'):
-+            raise Exception('Did not find gtest library, exiting!')
-+        test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gtest'])
-+        test_env.Append(LIBS='gtest')
-+
-+        if not conf.CheckLib('gmock'):
-+            raise Exception('Did not find gmock library, exiting!')
-+        test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gmock'])
-+        test_env.Append(LIBS='gmock')
- 
- class Shoutcast(Feature):
-     def description(self):
---- mixxx-1.11.0/src/engine/enginefilterbutterworth8.cpp
-+++ mixxx-1.11.0/src/engine/enginefilterbutterworth8.cpp
-@@ -20,7 +20,7 @@
- #include "engine/enginefilterbutterworth8.h"

- #include "engine/enginefilter.h"

- #include "engine/engineobject.h"

--#include "../lib/fidlib-0.9.10/fidlib.h"

-+#include <fidlib.h>

- 

- /* Local Prototypes */

- inline double _processLowpass(double *coef, double *buf, register double val);

---- mixxx-1.11.0/src/engine/enginefilter.h
-+++ mixxx-1.11.0/src/engine/enginefilter.h
-@@ -20,7 +20,7 @@
- 
- #define MIXXX
- #include "engine/engineobject.h"
--#include "../lib/fidlib-0.9.10/fidlib.h"
-+#include <fidlib.h>
- #include "defs.h"
- 
- enum filterType{
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 8db6988c81e4..d994eeec2cb1 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/dtv-scan-tables/Manifest b/media-tv/dtv-scan-tables/Manifest
index 15fbdf54c8d0..a32eddcb0225 100644
--- a/media-tv/dtv-scan-tables/Manifest
+++ b/media-tv/dtv-scan-tables/Manifest
@@ -1,4 +1,4 @@
 DIST dtv-scan-tables-2017-10-03-c1986d5148d8.tar.bz2 168709 BLAKE2B fb4a7ad5b6892a7e7eed1d57ebb49b1f4493076f6f744953d2d5c51c0e1cf7fdaf864ad050c578c2697f5b11d72c245b96ee369522cb58d38a1a2cef035099a7 SHA512 e2b0cf8f52b536be6a532b4a2896421a8150fdc19613e92c92d0c8275fcfd306cb091db32fa26f97bbec0a51ef4ba61b5f98e8c974280a3f6dd36b67a3bf4aad
-EBUILD dtv-scan-tables-0_p20171003.ebuild 730 BLAKE2B 72e4c584017945a4cb3bd70c6966099c71f7817ee40532ac42bb7e8f80a3572b6110eab019f3fb678e3ef381096c60afe25df3a1535e4705f6b600170c8037fc SHA512 1db9fbc172bfef0df1948a37226b3349f6afc8ebef66a799717841314006924d33e2f34306bfcdd6893cae8b5799e7f3a529295f70df016df0b43e638741e753
-EBUILD dtv-scan-tables-9999.ebuild 730 BLAKE2B 72e4c584017945a4cb3bd70c6966099c71f7817ee40532ac42bb7e8f80a3572b6110eab019f3fb678e3ef381096c60afe25df3a1535e4705f6b600170c8037fc SHA512 1db9fbc172bfef0df1948a37226b3349f6afc8ebef66a799717841314006924d33e2f34306bfcdd6893cae8b5799e7f3a529295f70df016df0b43e638741e753
+EBUILD dtv-scan-tables-0_p20171003.ebuild 742 BLAKE2B 2b051afd0c0fd13514330eb0bef4e05ef2cd5fc12aea4c56905bf1f431d9181938dc26a0161c105e12daa7cb819b1ee68d70d0585000913b8dbde52fd5c5cc6a SHA512 e8c072d25cfa7262faa3ab2e1d597b523a50eb42f7b3c68ab62b8d9e5a3fa237d380012aa9daa83e03aee4e3bbd09e037fcce0906f8e34d9971453322c91ac8c
+EBUILD dtv-scan-tables-9999.ebuild 742 BLAKE2B 2b051afd0c0fd13514330eb0bef4e05ef2cd5fc12aea4c56905bf1f431d9181938dc26a0161c105e12daa7cb819b1ee68d70d0585000913b8dbde52fd5c5cc6a SHA512 e8c072d25cfa7262faa3ab2e1d597b523a50eb42f7b3c68ab62b8d9e5a3fa237d380012aa9daa83e03aee4e3bbd09e037fcce0906f8e34d9971453322c91ac8c
 MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20171003.ebuild b/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20171003.ebuild
index 08c15c3ef583..c4ec5b113aae 100644
--- a/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20171003.ebuild
+++ b/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20171003.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV#9999} != ${PV} ]]; then
 else
 	COMMIT="c1986d5148d8"
 	SRC_URI="https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${PV:3:4}-${PV:7:2}-${PV:9:2}-${COMMIT}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 	S="${WORKDIR}/usr/share/dvb"
 fi
 
diff --git a/media-tv/dtv-scan-tables/dtv-scan-tables-9999.ebuild b/media-tv/dtv-scan-tables/dtv-scan-tables-9999.ebuild
index 08c15c3ef583..c4ec5b113aae 100644
--- a/media-tv/dtv-scan-tables/dtv-scan-tables-9999.ebuild
+++ b/media-tv/dtv-scan-tables/dtv-scan-tables-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV#9999} != ${PV} ]]; then
 else
 	COMMIT="c1986d5148d8"
 	SRC_URI="https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${PV:3:4}-${PV:7:2}-${PV:9:2}-${COMMIT}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 	S="${WORKDIR}/usr/share/dvb"
 fi
 
diff --git a/media-tv/linuxtv-dvb-apps/Manifest b/media-tv/linuxtv-dvb-apps/Manifest
index 3416ec7c5733..9057fe07b73f 100644
--- a/media-tv/linuxtv-dvb-apps/Manifest
+++ b/media-tv/linuxtv-dvb-apps/Manifest
@@ -1,6 +1,8 @@
 AUX linuxtv-dvb-apps-1.1.1.20100223-alevt.patch 1418 BLAKE2B e8501fc28ae0e2288ad1ebb7f56e7dd61d979294d332fe1df6cb08ba0d3ebd1835dd60b31ffe5e350659080ca75cf0297921ad5a3cd0e4dfe08e12dcfc081fcb SHA512 7490d18c3408bc412a3f3a3bb54544885f863ee146176dd8f9caae624043b5ad797f9fe9edc1ae627fd82b0fdb392e6f458d814e68a11ef4efa253c1add4016d
 AUX linuxtv-dvb-apps-1.1.1.20100223-ldflags.patch 607 BLAKE2B ea2f229d1ab2d0f5df3541b85a90caa06c25e7296b5d77dfb572ac5b261efd4b61e4022ca0ee80fe31be7046b47090ea2e7457710e762ad2eecbc5165db2996b SHA512 abaf61336531e33148a8a0d5d4dfa545a607b077430e6e9ae363a667524fcf3d41e5fec1112e795dcf6be5160a8ef57049b224dac42b1211d3ea3b9f865dba48
 AUX linuxtv-dvb-apps-1.1.1.20100223-perl526.patch 519 BLAKE2B 1546d43af3d337062d1a454e79be0d70349c91950e55ce66e84e75092277d50a7c327eef48bd85239ccb86c8284a6393cd77b173b895956e66af17d625a767d3 SHA512 73fea472e484f41d9c3eb676628dc2765081c92202823c03489d866534cdfef81559205cdb7f0e4578f217e0b0102ee94ed1faf56b7c3a3eb8c4c7d9dfc1b1e8
-DIST linuxtv-dvb-apps-1.1.1.20100223.tar.bz2 429129 SHA256 8a657a1479de665a6d95d8f5585ffd0228232e1a030b88435d4c40d85e983461 SHA512 0950197e2a199b1ab4392fa2e893d9b537d2b8fed05b24d8b81a2abf11ed2373dcb299a51e217c6508ea68b81691728b120328e4080de68519449fc5fd506161 WHIRLPOOL 5129c13fbc1cc65c9a5177d29de87563c22f4a8c78bbe4534e65a9c46b3683344c5a296cd157379c7af9500a9079daea8418b927a65ed1596d24d6300441ed20
+DIST linuxtv-dvb-apps-1.1.1.20100223.tar.bz2 429129 BLAKE2B d67eb79f89243e73528ce1e79935031f9afb7270c4c22a8670f3c48b75d7ddbe0efe1188b77851b875f78a35419186b7015b82e335063751eecd1f9eacc72947 SHA512 0950197e2a199b1ab4392fa2e893d9b537d2b8fed05b24d8b81a2abf11ed2373dcb299a51e217c6508ea68b81691728b120328e4080de68519449fc5fd506161
+DIST linuxtv-dvb-apps-1.1.1.20140321.tar.bz2 368759 BLAKE2B 5ef1bc4ee4f0ab167cda8d87a73c83566b40005e16fbaa79525af4fb0b117dec19a4883eedad8bcfedd269c2e295dd7f9e055f905dff5f39dffe1ff052e87547 SHA512 ceb057f760fa0b3902e6824e74b9392be9a7bd3318a1a83f206c99672da17904060ffdc35e84c89d3b8af60ac29d4427acad44e9ae16797baaeb5738e2ab1bf5
 EBUILD linuxtv-dvb-apps-1.1.1.20100223-r1.ebuild 2032 BLAKE2B 2c48c887e58d67763ab08ffa86261a111ad8f0152d34e78a2b130a85769334a1b7bbb77087489718dc82d4741c2599855c949048af6a4b4da3154b6609775c54 SHA512 9e65d54aa3cc1443a524f79d35b77037618255d47b25c97d9a8d7c807b35299d44e85d041be4b3f0f76a293195d3be0b6846762f85e5dda3e6e774d95f2047d1
+EBUILD linuxtv-dvb-apps-1.1.1.20140321.ebuild 2117 BLAKE2B e95c464ada7e74e796af3e462c1fb27c66487c5420cfe7fa743458eb67d1d0c4058d94d9ec07d3859493813a3526fab984a6abe0d5b5da5f2dd9f3be4b369d0e SHA512 243a1cfc9f66bb6ef34b84ef54ab16de8beda37478179a1e498f55c3e713b7051e0447c731465efef1f39628ee7310dbe0809d131a076fa97b320c7ce437a21a
 MISC metadata.xml 230 BLAKE2B b1572b7d9c8d7cfb1ad670feba63226e05f2aa6d2de71ad3be92798dc2d1a21678aae2f8f9af6314e2a9fdc5fb1ac9fcac993d9b75a9afa457853888c94b0943 SHA512 1aaabf344edf8981ded68904e05257b579370a589c86b1ea8984378ad6a8ed3daf91c5e9069c07d207d47cf1f70a8039c644dbf6108557ed2053cba9769723ed
diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321.ebuild
new file mode 100644
index 000000000000..233e547a8a70
--- /dev/null
+++ b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs vcs-snapshot
+
+HOMEPAGE="https://www.linuxtv.org/"
+DESCRIPTION="Small utils for DVB to scan, zap, view signal strength"
+SRC_URI="https://www.linuxtv.org/hg/dvb-apps/archive/3d43b280298c.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="alevt usb"
+
+RDEPEND="
+	alevt? (
+		!media-video/alevt
+		media-libs/libpng:0=
+		media-libs/zvbi[v4l]
+		sys-libs/zlib
+		x11-libs/libX11
+	)
+	usb? ( virtual/libusb:0 )
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	virtual/linuxtv-dvb-headers
+"
+RDEPEND+="
+	media-tv/dtv-scan-tables
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.1.20100223-ldflags.patch
+	"${FILESDIR}"/${PN}-1.1.1.20100223-alevt.patch
+	"${FILESDIR}"/${PN}-1.1.1.20100223-perl526.patch
+)
+
+src_prepare() {
+	default
+
+	# do not compile test-progs, incompatible with videodev2.h
+	sed -i '/-C test/d' Makefile || die
+
+	# remove copy of header-files
+	rm -rv "${S}"/include/ || die
+}
+
+src_compile() {
+	emake V=1 CC=$(tc-getCC) $(usex usb "ttusb_dec_reset=1" "")
+	use alevt && emake -C util/alevt CC=$(tc-getCC) OPT="${CFLAGS}"
+}
+
+src_install() {
+	emake V=1 prefix="${EPREFIX}/usr" libdir="${EPREFIX}/usr/$(get_libdir)" \
+		$(usex usb "ttusb_dec_reset=1" "") \
+		DESTDIR="${D}" INSTDIR="${T}" install
+
+	if use alevt ; then
+		dodir /usr/share/{applications,man/man1}
+		emake -C util/alevt DESTDIR="${D}" install
+	fi
+
+	# rename scan to scan-dvb
+	mv "${ED}"/usr/bin/scan{,-dvb} || die
+
+	# install zap-files
+	local dir=""
+	for dir in dvb-{s,c,t} atsc ; do
+		insinto /usr/share/dvb/zap/${dir}
+		doins "${S}"/util/szap/channels-conf/${dir}/*
+	done
+
+	# install remote-key files
+	insinto /usr/share/dvb/av7110_loadkeys
+	doins util/av7110_loadkeys/*.rc*
+
+	# install Documentation
+	dodoc README
+	newdoc util/scan/README README.scan-dvb
+	newdoc util/szap/README README.zap
+	newdoc util/av7110_loadkeys/README README.av7110_loadkeys
+
+	use usb && newdoc util/ttusb_dec_reset/README README.ttusb_dec_reset
+}
+
+pkg_postinst() {
+	elog "/usr/bin/scan has been installed as scan-dvb."
+}
diff --git a/media-tv/xmltv/Manifest b/media-tv/xmltv/Manifest
index 3db3e6ce9c28..08b8e0cdf514 100644
--- a/media-tv/xmltv/Manifest
+++ b/media-tv/xmltv/Manifest
@@ -1,8 +1,10 @@
 AUX xmltv-0.5.68-perl526-1.patch 2066 BLAKE2B 97483506ba9351f3962e81a96f02548d24b55c1d78d5bf6bfc914bf292de6f94e539edf1b51840bd1cdd8ae4b4b139da32f84a071e8c75364df8300793b3f1aa SHA512 3dd149163cb6e0eb1077bf742cef4857869a7b4318732c084e30b402ab2db1b5760cac5bad9125fde7f5142f2a0b4b6c4d2c1aeed40abb9dc9a263af08c03290
 DIST xmltv-0.5.57.tar.bz2 778254 SHA256 4a42a1d239caa988fc6d25414ff0104aa831ffa273d4a571cff8c76c05e0afd3 SHA512 78e79b75b23cd8815403a0a5835036c67c80ff45fba79fae68e50a041ae384f427e18717d6122ea2d5eb57163370acac115946e24a8934a94b1cc72cb24314cc WHIRLPOOL 86624127ed922886d3c291358acdbd29a0b70d591baff83ed491345d5ec119de8ef486e0341499e1fa985fa38b85da9a6989e7e4159675da8876ec870b6cc433
 DIST xmltv-0.5.67.tar.bz2 1188778 SHA256 f5ee784961be2a35035d55ef39bcba0ccfd7aecfa5359c1a890cb411c1c7a694 SHA512 2451634bf63ed8f5ee1ef4eff23fa5cfe2a98422e8ae75bf055951d5139d8b7ff03ece6aeee9b3ae81abba5a3edd66e64bd9ae8f610f92cb97ec017b839eee1f WHIRLPOOL c500e8b61a59fd0507c66fbdd0401304321cfae837255085cd373ea0bb26133ebf16b2854cb0715ddd2783ed44c603dc7bb61d40a30552cea3691315c1bfc2eb
-DIST xmltv-0.5.68.tar.bz2 1200116 SHA256 ed6589118943f1028b318dea2cd30c395c41b8abc9bbf106b3787f095d79919d SHA512 bf21837d3804058c6cbfeb0e75af57e5d6e3cd35da40c96291c951bdadc3b4dbfa64c8145a4e2129713b65e7540e1d5da08fe6fbab4c7561ec448f2ce07acbd5 WHIRLPOOL 50ca08aaa414cab036d19cd6ff42de31c44abd53baed357a518c2888553d4ef3c9f4e524aaa9ab50912e247803efafe987c3de3d299b91ebb30bd7ed45b74848
+DIST xmltv-0.5.68.tar.bz2 1200116 BLAKE2B 3dcf6140c8eea5bcb729d8159b0e698f0716aff6e46175412a9087f156be5d9a400b4efb96c3566c17bbf352354671fe54d6c5bccd6ef878102a8c98b5749af8 SHA512 bf21837d3804058c6cbfeb0e75af57e5d6e3cd35da40c96291c951bdadc3b4dbfa64c8145a4e2129713b65e7540e1d5da08fe6fbab4c7561ec448f2ce07acbd5
+DIST xmltv-0.5.70.tar.bz2 1274164 BLAKE2B 4a6cbf6bc2f8f113a91fc579afbfc69fc04aec020d386182f6fd78f9f8c18821d0dc09077cccb1ad30e6f0583f958210fbf717d356f1e47dcf785e5a85864dc4 SHA512 36dd497dc20d296ca984ad0a1ca19f471c97cac7bfe7c5d4baeaae7faea565c36103bea10e7a7ae813c1cfc35c7ac376299edd2bf01c4c5da981cb5cca13317c
 EBUILD xmltv-0.5.57.ebuild 5401 BLAKE2B 0c4ca8aa05463ca5d41790431d844adefddad12def480b846b5a04273d8c7b3ff67d698af343d81eedc384c15fae90f093441972d3ed516944d2eb074a305b83 SHA512 881ec922d61a10fe6911e0fd9f6d3dcc15e58ba4ed480cf6eb79dddaf73d5b46fda6c0e084e83681a9ab4ea544bfc3c97722e9de2b8bd225008c50abe3b24e35
 EBUILD xmltv-0.5.67.ebuild 6412 BLAKE2B 4243e3b07cd309fafa2b80a638ba06c934498c49553067eb46d87a76e7bf6a98009710a3c5e297f261b83a38e2fc07ecb21720aaeea587f33de60a318fd211b8 SHA512 dff1d33659be05a6aa2a02db20df66ceac10ac2d6f14f29a071e700be59ad93fd2af5cbcd561387af88e43b77a97f24660365e878dac8cc25ec37b226a1de004
 EBUILD xmltv-0.5.68.ebuild 6719 BLAKE2B 53aedba579a68deda5abd38587708af93bfcd7ff85180097b089dd250b802fc280bb76f2ed0ead591fe8a6c5356d27e0fe29dd76f66342175c84d98ae2d20c42 SHA512 44b24f18ce10ef1a6c578045a134b90abbcfbcfcc9af5381dd84047c2a87f2ce57b0a696096ed3d4402cf8b20769dd36e1bddb7f73cfca6da37f808c6f98eda5
-MISC metadata.xml 3093 BLAKE2B 90b78856bc1087d855dbd2b42cbd3feee702acc866c066d65ef2f866f454a162884ab497303363297392685f1cd413ec06b01a2700b6123b6040d3d7007ab50e SHA512 07b487b5d43f2cac0a15962bd87e11eaa38a703d9b6453b433eaab615a27f3f853982105e50c3b62ec625074c19dd491f0f2c3dbbe43c80284d99415bfa4a261
+EBUILD xmltv-0.5.70.ebuild 5716 BLAKE2B a44d3b66c3a5def7d45d5383f484a28fcbbac2bfe7c48fdcd7de526d21b002f4ef820e091cef01508091c87ee71886bc3d336030af3b3d3344453576a0df48ea SHA512 b89eb6e531be3d77e6a3d5aa7cd7949fc940c5a1d4e196c0568bc841f3f64d7b68a99935218711ce9c081044bda4052300737f019c5c3ae08dd211ae3a3e4ef7
+MISC metadata.xml 3190 BLAKE2B 2d22268251417f41624e47fa7696e963318493e67d431af881d2cfd6520ead145cea16e0bad0a42c6b745f2fea0f90de7285374baf6832d85b24fac453158dfd SHA512 b6e46b63d3a3ddee90318a204892b2a8d790ee7c8c226ed53e79ce30f817cb5b7a28d0a63b941e0cee0d1a18ee1b73845fde3402bccbc75efc46f8113e17f5e7
diff --git a/media-tv/xmltv/metadata.xml b/media-tv/xmltv/metadata.xml
index bef47687a8ae..8f4d6b5829f2 100644
--- a/media-tv/xmltv/metadata.xml
+++ b/media-tv/xmltv/metadata.xml
@@ -53,6 +53,7 @@
 		<flag name="uk_tvguide">UK and Ireland tv listing grabber using TV Guide website</flag>
 		<flag name="sd_json">Grabber for schedulesDirect.org SD-JSON service (many countries)</flag>
 		<flag name="za">South Africa tv listing grabber</flag>
+		<flag name="zz_sdjson">Grabber for schedulesDirect.org SD-JSON service (many countries)</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">xmltv</remote-id>
diff --git a/media-tv/xmltv/xmltv-0.5.70.ebuild b/media-tv/xmltv/xmltv-0.5.70.ebuild
new file mode 100644
index 000000000000..b137f72ef360
--- /dev/null
+++ b/media-tv/xmltv/xmltv-0.5.70.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils perl-module
+
+DESCRIPTION="Set of utilities to manage TV listings stored in the XMLTV format"
+HOMEPAGE="http://xmltv.org"
+SRC_URI="mirror://sourceforge/xmltv/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-linux"
+
+IUSE="ar ch_search dk dtvla es_laguiatv eu_dotmedia eu_epg fi fi_sv
+fr fr_kazer huro il is it na_dd na_dtv na_tvmedia nl no_gf pt_meo se_swedb
+se_tvzon tr uk_bleb uk_tvguide tv_check tv_combiner tv_pick_cgi zz_sdjson"
+
+# NOTE: you can customize the xmltv installation by
+#       defining USE FLAGS (custom ones in
+#	/etc/portage/package.use for example).
+#
+#	Do "equery u media-tv/xmltv" for the complete
+#	list of the flags you can set, with description.
+
+# EXAMPLES:
+# enable just North American grabber
+#  in /etc/portage/package.use : media-tv/xmltv na_dd
+#
+# enable graphical front-end, Italy grabber
+#  in /etc/portage/package.use : media-tv/xmltv tv_check it
+
+RDEPEND=">=dev-perl/libwww-perl-5.65
+	>=dev-perl/XML-Parser-2.34
+	>=dev-perl/XML-Twig-3.10
+	>=dev-perl/Date-Manip-5.42
+	>=dev-perl/XML-Writer-0.6
+	virtual/perl-Memoize
+	virtual/perl-Storable
+	>=dev-perl/Lingua-Preferred-0.2.4
+	>=dev-perl/Term-ProgressBar-2.03
+	virtual/perl-IO-Compress
+	dev-perl/Unicode-String
+	dev-perl/TermReadKey
+	dev-perl/File-Slurp
+	>=dev-lang/perl-5.6.1
+	dev-perl/XML-LibXML
+	dev-perl/XML-TreePP
+"
+DEPEND="${RDEPEND}
+	ar? ( dev-perl/HTML-Tree >=dev-perl/HTML-Parser-3.34 dev-perl/HTTP-Cookies dev-perl/TimeDate )
+	ch_search? ( dev-perl/HTML-Tree >=dev-perl/HTML-Parser-3.34 )
+	dk? ( dev-perl/JSON dev-perl/IO-stringy dev-perl/DateTime )
+	dtvla? ( dev-perl/HTML-Tree dev-perl/HTTP-Cookies dev-perl/TimeDate )
+	es_laguiatv? ( dev-perl/HTML-Tree )
+	eu_dotmedia? ( dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent )
+	eu_epg? ( dev-perl/Archive-Zip dev-perl/DateTime-Format-Strptime >=dev-perl/HTML-Parser-3.34 dev-perl/IO-stringy )
+	fi? ( dev-perl/HTML-Tree )
+	fi_sv? ( dev-perl/IO-stringy dev-perl/HTML-Tree dev-perl/DateTime )
+	fr? ( dev-perl/DateTime-TimeZone dev-perl/HTML-Tree dev-perl/DateTime >=dev-perl/HTML-Parser-3.34 )
+	huro? ( dev-perl/HTML-Tree )
+	is? ( dev-perl/XML-DOM dev-perl/XML-LibXSLT )
+	na_dd? ( dev-perl/SOAP-Lite )
+	na_dtv? ( >=dev-perl/HTML-Parser-3.34 dev-perl/DateTime dev-perl/HTTP-Cookies )
+	na_tvmedia? ( dev-perl/XML-LibXML )
+	nl? ( dev-perl/HTTP-Cache-Transparent dev-perl/HTML-Tree dev-perl/DateTime >=dev-perl/HTML-Parser-3.34 dev-perl/TimeDate )
+	pt_meo? ( dev-perl/XML-LibXML dev-perl/DateTime )
+	se_swedb? ( dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent )
+	se_tvzon? ( dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent )
+	tr? ( dev-perl/URI dev-perl/HTTP-Cache-Transparent dev-perl/DateTime dev-perl/HTTP-Cookies dev-perl/TimeDate )
+	uk_bleb? ( dev-perl/IO-stringy dev-perl/Archive-Zip )
+	uk_tvguide? ( dev-perl/HTML-Tree dev-perl/URI dev-perl/HTTP-Cache-Transparent dev-perl/DateTime dev-perl/TimeDate )
+	zz_sdjson? ( dev-perl/DateTime-Format-ISO8601 virtual/perl-Digest-SHA dev-perl/JSON dev-perl/List-MoreUtils dev-perl/libwww-perl virtual/perl-Storable dev-perl/Try-Tiny )
+	tv_check? ( dev-perl/Tk dev-perl/Tk-TableMatrix )
+	tv_combiner? ( dev-perl/XML-LibXML )
+"
+
+PREFIX="/usr"
+
+pkg_setup() {
+	# Uses Data::Manip in various places which can fail
+	# if TZ is still set to Factory as it is in stock gentoo
+	# install media
+	export TZ=UTC
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s:\$VERSION = '${PV}':\$VERSION = '${PVR}':" \
+		-e "/^@docs/s:doc/COPYING ::" \
+		Makefile.PL || die
+}
+
+src_configure() {
+	make_config() {
+		# Never except default configuration
+		echo "no"
+
+		# Enable Agentina
+		usex ar
+		# Enable Switzerland Search
+		usex ch_search
+		# Enable Denmark
+		usex dk
+		# Enable Latin America
+		usex dtvla
+		# Enable Spain
+		usex es_laguiatv
+		# Enable EU xmltv.se
+		usex eu_dotmedia
+		# Enable EU epgdata.com
+		usex eu_epg
+		# Enable Finland
+		usex fi
+		# Enable Swedish listings in Finland
+		usex fi_sv
+		# Enable France
+		usex fr
+		# Enable France EPG from kazer.org
+		usex fr_kazer
+		# Enable Hungary and Romania
+		usex huro
+		# Enable Israel
+		usex il
+		# Enable Iceland
+		usex is
+		# Enable Italy
+		usex it
+		# Enable Italy from DVB-S stream
+		echo "no" # missing Linux::DVB
+		# Enable North America using DataDirect
+		usex na_dd
+		# Enable North America from directv.com
+		usex na_dtv
+		# Enable North America XMLTVListings.com
+		usex na_tvmedia
+		# Enable Netherlands
+		usex nl
+		# Enable Portugal EPG from sappo.pt
+		usex pt_meo
+		# Enable Sweden
+		usex se_swedb
+		# Enable Sweeden Alternative
+		usex se_tvzon
+		# Enable Turkey
+		usex tr
+		# Enable UK fast alternative grabber
+		usex uk_bleb
+		# Enable UK/Ireland TV Guide
+		usex uk_tvguide
+		# Enable Schedules Direct JSON
+		usex zz_sdjson
+		# Enable Schedules Direct JSON (SQLite version)
+		echo "no" # TODO
+		# Enable GUI checking.
+		usex tv_check
+		# Enable combiner
+		usex tv_combiner
+		# Enable CGI support
+		usex tv_pick_cgi
+	}
+
+	pm_echovar=`make_config`
+	perl-module_src_configure
+}
+
+src_install() {
+	# actually make test should be unneeded, but if non na grabbers
+	# start to not install remove comment below
+	#make test
+	#make
+
+	# to bypass build issue
+	#make DESTDIR=${D} install || die "error installing"
+
+	perl-module_src_install
+
+	for i in $(grep -rl "${D}" "${D}"); do
+		sed -e "s:${D}::g" -i "${i}" || die
+	done
+
+	if use tv_pick_cgi; then
+		dobin choose/tv_pick/tv_pick_cgi
+	fi
+}
+
+pkg_postinst() {
+	if use tv_pick_cgi; then
+		elog "To use tv_pick_cgi, please link it from /usr/bin/tv_pick_cgi"
+		elog "to where the ScriptAlias directive is configured."
+	fi
+}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 1c8f6eee66fa..578d96f6fc4d 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index 9fa29801c098..c18cd64800ef 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -1,4 +1,3 @@
-AUX smplayer-14.9.0.6690-zero-bidi.patch 410 BLAKE2B a6d5a9460dfd76ab70e7eacd13a89c21ddfab9fed6522fa0ec8d8fa50288f527525a1c1b73702168349ac57a376dca51d9f0359cf33980e86b11be60ed3e14af SHA512 0498e2519fbaf5f217e0ae7b47660f26e5a25a99aa8500c6e82716540d348d679628d061552e75afbf70dbe38e5ce3a433c553119d1ab8180e6fe7d9640433e7
 AUX smplayer-14.9.0.6966-unbundle-qtsingleapplication.patch 566 BLAKE2B bc96833566d3d87d0bde532b0b6a6500671d9ec75cc0ee5f9485ea052ad030f8237d01184200f846febc07f4d7195af15d379e589de6772d58d4cfe89bff8ac3 SHA512 9c757a1eaca358c9fb712801c0a17d084ea9dd3be26dd43f9b2c83bf39d2bbe4b458ba9432aba9e76cb83b56fb698a2976951be2074acfaa787cbfbed2a54fa9
 AUX smplayer-16.4.0-zero-bidi.patch 489 BLAKE2B 50f535154f771e535c244aff2dbd27b60cdbed36f01b4c3f3bf1bd27dbaceb52d41a061aa4d15501c8ae3d0e4bb3adfc2ecd5e0eaee91aa06207738321e7a89a SHA512 acde9545bc1a0659673f6e747291c837ab36b9894bde6d03e419acf579c2f8f581127424dde786496f37308676754319c4f4402f52b620e97a63cdccd1af80d6
 AUX smplayer-17.1.0-advertisement_crap.patch 1982 BLAKE2B 22a5027e9d20dca47fed1176e13cd9f8f5c912f51352d07f8fc0dd1f0850dc241483e22524c9fab2b9e20e67d1527f391a791afa2ac96285c4a199801ab96b65 SHA512 7bc1a3e9fb916d3a7e0c4f9bba8bb2adb7a3822e34694f79501e228f700b27633cac2eba237ab4af221c50f07295ecab3093c2a7033578a3e0a91a1e6449570d
diff --git a/media-video/smplayer/files/smplayer-14.9.0.6690-zero-bidi.patch b/media-video/smplayer/files/smplayer-14.9.0.6690-zero-bidi.patch
deleted file mode 100644
index 650dcd79c4b4..000000000000
--- a/media-video/smplayer/files/smplayer-14.9.0.6690-zero-bidi.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/core.cpp
-+++ b/src/core.cpp
-@@ -1811,10 +1811,6 @@
- 
- 		proc->setOption("ass-font-scale", QString::number(mset.sub_scale_ass));
- 
--		if (!pref->mplayer_is_mplayer2) {
--			proc->setOption("flip-hebrew",false); // It seems to be necessary to display arabic subtitles correctly when using -ass
--		}
--
- 		if (pref->enable_ass_styles) {
- 			if (!pref->force_ass_styles) {
- 				// Load the styles.ass file
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 9eab6e1be0e0..bf3f6b1658f5 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -7,7 +7,6 @@ AUX vlc-2.2.4-cxx0x.patch 598 BLAKE2B 80771a75c7f0dd8b5c2dda9d7957450a5d1b54a4a2
 AUX vlc-2.2.4-decoder-lock-scope.patch 1337 BLAKE2B d1c178a3d7ded6cd3aa377d5064fd83f63ac7c69ad33f1a21399c6ef44c268355428caf29ab7e315455629320ad49252fd54683380cf54ad757d62bb3888c686 SHA512 a81704adf25aa54cc8fa7c2f97117ef6c300af15c5b78b74b0df5ee4eba1d8e0f9d9b3b99e2793f7362d1727de24990fb555222bd5f73cce31df2c49371063a1
 AUX vlc-2.2.4-ffmpeg3.patch 6377 BLAKE2B 2cd08b9058914fd899f515f434e0f93d06ae671e114ae2a2d4997fae92f1aa9e2e87eb13583f7a51e005d452547b6a965b87c7a09472723a8005a9ada0b6d5bb SHA512 efede86f7d4c8a475f14c88405d4f9810784b93b8dbee8a21ca2f59b4a62ba008996fbd72ad77300b76a6faa328720a7b99afdd753480f2a17dc25204e52d2ee
 AUX vlc-2.2.4-libav-11.7.patch 291 BLAKE2B 9ad8bac7897976ba50b98ce1063baab311f0ad8e267cbad751b1378280b2f8238e22096448889b4eb69bbec34d08225269c7d2f653676828dc7a7d755fe676bf SHA512 f216833dc1ad5ddbf6a19b497238e9c850582f16eae452862a4c7c9acd110a0033879b3e3555177ac0ef30663cdd3f72d1a1020999c44e1f577ef665dd658315
-AUX vlc-2.2.4-qt57.patch 8624 BLAKE2B 5b2521dc8d793c9b44dfbb6c0c23ca90e32d45d16c6ebebf07c6f1c357bcb7d8605753e626f502cfaa64cda2f4f0fc0260dcb2eacffe1adf1647bef68099cb0b SHA512 4f7bf09fe6721c7bbaf26761c7f868dfe66b7b63e50892ee9b107a036c743331f14be9820cf0415ac5463b223699c86efe104092d13cda8d436073d0d76dad00
 AUX vlc-2.2.4-relax_ffmpeg.patch 1686 BLAKE2B f802c5ae95962036fe3fcfa67e725ac5a5d5466e614e892e7e617b5a972ab9e204bcb4096822412c68a7ad43133ed230f6dcdecc9bf0a1737126ada8b54ccaf7 SHA512 a15862d6ac60575c0c338faff6052e3c28c4bd75f86f37ff8fbe36a64bc1a82689c56b2dc19f05109fc0913b85aab7ba28a94bfdd5fdd0e3c87cb7e6e58d1caa
 AUX vlc-2.2.6-decoder-lock-scope.patch 973 BLAKE2B 7fb92001311b61d35b4f029da55e308c248d1e052178769eb106739b86a6c4d45a01ca5e111a2d710a5676b5437c81a481fb0125038da33eed43eb9c1d05dc4f SHA512 b6d360f4eb6923332a67605118c5a47ed2e54bedcc68625eb5f78313e971da66ab19998f3037dcc0ce588287da1510c93cf68247c47ae25d0b1305af931794e3
 AUX vlc-9999-libva-1.2.1-compat.patch 291 BLAKE2B ed2e146e43ab65474d8e20f87f79b97b6a504a762375347223d759b605e20d210fd62d967160ba43cc10a1730409d7d06d71ad95c0aaf37bb05caa320ad35213 SHA512 47b9d3f7a5e7c90045acac3b3253feb927da26646b6a457655669c1ab18f6a0e027160285695dc06642e6117ed1fcd87db90ae1f409e8fee737a2a41e80e1968
diff --git a/media-video/vlc/files/vlc-2.2.4-qt57.patch b/media-video/vlc/files/vlc-2.2.4-qt57.patch
deleted file mode 100644
index 97472a64c398..000000000000
--- a/media-video/vlc/files/vlc-2.2.4-qt57.patch
+++ /dev/null
@@ -1,284 +0,0 @@
-As the 2.2 headers are still using vlc_atomics (picture)
-we cannot have a way to avoid collisions with early
-or late <atomic> inclusion when using GCC >= 4.7
-
-Conditionals in vlc_atomic won't work.
-
-Happens in ProjectM and Qt5.
----
- modules/gui/qt4/actions_manager.cpp                |  2 ++
- modules/gui/qt4/adapters/seekpoints.cpp            |  4 +--
- modules/gui/qt4/adapters/seekpoints.hpp            |  4 +--
- modules/gui/qt4/components/controller.cpp          |  2 ++
- .../gui/qt4/components/playlist/playlist_model.hpp |  4 +--
- modules/gui/qt4/components/playlist/views.cpp      |  6 ++++
- modules/gui/qt4/dialogs/messages.cpp               |  2 ++
- modules/gui/qt4/dialogs/vlm.cpp                    |  4 ---
- modules/gui/qt4/dialogs/vlm.hpp                    |  4 ++-
- modules/gui/qt4/input_manager.cpp                  |  2 ++
- modules/gui/qt4/input_manager.hpp                  |  3 +-
- modules/gui/qt4/menus.cpp                          |  2 ++
- modules/gui/qt4/qt4.hpp                            | 32 ++++++++++++++++++----
- modules/gui/qt4/util/pictureflow.cpp               |  2 ++
- modules/visualization/projectm.cpp                 |  4 +++
- 15 files changed, 56 insertions(+), 21 deletions(-)
-
-diff --git a/modules/gui/qt4/actions_manager.cpp b/modules/gui/qt4/actions_manager.cpp
-index eff40d9..b7ca967 100644
---- a/modules/gui/qt4/actions_manager.cpp
-+++ b/modules/gui/qt4/actions_manager.cpp
-@@ -25,6 +25,8 @@
- # include "config.h"
- #endif
- 
-+#include "qt4.hpp"
-+
- #include <vlc_vout.h>
- #include <vlc_keys.h>
- 
-diff --git a/modules/gui/qt4/adapters/seekpoints.cpp b/modules/gui/qt4/adapters/seekpoints.cpp
-index fbf2957..a3564bb 100644
---- a/modules/gui/qt4/adapters/seekpoints.cpp
-+++ b/modules/gui/qt4/adapters/seekpoints.cpp
-@@ -19,14 +19,12 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
-  *****************************************************************************/
- 
-+#include "seekpoints.hpp"
- 
- #include "recents.hpp"
- #include "dialogs_provider.hpp"
- #include "menus.hpp"
- 
--#include "seekpoints.hpp"
--
--#include "qt4.hpp"
- #include "input_manager.hpp"
- 
- SeekPoints::SeekPoints( QObject *parent, intf_thread_t *p_intf_ ) :
-diff --git a/modules/gui/qt4/adapters/seekpoints.hpp b/modules/gui/qt4/adapters/seekpoints.hpp
-index 0083989..bbb9214 100644
---- a/modules/gui/qt4/adapters/seekpoints.hpp
-+++ b/modules/gui/qt4/adapters/seekpoints.hpp
-@@ -22,9 +22,7 @@
- #ifndef SEEKPOINTS_HPP
- #define SEEKPOINTS_HPP
- 
--#ifdef HAVE_CONFIG_H
--#include "config.h"
--#endif
-+#include "qt4.hpp"
- 
- #include <vlc_common.h>
- #include <vlc_interface.h>
-diff --git a/modules/gui/qt4/components/controller.cpp b/modules/gui/qt4/components/controller.cpp
-index d93e0db..c43d929 100644
---- a/modules/gui/qt4/components/controller.cpp
-+++ b/modules/gui/qt4/components/controller.cpp
-@@ -26,6 +26,8 @@
- # include "config.h"
- #endif
- 
-+#include "qt4.hpp"
-+
- #include <vlc_vout.h>                       /* vout_thread_t for FSC */
- 
- /* Widgets */
-diff --git a/modules/gui/qt4/components/playlist/playlist_model.hpp b/modules/gui/qt4/components/playlist/playlist_model.hpp
-index f9d1d0c..1f71ac9 100644
---- a/modules/gui/qt4/components/playlist/playlist_model.hpp
-+++ b/modules/gui/qt4/components/playlist/playlist_model.hpp
-@@ -25,9 +25,7 @@
- #ifndef _PLAYLIST_MODEL_H_
- #define _PLAYLIST_MODEL_H_
- 
--#ifdef HAVE_CONFIG_H
--# include "config.h"
--#endif
-+#include "qt4.hpp"
- 
- #include <vlc_input.h>
- #include <vlc_playlist.h>
-diff --git a/modules/gui/qt4/components/playlist/views.cpp b/modules/gui/qt4/components/playlist/views.cpp
-index 59f6535..0066205 100644
---- a/modules/gui/qt4/components/playlist/views.cpp
-+++ b/modules/gui/qt4/components/playlist/views.cpp
-@@ -21,6 +21,12 @@
-  * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
-  *****************************************************************************/
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#include "qt4.hpp"
-+
- #include "components/playlist/views.hpp"
- #include "components/playlist/vlc_model.hpp"      /* VLCModel */
- #include "components/playlist/sorting.h"          /* Columns List */
-diff --git a/modules/gui/qt4/dialogs/messages.cpp b/modules/gui/qt4/dialogs/messages.cpp
-index 30793a2..9c79c99 100644
---- a/modules/gui/qt4/dialogs/messages.cpp
-+++ b/modules/gui/qt4/dialogs/messages.cpp
-@@ -24,6 +24,8 @@
- # include "config.h"
- #endif
- 
-+#include "qt4.hpp"
-+
- #include "dialogs/messages.hpp"
- 
- #include <QPlainTextEdit>
-diff --git a/modules/gui/qt4/dialogs/vlm.cpp b/modules/gui/qt4/dialogs/vlm.cpp
-index 0da88cc..595f015 100644
---- a/modules/gui/qt4/dialogs/vlm.cpp
-+++ b/modules/gui/qt4/dialogs/vlm.cpp
-@@ -23,10 +23,6 @@
-  * Foundation, Inc., 51 Franklin street, Fifth Floor, Boston MA 02110-1301, USA.
-  *****************************************************************************/
- 
--#ifdef HAVE_CONFIG_H
--# include "config.h"
--#endif
--
- #include "dialogs/vlm.hpp"
- 
- #ifdef ENABLE_VLM
-diff --git a/modules/gui/qt4/dialogs/vlm.hpp b/modules/gui/qt4/dialogs/vlm.hpp
-index a3c6e5d..dcf7110 100644
---- a/modules/gui/qt4/dialogs/vlm.hpp
-+++ b/modules/gui/qt4/dialogs/vlm.hpp
-@@ -25,8 +25,10 @@
- #ifndef QVLC_VLM_DIALOG_H_
- #define QVLC_VLM_DIALOG_H_ 1
- 
-+#include "qt4.hpp"
-+
- #ifdef HAVE_CONFIG_H
--# include "config.h"
-+#include "config.h"
- #endif
- 
- #ifdef ENABLE_VLM
-diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
-index fd45f4a..c50cb6c 100644
---- a/modules/gui/qt4/input_manager.cpp
-+++ b/modules/gui/qt4/input_manager.cpp
-@@ -30,6 +30,8 @@
- # include "config.h"
- #endif
- 
-+#include "qt4.hpp"
-+
- #include "input_manager.hpp"
- #include "recents.hpp"
- 
-diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp
-index 7d3b76a..4fbecbb 100644
---- a/modules/gui/qt4/input_manager.hpp
-+++ b/modules/gui/qt4/input_manager.hpp
-@@ -29,9 +29,10 @@
- # include "config.h"
- #endif
- 
-+#include "qt4.hpp"
-+
- #include <vlc_input.h>
- 
--#include "qt4.hpp"
- #include "util/singleton.hpp"
- #include "adapters/variables.hpp"
- 
-diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
-index 116e98c..46240b0 100644
---- a/modules/gui/qt4/menus.cpp
-+++ b/modules/gui/qt4/menus.cpp
-@@ -34,6 +34,8 @@
- # include "config.h"
- #endif
- 
-+#include "qt4.hpp"
-+
- #include <vlc_common.h>
- #include <vlc_intf_strings.h>
- #include <vlc_vout.h>                             /* vout_thread_t */
-diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
-index 44d7db6..5aec957 100644
---- a/modules/gui/qt4/qt4.hpp
-+++ b/modules/gui/qt4/qt4.hpp
-@@ -29,12 +29,7 @@
- # include "config.h"
- #endif
- 
--#include <vlc_common.h>    /* VLC_COMMON_MEMBERS for vlc_interface.h */
--#include <vlc_interface.h> /* intf_thread_t */
--#include <vlc_playlist.h>  /* playlist_t */
--
--#define QT_NO_CAST_TO_ASCII
--#include <QString>
-+#include <QtGlobal>
- 
- #if ( QT_VERSION < 0x040600 )
- # error Update your Qt version to at least 4.6.0
-@@ -43,6 +38,31 @@
- #define HAS_QT47 ( QT_VERSION >= 0x040700 )
- #define HAS_QT5  ( QT_VERSION >= 0x050000 )
- 
-+#if HAS_QT5
-+  #include <QtCore/qcompilerdetection.h>
-+  #if defined(Q_COMPILER_ATOMICS) && \
-+             ( __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7 ) )
-+   #define VLC_ATOMIC_H
-+   #include <atomic>
-+   using namespace std;
-+   #  define atomic_store(object,desired) \
-+      do { \
-+          *(object) = (desired); \
-+          __sync_synchronize(); \
-+      } while (0)
-+
-+   #  define atomic_load(object) \
-+       (__sync_synchronize(), *(object))
-+  #endif
-+#endif
-+
-+#include <vlc_common.h>    /* VLC_COMMON_MEMBERS for vlc_interface.h */
-+#include <vlc_interface.h> /* intf_thread_t */
-+#include <vlc_playlist.h>  /* playlist_t */
-+
-+#define QT_NO_CAST_TO_ASCII
-+#include <QString>
-+
- enum {
-     DialogEventTypeOffset = 0,
-     IMEventTypeOffset     = 100,
-diff --git a/modules/gui/qt4/util/pictureflow.cpp b/modules/gui/qt4/util/pictureflow.cpp
-index 9318953..a7e6a01 100644
---- a/modules/gui/qt4/util/pictureflow.cpp
-+++ b/modules/gui/qt4/util/pictureflow.cpp
-@@ -29,6 +29,8 @@
-   THE SOFTWARE.
- */
- 
-+#include "qt4.hpp"
-+
- #include "pictureflow.hpp"
- 
- #include <QApplication>
-diff --git a/modules/visualization/projectm.cpp b/modules/visualization/projectm.cpp
-index e80fbf4..96d532d 100644
---- a/modules/visualization/projectm.cpp
-+++ b/modules/visualization/projectm.cpp
-@@ -30,6 +30,10 @@
- #endif
- 
- #include <assert.h>
-+#if defined(__GNUC__) && \
-+           ( __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7 ) )
-+  #define VLC_ATOMIC_H /* Ensure C atomics wont collide with old intrinsics */
-+#endif
- 
- #include <vlc_common.h>
- #include <vlc_plugin.h>
--- 
-2.7.4
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index b1a206b33179..005a44dbe0fc 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 4282eb9dc1ea..82e09928f62e 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 03 Dec 2017 15:08:40 +0000
+Mon, 04 Dec 2017 11:08:43 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 8d3dee232d34..eda115a3c286 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 412220 BLAKE2B 617f98a11422c1ee21088130d37b0366715c394e1b07542c78cc30517f3787d1a7caef3c41d798a3b476df30c0c66c05c78794ebc80ff83c5b528cbc6cfe4b21 SHA512 cd79d1d0f667c0328946b3f39635013f95ead0bdc9d55e949bdeff00c6846b73b692fe2e0db699410d94aec83dcc49b2344f458738ab9321428be107da1bc56a
-TIMESTAMP 2017-12-03T15:08:44Z
+TIMESTAMP 2017-12-04T11:08:47Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlokE3xfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlolLL9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDScA/+N/SLchEQ1y0eeIgGqWoGTXyhKFwIKPoKRAmx7ugXD8fvzd7QlKPHB/Rf
-t1wkIEFDyWebovO8qmnri1C4Q8YMme7JzSksfG+e8togOQ4hGWXCdOUYVCp9jK+o
-LgBDJEPsXD9iMVpS7Yifmuu3k/5W/s3+NdywreBZJspBwx9BsrbdOKf5CYHjFjfe
-7o1HGBpXy4N9QazFz/3tAeT7Rkur97SyJJfLEyT7+pbUAd38G+CULgfVmFziPJg8
-Yc9Xx55w59L/EvfLQ1BsxGUAl1BwLJuTcIKBl8uf4Sjy9HXwmqELM3NS8b7pX1dH
-YBCEQELgAQM6Rsh49pXvccGQNzFQUkfWxyJ3n4+T7jiFpHxzVwuDmHlk6zwJo3Nj
-RTZeOrAovF5ooI/b+5YsKfWfCyUa3wLWgJWDu/YYKCw4vVTyfm5XoiXyk03L41hQ
-1viXmFu10yDtEy0oifkcrlA8LwRyvzv9xty9ez6f42Io1Kqf7lYmRuEADUF9FOho
-R2RK/j/H9igzAn8uMBDEoeCz1BTfcE5dVP7DiW8Lh8z8qF3xrcV6WaU2+UAFDbzg
-cgrl8a+KPuW3tjs5a6VqiTPmvM9L0qVwDwryd3O6X7PDs9TrhMnIc9Ks0NfrH7k1
-RZLEPA3vEhQS2RjKDfkSflLzn/mJ1CHmAfuPnoXJm0VqOcW3cVQ=
-=/m5L
+klDH5RAAl0dgu4wy9+SRMDmp5qm0OGAfHh439hhpuzfjxdgoxKVgQB6yYq2kV8SE
+oIJUCjk4PqD+xj0RB5zDBOcudVo06LVdD8IlfPXjklUyiBv6L63zm9EE5VkBvluc
+mrEK6dvkGkQnFO8fydz9OZ3NCKM5gtvlJ5qigGB9NygTWCzIjUi9zLKFKcb5t4g0
+0pAssWQuu0svWkUcSWYVs7ejuY/NbXDSljYngUeSo3ChRzFbhxSwEL4CIFsN8cW8
+TeYdjvd68deBrq4N1H8Y34XouZbBZrGDBfgDZZQCSqDqDzRcDgCRDDbzTzjXFM+S
+VMWEDnbHKZUmM9cwB3/iDnfulMSxTRzMwZrwyFkcG/1cZUbBsf6EFY6PLbBDhVPd
+yf4lwgXQXv7FEalUTPC6HvOiWT4IZR5soRTlJxE/H7AK5cxZBwZgGQoSgLWAK7aI
+91iXglakB1KvBtw0/c8uGQOmLfCqhMO3uBJEAzBkpzPZos0n/9LEE/p1akIxCPTK
+70QsV03+tYu1cJuoyCbmFc1MMxAZCr+IZPhNVitn1e05XWeH9LHK21yZmEV6mc+n
+DDrtrKjiVoHd5BBu8wduSP8vRuyDziwRuCUf+1TfdqrLfK2Z1O3ZClLk+f36fIIz
+hASwXWnMECBOwn7NMANXc1cIebW8AmgErepZypNK4++4JDtwsKY=
+=t2Cl
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 4282eb9dc1ea..82e09928f62e 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 03 Dec 2017 15:08:40 +0000
+Mon, 04 Dec 2017 11:08:43 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index a72ec219b383..522c9ec3c25a 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index 6da2a3c617fd..4236a7e65914 100644
--- a/metadata/md5-cache/app-accessibility/Manifest.gz
+++ b/metadata/md5-cache/app-accessibility/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/brltty-5.2-r1 b/metadata/md5-cache/app-accessibility/brltty-5.2-r1
index f482b6dcb2ad..0141e2e4cb5d 100644
--- a/metadata/md5-cache/app-accessibility/brltty-5.2-r1
+++ b/metadata/md5-cache/app-accessibility/brltty-5.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=virtual/pkgconfig java? ( >=virtual/jdk-1.4 ) python? ( >=dev-python/cython-0.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) bluetooth? ( net-wireless/bluez ) gpm? ( >=sys-libs/gpm-1.20 ) iconv? ( virtual/libiconv ) icu? ( dev-libs/icu:= ) python? ( 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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ncurses? ( sys-libs/ncurses:= ) nls? ( virtual/libintl ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libXaw ) ocaml? ( >=dev-ml/findlib-1.0.4-r1 ) java? ( >=dev-java/java-config-2.2.0-r3 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
+DEPEND=virtual/pkgconfig java? ( >=virtual/jdk-1.4 ) python? ( >=dev-python/cython-0.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) bluetooth? ( net-wireless/bluez ) gpm? ( >=sys-libs/gpm-1.20 ) iconv? ( virtual/libiconv ) icu? ( dev-libs/icu:= ) python? ( 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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libXaw ) ocaml? ( >=dev-ml/findlib-1.0.4-r1 ) java? ( >=dev-java/java-config-2.2.0-r3 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=Daemon that provides access to the Linux/Unix console for a blind person
 EAPI=5
 HOMEPAGE=http://brltty.com/
 IUSE=+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu java +midi ncurses nls ocaml +pcm python usb +speech tcl X elibc_FreeBSD java python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
 KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=java? ( >=virtual/jre-1.4 ) bluetooth? ( net-wireless/bluez ) gpm? ( >=sys-libs/gpm-1.20 ) iconv? ( virtual/libiconv ) icu? ( dev-libs/icu:= ) python? ( 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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ncurses? ( sys-libs/ncurses:= ) nls? ( virtual/libintl ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libXaw ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api ) tcl? ( api )
+RDEPEND=java? ( >=virtual/jre-1.4 ) bluetooth? ( net-wireless/bluez ) gpm? ( >=sys-libs/gpm-1.20 ) iconv? ( virtual/libiconv ) icu? ( dev-libs/icu:= ) python? ( 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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libXaw ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ) tcl? ( api )
 SLOT=0
 SRC_URI=http://brltty.com/archive/brltty-5.2.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	findlib	45d6030075064a68da8d7143726a1150	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=da65b0e84827ef714901434c3fe978fe
+_md5_=f7d6fec467d4b09e81f99fe8001b1686
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index b05d9cf0ff00..8ddeafa0f729 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/ansible-2.3.2.0-r2 b/metadata/md5-cache/app-admin/ansible-2.3.2.0-r2
deleted file mode 100644
index 9b9982fea931..000000000000
--- a/metadata/md5-cache/app-admin/ansible-2.3.2.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] test? ( 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/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/pycrypto-2.6[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 dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] <dev-python/mock-1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/passlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-vcs/git ) 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(-)]
-DESCRIPTION=Model-driven deployment, config management, and command execution framework
-EAPI=6
-HOMEPAGE=http://ansible.com/
-IUSE=test python_targets_python2_7 python_targets_python3_5
-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/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/pycrypto-2.6[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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://releases.ansible.com/ansible/ansible-2.3.2.0.tar.gz https://dev.gentoo.org/~prometheanfire/dist/ansible/ansible-2.3.2.0-pycryptodome.patch
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e3ba6d7eca7abe7075db63f9818e239b
diff --git a/metadata/md5-cache/app-admin/ansible-2.4.0.0 b/metadata/md5-cache/app-admin/ansible-2.4.0.0
deleted file mode 100644
index 97c14a107cd8..000000000000
--- a/metadata/md5-cache/app-admin/ansible-2.4.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] test? ( 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 dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] <dev-python/mock-1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/passlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-vcs/git ) 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(-)]
-DESCRIPTION=Model-driven deployment, config management, and command execution framework
-EAPI=6
-HOMEPAGE=http://ansible.com/
-IUSE=test python_targets_python2_7 python_targets_python3_5
-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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://releases.ansible.com/ansible/ansible-2.4.0.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7eef982200308e4d441cbc8b0d6cc767
diff --git a/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r26 b/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r26
index 712073890f22..7eb0a2df2a81 100644
--- a/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r26
+++ b/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r26
@@ -4,10 +4,10 @@ DESCRIPTION=A simple utility to read the temperature of SMART capable hard drive
 EAPI=5
 HOMEPAGE=https://savannah.nongnu.org/projects/hddtemp/
 IUSE=network-cron nls selinux
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ~ppc64 sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ~ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-hddtemp )
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/hddtemp/hddtemp-0.3-beta15.tar.bz2 mirror://gentoo/hddtemp-20080531.db.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=bea8b7fcabdf8d5d21a4c041a9e0a135
+_md5_=2685c28e91e8dc880cbeebf4f0d27dc9
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.12.1 b/metadata/md5-cache/app-admin/syslog-ng-3.12.1
new file mode 100644
index 000000000000..ee1d770496ed
--- /dev/null
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.12.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=amqp? ( >=net-libs/rabbitmq-c-0.8.0 ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9 ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) redis? ( >=dev-libs/hiredis-0.11.0 ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1 ) systemd? ( sys-apps/systemd ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=dev-libs/libpcre-6.1 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) !dev-libs/eventlog >=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.36.1 sys-devel/flex virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=syslog replacement with advanced filtering features
+EAPI=6
+HOMEPAGE=http://www.balabit.com/network-security/syslog-ng
+IUSE=amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd 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
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=amqp? ( >=net-libs/rabbitmq-c-0.8.0 ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9 ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) redis? ( >=dev-libs/hiredis-0.11.0 ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1 ) systemd? ( sys-apps/systemd ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=dev-libs/libpcre-6.1 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) !dev-libs/eventlog >=dev-libs/glib-2.10.1:2
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.12.1/syslog-ng-3.12.1.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=08b6669f073ba3f7221ee00aecf6fb73
diff --git a/metadata/md5-cache/app-antivirus/Manifest.gz b/metadata/md5-cache/app-antivirus/Manifest.gz
index 3671dc849b6f..65de6582e855 100644
--- a/metadata/md5-cache/app-antivirus/Manifest.gz
+++ b/metadata/md5-cache/app-antivirus/Manifest.gz
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.99.2-r1 b/metadata/md5-cache/app-antivirus/clamav-0.99.2-r1
index 3d6aad713c22..d7c3d8dc9673 100644
--- a/metadata/md5-cache/app-antivirus/clamav-0.99.2-r1
+++ b/metadata/md5-cache/app-antivirus/clamav-0.99.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Clam Anti-Virus Scanner
 EAPI=6
 HOMEPAGE=http://www.clamav.net/
 IUSE=bzip2 clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs uclibc
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) iconv? ( virtual/libiconv ) metadata-analysis-api? ( dev-libs/json-c ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) dev-libs/libtommath >=sys-libs/zlib-1.2.2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-devel/libtool || ( dev-libs/libpcre2 >dev-libs/libpcre-6 ) !!<app-antivirus/clamav-0.99 selinux? ( sec-policy/selinux-clamav )
 SLOT=0
 SRC_URI=https://www.clamav.net/downloads/production/clamav-0.99.2.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=6fcfe9fbd87dbf8077b0b3c810a5976b
+_md5_=0dad5b595a9dabfd7081b7ee390f9b96
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 07874e8aac8f..0e123d944bcf 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/moolticute-0.9.8_beta b/metadata/md5-cache/app-crypt/moolticute-0.10.0_beta
index 7a0d5652b6ed..38c575a9a247 100644
--- a/metadata/md5-cache/app-crypt/moolticute-0.9.8_beta
+++ b/metadata/md5-cache/app-crypt/moolticute-0.10.0_beta
@@ -1,12 +1,12 @@
-DEFINED_PHASES=configure install postinst postrm
+DEFINED_PHASES=configure install postinst postrm prepare
 DEPEND=>=dev-libs/libusb-1.0.20 >=dev-qt/qtcore-5.6:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qttest:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 virtual/pkgconfig
 DESCRIPTION=Mooltipass crossplatform daemon/tools
 EAPI=6
-HOMEPAGE=https://github.com/raoulh/moolticute
+HOMEPAGE=https://github.com/mooltipass/moolticute
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/libusb-1.0.20 >=dev-qt/qtcore-5.6:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qttest:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5
 SLOT=0
-SRC_URI=https://github.com/raoulh/moolticute/archive/v0.9.8-beta.tar.gz -> moolticute-0.9.8_beta.tar.gz
+SRC_URI=https://github.com/mooltipass/moolticute/archive/v0.10.0-beta.tar.gz -> moolticute-0.10.0_beta.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3e0693ff1c4fa7dace52ff54008dfb10
+_md5_=4094b0144eed372137d2b47d34055410
diff --git a/metadata/md5-cache/app-crypt/moolticute-9999 b/metadata/md5-cache/app-crypt/moolticute-9999
index 6c5193ff4ab3..1a74b5733bd2 100644
--- a/metadata/md5-cache/app-crypt/moolticute-9999
+++ b/metadata/md5-cache/app-crypt/moolticute-9999
@@ -1,10 +1,10 @@
-DEFINED_PHASES=configure install postinst postrm unpack
+DEFINED_PHASES=configure install postinst postrm prepare unpack
 DEPEND=>=dev-libs/libusb-1.0.20 >=dev-qt/qtcore-5.6:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qttest:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 >=dev-vcs/git-1.8.2.1 >=sys-apps/sed-4 virtual/pkgconfig
 DESCRIPTION=Mooltipass crossplatform daemon/tools
 EAPI=6
-HOMEPAGE=https://github.com/raoulh/moolticute
+HOMEPAGE=https://github.com/mooltipass/moolticute
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/libusb-1.0.20 >=dev-qt/qtcore-5.6:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qttest:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3e0693ff1c4fa7dace52ff54008dfb10
+_md5_=4094b0144eed372137d2b47d34055410
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 9c43afa1e3f5..89bfa8084eda 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.36.5 b/metadata/md5-cache/app-emulation/libguestfs-1.36.5
index 76d149b35d99..12d8f4849bfa 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-1.36.5
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.36.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.02[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:* ) >=app-shells/bash-completion-2.0 >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) dev-util/gperf >=dev-util/gtk-doc-am-1.14 doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl:=
+DEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) >=dev-lang/ocaml-4.02[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:* ) >=app-shells/bash-completion-2.0 >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) dev-util/gperf >=dev-util/gtk-doc-am-1.14 doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl:=
 DESCRIPTION=Tools for accessing, inspect and modifying virtual machine (VM) disk images
 EAPI=6
 HOMEPAGE=http://libguestfs.org/
-IUSE=bash-completion erlang +fuse debug ocaml doc +perl python ruby static-libs selinux systemtap introspection inspect-icons test lua gtk python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
+IUSE=bash-completion erlang +fuse debug doc +perl python ruby static-libs selinux systemtap introspection inspect-icons test lua gtk python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
 KEYWORDS=~amd64
 LICENSE=GPL-2 LGPL-2
-RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.02[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:* ) >=app-shells/bash-completion-2.0 >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) app-emulation/libguestfs-appliance dev-lang/perl:=
+RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) >=dev-lang/ocaml-4.02[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:* ) >=app-shells/bash-completion-2.0 >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) app-emulation/libguestfs-appliance dev-lang/perl:=
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) )
 SLOT=0/1.36
 SRC_URI=http://libguestfs.org/download/1.36-stable/libguestfs-1.36.5.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=e39ead5b27bc2fb7df98f02c4ca57db2
+_md5_=ea536ea1bd86e77b075c83665bd70beb
diff --git a/metadata/md5-cache/app-emulation/wine-any-2.0-r1 b/metadata/md5-cache/app-emulation/wine-any-2.0-r1
index 29ad8fb34556..02c80478ee8d 100644
--- a/metadata/md5-cache/app-emulation/wine-any-2.0-r1
+++ b/metadata/md5-cache/app-emulation/wine-any-2.0-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=2.0
 SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.tar.bz2 https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20170830.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.0.tar.gz -> wine-staging-2.0.tar.gz ) d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.0.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	2c2e15383ba891d642f51896a7f0ecfe	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=320051620547376d2c25905d48735251
+_md5_=fa47c3edf6b194333115a4aabf2e04df
diff --git a/metadata/md5-cache/app-emulation/wine-any-2.17-r1 b/metadata/md5-cache/app-emulation/wine-any-2.17-r1
index 7b6d7459608e..5fe4321ec7e8 100644
--- a/metadata/md5-cache/app-emulation/wine-any-2.17-r1
+++ b/metadata/md5-cache/app-emulation/wine-any-2.17-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=2.17
 SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.17.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20170830.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.17.tar.gz -> wine-staging-2.17.tar.gz ) d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.17.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	2c2e15383ba891d642f51896a7f0ecfe	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4327ce784850093de28606c80649efb1
+_md5_=7dcdf7c4bdc3b6157e6562104458c565
diff --git a/metadata/md5-cache/app-emulation/wine-any-2.18 b/metadata/md5-cache/app-emulation/wine-any-2.18
index 6bcdde38055f..db92c21ef1ac 100644
--- a/metadata/md5-cache/app-emulation/wine-any-2.18
+++ b/metadata/md5-cache/app-emulation/wine-any-2.18
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=2.18
 SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.18.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20170830.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.18.tar.gz -> wine-staging-2.18.tar.gz ) d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.18.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	2c2e15383ba891d642f51896a7f0ecfe	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c607f5ff3f1aecb9a1fe7d7803dffb8a
+_md5_=90c0a02d88b2204f1e92161577bbe2b3
diff --git a/metadata/md5-cache/app-emulation/wine-any-2.19 b/metadata/md5-cache/app-emulation/wine-any-2.19
index 8e68fb2eaa39..3d9f368c65e1 100644
--- a/metadata/md5-cache/app-emulation/wine-any-2.19
+++ b/metadata/md5-cache/app-emulation/wine-any-2.19
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=2.19
 SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.19.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20170830.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.19.tar.gz -> wine-staging-2.19.tar.gz ) d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.19.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	2c2e15383ba891d642f51896a7f0ecfe	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c607f5ff3f1aecb9a1fe7d7803dffb8a
+_md5_=90c0a02d88b2204f1e92161577bbe2b3
diff --git a/metadata/md5-cache/app-emulation/wine-any-9999 b/metadata/md5-cache/app-emulation/wine-any-9999
index c92445e2ffb9..188756fe9127 100644
--- a/metadata/md5-cache/app-emulation/wine-any-9999
+++ b/metadata/md5-cache/app-emulation/wine-any-9999
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=9999
 SRC_URI=https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20170830.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	2c2e15383ba891d642f51896a7f0ecfe	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c607f5ff3f1aecb9a1fe7d7803dffb8a
+_md5_=90c0a02d88b2204f1e92161577bbe2b3
diff --git a/metadata/md5-cache/app-emulation/wine-d3d9-2.0-r1 b/metadata/md5-cache/app-emulation/wine-d3d9-2.0-r1
index 5fb709ddf07e..42e9eb75e573 100644
--- a/metadata/md5-cache/app-emulation/wine-d3d9-2.0-r1
+++ b/metadata/md5-cache/app-emulation/wine-d3d9-2.0-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=2.0
 SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.tar.bz2 https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20170830.tar.xz d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.0.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	2c2e15383ba891d642f51896a7f0ecfe	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3b3dfdbf807771a2aac9877ce94203f7
+_md5_=4552e837cc903769d6696c970e70fee1
diff --git a/metadata/md5-cache/app-emulation/wine-d3d9-2.17-r1 b/metadata/md5-cache/app-emulation/wine-d3d9-2.17-r1
index 6001cdf74779..bc5d31dfe82f 100644
--- a/metadata/md5-cache/app-emulation/wine-d3d9-2.17-r1
+++ b/metadata/md5-cache/app-emulation/wine-d3d9-2.17-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=2.17
 SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.17.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20170830.tar.xz d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.17.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	2c2e15383ba891d642f51896a7f0ecfe	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ef0e7d817bce69cba3851bd77b3cbb1a
+_md5_=2a30472e9b3c3d1402d1559a5724c4ac
diff --git a/metadata/md5-cache/app-emulation/wine-d3d9-2.18 b/metadata/md5-cache/app-emulation/wine-d3d9-2.18
index 26ddd465714e..c78328667cad 100644
--- a/metadata/md5-cache/app-emulation/wine-d3d9-2.18
+++ b/metadata/md5-cache/app-emulation/wine-d3d9-2.18
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=2.18
 SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.18.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20170830.tar.xz d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.18.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	2c2e15383ba891d642f51896a7f0ecfe	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3875c65a762d9840c6a8c34394ca6589
+_md5_=fea031735678f0bd14076f35057d3f75
diff --git a/metadata/md5-cache/app-emulation/wine-d3d9-2.19 b/metadata/md5-cache/app-emulation/wine-d3d9-2.19
index 9f6052032800..e2e81df5e281 100644
--- a/metadata/md5-cache/app-emulation/wine-d3d9-2.19
+++ b/metadata/md5-cache/app-emulation/wine-d3d9-2.19
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=2.19
 SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.19.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20170830.tar.xz d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.19.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	2c2e15383ba891d642f51896a7f0ecfe	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3875c65a762d9840c6a8c34394ca6589
+_md5_=fea031735678f0bd14076f35057d3f75
diff --git a/metadata/md5-cache/app-emulation/wine-d3d9-9999 b/metadata/md5-cache/app-emulation/wine-d3d9-9999
index db3a6708b992..e956cf3e6874 100644
--- a/metadata/md5-cache/app-emulation/wine-d3d9-9999
+++ b/metadata/md5-cache/app-emulation/wine-d3d9-9999
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=9999
 SRC_URI=https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20170830.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	2c2e15383ba891d642f51896a7f0ecfe	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3875c65a762d9840c6a8c34394ca6589
+_md5_=fea031735678f0bd14076f35057d3f75
diff --git a/metadata/md5-cache/app-emulation/wine-staging-2.0-r1 b/metadata/md5-cache/app-emulation/wine-staging-2.0-r1
index 1a5f83387b93..ddf24841c285 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-2.0-r1
+++ b/metadata/md5-cache/app-emulation/wine-staging-2.0-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=2.0
 SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.tar.bz2 https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20170830.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.0.tar.gz -> wine-staging-2.0.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	2c2e15383ba891d642f51896a7f0ecfe	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5f7447b66d55a4626fd7a11e8cdb2e4d
+_md5_=218ee5fd18ac666588408f3885b580a5
diff --git a/metadata/md5-cache/app-emulation/wine-staging-2.17-r1 b/metadata/md5-cache/app-emulation/wine-staging-2.17-r1
index 0a8520dd88f2..9c8040fd1b3c 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-2.17-r1
+++ b/metadata/md5-cache/app-emulation/wine-staging-2.17-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=2.17
 SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.17.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20170830.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.17.tar.gz -> wine-staging-2.17.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	2c2e15383ba891d642f51896a7f0ecfe	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c2eb1d03476516d44b08d05679d7b2f1
+_md5_=7eb7bfe6f272c8400102ce7d18dc7a6d
diff --git a/metadata/md5-cache/app-emulation/wine-staging-2.18 b/metadata/md5-cache/app-emulation/wine-staging-2.18
index 671677b72380..fe7816dd7caf 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-2.18
+++ b/metadata/md5-cache/app-emulation/wine-staging-2.18
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=2.18
 SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.18.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20170830.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.18.tar.gz -> wine-staging-2.18.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	2c2e15383ba891d642f51896a7f0ecfe	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=86fbe901755cc0cb85b4e1f3ca476a76
+_md5_=5ac5992775a938485f3350a6576ac74f
diff --git a/metadata/md5-cache/app-emulation/wine-staging-2.19 b/metadata/md5-cache/app-emulation/wine-staging-2.19
index bce19c96936a..d8decf049119 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-2.19
+++ b/metadata/md5-cache/app-emulation/wine-staging-2.19
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=2.19
 SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.19.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20170830.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.19.tar.gz -> wine-staging-2.19.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	2c2e15383ba891d642f51896a7f0ecfe	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=86fbe901755cc0cb85b4e1f3ca476a76
+_md5_=5ac5992775a938485f3350a6576ac74f
diff --git a/metadata/md5-cache/app-emulation/wine-staging-9999 b/metadata/md5-cache/app-emulation/wine-staging-9999
index 9020b00f59cb..a7110646e6d3 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-9999
+++ b/metadata/md5-cache/app-emulation/wine-staging-9999
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=9999
 SRC_URI=https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20170830.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	2c2e15383ba891d642f51896a7f0ecfe	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=86fbe901755cc0cb85b4e1f3ca476a76
+_md5_=5ac5992775a938485f3350a6576ac74f
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-2.0-r1 b/metadata/md5-cache/app-emulation/wine-vanilla-2.0-r1
index 550a24cbf2ab..3ac068c4cc83 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-2.0-r1
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-2.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchse
 EAPI=6
 HOMEPAGE=https://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
-KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
+KEYWORDS=-* amd64 x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-baselibs-20140508-r14 !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-db-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-medialibs-20140508-r6 !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-opengl-20140508-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-sdl-20140508-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-soundlibs-20140508 !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-xlibs-20140508 ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.6.4 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=2.0
 SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.tar.bz2 https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20170830.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	2c2e15383ba891d642f51896a7f0ecfe	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c341e9ead6b9d536592f2be1658290c5
+_md5_=0da39505d74d4f01582832dda8ed5963
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-2.0.1 b/metadata/md5-cache/app-emulation/wine-vanilla-2.0.1
deleted file mode 100644
index 1dd749101843..000000000000
--- a/metadata/md5-cache/app-emulation/wine-vanilla-2.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-baselibs-20140508-r14 !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-db-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-medialibs-20140508-r6 !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-opengl-20140508-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-sdl-20140508-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-soundlibs-20140508 !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-xlibs-20140508 ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-proto/xineramaproto ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
-EAPI=6
-HOMEPAGE=https://www.winehq.org/
-IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
-KEYWORDS=-* amd64 x86 ~x86-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-baselibs-20140508-r14 !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-db-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-medialibs-20140508-r6 !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-opengl-20140508-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-sdl-20140508-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-soundlibs-20140508 !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-xlibs-20140508 ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.6.4 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 )
-RESTRICT=test
-SLOT=2.0.1
-SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.1.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20170830.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	2c2e15383ba891d642f51896a7f0ecfe	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=993ab102affdb14c3f4a828ef60aaafb
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-2.0.1-r1 b/metadata/md5-cache/app-emulation/wine-vanilla-2.0.1-r1
index 2d9c913c4608..c10dfc23ff42 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-2.0.1-r1
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-2.0.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchse
 EAPI=6
 HOMEPAGE=https://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
-KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
+KEYWORDS=-* amd64 x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-baselibs-20140508-r14 !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-db-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-medialibs-20140508-r6 !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-opengl-20140508-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-sdl-20140508-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-soundlibs-20140508 !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-xlibs-20140508 ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.6.4 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=2.0.1
 SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.1.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20170830.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	2c2e15383ba891d642f51896a7f0ecfe	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9f345e75761e5087ef30653d0c2c3e3b
+_md5_=7fba872a79b3c2bd60cd4ed0abdb1564
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-2.0.2 b/metadata/md5-cache/app-emulation/wine-vanilla-2.0.2
deleted file mode 100644
index 07d6c5529e6f..000000000000
--- a/metadata/md5-cache/app-emulation/wine-vanilla-2.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-baselibs-20140508-r14 !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-db-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-medialibs-20140508-r6 !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-opengl-20140508-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-sdl-20140508-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-soundlibs-20140508 !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-xlibs-20140508 ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-proto/xineramaproto ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
-EAPI=6
-HOMEPAGE=https://www.winehq.org/
-IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
-KEYWORDS=-* amd64 x86 ~x86-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-baselibs-20140508-r14 !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-db-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-medialibs-20140508-r6 !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-opengl-20140508-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-sdl-20140508-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-soundlibs-20140508 !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-xlibs-20140508 ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.6.4 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 )
-RESTRICT=test
-SLOT=2.0.2
-SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.2.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20170830.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	2c2e15383ba891d642f51896a7f0ecfe	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=993ab102affdb14c3f4a828ef60aaafb
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-2.0.2-r1 b/metadata/md5-cache/app-emulation/wine-vanilla-2.0.2-r1
index 31435bbd2acd..ecee42c0d251 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-2.0.2-r1
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-2.0.2-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchse
 EAPI=6
 HOMEPAGE=https://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
-KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
+KEYWORDS=-* amd64 x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-baselibs-20140508-r14 !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-db-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-medialibs-20140508-r6 !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-opengl-20140508-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-sdl-20140508-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-soundlibs-20140508 !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-xlibs-20140508 ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.6.4 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=2.0.2
 SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.2.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20170830.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	2c2e15383ba891d642f51896a7f0ecfe	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9f345e75761e5087ef30653d0c2c3e3b
+_md5_=7fba872a79b3c2bd60cd4ed0abdb1564
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-2.0.3 b/metadata/md5-cache/app-emulation/wine-vanilla-2.0.3
index d5effdbb50d5..59432f69afa7 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-2.0.3
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-2.0.3
@@ -4,7 +4,7 @@ DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchse
 EAPI=6
 HOMEPAGE=https://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
-KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
+KEYWORDS=-* amd64 x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-baselibs-20140508-r14 !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-db-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-medialibs-20140508-r6 !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-opengl-20140508-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-sdl-20140508-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-soundlibs-20140508 !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-xlibs-20140508 ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.6.4 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=2.0.3
 SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.3.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20170830.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	2c2e15383ba891d642f51896a7f0ecfe	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5c8161b05925dd8b4baee1f19506a5aa
+_md5_=87779913b17511bde0952d37f547b5dd
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-2.18-r2 b/metadata/md5-cache/app-emulation/wine-vanilla-2.18-r2
index 48ce43981806..2d61b0ad2493 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-2.18-r2
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-2.18-r2
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=2.18
 SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.18.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20170830.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	2c2e15383ba891d642f51896a7f0ecfe	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bd2e4f00f37ded9df2a9bce6708d9235
+_md5_=90867772701e688c969437140cc4b6fc
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-2.19-r1 b/metadata/md5-cache/app-emulation/wine-vanilla-2.19-r1
index 0e853f9abaee..8c93879f6e7d 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-2.19-r1
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-2.19-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=2.19
 SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.19.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20170830.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	2c2e15383ba891d642f51896a7f0ecfe	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bd2e4f00f37ded9df2a9bce6708d9235
+_md5_=90867772701e688c969437140cc4b6fc
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-2.20 b/metadata/md5-cache/app-emulation/wine-vanilla-2.20
index b4d3e9f96f3d..d5d2f3df6e3f 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-2.20
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-2.20
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=2.20
 SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.20.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20170830.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	2c2e15383ba891d642f51896a7f0ecfe	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9b6c4aabe044250889ba39832bf872d4
+_md5_=7a0096f397cb3a4427711eac3c80aaae
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-9999 b/metadata/md5-cache/app-emulation/wine-vanilla-9999
index 43d40ea932bf..68ee8116d7b8 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-9999
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-9999
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=9999
 SRC_URI=https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20170830.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	2c2e15383ba891d642f51896a7f0ecfe	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9b6c4aabe044250889ba39832bf872d4
+_md5_=7a0096f397cb3a4427711eac3c80aaae
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 5f24ac986d4c..39f1ac0272f2 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/vifm-0.8.2 b/metadata/md5-cache/app-misc/vifm-0.8.2
deleted file mode 100644
index 63914e570578..000000000000
--- a/metadata/md5-cache/app-misc/vifm-0.8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=sys-libs/ncurses-5.9-r3:0 magic? ( sys-apps/file ) gtk? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Console file manager with vi(m)-like keybindings
-EAPI=5
-HOMEPAGE=http://vifm.info/
-IUSE=X developer +extended-keys gtk +magic vim vim-syntax
-KEYWORDS=amd64 ppc ~s390 x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/ncurses-5.9-r3:0 magic? ( sys-apps/file ) gtk? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 ) vim? ( || ( app-editors/vim app-editors/gvim ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/vifm/vifm-0.8.2.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
-_md5_=4cbbeeb7249af371a3bceb98864438d1
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 35482b196e00..d201dbee5a51 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/kmymoney-4.8.0-r2 b/metadata/md5-cache/app-office/kmymoney-4.8.0-r2
deleted file mode 100644
index 0550054b359c..000000000000
--- a/metadata/md5-cache/app-office/kmymoney-4.8.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-crypt/gpgme-1.7.0[cxx] <app-office/libalkimia-6.0.0 dev-libs/gmp:0= dev-libs/libgpg-error x11-misc/shared-mime-info calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-5.5.1 >=sys-libs/gwenhywfar-4.15.3[qt4] ) ofx? ( >=dev-libs/libofx-0.9.4 ) weboob? ( www-client/weboob ) dev-libs/boost virtual/pkgconfig doc? ( app-doc/doxygen ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-3.7.2 dev-util/automoc virtual/pkgconfig >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) >=dev-qt/qtsql-4.8.5:4 dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
-DESCRIPTION=Personal finance manager by KDE
-EAPI=6
-HOMEPAGE=https://kmymoney.org/
-IUSE=calendar debug doc hbci ofx quotes weboob l10n_bs l10n_ca l10n_ca-valencia l10n_cs l10n_da l10n_de l10n_el l10n_en-GB l10n_es l10n_et l10n_eu l10n_fi l10n_fr l10n_gl l10n_hu l10n_it l10n_kk l10n_nds l10n_nl l10n_pl l10n_pt l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sv l10n_tr l10n_uk l10n_zh-CN l10n_zh-TW test +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-crypt/gpgme-1.7.0[cxx] <app-office/libalkimia-6.0.0 dev-libs/gmp:0= dev-libs/libgpg-error x11-misc/shared-mime-info calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-5.5.1 >=sys-libs/gwenhywfar-4.15.3[qt4] ) ofx? ( >=dev-libs/libofx-0.9.4 ) weboob? ( www-client/weboob ) quotes? ( dev-perl/Finance-Quote ) kde-frameworks/oxygen-icons l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[l10n_bs(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[l10n_en-GB(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[l10n_et(+)] ) l10n_eu? ( >=kde-apps/kde4-l10n-4.4:4[l10n_eu(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fr(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_gl(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hu(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[l10n_it(+)] ) l10n_kk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_kk(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nl(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sk(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[l10n_zh-TW(+)] ) handbook? ( kde-frameworks/kdelibs:4[handbook] ) >=dev-qt/qtsql-4.8.5:4 dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
-SLOT=4
-SRC_URI=mirror://kde/stable/kmymoney/4.8.0/src/kmymoney-4.8.0.tar.xz
-_eclasses_=cmake-utils	485ec8c8e86e1c95f8f27515544a1aba	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=692b662346dafcf6275bb0f603325338
diff --git a/metadata/md5-cache/app-office/kmymoney-4.8.0-r3 b/metadata/md5-cache/app-office/kmymoney-4.8.0-r3
new file mode 100644
index 000000000000..37049c298677
--- /dev/null
+++ b/metadata/md5-cache/app-office/kmymoney-4.8.0-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=app-crypt/gpgme-1.7.0[cxx] <app-office/libalkimia-6.0.0 dev-libs/gmp:0= dev-libs/libgpg-error x11-misc/shared-mime-info calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-5.5.1 >=sys-libs/gwenhywfar-4.15.3[qt4] ) ofx? ( >=dev-libs/libofx-0.9.4 ) weboob? ( www-client/weboob ) dev-libs/boost virtual/pkgconfig doc? ( app-doc/doxygen ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-3.7.2 dev-util/automoc virtual/pkgconfig >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) >=dev-qt/qtsql-4.8.5:4 dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
+DESCRIPTION=Personal finance manager by KDE
+EAPI=6
+HOMEPAGE=https://kmymoney.org/
+IUSE=calendar debug doc hbci ofx quotes weboob test +handbook
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=app-crypt/gpgme-1.7.0[cxx] <app-office/libalkimia-6.0.0 dev-libs/gmp:0= dev-libs/libgpg-error x11-misc/shared-mime-info calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-5.5.1 >=sys-libs/gwenhywfar-4.15.3[qt4] ) ofx? ( >=dev-libs/libofx-0.9.4 ) weboob? ( www-client/weboob ) quotes? ( dev-perl/Finance-Quote ) kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) >=dev-qt/qtsql-4.8.5:4 dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
+SLOT=4
+SRC_URI=mirror://kde/stable/kmymoney/4.8.0/src/kmymoney-4.8.0.tar.xz
+_eclasses_=cmake-utils	485ec8c8e86e1c95f8f27515544a1aba	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=628d18a42ab023e2eb4078f5f04e77bd
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 23c52762b778..19b3315952e9 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r2 b/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r2
index e844ed103162..78ea7c4f38b1 100644
--- a/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r2
+++ b/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r2
@@ -3,11 +3,11 @@ DESCRIPTION=XSL Stylesheets for Docbook
 EAPI=6
 HOMEPAGE=http://wiki.docbook.org/DocBookXslStylesheets
 IUSE=ruby
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=app-text/build-docbook-catalog-1.1 ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.3 ) virtual/rubygems )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/docbook/docbook-xsl-1.79.1.tar.bz2
 _eclasses_=ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	f8a0644cb27ba724df27b2a20a739b53
-_md5_=6c40eedb399b7270c0020c5e3d9310ff
+_md5_=71b54abbab67fae64c0c4abc3f4f3141
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index 6fd364b8e707..d060d9229712 100644
--- a/metadata/md5-cache/dev-haskell/Manifest.gz
+++ b/metadata/md5-cache/dev-haskell/Manifest.gz
diff --git a/metadata/md5-cache/dev-haskell/cabal-2.0.0.2 b/metadata/md5-cache/dev-haskell/cabal-2.0.0.2
new file mode 100644
index 000000000000..bc84267d448d
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/cabal-2.0.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.8.1:=
+DESCRIPTION=A framework for packaging Haskell software
+EAPI=6
+HOMEPAGE=http://www.haskell.org/cabal/
+IUSE=profile test
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.8.1:=
+RESTRICT=test
+SLOT=0/2.0.0.2
+SRC_URI=mirror://hackage/packages/archive/Cabal/2.0.0.2/Cabal-2.0.0.2.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5db3a9b4634be26d5d435c9352115b00
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 3ba3c4f2d617..44a0de936e6d 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/perl-5.26.0 b/metadata/md5-cache/dev-lang/perl-5.26.0
index 02c680cf3665..1dba1c70e6e3 100644
--- a/metadata/md5-cache/dev-lang/perl-5.26.0
+++ b/metadata/md5-cache/dev-lang/perl-5.26.0
@@ -11,4 +11,4 @@ RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) app-arch/bzip2
 SLOT=0/5.26
 SRC_URI=mirror://cpan/src/5.0/perl-5.26.0.tar.xz mirror://cpan/authors/id/X/XS/XSAWYERX/perl-5.26.0.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.25.11-patches-1/perl-5.25.11-patches-1.tar.xz mirror://gentoo/perl-5.25.11-patches-1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.25.11-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.1.5/perl-cross-1.1.5.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=a5d763008f6e55b9959812c993aee917
+_md5_=5deb4a2238b9e9141d20cf13f678ad49
diff --git a/metadata/md5-cache/dev-lang/perl-5.26.1 b/metadata/md5-cache/dev-lang/perl-5.26.1
index edc59e2f8b58..979293123e25 100644
--- a/metadata/md5-cache/dev-lang/perl-5.26.1
+++ b/metadata/md5-cache/dev-lang/perl-5.26.1
@@ -11,4 +11,4 @@ RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) app-arch/bzip2
 SLOT=0/5.26
 SRC_URI=mirror://cpan/src/5.0/perl-5.26.1.tar.xz mirror://cpan/authors/id/S/SH/SHAY/perl-5.26.1.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.25.11-patches-1/perl-5.25.11-patches-1.tar.xz mirror://gentoo/perl-5.25.11-patches-1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.25.11-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.1.7/perl-cross-1.1.7.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=fbaa8965ef464449a1aaf596c08a6614
+_md5_=3b9cd666126dc6a6b85d3b1314d94c4b
diff --git a/metadata/md5-cache/dev-lang/perl-5.26.1-r1 b/metadata/md5-cache/dev-lang/perl-5.26.1-r1
index 8a5ce52e32e8..5fbeb4e6fd5e 100644
--- a/metadata/md5-cache/dev-lang/perl-5.26.1-r1
+++ b/metadata/md5-cache/dev-lang/perl-5.26.1-r1
@@ -11,4 +11,4 @@ RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) app-arch/bzip2
 SLOT=0/5.26
 SRC_URI=mirror://cpan/src/5.0/perl-5.26.1.tar.xz mirror://cpan/authors/id/S/SH/SHAY/perl-5.26.1.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.25.11-patches-1/perl-5.25.11-patches-1.tar.xz mirror://gentoo/perl-5.25.11-patches-1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.25.11-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.1.7/perl-cross-1.1.7.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=b311699b7b80411e5bc852b81e0f5622
+_md5_=da83411990973bbcba0ff657e709776d
diff --git a/metadata/md5-cache/dev-lang/perl-5.26.9999 b/metadata/md5-cache/dev-lang/perl-5.26.9999
index 95489a10e5e2..1b367e5b34b4 100644
--- a/metadata/md5-cache/dev-lang/perl-5.26.9999
+++ b/metadata/md5-cache/dev-lang/perl-5.26.9999
@@ -10,4 +10,4 @@ RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) app-arch/bzip2
 SLOT=0/5.26
 SRC_URI=mirror://cpan/src/5.0/perl-5.26.1-RC1.tar.xz mirror://cpan/authors/id/S/SH/SHAY/perl-5.26.1-RC1.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.25.11-patches-1/perl-5.25.11-patches-1.tar.xz mirror://gentoo/perl-5.25.11-patches-1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.25.11-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.1.7/perl-cross-1.1.7.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=3c3d48f56012a1d6b22691b59614496a
+_md5_=5482c94deb9359b351b7925fe3a7e1c6
diff --git a/metadata/md5-cache/dev-lang/perl-5.28.9999 b/metadata/md5-cache/dev-lang/perl-5.28.9999
index 29521003c807..b2b4281e1d5f 100644
--- a/metadata/md5-cache/dev-lang/perl-5.28.9999
+++ b/metadata/md5-cache/dev-lang/perl-5.28.9999
@@ -10,4 +10,4 @@ RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) app-arch/bzip2
 SLOT=0/5.27.6
 SRC_URI=mirror://cpan/src/5.0/perl-5.27.6.tar.xz mirror://cpan/authors/id/S/SH/SHAY/perl-5.27.6.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.27.6-patches-1/perl-5.27.6-patches-1.tar.xz mirror://gentoo/perl-5.27.6-patches-1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.27.6-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.1.7/perl-cross-1.1.7.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=97ed4da253835d0a6da9b7b9942e5c6b
+_md5_=ef55627eb2c4bc26ee699935ff283979
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.6.0_rc1 b/metadata/md5-cache/dev-lang/swi-prolog-7.6.1
index 762b187a2e11..8cdf923246f5 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-7.6.0_rc1
+++ b/metadata/md5-cache/dev-lang/swi-prolog-7.6.1
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:= archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/stable/src/swipl-7.6.0-rc1.tar.gz
+SRC_URI=http://www.swi-prolog.org/download/stable/src/swipl-7.6.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=cc2dd4f2f4e28ff357a41ee45e78b56b
+_md5_=04d5e7b8cf66f3050488f20849caf6b0
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.7.1 b/metadata/md5-cache/dev-lang/swi-prolog-7.7.1
deleted file mode 100644
index d5be074f354f..000000000000
--- a/metadata/md5-cache/dev-lang/swi-prolog-7.7.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=sys-libs/ncurses:= archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) X? ( x11-proto/xproto ) java? ( test? ( =dev-java/junit-3.8* ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=free, small, and standard compliant Prolog compiler
-EAPI=5
-HOMEPAGE=http://www.swi-prolog.org/
-IUSE=archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc pcre readline ssl static-libs test uuid zlib X elibc_FreeBSD java
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:= archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-7.7.1.tar.gz mirror://gentoo/swi-prolog-7.7.1-gentoo-patchset-0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=6fea4ad38b551f2569560ef6bf0dfc13
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.7.0 b/metadata/md5-cache/dev-lang/swi-prolog-7.7.2
index c89a5c9fb591..4fc7644ac376 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-7.7.0
+++ b/metadata/md5-cache/dev-lang/swi-prolog-7.7.2
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:= archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-7.7.0.tar.gz
+SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-7.7.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2eaa82e07c5e1336f7912726e3542248
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.6.0_rc2 b/metadata/md5-cache/dev-lang/swi-prolog-7.7.3
index 8bb4bfac9a10..6d2624a0b785 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-7.6.0_rc2
+++ b/metadata/md5-cache/dev-lang/swi-prolog-7.7.3
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:= archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/stable/src/swipl-7.6.0-rc2.tar.gz
+SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-7.7.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=cc2dd4f2f4e28ff357a41ee45e78b56b
+_md5_=2eaa82e07c5e1336f7912726e3542248
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index e056b90084b0..0ed1b4bebf0a 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/c-blosc-1.11.1 b/metadata/md5-cache/dev-libs/c-blosc-1.11.1
deleted file mode 100644
index 68dae609da82..000000000000
--- a/metadata/md5-cache/dev-libs/c-blosc-1.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=lz4? ( >=app-arch/lz4-0_p120:= ) snappy? ( app-arch/snappy ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Blocking, shuffling and lossless compression library
-EAPI=6
-HOMEPAGE=http://www.blosc.org/
-IUSE=cpu_flags_x86_avx2 +lz4 +snappy static-libs test zlib zstd
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=lz4? ( >=app-arch/lz4-0_p120:= ) snappy? ( app-arch/snappy ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd )
-SLOT=0/1
-SRC_URI=https://github.com/Blosc/c-blosc/archive/v1.11.1.tar.gz -> c-blosc-1.11.1.tar.gz
-_eclasses_=cmake-utils	485ec8c8e86e1c95f8f27515544a1aba	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=20fb602792681193b8ac358d52faa43d
diff --git a/metadata/md5-cache/dev-libs/c-blosc-1.3.2 b/metadata/md5-cache/dev-libs/c-blosc-1.3.2
deleted file mode 100644
index a5cc448201ac..000000000000
--- a/metadata/md5-cache/dev-libs/c-blosc-1.3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=hdf5? ( sci-libs/hdf5 ) lz4? ( >=app-arch/lz4-0_p120 ) snappy? ( app-arch/snappy ) zlib? ( sys-libs/zlib ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Blocking, shuffling and lossless compression library
-EAPI=5
-HOMEPAGE=http://www.blosc.org/
-IUSE=hdf5 +lz4 +snappy static-libs test zlib
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=hdf5? ( sci-libs/hdf5 ) lz4? ( >=app-arch/lz4-0_p120 ) snappy? ( app-arch/snappy ) zlib? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=https://github.com/Blosc/c-blosc/archive/v1.3.2.tar.gz -> c-blosc-1.3.2.tar.gz
-_eclasses_=cmake-utils	485ec8c8e86e1c95f8f27515544a1aba	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=a0a58e98d82fcdb954fb58c5770bceb9
diff --git a/metadata/md5-cache/dev-libs/c-blosc-1.3.5 b/metadata/md5-cache/dev-libs/c-blosc-1.3.5
deleted file mode 100644
index 65f95dacbb0d..000000000000
--- a/metadata/md5-cache/dev-libs/c-blosc-1.3.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=hdf5? ( sci-libs/hdf5:0= ) lz4? ( >=app-arch/lz4-0_p120:0= ) snappy? ( app-arch/snappy:0= ) zlib? ( sys-libs/zlib:0= ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Blocking, shuffling and lossless compression library
-EAPI=5
-HOMEPAGE=http://www.blosc.org/
-IUSE=hdf5 +lz4 +snappy static-libs test zlib
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=hdf5? ( sci-libs/hdf5:0= ) lz4? ( >=app-arch/lz4-0_p120:0= ) snappy? ( app-arch/snappy:0= ) zlib? ( sys-libs/zlib:0= )
-SLOT=0
-SRC_URI=https://github.com/Blosc/c-blosc/archive/v1.3.5.tar.gz -> c-blosc-1.3.5.tar.gz
-_eclasses_=cmake-utils	485ec8c8e86e1c95f8f27515544a1aba	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=39e02256939b1fbefa9b14055a68a715
diff --git a/metadata/md5-cache/dev-libs/c-blosc-1.5.3 b/metadata/md5-cache/dev-libs/c-blosc-1.5.3
deleted file mode 100644
index 1be53f1751f0..000000000000
--- a/metadata/md5-cache/dev-libs/c-blosc-1.5.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=hdf5? ( sci-libs/hdf5:0= ) lz4? ( >=app-arch/lz4-0_p120:0= ) snappy? ( app-arch/snappy:0= ) zlib? ( sys-libs/zlib:0= ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Blocking, shuffling and lossless compression library
-EAPI=5
-HOMEPAGE=http://www.blosc.org/
-IUSE=hdf5 +lz4 +snappy static-libs test zlib
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=hdf5? ( sci-libs/hdf5:0= ) lz4? ( >=app-arch/lz4-0_p120:0= ) snappy? ( app-arch/snappy:0= ) zlib? ( sys-libs/zlib:0= )
-SLOT=0
-SRC_URI=https://github.com/Blosc/c-blosc/archive/v1.5.3.tar.gz -> c-blosc-1.5.3.tar.gz
-_eclasses_=cmake-utils	485ec8c8e86e1c95f8f27515544a1aba	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=a76efc4df21585f90ecef621fe4a4242
diff --git a/metadata/md5-cache/dev-libs/icu-58.2-r1 b/metadata/md5-cache/dev-libs/icu-58.2-r1
index 9e9c6d3c1f25..1851c73f884e 100644
--- a/metadata/md5-cache/dev-libs/icu-58.2-r1
+++ b/metadata/md5-cache/dev-libs/icu-58.2-r1
@@ -4,9 +4,9 @@ DESCRIPTION=International Components for Unicode
 EAPI=6
 HOMEPAGE=http://www.icu-project.org/
 IUSE=debug doc examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=BSD
 SLOT=0/58.2
 SRC_URI=http://download.icu-project.org/files/icu4c/58.2/icu4c-58_2-src.tgz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=20fc8cf0fb3aab2be1c93bed8c700fe8
+_md5_=cd4dfc47cd2eeda59789b851c9a161a5
diff --git a/metadata/md5-cache/dev-libs/icu-60.1 b/metadata/md5-cache/dev-libs/icu-60.1
index 7a86bec598cc..5d44f974389c 100644
--- a/metadata/md5-cache/dev-libs/icu-60.1
+++ b/metadata/md5-cache/dev-libs/icu-60.1
@@ -4,9 +4,9 @@ DESCRIPTION=International Components for Unicode
 EAPI=6
 HOMEPAGE=http://www.icu-project.org/
 IUSE=debug doc examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=BSD
 SLOT=0/60.1
 SRC_URI=http://download.icu-project.org/files/icu4c/60.1/icu4c-60_1-src.tgz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=b9e2c7333854bc4b1fab3709d235b237
+_md5_=812d65bde59b6bce9e7fd7dd7fca2bea
diff --git a/metadata/md5-cache/dev-libs/ivykis-0.42.2 b/metadata/md5-cache/dev-libs/ivykis-0.42.2
new file mode 100644
index 000000000000..c4e1c0e895d7
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/ivykis-0.42.2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Library for asynchronous I/O readiness notification
+EAPI=6
+HOMEPAGE=https://github.com/buytenh/ivykis
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=https://github.com/buytenh/ivykis/archive/v0.42.2.tar.gz -> ivykis-0.42.2.tar.gz
+_md5_=baffb1763e1009ed3a73aed24e98e785
diff --git a/metadata/md5-cache/dev-libs/jemalloc-5.0.1 b/metadata/md5-cache/dev-libs/jemalloc-5.0.1
index f0ad04ce86c9..999e13f212a7 100644
--- a/metadata/md5-cache/dev-libs/jemalloc-5.0.1
+++ b/metadata/md5-cache/dev-libs/jemalloc-5.0.1
@@ -4,9 +4,9 @@ DESCRIPTION=Jemalloc is a general-purpose scalable concurrent allocator
 EAPI=6
 HOMEPAGE=http://www.canonware.com/jemalloc/
 IUSE=debug hardened +hugepages lazy-lock static-libs stats xmalloc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 SLOT=0/2
 SRC_URI=https://github.com/jemalloc/jemalloc/releases/download/5.0.1/jemalloc-5.0.1.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=7a583723c365c0a6c951573f5149e452
+_md5_=50e96c07b0480c99f46683f37c5aacaf
diff --git a/metadata/md5-cache/dev-libs/libowfat-0.31-r1 b/metadata/md5-cache/dev-libs/libowfat-0.31-r1
index 0fab0adb0c0b..fb8b3671de60 100644
--- a/metadata/md5-cache/dev-libs/libowfat-0.31-r1
+++ b/metadata/md5-cache/dev-libs/libowfat-0.31-r1
@@ -4,10 +4,10 @@ DESCRIPTION=reimplement libdjb - excellent libraries from Dan Bernstein
 EAPI=6
 HOMEPAGE=https://www.fefe.de/libowfat/
 IUSE=diet
-KEYWORDS=~amd64 ~hppa ~sparc ~x86
+KEYWORDS=~amd64 ~hppa sparc ~x86
 LICENSE=GPL-2
 RDEPEND=diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )
 SLOT=0
 SRC_URI=https://www.fefe.de/libowfat/libowfat-0.31.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=fe7e0e70e9666a8a32d9bebeb17bf332
+_md5_=4c3d4864a261e88fda79e528c129a831
diff --git a/metadata/md5-cache/dev-libs/uriparser-0.8.4 b/metadata/md5-cache/dev-libs/uriparser-0.8.4
index 47b22f369ca9..ba291bf9ec3f 100644
--- a/metadata/md5-cache/dev-libs/uriparser-0.8.4
+++ b/metadata/md5-cache/dev-libs/uriparser-0.8.4
@@ -4,9 +4,9 @@ DESCRIPTION=Uriparser is a strictly RFC 3986 compliant URI parsing library in C
 EAPI=5
 HOMEPAGE=http://uriparser.sourceforge.net/
 IUSE=doc qt4 test unicode
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD
 REQUIRED_USE=test? ( unicode )
 SLOT=0
 SRC_URI=mirror://sourceforge/uriparser/uriparser-0.8.4.tar.bz2
-_md5_=d93e6c37dfc78411841cde5dd99155b3
+_md5_=19e923823c6907fb8c8a5c7095df376f
diff --git a/metadata/md5-cache/dev-perl/Archive-Zip-1.590.0 b/metadata/md5-cache/dev-perl/Archive-Zip-1.590.0
index 63de7943207f..ffe54e90cb9e 100644
--- a/metadata/md5-cache/dev-perl/Archive-Zip-1.590.0
+++ b/metadata/md5-cache/dev-perl/Archive-Zip-1.590.0
@@ -4,10 +4,10 @@ DESCRIPTION=A wrapper that lets you read Zip archive members as if they were fil
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Archive-Zip/
 IUSE=test examples
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Compress-Raw-Zlib-2.17.0 virtual/perl-File-Path >=virtual/perl-File-Spec-0.800.0 virtual/perl-File-Temp virtual/perl-IO virtual/perl-Time-Local dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.59.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=956a9306b6f9ff2ee9b9b9f01d7f66f1
+_md5_=507cf3451df4aae2721ace850dd94dc3
diff --git a/metadata/md5-cache/dev-perl/Email-Find-0.100.0-r1 b/metadata/md5-cache/dev-perl/Email-Find-0.100.0-r1
index 3974dfeb1e44..da4996713ad1 100644
--- a/metadata/md5-cache/dev-perl/Email-Find-0.100.0-r1
+++ b/metadata/md5-cache/dev-perl/Email-Find-0.100.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-perl/MailTools dev-perl/Email-Valid virtual/perl-Test-Simple dev-lang
 DESCRIPTION=Find RFC 822 email addresses in plain text
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Email-Find/
-KEYWORDS=amd64 hppa ~mips ppc ppc64 x86 ~x86-linux
+KEYWORDS=amd64 ~arm hppa ~mips ppc ppc64 x86 ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/MailTools dev-perl/Email-Valid virtual/perl-Test-Simple dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/Email-Find-0.10.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=79d0aae3536cf05c6be0c07902dd61bf
+_md5_=f89c575efe481354b341aa89373c118c
diff --git a/metadata/md5-cache/dev-perl/Email-Valid-1.202.0 b/metadata/md5-cache/dev-perl/Email-Valid-1.202.0
index 21fc1fff0f4f..1649248a137d 100644
--- a/metadata/md5-cache/dev-perl/Email-Valid-1.202.0
+++ b/metadata/md5-cache/dev-perl/Email-Valid-1.202.0
@@ -4,10 +4,10 @@ DESCRIPTION=Check validity of Internet email addresses
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Email-Valid/
 IUSE=test
-KEYWORDS=~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~x86-linux
+KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-File-Spec dev-perl/IO-CaptureOutput virtual/perl-IO dev-perl/MailTools dev-perl/Net-DNS >=dev-perl/Net-Domain-TLD-1.650.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Valid-1.202.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=9a152049dfdc308ab975f67a2c7b6878
+_md5_=48c4b7dd4420c06975a2b027b97df8d1
diff --git a/metadata/md5-cache/dev-perl/Gtk2-1.249.920 b/metadata/md5-cache/dev-perl/Gtk2-1.249.920
index edeb892b5f94..937c5be6fa16 100644
--- a/metadata/md5-cache/dev-perl/Gtk2-1.249.920
+++ b/metadata/md5-cache/dev-perl/Gtk2-1.249.920
@@ -4,10 +4,10 @@ DESCRIPTION=Perl bindings for GTK2
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Gtk2/
 IUSE=test test
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=x11-libs/gtk+:2 >=dev-perl/Cairo-1 >=dev-perl/glib-perl-1.280.0 >=dev-perl/Pango-1.220.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Gtk2-1.24992.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	virtualx	171580f737f5aaf18fcb456548588066
-_md5_=db3c99c7ec90bcf92dfd43449cf53073
+_md5_=8e66f79201219a1e3cbc2b941301efb1
diff --git a/metadata/md5-cache/dev-perl/HTML-FromText-2.70.0 b/metadata/md5-cache/dev-perl/HTML-FromText-2.70.0
index e21f59bce7cf..15cc157ee458 100644
--- a/metadata/md5-cache/dev-perl/HTML-FromText-2.70.0
+++ b/metadata/md5-cache/dev-perl/HTML-FromText-2.70.0
@@ -4,10 +4,10 @@ DESCRIPTION=Convert plain text to HTML
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/HTML-FromText/
 IUSE=test
-KEYWORDS=~amd64 ~hppa ~mips ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Email-Find-0.90.0 >=virtual/perl-Exporter-5.58 >=dev-perl/HTML-Parser-1.260.0 >=virtual/perl-Scalar-List-Utils-1.120.0 >=virtual/perl-Text-Tabs+Wrap-98.112.800 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/HTML-FromText-2.07.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=20fcd986d8f086b26e80b8ac40c91f6a
+_md5_=d4e1a796967a30e74d24fa3f811c77b5
diff --git a/metadata/md5-cache/dev-perl/HTTP-Cache-Transparent-1.400.0 b/metadata/md5-cache/dev-perl/HTTP-Cache-Transparent-1.400.0
index 6680f4949208..21c5724b17bd 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Cache-Transparent-1.400.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Cache-Transparent-1.400.0
@@ -4,10 +4,10 @@ DESCRIPTION=Cache the result of http get-requests persistently
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/HTTP-Cache-Transparent/
 IUSE=test examples
-KEYWORDS=~amd64 ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl virtual/perl-Digest-MD5 virtual/perl-Storable dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MATTIASH/HTTP-Cache-Transparent-1.4.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=11edb354d1c671d4cc0ab7579b10733d
+_md5_=df6454e1ae3ea0903b4539dfdecfad54
diff --git a/metadata/md5-cache/dev-perl/IO-SessionData-1.30.0-r1 b/metadata/md5-cache/dev-perl/IO-SessionData-1.30.0-r1
index 13264044d116..92c29d6f34bc 100644
--- a/metadata/md5-cache/dev-perl/IO-SessionData-1.30.0-r1
+++ b/metadata/md5-cache/dev-perl/IO-SessionData-1.30.0-r1
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
 DESCRIPTION=Session data support module for SOAP::Lite
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/IO-SessionData/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/IO-SessionData-1.03.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=23945a2d43070cd24061a6b5528124c8
+_md5_=a6d25923d4ffd8581c32e299f5cf0d79
diff --git a/metadata/md5-cache/dev-perl/Lingua-Preferred-0.2.4-r1 b/metadata/md5-cache/dev-perl/Lingua-Preferred-0.2.4-r1
index 174c3c3171fc..4a9069dc9f7a 100644
--- a/metadata/md5-cache/dev-perl/Lingua-Preferred-0.2.4-r1
+++ b/metadata/md5-cache/dev-perl/Lingua-Preferred-0.2.4-r1
@@ -3,10 +3,10 @@ DEPEND=dev-perl/Log-TraceMessages dev-lang/perl:=[-build(-)]
 DESCRIPTION=Pick a language based on user's preferences
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Lingua-Preferred/
-KEYWORDS=amd64 ppc x86
+KEYWORDS=amd64 ~arm ppc x86
 LICENSE=|| ( Artistic GPL-2 GPL-3 )
 RDEPEND=dev-perl/Log-TraceMessages dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ED/EDAVIS/Lingua-Preferred-0.2.4.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=f1f0a860d65137470d27bdaca067d472
+_md5_=7a45787dbb44b53feacb7a0888659d36
diff --git a/metadata/md5-cache/dev-perl/Log-TraceMessages-1.400.0-r1 b/metadata/md5-cache/dev-perl/Log-TraceMessages-1.400.0-r1
index a259795f8b7d..ffde614e41cd 100644
--- a/metadata/md5-cache/dev-perl/Log-TraceMessages-1.400.0-r1
+++ b/metadata/md5-cache/dev-perl/Log-TraceMessages-1.400.0-r1
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/HTML-FromText-1.004 dev-lang/perl:=[-build(-)]
 DESCRIPTION=Logging/debugging aid
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Log-TraceMessages/
-KEYWORDS=amd64 ppc x86 ~x86-linux
+KEYWORDS=amd64 ~arm ppc x86 ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/HTML-FromText-1.004 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ED/EDAVIS/Log-TraceMessages-1.4.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=557776c007d352fb9a7221fb7916f35b
+_md5_=009959c84487a5b533c4725b9367b386
diff --git a/metadata/md5-cache/dev-perl/MIME-tools-5.509.0 b/metadata/md5-cache/dev-perl/MIME-tools-5.509.0
index 5279d9d538a9..9ed383c3dc95 100644
--- a/metadata/md5-cache/dev-perl/MIME-tools-5.509.0
+++ b/metadata/md5-cache/dev-perl/MIME-tools-5.509.0
@@ -4,10 +4,10 @@ DESCRIPTION=A Perl module for parsing and creating MIME entities
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/MIME-tools/
 IUSE=test examples
-KEYWORDS=alpha amd64 ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-File-Path-1 >=virtual/perl-File-Spec-0.600.0 >=virtual/perl-File-Temp-0.180.0 virtual/perl-IO >=virtual/perl-MIME-Base64-2.200.0 dev-perl/MailTools dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DS/DSKOLL/MIME-tools-5.509.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=509a4fd6b4e9c71516c6a6b1ed224463
+_md5_=6376b04fc35b4adf961378cc8439f5d9
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 51066391cc34..c648cfb5613b 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/dev-perl/Net-CUPS-0.640.0 b/metadata/md5-cache/dev-perl/Net-CUPS-0.640.0
new file mode 100644
index 000000000000..b1e6c21462dd
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-CUPS-0.640.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-print/cups net-print/cups-filters virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl:=
+DESCRIPTION=CUPS C API Interface
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Net-CUPS/
+IUSE=test examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=net-print/cups net-print/cups-filters dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/N/NI/NINE/Net-CUPS-0.64.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=94a6384e5fde7f6d90db5604f339cd8f
diff --git a/metadata/md5-cache/dev-perl/Net-DNS-1.130.0 b/metadata/md5-cache/dev-perl/Net-DNS-1.130.0
new file mode 100644
index 000000000000..b6f75c09cbc8
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-DNS-1.130.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/Digest-HMAC-1.30.0 >=virtual/perl-Digest-MD5-2.130.0 >=virtual/perl-Digest-SHA-5.230.0 >=virtual/perl-File-Spec-0.860.0 >=virtual/perl-MIME-Base64-2.110.0 >=virtual/perl-Time-Local-1.190.0 ipv6? ( >=virtual/perl-IO-Socket-IP-0.380.0 ) !minimal? ( >=dev-perl/Digest-BubbleBabble-0.10.0 >=dev-perl/Net-LibIDN-0.120.0 >=dev-perl/Net-LibIDN2-1.0.0 >=virtual/perl-Scalar-List-Utils-1.250.0 ) virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.520.0 ) dev-lang/perl:=
+DESCRIPTION=Perl Interface to the Domain Name System
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Net-DNS/
+IUSE=+ipv6 test minimal examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+PDEPEND=!minimal? ( >=dev-perl/Net-DNS-SEC-1.10.0 )
+RDEPEND=>=dev-perl/Digest-HMAC-1.30.0 >=virtual/perl-Digest-MD5-2.130.0 >=virtual/perl-Digest-SHA-5.230.0 >=virtual/perl-File-Spec-0.860.0 >=virtual/perl-MIME-Base64-2.110.0 >=virtual/perl-Time-Local-1.190.0 ipv6? ( >=virtual/perl-IO-Socket-IP-0.380.0 ) !minimal? ( >=dev-perl/Digest-BubbleBabble-0.10.0 >=dev-perl/Net-LibIDN-0.120.0 >=dev-perl/Net-LibIDN2-1.0.0 >=virtual/perl-Scalar-List-Utils-1.250.0 ) dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-1.13.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=6ae6c8aed4955b85965e2acbdfeb0193
diff --git a/metadata/md5-cache/dev-perl/Net-Domain-TLD-1.740.0 b/metadata/md5-cache/dev-perl/Net-Domain-TLD-1.740.0
index 9968c9854e34..b53653843d84 100644
--- a/metadata/md5-cache/dev-perl/Net-Domain-TLD-1.740.0
+++ b/metadata/md5-cache/dev-perl/Net-Domain-TLD-1.740.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-Carp virtual/perl-Storable virtual/perl-ExtUtils-MakeMaker d
 DESCRIPTION=Current top level domain names including new ICANN additions and ccTLDs
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Net-Domain-TLD/
-KEYWORDS=amd64 hppa ~mips ppc ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm hppa ~mips ppc ppc64 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Storable dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALEXP/Net-Domain-TLD-1.74.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=269f2283924f86a56f708565006265b6
+_md5_=db2897c03aa6550efa15a9e78640d1f6
diff --git a/metadata/md5-cache/dev-perl/Net-IMAP-Simple-1.220.900 b/metadata/md5-cache/dev-perl/Net-IMAP-Simple-1.220.900
new file mode 100644
index 000000000000..d6273e95175a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-IMAP-Simple-1.220.900
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-IO dev-perl/Parse-RecDescent virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+DESCRIPTION=Perl extension for simple IMAP account handling
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Net-IMAP-Simple/
+IUSE=examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-IO dev-perl/Parse-RecDescent dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/J/JE/JETTERO/Net-IMAP-Simple-1.2209.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=50767bbd64fb3d8079dadaa6f3176b62
diff --git a/metadata/md5-cache/dev-perl/Net-LibIDN2-1.0.0 b/metadata/md5-cache/dev-perl/Net-LibIDN2-1.0.0
new file mode 100644
index 000000000000..e9753d46e732
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-LibIDN2-1.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-dns/libidn2 virtual/perl-ExtUtils-CBuilder virtual/perl-ExtUtils-ParseXS dev-perl/Module-Build test? ( >=virtual/perl-Test-Simple-0.10.0 ) dev-lang/perl:=
+DESCRIPTION=Perl bindings for GNU Libidn2
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Net-LibIDN2/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=net-dns/libidn2 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TH/THOR/Net-LibIDN2-1.00.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=5626b844a7c1e8c75691f28fc1a57cd8
diff --git a/metadata/md5-cache/dev-perl/Parse-RecDescent-1.967.15 b/metadata/md5-cache/dev-perl/Parse-RecDescent-1.967.15
index 69fea8c5415f..6571a0af7ba6 100644
--- a/metadata/md5-cache/dev-perl/Parse-RecDescent-1.967.15
+++ b/metadata/md5-cache/dev-perl/Parse-RecDescent-1.967.15
@@ -4,10 +4,10 @@ DESCRIPTION=Generate Recursive-Descent Parsers
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Parse-RecDescent/
 IUSE=test examples
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Text-Balanced-1.950.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JT/JTBRAUN/Parse-RecDescent-1.967015.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=40e3819e16c1f0c3839856048780fa35
+_md5_=d6860e6ab3a4071684d76b7bae45b3a6
diff --git a/metadata/md5-cache/dev-perl/SOAP-Lite-1.190.0 b/metadata/md5-cache/dev-perl/SOAP-Lite-1.190.0
index 0d8ffedf8dc7..ed4def70371e 100644
--- a/metadata/md5-cache/dev-perl/SOAP-Lite-1.190.0
+++ b/metadata/md5-cache/dev-perl/SOAP-Lite-1.190.0
@@ -4,10 +4,10 @@ DESCRIPTION=Lightweight interface to the SOAP protocol both on client and server
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/SOAP-Lite/
 IUSE=ssl test xmpp
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Inspector >=dev-perl/IO-SessionData-1.30.0 dev-perl/libwww-perl virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils dev-perl/Task-Weaken dev-perl/URI >=dev-perl/XML-Parser-2.230.0 dev-perl/MIME-tools ssl? ( dev-perl/IO-Socket-SSL dev-perl/LWP-Protocol-https dev-perl/Crypt-SSLeay ) xmpp? ( dev-perl/Net-Jabber ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/SOAP-Lite-1.19.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=69ba44afccae1c36edb097acf83d7c06
+_md5_=80eaabab53d4d46c12d72b85d618b094
diff --git a/metadata/md5-cache/dev-perl/SUPER-1.201.411.170 b/metadata/md5-cache/dev-perl/SUPER-1.201.411.170
index 014a9764edba..a13bd5960972 100644
--- a/metadata/md5-cache/dev-perl/SUPER-1.201.411.170
+++ b/metadata/md5-cache/dev-perl/SUPER-1.201.411.170
@@ -4,10 +4,10 @@ DESCRIPTION=control superclass method dispatch
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/SUPER/
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Scalar-List-Utils dev-perl/Sub-Identify dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHROMATIC/SUPER-1.20141117.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=8a30da13342aaf618f9c0bdb05a1f919
+_md5_=185de7f49fd6cecb0196d4cc1b293ac9
diff --git a/metadata/md5-cache/dev-perl/Sub-Uplevel-0.280.0 b/metadata/md5-cache/dev-perl/Sub-Uplevel-0.280.0
index 7543d134f0d9..4754f469a10d 100644
--- a/metadata/md5-cache/dev-perl/Sub-Uplevel-0.280.0
+++ b/metadata/md5-cache/dev-perl/Sub-Uplevel-0.280.0
@@ -4,10 +4,10 @@ DESCRIPTION=Apparently run a function in a higher stack frame
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Sub-Uplevel/
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-0.2800.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=053abf429185fbd0a3bda36949188fcb
+_md5_=15a3bc219f8e189d5af5878dfbbfc25a
diff --git a/metadata/md5-cache/dev-perl/Term-ProgressBar-2.170.0 b/metadata/md5-cache/dev-perl/Term-ProgressBar-2.170.0
index 6cca19d2deae..5ffd851c8cbd 100644
--- a/metadata/md5-cache/dev-perl/Term-ProgressBar-2.170.0
+++ b/metadata/md5-cache/dev-perl/Term-ProgressBar-2.170.0
@@ -4,10 +4,10 @@ DESCRIPTION=Perl module for Term-ProgressBar
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Term-ProgressBar/
 IUSE=test
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-linux
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-MethodMaker dev-perl/TermReadKey dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SZ/SZABGAB/Term-ProgressBar-2.17.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=15d1ee78eb2a5873eccd671afa0e3d02
+_md5_=c7824a9053d30d572f7e130dbdf83676
diff --git a/metadata/md5-cache/dev-perl/Test-MockModule-0.110.0 b/metadata/md5-cache/dev-perl/Test-MockModule-0.110.0
index fe8b5247c193..1b86c86aecd4 100644
--- a/metadata/md5-cache/dev-perl/Test-MockModule-0.110.0
+++ b/metadata/md5-cache/dev-perl/Test-MockModule-0.110.0
@@ -4,10 +4,10 @@ DESCRIPTION=Override subroutines in a module for unit testing
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Test-MockModule/
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/SUPER virtual/perl-Scalar-List-Utils dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-0.11.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=473bbc657b9f0755222146b32aa3a257
+_md5_=f46b55c54582b514604bf8cbe797bec9
diff --git a/metadata/md5-cache/dev-perl/Tk-TableMatrix-1.230.0-r1 b/metadata/md5-cache/dev-perl/Tk-TableMatrix-1.230.0-r1
index 072ed8b4d971..232cdba3b37a 100644
--- a/metadata/md5-cache/dev-perl/Tk-TableMatrix-1.230.0-r1
+++ b/metadata/md5-cache/dev-perl/Tk-TableMatrix-1.230.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-perl/Tk dev-lang/perl:=[-build(-)]
 DESCRIPTION=Perl module for Tk-TableMatrix
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Tk-TableMatrix/
-KEYWORDS=alpha amd64 ia64 ppc sparc x86
+KEYWORDS=alpha amd64 ~arm ia64 ppc sparc x86
 LICENSE=Artistic
 RDEPEND=dev-perl/Tk dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CE/CERNEY/Tk-TableMatrix-1.23.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=6cc137f0f54e86af23621ec28848f7cc
+_md5_=e7fc98f10e15156ef2f7b313600974ae
diff --git a/metadata/md5-cache/dev-perl/XML-Parser-Lite-0.721.0 b/metadata/md5-cache/dev-perl/XML-Parser-Lite-0.721.0
index 14b73373eb70..aa4fad9e74c8 100644
--- a/metadata/md5-cache/dev-perl/XML-Parser-Lite-0.721.0
+++ b/metadata/md5-cache/dev-perl/XML-Parser-Lite-0.721.0
@@ -4,10 +4,10 @@ DESCRIPTION=Lightweight regexp-based XML parser
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/XML-Parser-Lite/
 IUSE=test minimal
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/XML-Parser-Lite-0.721.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=130849d994924c4de336c5b8bf4ba088
+_md5_=c052f6d32adc05d1726a7a6929fddb17
diff --git a/metadata/md5-cache/dev-perl/XML-SAX-Base-1.90.0 b/metadata/md5-cache/dev-perl/XML-SAX-Base-1.90.0
index 0dd0ad98ef82..bd61da0af428 100644
--- a/metadata/md5-cache/dev-perl/XML-SAX-Base-1.90.0
+++ b/metadata/md5-cache/dev-perl/XML-SAX-Base-1.90.0
@@ -4,10 +4,10 @@ DESCRIPTION=Base class SAX Drivers and Filters
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/XML-SAX-Base/
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/XML-SAX-0.990.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-Base-1.09.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=3e37bfeb266d0b52ee5faf5ce8c45768
+_md5_=4beecad0e3231697ae6de8d9f8803d4b
diff --git a/metadata/md5-cache/dev-perl/XML-TreePP-0.430.0 b/metadata/md5-cache/dev-perl/XML-TreePP-0.430.0
index 94e0b5adc0d0..5ef0aaeafd66 100644
--- a/metadata/md5-cache/dev-perl/XML-TreePP-0.430.0
+++ b/metadata/md5-cache/dev-perl/XML-TreePP-0.430.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=[-build(-)]
 DESCRIPTION=Pure Perl implementation for parsing/writing XML documents
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/XML-TreePP/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KAWASAKI/XML-TreePP-0.43.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=1bb461b2b6a4241bdcca902e69b8db14
+_md5_=0e7c5a15d7697713c638fe9ea141c608
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 17300c689226..ed32ed1b7dbd 100644
--- a/metadata/md5-cache/dev-php/Manifest.gz
+++ b/metadata/md5-cache/dev-php/Manifest.gz
diff --git a/metadata/md5-cache/dev-php/composer-1.5.2-r1 b/metadata/md5-cache/dev-php/composer-1.5.5
index f63833378bcc..0fe7362fe9f4 100644
--- a/metadata/md5-cache/dev-php/composer-1.5.2-r1
+++ b/metadata/md5-cache/dev-php/composer-1.5.5
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-lang/php:*[curl] >=dev-php/ca-bundle-1.0.0 >=dev-php/cli-prompt-1.0.0 >=dev-php/psr-log-1.0.2 dev-php/fedora-autoloader >=dev-php/json-schema-3.0.0 >=dev-php/jsonlint-1.4.0 >=dev-php/phar-utils-1.0.0 >=dev-php/semver-1.0.0 >=dev-php/spdx-licenses-1.0.0 >=dev-php/symfony-console-2.7.9 >=dev-php/symfony-filesystem-2.7.20 >=dev-php/symfony-finder-2.7.20 >=dev-php/symfony-process-2.8.12
 SLOT=0
-SRC_URI=https://github.com/composer/composer/archive/1.5.2.tar.gz -> composer-1.5.2.tar.gz
+SRC_URI=https://github.com/composer/composer/archive/1.5.5.tar.gz -> composer-1.5.5.tar.gz
 _md5_=4aedb58adb91ff12648cdf83ab39ddce
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 841bca8ce668..038dd3d75795 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/contextlib2-0.5.5 b/metadata/md5-cache/dev-python/contextlib2-0.5.5
index 563a7865cc32..d9196e727457 100644
--- a/metadata/md5-cache/dev-python/contextlib2-0.5.5
+++ b/metadata/md5-cache/dev-python/contextlib2-0.5.5
@@ -4,11 +4,11 @@ DESCRIPTION=Backports and enhancements for the contextlib module
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/contextlib2
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~x86
 LICENSE=PSF-2.4
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/contextlib2/contextlib2-0.5.5.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_=d6804a58fc2cdaf4c10f531f8d6a8404
+_md5_=afd55c9863662e5da81977b2da8843ce
diff --git a/metadata/md5-cache/dev-python/denonavr-0.5.3 b/metadata/md5-cache/dev-python/denonavr-0.5.5
index 4f4004c08a89..3cbbe48eb5f9 100644
--- a/metadata/md5-cache/dev-python/denonavr-0.5.3
+++ b/metadata/md5-cache/dev-python/denonavr-0.5.5
@@ -9,6 +9,6 @@ LICENSE=MIT
 RDEPEND=dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-SRC_URI=https://github.com/scarface-4711/denonavr/archive/0.5.3.tar.gz -> denonavr-0.5.3.tar.gz
+SRC_URI=mirror://pypi/d/denonavr/denonavr-0.5.5.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_=27577881aaea572a7299a2a5e968d821
+_md5_=6f968079c7fbc3c1df901aa7721bc0d8
diff --git a/metadata/md5-cache/dev-python/detox-0.11 b/metadata/md5-cache/dev-python/detox-0.11
new file mode 100644
index 000000000000..db1cd7f3b6d1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/detox-0.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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(-)] test? ( 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/py-1.4.27[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/eventlet-0.15.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/tox-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/pytest[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(-)]
+DESCRIPTION=distributed tox
+EAPI=6
+HOMEPAGE=https://github.com/tox-dev/detox https://pypi.python.org/pypi/detox
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=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/py-1.4.27[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/eventlet-0.15.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/tox-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 )
+SLOT=0
+SRC_URI=mirror://pypi/d/detox/detox-0.11.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_=32e6a5d2af8925c027326ede79e86dbf
diff --git a/metadata/md5-cache/dev-python/libzilla-1.3 b/metadata/md5-cache/dev-python/libzilla-1.3
index c23fb2393b76..918a40cffc22 100644
--- a/metadata/md5-cache/dev-python/libzilla-1.3
+++ b/metadata/md5-cache/dev-python/libzilla-1.3
@@ -4,11 +4,11 @@ DESCRIPTION=Library for managing Bugzilla bug reports from the CLI
 EAPI=6
 HOMEPAGE=https://github.com/monsieurp/libzilla
 IUSE=python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 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(-)]
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/monsieurp/libzilla/archive/v1.3.zip -> libzilla-1.3.zip
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4c25fdad5e8711e6ca78ddec28295cff
+_md5_=b24db6f3c2ca736b6230558011ff125b
diff --git a/metadata/md5-cache/dev-python/libzilla-1.4 b/metadata/md5-cache/dev-python/libzilla-1.4
new file mode 100644
index 000000000000..efda211adc4a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/libzilla-1.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/docopt[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Library for managing Bugzilla bug reports from the CLI
+EAPI=6
+HOMEPAGE=https://github.com/monsieurp/libzilla
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/monsieurp/libzilla/archive/v1.4.tar.gz -> libzilla-1.4.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_=35c67625dede2d8b2244387cd6f47160
diff --git a/metadata/md5-cache/dev-python/pytables-3.1.1-r2 b/metadata/md5-cache/dev-python/pytables-3.1.1-r2
deleted file mode 100644
index 1fab824aa81d..000000000000
--- a/metadata/md5-cache/dev-python/pytables-3.1.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/bzip2:0= dev-libs/c-blosc:0=[hdf5] dev-libs/lzo:2= dev-python/numpy[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/numexpr[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(-)] sci-libs/hdf5:0= >=dev-python/cython-0.14[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[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=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=Hierarchical datasets for Python
-EAPI=5
-HOMEPAGE=http://www.pytables.org/
-IUSE=doc examples python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=app-arch/bzip2:0= dev-libs/c-blosc:0=[hdf5] dev-libs/lzo:2= dev-python/numpy[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/numexpr[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(-)] sci-libs/hdf5:0= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=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 )
-SLOT=0
-SRC_URI=mirror://pypi/t/tables/tables-3.1.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8c5b889c0b45d8b0f124377d8f56a7df
diff --git a/metadata/md5-cache/dev-python/pytest-fixture-config-1.2.11 b/metadata/md5-cache/dev-python/pytest-fixture-config-1.2.11
index 39408c31564d..bcdb930cd1f5 100644
--- a/metadata/md5-cache/dev-python/pytest-fixture-config-1.2.11
+++ b/metadata/md5-cache/dev-python/pytest-fixture-config-1.2.11
@@ -4,11 +4,11 @@ DESCRIPTION=Virtualenv fixture for py.test
 EAPI=6
 HOMEPAGE=https://github.com/manahl/pytest-plugins https://pypi.python.org/pypi/pytest-fixture-config
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~ia64 ~mips ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-fixture-config/pytest-fixture-config-1.2.11.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_=df9bf0ca867de4778c02af6b93b3c946
+_md5_=b4b60947905e9d142f01075aa4b71085
diff --git a/metadata/md5-cache/dev-python/pytest-shutil-1.2.11 b/metadata/md5-cache/dev-python/pytest-shutil-1.2.11
index a53481579110..700930e794d3 100644
--- a/metadata/md5-cache/dev-python/pytest-shutil-1.2.11
+++ b/metadata/md5-cache/dev-python/pytest-shutil-1.2.11
@@ -4,11 +4,11 @@ DESCRIPTION=A goodie-bag of unix shell and environment tools for py.test
 EAPI=6
 HOMEPAGE=https://github.com/manahl/pytest-plugins https://pypi.python.org/pypi/pytest-shutil
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~ia64 ~mips ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/execnet[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/contextlib2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/path-py[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-shutil/pytest-shutil-1.2.11.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_=2d87e22ef80ec3a35615d5fe71ab3153
+_md5_=a51c41f53e032e9d85bad8e77226fff6
diff --git a/metadata/md5-cache/dev-python/pytest-virtualenv-1.2.11 b/metadata/md5-cache/dev-python/pytest-virtualenv-1.2.11
index a30fcabcbb1b..0178ac3c7130 100644
--- a/metadata/md5-cache/dev-python/pytest-virtualenv-1.2.11
+++ b/metadata/md5-cache/dev-python/pytest-virtualenv-1.2.11
@@ -4,11 +4,11 @@ DESCRIPTION=Virtualenv fixture for py.test
 EAPI=6
 HOMEPAGE=https://github.com/manahl/pytest-plugins https://pypi.python.org/pypi/pytest-virtualenv
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~ia64 ~mips ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/pytest-fixture-config[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-shutil[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/virtualenv[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-virtualenv/pytest-virtualenv-1.2.11.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_=234960136cfd260a637a17bfb7ffe39c
+_md5_=9d131e6395dc2f383265a5e8e9c433f7
diff --git a/metadata/md5-cache/dev-python/regex-2017.04.05 b/metadata/md5-cache/dev-python/regex-2017.04.05
index 9a7f33c3d152..76742a3508d6 100644
--- a/metadata/md5-cache/dev-python/regex-2017.04.05
+++ b/metadata/md5-cache/dev-python/regex-2017.04.05
@@ -4,11 +4,11 @@ DESCRIPTION=Alternative regular expression module to replace re
 EAPI=5
 HOMEPAGE=https://bitbucket.org/mrabarnett/mrab-regex
 IUSE=doc python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/regex/regex-2017.04.05.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c98d635ecc121179b28bcabe6f042d75
+_md5_=6579288d268fa5970640d70c520e654f
diff --git a/metadata/md5-cache/dev-python/rfc3987-1.3.7 b/metadata/md5-cache/dev-python/rfc3987-1.3.7
index 54cff050f5bd..d6574391c5e6 100644
--- a/metadata/md5-cache/dev-python/rfc3987-1.3.7
+++ b/metadata/md5-cache/dev-python/rfc3987-1.3.7
@@ -4,11 +4,11 @@ DESCRIPTION=Parsing and validation of URIs (RFC 3986) and IRIs (RFC 3987)
 EAPI=5
 HOMEPAGE=https://github.com/dgerber/rfc3987 https://pypi.python.org/pypi/rfc3987
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=python_targets_pypy? ( dev-python/regex[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python2_7? ( dev-python/regex[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-python/regex[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-python/regex[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-python/regex[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3987/rfc3987-1.3.7.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3201966d189ba34eb9b7a28b0403c8b0
+_md5_=c95f13eed04763a789814f227452aae8
diff --git a/metadata/md5-cache/dev-python/rst-linker-1.9-r1 b/metadata/md5-cache/dev-python/rst-linker-1.9-r1
index c1f689f01abb..4d6791f61213 100644
--- a/metadata/md5-cache/dev-python/rst-linker-1.9-r1
+++ b/metadata/md5-cache/dev-python/rst-linker-1.9-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Sphinx plugin to add links and timestamps to the changelog
 EAPI=6
 HOMEPAGE=https://github.com/jaraco/rst.linker
 IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/python-dateutil[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rst.linker/rst.linker-1.9.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_=a0ece7d33f3b8faa39772a4fc56c8ba8
+_md5_=f218dba531f4f6265bcdba9e7d415443
diff --git a/metadata/md5-cache/dev-python/setuptools-36.7.2 b/metadata/md5-cache/dev-python/setuptools-36.7.2
index ad7f7254e62b..3e429c09b558 100644
--- a/metadata/md5-cache/dev-python/setuptools-36.7.2
+++ b/metadata/md5-cache/dev-python/setuptools-36.7.2
@@ -4,7 +4,7 @@ DESCRIPTION=Collection of extensions to Distutils
 EAPI=6
 HOMEPAGE=https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~ia64 ~mips ~ppc ~ppc64 ~x86
 LICENSE=MIT
 PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools/setuptools-36.7.2.zip
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=79ddcb2a3275256526bb75add0427aef
+_md5_=95d246a8afe6ec3295b4faa19fa065b8
diff --git a/metadata/md5-cache/dev-python/setuptools-git-1.2 b/metadata/md5-cache/dev-python/setuptools-git-1.2
index ff9d6f52b1ba..1cc20503b728 100644
--- a/metadata/md5-cache/dev-python/setuptools-git-1.2
+++ b/metadata/md5-cache/dev-python/setuptools-git-1.2
@@ -4,11 +4,11 @@ DESCRIPTION=Setuptools revision control system plugin for Git
 EAPI=6
 HOMEPAGE=https://github.com/wichert/setuptools-git
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~ia64 ~mips ~ppc ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-vcs/git python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools-git/setuptools-git-1.2.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_=afbeefd773dcc3bc25c96c4b5ea06779
+_md5_=006eb6641c24402176039230b0bb18f6
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index c4931a01797b..034286c13dcc 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/multi_xml-0.5.5 b/metadata/md5-cache/dev-ruby/multi_xml-0.5.5
index 93511d1275d7..c8c45ad41f7d 100644
--- a/metadata/md5-cache/dev-ruby/multi_xml-0.5.5
+++ b/metadata/md5-cache/dev-ruby/multi_xml-0.5.5
@@ -4,11 +4,11 @@ DESCRIPTION=A generic swappable back-end for XML parsing
 EAPI=5
 HOMEPAGE=http://rdoc.info/gems/multi_xml
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/multi_xml-0.5.5.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=35be36ac0c97c984099641fa61dc6f67
+_md5_=f5a95ef9c70cc6f9c1e6d46ad9cc6be8
diff --git a/metadata/md5-cache/dev-ruby/ox-2.6.0 b/metadata/md5-cache/dev-ruby/ox-2.6.0
index a3d4795c2021..2e486eef5db7 100644
--- a/metadata/md5-cache/dev-ruby/ox-2.6.0
+++ b/metadata/md5-cache/dev-ruby/ox-2.6.0
@@ -4,11 +4,11 @@ DESCRIPTION=A fast XML parser and Object marshaller
 EAPI=6
 HOMEPAGE=http://www.ohler.com/ox/ https://github.com/ohler55/ox
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/ohler55/ox/archive/v2.6.0.tar.gz -> ox-2.6.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=101a8712b7dfa29f69a6db245410db19
+_md5_=01d70ad3dc3de1e532e9e2a5caebfd37
diff --git a/metadata/md5-cache/dev-ruby/ox-2.7.0 b/metadata/md5-cache/dev-ruby/ox-2.7.0
deleted file mode 100644
index bb8c5ba1e714..000000000000
--- a/metadata/md5-cache/dev-ruby/ox-2.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A fast XML parser and Object marshaller
-EAPI=6
-HOMEPAGE=http://www.ohler.com/ox/ https://github.com/ohler55/ox
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=BSD
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=https://github.com/ohler55/ox/archive/v2.7.0.tar.gz -> ox-2.7.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d35187b7de99bc32a9aefe993e80065c
diff --git a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.8 b/metadata/md5-cache/dev-ruby/rb-inotify-0.9.8
deleted file mode 100644
index c38e7da7b275..000000000000
--- a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( virtual/ruby-ffi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ffi[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A thorough inotify wrapper for Ruby using FFI
-EAPI=5
-HOMEPAGE=https://github.com/nex3/rb-inotify
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( virtual/ruby-ffi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ffi[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/rb-inotify-0.9.8.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=14de6a5c6279f1fb2b21564e59a44a48
diff --git a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.9 b/metadata/md5-cache/dev-ruby/rb-inotify-0.9.9
deleted file mode 100644
index 5f9bd3b6102c..000000000000
--- a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( virtual/ruby-ffi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ffi[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A thorough inotify wrapper for Ruby using FFI
-EAPI=5
-HOMEPAGE=https://github.com/nex3/rb-inotify
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( virtual/ruby-ffi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ffi[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/rb-inotify-0.9.9.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=57f19e85fb7ae45a0a3f03ef9e0eced2
diff --git a/metadata/md5-cache/dev-ruby/ox-2.5.0 b/metadata/md5-cache/dev-ruby/tins-1.16.0
index 7e37b68ca146..a8ec25a9c1e6 100644
--- a/metadata/md5-cache/dev-ruby/ox-2.5.0
+++ b/metadata/md5-cache/dev-ruby/tins-1.16.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A fast XML parser and Object marshaller
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=All the stuff that isn't good enough for a real library
 EAPI=6
-HOMEPAGE=http://www.ohler.com/ox/ https://github.com/ohler55/ox
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=BSD
+HOMEPAGE=https://github.com/flori/tins
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
-SRC_URI=https://github.com/ohler55/ox/archive/v2.5.0.tar.gz -> ox-2.5.0.tar.gz
+SRC_URI=mirror://rubygems/tins-1.16.0.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=101a8712b7dfa29f69a6db245410db19
+_md5_=55902b14f80b493c512b9c16bdb05264
diff --git a/metadata/md5-cache/dev-ruby/uglifier-4.0.1 b/metadata/md5-cache/dev-ruby/uglifier-4.0.1
new file mode 100644
index 000000000000..c8c8e164babf
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/uglifier-4.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Ruby wrapper for UglifyJS JavaScript compressor
+EAPI=6
+HOMEPAGE=https://github.com/lautis/uglifier
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~amd64-linux
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=4
+SRC_URI=https://github.com/lautis/uglifier/archive/v4.0.1.tar.gz -> uglifier-4.0.1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f94b61d75f645d4f05f907b0cbcc9140
diff --git a/metadata/md5-cache/dev-ruby/yard-0.9.8 b/metadata/md5-cache/dev-ruby/yard-0.9.8
deleted file mode 100644
index 89603be1ee9d..000000000000
--- a/metadata/md5-cache/dev-ruby/yard-0.9.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby22] dev-ruby/rdiscount[ruby_targets_ruby22] dev-ruby/bluecloth[ruby_targets_ruby22] dev-ruby/kramdown[ruby_targets_ruby22] ) ) ) ruby_targets_ruby23? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby23] dev-ruby/rdiscount[ruby_targets_ruby23] dev-ruby/bluecloth[ruby_targets_ruby23] dev-ruby/kramdown[ruby_targets_ruby23] ) ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/ruby-gettext-2.3.8[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Documentation generation tool for the Ruby programming language
-EAPI=5
-HOMEPAGE=http://yardoc.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=https://github.com/lsegal/yard/archive/v0.9.8.tar.gz -> yard-0.9.8-git.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9f48c0af79adc4c45df47e38b5314478
diff --git a/metadata/md5-cache/dev-ruby/yard-0.9.9 b/metadata/md5-cache/dev-ruby/yard-0.9.9
deleted file mode 100644
index 85c99b44a67c..000000000000
--- a/metadata/md5-cache/dev-ruby/yard-0.9.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby22] dev-ruby/rdiscount[ruby_targets_ruby22] dev-ruby/bluecloth[ruby_targets_ruby22] dev-ruby/kramdown[ruby_targets_ruby22] ) ) ) ruby_targets_ruby23? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby23] dev-ruby/rdiscount[ruby_targets_ruby23] dev-ruby/bluecloth[ruby_targets_ruby23] dev-ruby/kramdown[ruby_targets_ruby23] ) ) ) ruby_targets_ruby24? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby24] dev-ruby/rdiscount[ruby_targets_ruby24] dev-ruby/bluecloth[ruby_targets_ruby24] dev-ruby/kramdown[ruby_targets_ruby24] ) ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/ruby-gettext-2.3.8[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/ruby-gettext-2.3.8[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Documentation generation tool for the Ruby programming language
-EAPI=6
-HOMEPAGE=http://yardoc.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=https://github.com/lsegal/yard/archive/v0.9.9.tar.gz -> yard-0.9.9-git.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=4ec1bf0fba1144159cdb92f005a30639
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 1824fd44b1a1..f3e5cdecaf84 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/cpptest-1.1.2 b/metadata/md5-cache/dev-util/cpptest-1.1.2
index d70a39a32773..df56e10f68f0 100644
--- a/metadata/md5-cache/dev-util/cpptest-1.1.2
+++ b/metadata/md5-cache/dev-util/cpptest-1.1.2
@@ -4,9 +4,9 @@ DESCRIPTION=Simple but powerful unit testing framework for C++
 EAPI=4
 HOMEPAGE=http://cpptest.sourceforge.net/
 IUSE=doc
-KEYWORDS=amd64 ppc ppc64 x86
+KEYWORDS=amd64 ~arm ppc ppc64 x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/cpptest/cpptest-1.1.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=84bc746d4dd800fbc8a490b64cf944c1
+_md5_=0023da47b96dcf0a8a7a59c68cd6e156
diff --git a/metadata/md5-cache/dev-util/intltool-0.51.0-r2 b/metadata/md5-cache/dev-util/intltool-0.51.0-r2
index 93e0b583b14e..a7f0a168aeb6 100644
--- a/metadata/md5-cache/dev-util/intltool-0.51.0-r2
+++ b/metadata/md5-cache/dev-util/intltool-0.51.0-r2
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl dev-perl/XML-Parser
 DESCRIPTION=Internationalization Tool Collection
 EAPI=6
 HOMEPAGE=https://launchpad.net/intltool/
-KEYWORDS=alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-perl/XML-Parser sys-devel/gettext
 SLOT=0
 SRC_URI=https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz
-_md5_=7a6df493d56533cf1eb8e7983580c6e4
+_md5_=3b1a8aca4ab6b41460b2687732a0e086
diff --git a/metadata/md5-cache/dev-util/patchbin-20160208 b/metadata/md5-cache/dev-util/patchbin-20160208
index f8787c4f95a9..098fe3205bbd 100644
--- a/metadata/md5-cache/dev-util/patchbin-20160208
+++ b/metadata/md5-cache/dev-util/patchbin-20160208
@@ -3,9 +3,9 @@ DESCRIPTION=Apply binary patches without git
 EAPI=6
 HOMEPAGE=https://github.com/wine-compholio/wine-staging
 IUSE=userland_BSD userland_GNU
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=app-shells/bash sys-apps/coreutils sys-apps/gawk sys-apps/grep userland_BSD? ( sys-freebsd/freebsd-bin sys-freebsd/freebsd-ubin ) userland_GNU? ( sys-apps/util-linux sys-devel/patch )
 SLOT=0
 SRC_URI=https://github.com/wine-compholio/wine-staging/archive/4ffcf184bb71c6c3512b3a8c144dcf4a3a76d23c.tar.gz -> patchbin-20160208.tar.gz
-_md5_=3f91eb7636e6d9439a274461e5adab81
+_md5_=3b34159ea7bc7e81a182cfe2a54c0db0
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index a2921607f350..761df313be6e 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/higan-094 b/metadata/md5-cache/games-emulation/higan-094
index 8da9d4245399..f5cf057957bf 100644
--- a/metadata/md5-cache/games-emulation/higan-094
+++ b/metadata/md5-cache/games-emulation/higan-094
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext ao? ( media-libs/libao ) openal? ( media-libs/openal ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) xv? ( x11-libs/libXv ) opengl? ( virtual/opengl ) sdl? ( media-libs/libsdl[X,joystick,video] ) udev? ( virtual/udev ) !qt4? ( x11-libs/gtk+:2 ) qt4? ( >=dev-qt/qtgui-4.5:4 ) virtual/pkgconfig >=sys-apps/sed-4
+DEPEND=x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext ao? ( media-libs/libao ) openal? ( media-libs/openal ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) xv? ( x11-libs/libXv ) opengl? ( virtual/opengl ) sdl? ( media-libs/libsdl[X,joystick,video] ) udev? ( virtual/udev ) virtual/pkgconfig >=sys-apps/sed-4
 DESCRIPTION=A Nintendo multi-system emulator formerly known as bsnes
 EAPI=5
 HOMEPAGE=http://byuu.org/higan/ https://code.google.com/p/higan/
-IUSE=ao +alsa openal opengl oss profile_accuracy +profile_balanced profile_performance pulseaudio qt4 +sdl udev xv
+IUSE=ao +alsa openal opengl oss profile_accuracy +profile_balanced profile_performance pulseaudio +sdl udev xv
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=x11-libs/libX11 x11-libs/libXext ao? ( media-libs/libao ) openal? ( media-libs/openal ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) xv? ( x11-libs/libXv ) opengl? ( virtual/opengl ) sdl? ( media-libs/libsdl[X,joystick,video] ) udev? ( virtual/udev ) !qt4? ( x11-libs/gtk+:2 ) qt4? ( >=dev-qt/qtgui-4.5:4 ) games-misc/games-envd
+RDEPEND=x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext ao? ( media-libs/libao ) openal? ( media-libs/openal ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) xv? ( x11-libs/libXv ) opengl? ( virtual/opengl ) sdl? ( media-libs/libsdl[X,joystick,video] ) udev? ( virtual/udev ) games-misc/games-envd
 REQUIRED_USE=|| ( ao openal alsa pulseaudio oss ) || ( xv opengl sdl ) || ( profile_accuracy profile_balanced profile_performance )
 SLOT=0
 SRC_URI=http://byuu.org/files/higan_v094-source.tar.xz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b3bf7cebd246024299c4d9b5ec33867d
+_md5_=3e2ae60ca041dda624d716741ba225a2
diff --git a/metadata/md5-cache/games-emulation/higan-099 b/metadata/md5-cache/games-emulation/higan-099
index 64cc7265dbac..ff7ebaa7e45b 100644
--- a/metadata/md5-cache/games-emulation/higan-099
+++ b/metadata/md5-cache/games-emulation/higan-099
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext icarus? ( x11-libs/gtksourceview:2.0 x11-libs/gtk+:2 x11-libs/pango dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf dev-libs/glib:2 media-libs/fontconfig media-libs/freetype ) ao? ( media-libs/libao ) openal? ( media-libs/openal ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) xv? ( x11-libs/libXv ) opengl? ( virtual/opengl ) sdl? ( media-libs/libsdl[X,joystick,video] ) udev? ( virtual/udev ) !qt4? ( x11-libs/gtk+:2 ) qt4? ( dev-qt/qtcore:4 >=dev-qt/qtgui-4.5:4 ) app-arch/p7zip virtual/pkgconfig >=sys-apps/sed-4
+DEPEND=x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext icarus? ( x11-libs/gtksourceview:2.0 x11-libs/gtk+:2 x11-libs/pango dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf dev-libs/glib:2 media-libs/fontconfig media-libs/freetype ) ao? ( media-libs/libao ) openal? ( media-libs/openal ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) xv? ( x11-libs/libXv ) opengl? ( virtual/opengl ) sdl? ( media-libs/libsdl[X,joystick,video] ) udev? ( virtual/udev ) app-arch/p7zip virtual/pkgconfig >=sys-apps/sed-4
 DESCRIPTION=A Nintendo multi-system emulator formerly known as bsnes
 EAPI=5
 HOMEPAGE=http://byuu.org/higan/ https://code.google.com/p/higan/
-IUSE=ao +alsa +icarus openal opengl oss pulseaudio qt4 +sdl udev xv
+IUSE=ao +alsa +icarus openal opengl oss pulseaudio +sdl udev xv
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=x11-libs/libX11 x11-libs/libXext icarus? ( x11-libs/gtksourceview:2.0 x11-libs/gtk+:2 x11-libs/pango dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf dev-libs/glib:2 media-libs/fontconfig media-libs/freetype ) ao? ( media-libs/libao ) openal? ( media-libs/openal ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) xv? ( x11-libs/libXv ) opengl? ( virtual/opengl ) sdl? ( media-libs/libsdl[X,joystick,video] ) udev? ( virtual/udev ) !qt4? ( x11-libs/gtk+:2 ) qt4? ( dev-qt/qtcore:4 >=dev-qt/qtgui-4.5:4 ) games-misc/games-envd
+RDEPEND=x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext icarus? ( x11-libs/gtksourceview:2.0 x11-libs/gtk+:2 x11-libs/pango dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf dev-libs/glib:2 media-libs/fontconfig media-libs/freetype ) ao? ( media-libs/libao ) openal? ( media-libs/openal ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) xv? ( x11-libs/libXv ) opengl? ( virtual/opengl ) sdl? ( media-libs/libsdl[X,joystick,video] ) udev? ( virtual/udev ) games-misc/games-envd
 REQUIRED_USE=|| ( ao openal alsa pulseaudio oss ) || ( xv opengl sdl )
 SLOT=0
 SRC_URI=http://download.byuu.org/higan_v099-source.7z
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6d23b4c9a7df81c087f7c9456dae25f2
+_md5_=76b9de0340e1d1e2990a56bee4a4433c
diff --git a/metadata/md5-cache/games-emulation/mupen64plus-1.5-r1 b/metadata/md5-cache/games-emulation/mupen64plus-1.5-r1
deleted file mode 100644
index 3734253ff92e..000000000000
--- a/metadata/md5-cache/games-emulation/mupen64plus-1.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=virtual/opengl media-libs/freetype:2 media-libs/libpng media-libs/libsdl media-libs/sdl-ttf sys-libs/zlib x11-libs/gtk+:2 libsamplerate? ( media-libs/libsamplerate ) lirc? ( app-misc/lirc ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 ) app-arch/xz-utils dev-lang/yasm virtual/pkgconfig
-DESCRIPTION=A fork of Mupen64 Nintendo 64 emulator
-EAPI=2
-HOMEPAGE=http://www.mupen64plus.org/
-IUSE=+gtk libsamplerate lirc qt4 cpu_flags_x86_sse
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/opengl media-libs/freetype:2 media-libs/libpng media-libs/libsdl media-libs/sdl-ttf sys-libs/zlib x11-libs/gtk+:2 libsamplerate? ( media-libs/libsamplerate ) lirc? ( app-misc/lirc ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 ) app-arch/xz-utils games-misc/games-envd
-SLOT=0
-SRC_URI=https://mupen64plus.googlecode.com/files/Mupen64Plus-1-5-src.tar.gz mirror://gentoo/mupen64plus-1.5-patches-20091123.tar.bz2
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=dffbea1868b76e29bfa92583ed8da4cc
diff --git a/metadata/md5-cache/games-emulation/mupen64plus-1.5-r2 b/metadata/md5-cache/games-emulation/mupen64plus-1.5-r2
deleted file mode 100644
index a3ef95b6b557..000000000000
--- a/metadata/md5-cache/games-emulation/mupen64plus-1.5-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=virtual/opengl media-libs/freetype:2 media-libs/libpng media-libs/libsdl media-libs/sdl-ttf media-fonts/dejavu sys-libs/zlib[minizip] x11-libs/gtk+:2 libsamplerate? ( media-libs/libsamplerate ) lirc? ( app-misc/lirc ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 ) app-arch/xz-utils dev-lang/yasm virtual/pkgconfig
-DESCRIPTION=A fork of Mupen64 Nintendo 64 emulator
-EAPI=2
-HOMEPAGE=http://www.mupen64plus.org/
-IUSE=+gtk libsamplerate lirc qt4 cpu_flags_x86_sse
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/opengl media-libs/freetype:2 media-libs/libpng media-libs/libsdl media-libs/sdl-ttf media-fonts/dejavu sys-libs/zlib[minizip] x11-libs/gtk+:2 libsamplerate? ( media-libs/libsamplerate ) lirc? ( app-misc/lirc ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 ) app-arch/xz-utils games-misc/games-envd
-SLOT=0
-SRC_URI=https://mupen64plus.googlecode.com/files/Mupen64Plus-1-5-src.tar.gz mirror://gentoo/mupen64plus-1.5-patches-20100507.tar.bz2
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=cdf25be8052e4e5f14c711785d98c0d5
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 31030f03a45a..e4b142f0a804 100644
--- a/metadata/md5-cache/games-strategy/Manifest.gz
+++ b/metadata/md5-cache/games-strategy/Manifest.gz
diff --git a/metadata/md5-cache/games-strategy/freeorion-0.4.7.1-r1 b/metadata/md5-cache/games-strategy/freeorion-0.4.7.1-r1
new file mode 100644
index 000000000000..e2cc2056da68
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/freeorion-0.4.7.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-libs/boost-1.56:=[python,threads] media-libs/freealut media-libs/freetype media-libs/glew:* media-libs/libsdl2 >=media-libs/libogg-1.1.3 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] >=media-libs/libvorbis-1.1.2 media-libs/openal sci-physics/bullet sys-libs/zlib virtual/opengl !dev-games/gigi || ( >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DESCRIPTION=A free turn-based space empire and galactic conquest game
+EAPI=6
+HOMEPAGE=http://www.freeorion.org
+KEYWORDS=~amd64
+LICENSE=GPL-2 LGPL-2.1 CC-BY-SA-3.0
+RDEPEND=>=dev-libs/boost-1.56:=[python,threads] media-libs/freealut media-libs/freetype media-libs/glew:* media-libs/libsdl2 >=media-libs/libogg-1.1.3 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] >=media-libs/libvorbis-1.1.2 media-libs/openal sci-physics/bullet sys-libs/zlib virtual/opengl !dev-games/gigi
+SLOT=0
+SRC_URI=https://github.com/freeorion/freeorion/archive/v0.4.7.1.tar.gz -> freeorion-0.4.7.1.tar.gz
+_eclasses_=cmake-utils	485ec8c8e86e1c95f8f27515544a1aba	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=de604cee91ad8009e74b4cc956630c0e
diff --git a/metadata/md5-cache/games-strategy/freeorion-9999 b/metadata/md5-cache/games-strategy/freeorion-9999
index 96dc09bd4791..3e3488ea4a72 100644
--- a/metadata/md5-cache/games-strategy/freeorion-9999
+++ b/metadata/md5-cache/games-strategy/freeorion-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=dev-libs/boost-1.56[python,threads] media-libs/freealut media-libs/freetype media-libs/glew:* media-libs/libsdl2 >=media-libs/libogg-1.1.3 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] >=media-libs/libvorbis-1.1.2 media-libs/openal sci-physics/bullet sys-libs/zlib virtual/opengl !dev-games/gigi || ( >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
+DEPEND=>=dev-libs/boost-1.56:=[python,threads] media-libs/freealut media-libs/freetype media-libs/glew:* media-libs/libsdl2 >=media-libs/libogg-1.1.3 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] >=media-libs/libvorbis-1.1.2 media-libs/openal sci-physics/bullet sys-libs/zlib virtual/opengl !dev-games/gigi || ( >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=A free turn-based space empire and galactic conquest game
 EAPI=6
 HOMEPAGE=http://www.freeorion.org
 LICENSE=GPL-2 LGPL-2.1 CC-BY-SA-3.0
-RDEPEND=>=dev-libs/boost-1.56[python,threads] media-libs/freealut media-libs/freetype media-libs/glew:* media-libs/libsdl2 >=media-libs/libogg-1.1.3 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] >=media-libs/libvorbis-1.1.2 media-libs/openal sci-physics/bullet sys-libs/zlib virtual/opengl !dev-games/gigi
+RDEPEND=>=dev-libs/boost-1.56:=[python,threads] media-libs/freealut media-libs/freetype media-libs/glew:* media-libs/libsdl2 >=media-libs/libogg-1.1.3 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] >=media-libs/libvorbis-1.1.2 media-libs/openal sci-physics/bullet sys-libs/zlib virtual/opengl !dev-games/gigi
 SLOT=0
 _eclasses_=cmake-utils	485ec8c8e86e1c95f8f27515544a1aba	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d43cb6199a5176536bebf250ecd6879a
+_md5_=de604cee91ad8009e74b4cc956630c0e
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 8d786ec76619..c764b93b68f3 100644
--- a/metadata/md5-cache/kde-frameworks/Manifest.gz
+++ b/metadata/md5-cache/kde-frameworks/Manifest.gz
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs-4.14.37 b/metadata/md5-cache/kde-frameworks/kdelibs-4.14.37
index 794e65f39320..f379020de555 100644
--- a/metadata/md5-cache/kde-frameworks/kdelibs-4.14.37
+++ b/metadata/md5-cache/kde-frameworks/kdelibs-4.14.37
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm setup test unpack
-DEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.4.2 dev-libs/libdbusmenu-qt[qt4] dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtcore-4.8.5:4[qt3support?] media-libs/fontconfig media-libs/freetype:2 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt4] sys-libs/zlib virtual/jpeg:0 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-misc/shared-mime-info !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) acl? ( virtual/acl ) bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper:= ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) plasma? ( app-crypt/qca:2[qt4] >=dev-qt/qtsql-4.8.5:4[qt3support?] ) policykit? ( sys-auth/polkit-qt[qt4] ) spell? ( app-text/enchant:= ) ssl? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) doc? ( app-doc/doxygen ) nls? ( virtual/libintl ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.7.2 test? ( dev-util/cppunit ) dev-util/automoc virtual/pkgconfig >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) >=dev-qt/qtdeclarative-4.8.5:4 opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4
+DEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.4.2 dev-libs/libdbusmenu-qt[qt4] dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtcore-4.8.5:4[qt3support?] media-libs/fontconfig media-libs/freetype:2 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt4] sys-libs/zlib virtual/jpeg:0 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-misc/shared-mime-info !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) acl? ( virtual/acl ) bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper:= ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) plasma? ( app-crypt/qca:2[qt4] >=dev-qt/qtsql-4.8.5:4[qt3support?] ) policykit? ( sys-auth/polkit-qt[qt4] ) spell? ( app-text/enchant:= ) ssl? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) doc? ( app-doc/doxygen ) nls? ( virtual/libintl ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.7.2 test? ( dev-util/cppunit ) dev-util/automoc virtual/pkgconfig >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) >=dev-qt/qtdeclarative-4.8.5:4 dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4
 DESCRIPTION=Libraries needed for programs by KDE
 EAPI=6
 HOMEPAGE=https://www.kde.org/
-IUSE=cpu_flags_x86_3dnow acl altivec +bzip2 debug doc fam jpeg2k kerberos libressl lzma cpu_flags_x86_mmx nls openexr plasma +policykit qt3support spell cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf opengl test +handbook
+IUSE=cpu_flags_x86_3dnow acl altivec +bzip2 debug doc fam jpeg2k kerberos libressl lzma cpu_flags_x86_mmx nls openexr plasma +policykit qt3support spell cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf test +handbook
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 PDEPEND=x11-misc/xdg-utils handbook? ( kde-apps/khelpcenter:* ) policykit? ( kde-plasma/polkit-kde-agent )
-RDEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.4.2 dev-libs/libdbusmenu-qt[qt4] dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtcore-4.8.5:4[qt3support?] media-libs/fontconfig media-libs/freetype:2 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt4] sys-libs/zlib virtual/jpeg:0 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-misc/shared-mime-info !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) acl? ( virtual/acl ) bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper:= ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) plasma? ( app-crypt/qca:2[qt4] >=dev-qt/qtsql-4.8.5:4[qt3support?] ) policykit? ( sys-auth/polkit-qt[qt4] ) spell? ( app-text/enchant:= ) ssl? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !dev-qt/qtphonon >=app-crypt/gnupg-2.0.11 app-misc/ca-certificates kde-frameworks/kdelibs-env:4 sys-apps/dbus[X] x11-apps/iceauth x11-apps/rgb x11-misc/xdg-utils plasma? ( !sci-libs/plasma ) udev? ( app-misc/media-player-info ) udisks? ( sys-fs/udisks:2 ) upower? ( >=sys-power/upower-0.9.23 ) kde-frameworks/oxygen-icons >=dev-qt/qtdeclarative-4.8.5:4 opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4
-REQUIRED_USE=opengl? ( plasma ) udisks? ( udev ) upower? ( udev )
+RDEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.4.2 dev-libs/libdbusmenu-qt[qt4] dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtcore-4.8.5:4[qt3support?] media-libs/fontconfig media-libs/freetype:2 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt4] sys-libs/zlib virtual/jpeg:0 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-misc/shared-mime-info !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) acl? ( virtual/acl ) bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper:= ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) plasma? ( app-crypt/qca:2[qt4] >=dev-qt/qtsql-4.8.5:4[qt3support?] ) policykit? ( sys-auth/polkit-qt[qt4] ) spell? ( app-text/enchant:= ) ssl? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !dev-qt/qtphonon >=app-crypt/gnupg-2.0.11 app-misc/ca-certificates kde-frameworks/kdelibs-env:4 sys-apps/dbus[X] x11-apps/iceauth x11-apps/rgb x11-misc/xdg-utils plasma? ( !sci-libs/plasma ) udev? ( app-misc/media-player-info ) udisks? ( sys-fs/udisks:2 ) upower? ( >=sys-power/upower-0.9.23 ) kde-frameworks/oxygen-icons >=dev-qt/qtdeclarative-4.8.5:4 dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4
+REQUIRED_USE=udisks? ( udev ) upower? ( udev )
 RESTRICT=test
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kdelibs-4.14.37.tar.xz
 _eclasses_=cmake-utils	485ec8c8e86e1c95f8f27515544a1aba	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=19a80331ca933928d09e56d4ac9c6bd3
+_md5_=41d4e15fa4e92bf3463e65c6d54a18ff
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 6b538f3b4e68..81b39d19a8c6 100644
--- a/metadata/md5-cache/mail-client/Manifest.gz
+++ b/metadata/md5-cache/mail-client/Manifest.gz
diff --git a/metadata/md5-cache/mail-client/neomutt-9999 b/metadata/md5-cache/mail-client/neomutt-9999
index 824d4d47faa6..2a025423ce8a 100644
--- a/metadata/md5-cache/mail-client/neomutt-9999
+++ b/metadata/md5-cache/mail-client/neomutt-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
 SLOT=0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=19591f2b7052fd0080bf0c07fcc12f5a
+_md5_=784242e02ea228d211f462ea78474609
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index da1fd600d766..432076ee6ee3 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/kuickshow-0.9.1-r2 b/metadata/md5-cache/media-gfx/kuickshow-0.9.1-r2
deleted file mode 100644
index 5828fb299e5f..000000000000
--- a/metadata/md5-cache/media-gfx/kuickshow-0.9.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=media-libs/imlib >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.7.2 dev-util/automoc virtual/pkgconfig >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
-DESCRIPTION=KDE program to view images
-EAPI=6
-HOMEPAGE=https://userbase.kde.org/KuickShow
-IUSE=debug +handbook l10n_af l10n_ar l10n_be l10n_bg l10n_bn l10n_br l10n_ca l10n_ca-valencia l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_ga l10n_gl l10n_he l10n_hi l10n_hne l10n_hr l10n_hu l10n_is l10n_it l10n_ja l10n_km l10n_lt l10n_lv l10n_mai l10n_mk l10n_ms l10n_nb l10n_nds l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt l10n_pt-BR l10n_ro l10n_ru l10n_se l10n_sk l10n_sl l10n_sv l10n_ta l10n_tg l10n_th l10n_tr l10n_uk l10n_uz l10n_uz-Cyrl l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/imlib kde-frameworks/oxygen-icons l10n_af? ( >=kde-apps/kde4-l10n-4.4:4[l10n_af(+)] ) l10n_ar? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ar(+)] ) l10n_be? ( >=kde-apps/kde4-l10n-4.4:4[l10n_be(+)] ) l10n_bg? ( >=kde-apps/kde4-l10n-4.4:4[l10n_bg(+)] ) l10n_bn? ( >=kde-apps/kde4-l10n-4.4:4[l10n_bn(+)] ) l10n_br? ( >=kde-apps/kde4-l10n-4.4:4[l10n_br(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[l10n_cs(+)] ) l10n_cy? ( >=kde-apps/kde4-l10n-4.4:4[l10n_cy(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[l10n_en-GB(+)] ) l10n_eo? ( >=kde-apps/kde4-l10n-4.4:4[l10n_eo(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[l10n_et(+)] ) l10n_eu? ( >=kde-apps/kde4-l10n-4.4:4[l10n_eu(+)] ) l10n_fa? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fa(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_gl(+)] ) l10n_he? ( >=kde-apps/kde4-l10n-4.4:4[l10n_he(+)] ) l10n_hi? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hi(+)] ) l10n_hne? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hne(+)] ) l10n_hr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hu(+)] ) l10n_is? ( >=kde-apps/kde4-l10n-4.4:4[l10n_is(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ja(+)] ) l10n_km? ( >=kde-apps/kde4-l10n-4.4:4[l10n_km(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[l10n_lt(+)] ) l10n_lv? ( >=kde-apps/kde4-l10n-4.4:4[l10n_lv(+)] ) l10n_mai? ( >=kde-apps/kde4-l10n-4.4:4[l10n_mai(+)] ) l10n_mk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_mk(+)] ) l10n_ms? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ms(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nds(+)] ) l10n_ne? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ne(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nl(+)] ) l10n_nn? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nn(+)] ) l10n_oc? ( >=kde-apps/kde4-l10n-4.4:4[l10n_oc(+)] ) l10n_pa? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pa(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ru(+)] ) l10n_se? ( >=kde-apps/kde4-l10n-4.4:4[l10n_se(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sl(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sv(+)] ) l10n_ta? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ta(+)] ) l10n_tg? ( >=kde-apps/kde4-l10n-4.4:4[l10n_tg(+)] ) l10n_th? ( >=kde-apps/kde4-l10n-4.4:4[l10n_th(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_uk(+)] ) l10n_uz? ( >=kde-apps/kde4-l10n-4.4:4[l10n_uz(+)] ) l10n_uz-Cyrl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_uz-Cyrl(+)] ) l10n_vi? ( >=kde-apps/kde4-l10n-4.4:4[l10n_vi(+)] ) l10n_xh? ( >=kde-apps/kde4-l10n-4.4:4[l10n_xh(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[l10n_zh-TW(+)] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
-SLOT=4
-SRC_URI=mirror://kde/Attic/4.4.0/src/extragear/kuickshow-0.9.1-kde4.4.0.tar.bz2
-_eclasses_=cmake-utils	485ec8c8e86e1c95f8f27515544a1aba	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=af35ccd20619fa3c3b914ad7a4619bdd
diff --git a/metadata/md5-cache/media-gfx/kuickshow-0.9.1-r3 b/metadata/md5-cache/media-gfx/kuickshow-0.9.1-r3
new file mode 100644
index 000000000000..8c5fddfbc696
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/kuickshow-0.9.1-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=media-libs/imlib >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.7.2 dev-util/automoc virtual/pkgconfig >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
+DESCRIPTION=KDE program to view images
+EAPI=6
+HOMEPAGE=https://userbase.kde.org/KuickShow
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/imlib kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
+SLOT=4
+SRC_URI=mirror://kde/Attic/4.4.0/src/extragear/kuickshow-0.9.1-kde4.4.0.tar.bz2
+_eclasses_=cmake-utils	485ec8c8e86e1c95f8f27515544a1aba	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2858be985b4f4c061908e25b0845d8d8
diff --git a/metadata/md5-cache/media-gfx/sam2p-0.49.3 b/metadata/md5-cache/media-gfx/sam2p-0.49.3
index 8d6676ff2096..f0c5409c7efc 100644
--- a/metadata/md5-cache/media-gfx/sam2p-0.49.3
+++ b/metadata/md5-cache/media-gfx/sam2p-0.49.3
@@ -4,10 +4,10 @@ DESCRIPTION=Utility to convert raster images to EPS, PDF and many others
 EAPI=6
 HOMEPAGE=https://github.com/pts/sam2p
 IUSE=examples gif
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/pts/sam2p/archive/v0.49.3.tar.gz -> sam2p-0.49.3.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=2aefd86f9cb9dcffc9cb2b5e000b3365
+_md5_=f7a668e5a3a3253ecd634f50c0b53801
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index e5be864565f4..472b7323e3f9 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/libdvbcsa-1.1.0 b/metadata/md5-cache/media-libs/libdvbcsa-1.1.0
new file mode 100644
index 000000000000..5e5b41f3177e
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libdvbcsa-1.1.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=Free implementation of the DVB Common Scrambling Algorithm - DVB/CSA
+EAPI=6
+HOMEPAGE=https://www.videolan.org/developers/libdvbcsa.html
+IUSE=debug cpu_flags_x86_mmx cpu_flags_x86_sse2 static-libs
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://download.videolan.org/pub/videolan/libdvbcsa/1.1.0/libdvbcsa-1.1.0.tar.gz
+_md5_=aa94181a6b0b99f027c23e44dc3d8d82
diff --git a/metadata/md5-cache/media-libs/mesa-17.1.8 b/metadata/md5-cache/media-libs/mesa-17.1.8
index 43bc674b97f8..9dfc6f468c27 100644
--- a/metadata/md5-cache/media-libs/mesa-17.1.8
+++ b/metadata/md5-cache/media-libs/mesa-17.1.8
@@ -4,7 +4,7 @@ DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=6
 HOMEPAGE=https://www.mesa3d.org/
 IUSE=video_cards_i915 video_cards_i965 video_cards_intel video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_imx video_cards_nouveau video_cards_vc4 video_cards_vivante video_cards_vmware bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind vdpau vulkan wayland xvmc xa abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha ~amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) classic? ( app-eselect/eselect-mesa ) gallium? ( app-eselect/eselect-mesa ) >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vulkan? ( >=sys-devel/llvm-3.9.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-devel/llvm-3.6.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.11.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.77[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_i915? ( >=x11-libs/libdrm-2.4.77[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.77[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.77[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.77[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.77[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.77[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.77[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.77[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.77[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.77[video_cards_amdgpu] )
 REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) openmax? ( gallium ) gles1? ( egl ) gles2? ( egl ) vaapi? ( gallium ) vdpau? ( gallium ) vulkan? ( || ( video_cards_i965 video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) wayland? ( egl gbm ) xa? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_imx? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium )
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-17.1.8.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	llvm	fe231a791db197943447fdeadafa7e08	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=d8120e3830913356247ffed9ddfe0452
+_md5_=597de853130fce5ca827b53bae6b1226
diff --git a/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.6-r1 b/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.6-r1
index e5f2a7a0c563..1f2e19cdfc71 100644
--- a/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.6-r1
+++ b/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.6-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=media-libs/libsndfile media-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] doc? ( app-doc/doxygen )
-DESCRIPTION=Audio processing plugin system for plugins that extract descriptive information from audio data
+DESCRIPTION=Audio processing system for plugins to extract information from audio data
 EAPI=5
 HOMEPAGE=http://www.vamp-plugins.org
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
@@ -10,4 +10,4 @@ RDEPEND=media-libs/libsndfile
 SLOT=0
 SRC_URI=https://code.soundsoftware.ac.uk/attachments/download/1514/vamp-plugin-sdk-2.6.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=379be480da9360eb4f104196978b5c7e
+_md5_=e63af34041ae9dda2b52290f091ccfa3
diff --git a/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.7.1 b/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.7.1
index ee11759affa2..92530fe87e57 100644
--- a/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.7.1
+++ b/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.7.1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=media-libs/libsndfile media-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] doc? ( app-doc/doxygen )
-DESCRIPTION=Audio processing plugin system for plugins that extract descriptive information from audio data
+DESCRIPTION=Audio processing system for plugins to extract information from audio data
 EAPI=5
 HOMEPAGE=http://www.vamp-plugins.org
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
@@ -10,4 +10,4 @@ RDEPEND=media-libs/libsndfile
 SLOT=0
 SRC_URI=https://code.soundsoftware.ac.uk/attachments/download/2206/vamp-plugin-sdk-2.7.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=d9429699706c2ced652f2b656745f157
+_md5_=905573ebbc6cea35199c9414404a4364
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 6d4f27bb7554..31f7189e4473 100644
--- a/metadata/md5-cache/media-plugins/Manifest.gz
+++ b/metadata/md5-cache/media-plugins/Manifest.gz
diff --git a/metadata/md5-cache/media-plugins/tap-plugins-0.7.2 b/metadata/md5-cache/media-plugins/tap-plugins-0.7.2
index a03abb8c7d5e..cc4c670198c2 100644
--- a/metadata/md5-cache/media-plugins/tap-plugins-0.7.2
+++ b/metadata/md5-cache/media-plugins/tap-plugins-0.7.2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install prepare
 DEPEND=media-libs/ladspa-sdk
-DESCRIPTION=TAP LADSPA plugins package. Contains DeEsser, Dynamics, Equalizer, Reverb, Stereo Echo, Tremolo
+DESCRIPTION=A bunch of LADSPA plugins for audio processing
 EAPI=4
 HOMEPAGE=http://tap-plugins.sourceforge.net
 KEYWORDS=amd64 ~ppc x86
@@ -9,4 +9,4 @@ RDEPEND=media-libs/ladspa-sdk
 SLOT=0
 SRC_URI=mirror://sourceforge/tap-plugins/tap-plugins-0.7.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=78de0216edac490250dbc3d1a5b0eae3
+_md5_=0eac540263aa2d98cbbee8e9a8f007da
diff --git a/metadata/md5-cache/media-plugins/tap-plugins-0.7.3 b/metadata/md5-cache/media-plugins/tap-plugins-0.7.3
index 63720b3ef0df..4856ed200acb 100644
--- a/metadata/md5-cache/media-plugins/tap-plugins-0.7.3
+++ b/metadata/md5-cache/media-plugins/tap-plugins-0.7.3
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install prepare
 DEPEND=media-libs/ladspa-sdk
-DESCRIPTION=TAP LADSPA plugins package. Contains DeEsser, Dynamics, Equalizer, Reverb, Stereo Echo, Tremolo
+DESCRIPTION=A bunch of LADSPA plugins for audio processing
 EAPI=4
 HOMEPAGE=http://tap-plugins.sourceforge.net
 KEYWORDS=amd64 ~ppc x86
@@ -9,4 +9,4 @@ RDEPEND=media-libs/ladspa-sdk
 SLOT=0
 SRC_URI=mirror://sourceforge/tap-plugins/tap-plugins-0.7.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=17356223f252a81ba62dbdb999b3da9c
+_md5_=7745b8a12a05f35e61bcd350cbfcb512
diff --git a/metadata/md5-cache/media-plugins/vamp-libxtract-plugins-0.6.6.20121204 b/metadata/md5-cache/media-plugins/vamp-libxtract-plugins-0.6.6.20121204
index b964ad4ccc3b..5a49683c1273 100644
--- a/metadata/md5-cache/media-plugins/vamp-libxtract-plugins-0.6.6.20121204
+++ b/metadata/md5-cache/media-plugins/vamp-libxtract-plugins-0.6.6.20121204
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install prepare
 DEPEND==sci-libs/fftw-3* >=media-libs/libxtract-0.6.6 media-libs/vamp-plugin-sdk
-DESCRIPTION=Low-level feature extraction plugins using Jamie Bullock's libxtract library to provide around 50 spectral and other features
+DESCRIPTION=Vamp plugin encapsulating many of the functions of the LibXtract library
 EAPI=2
 HOMEPAGE=http://www.vamp-plugins.org/
 KEYWORDS=amd64 ~ppc ppc64 x86
@@ -9,4 +9,4 @@ RDEPEND==sci-libs/fftw-3* >=media-libs/libxtract-0.6.6 media-libs/vamp-plugin-sd
 SLOT=0
 SRC_URI=http://code.soundsoftware.ac.uk/attachments/download/618/vamp-libxtract-plugins-0.6.6.20121204.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=b3b353ac8d5cf1304cc1eaa045e25bc8
+_md5_=63b42b66ccd63d77d8a4a725cd3e050b
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index a687b6c633b0..eb8e20e8f99e 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/abcmidi-2017.11.27 b/metadata/md5-cache/media-sound/abcmidi-2017.11.27
new file mode 100644
index 000000000000..55d812bb86f4
--- /dev/null
+++ b/metadata/md5-cache/media-sound/abcmidi-2017.11.27
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=app-arch/unzip >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Programs for processing ABC music notation files
+EAPI=6
+HOMEPAGE=http://ifdo.ca/~seymour/runabc/top.html
+IUSE=examples
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://ifdo.ca/~seymour/runabc/abcMIDI-2017.11.27.zip
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=35cc25d55455c2a4784d056b97a7eb29
diff --git a/metadata/md5-cache/media-sound/amarok-2.8.90-r3 b/metadata/md5-cache/media-sound/amarok-2.8.90-r3
deleted file mode 100644
index 4371d1d1e07b..000000000000
--- a/metadata/md5-cache/media-sound/amarok-2.8.90-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-crypt/qca:2[qt4(+)] kde-frameworks/kdelibs:4[opengl?,plasma(+)] >=kde-apps/kdebase-kioslaves-4.4:4 >=media-libs/taglib-1.7[asf(+),mp4(+)] >=media-libs/taglib-extras-1.0.1 sys-libs/zlib >=virtual/mysql-5.1[embedded?] >=dev-qt/qtcore-4.8:4 >=dev-qt/qtdbus-4.8:4 >=dev-qt/qtscript-4.8:4 >=x11-libs/qtscriptgenerator-0.1.0 ipod? ( >=media-libs/libgpod-0.7.0[gtk] ) lastfm? ( >=media-libs/liblastfm-1.0.3[qt4(+)] ) mp3tunes? ( dev-libs/glib:2 dev-libs/libxml2 dev-libs/openssl:0 >=dev-qt/qtcore-4.8.4:4[glib] net-libs/loudmouth net-misc/curl ) mtp? ( >=media-libs/libmtp-1.0.0 ) ofa? ( >=media-libs/libofa-0.9.0 ) opengl? ( virtual/opengl ) dev-util/automoc virtual/pkgconfig test? ( dev-cpp/gmock ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-3.7.2 >=dev-qt/qtsql-4.8.5:4
-DESCRIPTION=Advanced audio player based on KDE framework
-EAPI=6
-HOMEPAGE=https://amarok.kde.org/
-IUSE=debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils l10n_bs l10n_ca l10n_ca-valencia l10n_cs l10n_da l10n_de l10n_el l10n_en-GB l10n_es l10n_et l10n_eu l10n_fi l10n_fr l10n_ga l10n_gl l10n_hu l10n_it l10n_ja l10n_lt l10n_lv l10n_nb l10n_nl l10n_pa l10n_pl l10n_pt l10n_pt-BR l10n_ro l10n_ru l10n_sl l10n_sr l10n_sr-ijekavsk l10n_sr-Latn-ijekavsk l10n_sr-Latn l10n_sv l10n_tr l10n_uk l10n_zh-CN l10n_zh-TW test +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-crypt/qca:2[qt4(+)] kde-frameworks/kdelibs:4[opengl?,plasma(+)] >=kde-apps/kdebase-kioslaves-4.4:4 >=media-libs/taglib-1.7[asf(+),mp4(+)] >=media-libs/taglib-extras-1.0.1 sys-libs/zlib >=virtual/mysql-5.1[embedded?] >=dev-qt/qtcore-4.8:4 >=dev-qt/qtdbus-4.8:4 >=dev-qt/qtscript-4.8:4 >=x11-libs/qtscriptgenerator-0.1.0 ipod? ( >=media-libs/libgpod-0.7.0[gtk] ) lastfm? ( >=media-libs/liblastfm-1.0.3[qt4(+)] ) mp3tunes? ( dev-libs/glib:2 dev-libs/libxml2 dev-libs/openssl:0 >=dev-qt/qtcore-4.8.4:4[glib] net-libs/loudmouth net-misc/curl ) mtp? ( >=media-libs/libmtp-1.0.0 ) ofa? ( >=media-libs/libofa-0.9.0 ) opengl? ( virtual/opengl ) !media-sound/amarok-utils >=kde-apps/phonon-kde-4.4:4 >=dev-qt/qtsql-4.8.5:4
-SLOT=4
-SRC_URI=mirror://kde/stable/amarok/2.8.90/src/amarok-2.8.90.tar.xz
-_eclasses_=cmake-utils	485ec8c8e86e1c95f8f27515544a1aba	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=de5e505eb61337fa3591fc5e817f5898
diff --git a/metadata/md5-cache/media-sound/amarok-2.8.90-r4 b/metadata/md5-cache/media-sound/amarok-2.8.90-r4
new file mode 100644
index 000000000000..01fb22036de7
--- /dev/null
+++ b/metadata/md5-cache/media-sound/amarok-2.8.90-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-apps/kdebase-kioslaves-4.4:4 app-crypt/qca:2[qt4] >=dev-qt/qtcore-4.8:4 >=dev-qt/qtdbus-4.8:4 >=dev-qt/qtscript-4.8:4 >=kde-frameworks/kdelibs-4.14.37:4[plasma] >=media-libs/taglib-1.7[asf(+),mp4(+)] >=media-libs/taglib-extras-1.0.1 sys-libs/zlib >=virtual/mysql-5.1[embedded?] >=x11-libs/qtscriptgenerator-0.1.0 ipod? ( >=media-libs/libgpod-0.7.0[gtk] ) lastfm? ( >=media-libs/liblastfm-1.0.3[qt4] ) mp3tunes? ( dev-libs/glib:2 dev-libs/libxml2 dev-libs/openssl:0 >=dev-qt/qtcore-4.8.4:4[glib] net-libs/loudmouth net-misc/curl ) mtp? ( >=media-libs/libmtp-1.0.0 ) ofa? ( >=media-libs/libofa-0.9.0 ) dev-util/automoc virtual/pkgconfig test? ( dev-cpp/gmock ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-3.7.2 >=dev-qt/qtsql-4.8.5:4
+DESCRIPTION=Advanced audio player based on KDE framework
+EAPI=6
+HOMEPAGE=https://amarok.kde.org/
+IUSE=debug +embedded ipod lastfm mp3tunes mtp ofa test +utils test +handbook
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=kde-apps/kdebase-kioslaves-4.4:4 app-crypt/qca:2[qt4] >=dev-qt/qtcore-4.8:4 >=dev-qt/qtdbus-4.8:4 >=dev-qt/qtscript-4.8:4 >=kde-frameworks/kdelibs-4.14.37:4[plasma] >=media-libs/taglib-1.7[asf(+),mp4(+)] >=media-libs/taglib-extras-1.0.1 sys-libs/zlib >=virtual/mysql-5.1[embedded?] >=x11-libs/qtscriptgenerator-0.1.0 ipod? ( >=media-libs/libgpod-0.7.0[gtk] ) lastfm? ( >=media-libs/liblastfm-1.0.3[qt4] ) mp3tunes? ( dev-libs/glib:2 dev-libs/libxml2 dev-libs/openssl:0 >=dev-qt/qtcore-4.8.4:4[glib] net-libs/loudmouth net-misc/curl ) mtp? ( >=media-libs/libmtp-1.0.0 ) ofa? ( >=media-libs/libofa-0.9.0 ) !media-sound/amarok-utils >=kde-apps/phonon-kde-4.4:4 >=dev-qt/qtsql-4.8.5:4
+SLOT=4
+SRC_URI=mirror://kde/stable/amarok/2.8.90/src/amarok-2.8.90.tar.xz
+_eclasses_=cmake-utils	485ec8c8e86e1c95f8f27515544a1aba	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6872495d9742ec1d5933ea7ef9dcee58
diff --git a/metadata/md5-cache/media-sound/clementine-9999 b/metadata/md5-cache/media-sound/clementine-9999
index 024a505c4174..45cb256724fd 100644
--- a/metadata/md5-cache/media-sound/clementine-9999
+++ b/metadata/md5-cache/media-sound/clementine-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++ dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5] media-libs/taglib[mp4(+)] sys-libs/zlib virtual/glu virtual/opengl cdda? ( dev-libs/libcdio ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt5] ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) || ( >=dev-cpp/gtest-1.8.0 dev-cpp/gmock ) dev-libs/boost:= dev-qt/linguist-tools:5 sys-devel/gettext virtual/pkgconfig box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) pulseaudio? ( media-sound/pulseaudio ) seafile? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) test? ( dev-qt/qttest:5 gnome-base/gsettings-desktop-schemas ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1
+DEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++ dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5] media-libs/taglib[mp4(+)] sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt5] ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 ) || ( >=dev-cpp/gtest-1.8.0 dev-cpp/gmock ) dev-libs/boost:= dev-qt/linguist-tools:5 sys-devel/gettext virtual/pkgconfig box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) pulseaudio? ( media-sound/pulseaudio ) seafile? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) test? ( dev-qt/qttest:5 gnome-base/gsettings-desktop-schemas ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Modern music player and library organizer based on Amarok 1.4 and Qt
 EAPI=6
 HOMEPAGE=https://www.clementine-player.org https://github.com/clementine-player/Clementine
-IUSE=box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote +X linguas_af linguas_ar linguas_be linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en linguas_en_CA linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_he_IL linguas_hi linguas_hr linguas_hu linguas_hy linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_ko linguas_lt linguas_lv linguas_mk_MK linguas_mr linguas_ms linguas_my linguas_nb linguas_nl linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_si_LK linguas_sk linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_te linguas_tr linguas_tr_TR linguas_uk linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW test
+IUSE=box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote linguas_af linguas_ar linguas_be linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en linguas_en_CA linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_he_IL linguas_hi linguas_hr linguas_hu linguas_hy linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_ko linguas_lt linguas_lv linguas_mk_MK linguas_mr linguas_ms linguas_my linguas_nb linguas_nl linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_si_LK linguas_sk linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_te linguas_tr linguas_tr_TR linguas_uk linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW test
 LICENSE=GPL-3
-RDEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++ dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5] media-libs/taglib[mp4(+)] sys-libs/zlib virtual/glu virtual/opengl cdda? ( dev-libs/libcdio ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt5] ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 mms? ( media-plugins/gst-plugins-libmms:1.0 ) mtp? ( gnome-base/gvfs[mtp] ) udisks? ( sys-fs/udisks:2 )
+RDEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++ dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5] media-libs/taglib[mp4(+)] sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt5] ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 mms? ( media-plugins/gst-plugins-libmms:1.0 ) mtp? ( gnome-base/gvfs[mtp] ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=udisks? ( dbus ) wiimote? ( dbus )
 SLOT=0
 _eclasses_=cmake-utils	485ec8c8e86e1c95f8f27515544a1aba	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	2c2e15383ba891d642f51896a7f0ecfe	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d6e59ae5f45d4fce1b74d8830260b9c6
+_md5_=0931627af7cdc724edae747607d67662
diff --git a/metadata/md5-cache/media-sound/jack2-1.9.10 b/metadata/md5-cache/media-sound/jack2-1.9.10
deleted file mode 100644
index d56c69cb7885..000000000000
--- a/metadata/md5-cache/media-sound/jack2-1.9.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) celt? ( media-libs/celt:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig doc? ( app-doc/doxygen )
-DESCRIPTION=Jackdmp jack implemention for multi-processor machine
-EAPI=5
-HOMEPAGE=http://jackaudio.org/
-IUSE=alsa celt dbus doc opus pam python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) celt? ( media-libs/celt:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) pam? ( sys-auth/realtime-base ) !media-sound/jack-audio-connection-kit:0
-REQUIRED_USE=python_targets_python2_7
-RESTRICT=mirror
-SLOT=2
-SRC_URI=https://github.com/jackaudio/jack2/archive/v1.9.10.tar.gz -> jack2-1.9.10.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=8fd307a044159c3bc24cc5aef5d5688b
diff --git a/metadata/md5-cache/media-sound/jack2-1.9.11_rc1 b/metadata/md5-cache/media-sound/jack2-1.9.11_rc1
index 8a309525ab0e..b82efa94570a 100644
--- a/metadata/md5-cache/media-sound/jack2-1.9.11_rc1
+++ b/metadata/md5-cache/media-sound/jack2-1.9.11_rc1
@@ -9,6 +9,6 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsamplerate media-libs/libsndfile sys-libs/readline:0= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) celt? ( media-libs/celt:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) pam? ( sys-auth/realtime-base ) !media-sound/jack-audio-connection-kit:0
 REQUIRED_USE=python_targets_python2_7
 SLOT=2
-SRC_URI=https://github.com/jackaudio/jack2/archive/v1.9.11-RC1.tar.gz -> jack2-1.9.11-RC1.tar.gz
+SRC_URI=https://github.com/jackaudio/jack2/releases/download/v1.9.11-RC1/jack2-1.9.11-RC1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=5b23a58a3bb2f96ae388181d267cfe2c
+_md5_=fefbc15ebb328a727be79d9c857d3c3a
diff --git a/metadata/md5-cache/media-sound/jack2-1.9.11_rc1-r1 b/metadata/md5-cache/media-sound/jack2-1.9.11_rc1-r1
new file mode 100644
index 000000000000..6e41acc0d93b
--- /dev/null
+++ b/metadata/md5-cache/media-sound/jack2-1.9.11_rc1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=media-libs/libsamplerate media-libs/libsndfile sys-libs/readline:0= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) celt? ( media-libs/celt:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig doc? ( app-doc/doxygen )
+DESCRIPTION=Jackdmp jack implemention for multi-processor machine
+EAPI=6
+HOMEPAGE=http://jackaudio.org/
+IUSE=alsa celt dbus doc opus pam classic sndfile libsamplerate readline python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsamplerate media-libs/libsndfile sys-libs/readline:0= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) celt? ( media-libs/celt:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) pam? ( sys-auth/realtime-base ) !media-sound/jack-audio-connection-kit:0
+REQUIRED_USE=python_targets_python2_7 || ( classic dbus )
+SLOT=2
+SRC_URI=https://github.com/jackaudio/jack2/releases/download/v1.9.11-RC1/jack2-1.9.11-RC1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
+_md5_=a5d4e17ba85d59113aba9028f840f6ac
diff --git a/metadata/md5-cache/media-sound/jack2-9999 b/metadata/md5-cache/media-sound/jack2-9999
new file mode 100644
index 000000000000..9820e4efa23b
--- /dev/null
+++ b/metadata/md5-cache/media-sound/jack2-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=media-libs/libsamplerate media-libs/libsndfile sys-libs/readline:0= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) celt? ( media-libs/celt:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig doc? ( app-doc/doxygen ) >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Jackdmp jack implemention for multi-processor machine
+EAPI=6
+HOMEPAGE=http://jackaudio.org/
+IUSE=alsa celt dbus doc opus pam classic sndfile libsamplerate readline python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+LICENSE=GPL-2
+RDEPEND=media-libs/libsamplerate media-libs/libsndfile sys-libs/readline:0= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) celt? ( media-libs/celt:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) pam? ( sys-auth/realtime-base ) !media-sound/jack-audio-connection-kit:0
+REQUIRED_USE=python_targets_python2_7 || ( classic dbus )
+SLOT=2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
+_md5_=78944b63eedf3bac323558ee338ff5d4
diff --git a/metadata/md5-cache/media-sound/meterbridge-0.9.3 b/metadata/md5-cache/media-sound/meterbridge-0.9.3
index 46f249324992..a93376580ce2 100644
--- a/metadata/md5-cache/media-sound/meterbridge-0.9.3
+++ b/metadata/md5-cache/media-sound/meterbridge-0.9.3
@@ -9,4 +9,4 @@ RDEPEND=media-sound/jack-audio-connection-kit >=media-libs/libsdl-1.2 >=media-li
 SLOT=0
 SRC_URI=http://plugin.org.uk/meterbridge/meterbridge-0.9.3.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=1ab5d19b2a14010726794c21cbb8ce6c
+_md5_=6ffc3651351ecfe01047f843654fdeb1
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index bf1326ab0704..9864382ff514 100644
--- a/metadata/md5-cache/media-tv/Manifest.gz
+++ b/metadata/md5-cache/media-tv/Manifest.gz
diff --git a/metadata/md5-cache/media-tv/dtv-scan-tables-0_p20171003 b/metadata/md5-cache/media-tv/dtv-scan-tables-0_p20171003
index 793dfccd7b4c..8e610346fd5c 100644
--- a/metadata/md5-cache/media-tv/dtv-scan-tables-0_p20171003
+++ b/metadata/md5-cache/media-tv/dtv-scan-tables-0_p20171003
@@ -3,8 +3,8 @@ DEPEND=>=media-tv/v4l-utils-1.4
 DESCRIPTION=Digital TV scan tables in v3 and v5 format
 EAPI=6
 HOMEPAGE=https://linuxtv.org/
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-2017-10-03-c1986d5148d8.tar.bz2
-_md5_=bec29735286ade3fbcdad5f081146585
+_md5_=ef73ddd4065619f290b2a9df78d87f98
diff --git a/metadata/md5-cache/media-tv/dtv-scan-tables-9999 b/metadata/md5-cache/media-tv/dtv-scan-tables-9999
index 5af1f6ae1bf0..fed203db9ee8 100644
--- a/metadata/md5-cache/media-tv/dtv-scan-tables-9999
+++ b/metadata/md5-cache/media-tv/dtv-scan-tables-9999
@@ -6,4 +6,4 @@ HOMEPAGE=https://linuxtv.org/
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 _eclasses_=git-r3	fec09a83ae965b041b47f5ff7c8ba29a
-_md5_=bec29735286ade3fbcdad5f081146585
+_md5_=ef73ddd4065619f290b2a9df78d87f98
diff --git a/metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20140321 b/metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20140321
new file mode 100644
index 000000000000..d510480a9ae7
--- /dev/null
+++ b/metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20140321
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=alevt? ( !media-video/alevt media-libs/libpng:0= media-libs/zvbi[v4l] sys-libs/zlib x11-libs/libX11 ) usb? ( virtual/libusb:0 ) dev-lang/perl virtual/linuxtv-dvb-headers
+DESCRIPTION=Small utils for DVB to scan, zap, view signal strength
+EAPI=6
+HOMEPAGE=https://www.linuxtv.org/
+IUSE=alevt usb
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=alevt? ( !media-video/alevt media-libs/libpng:0= media-libs/zvbi[v4l] sys-libs/zlib x11-libs/libX11 ) usb? ( virtual/libusb:0 ) media-tv/dtv-scan-tables
+SLOT=0
+SRC_URI=https://www.linuxtv.org/hg/dvb-apps/archive/3d43b280298c.tar.bz2 -> linuxtv-dvb-apps-1.1.1.20140321.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e
+_md5_=3fa3977982c485ccbe9e30099bf2be2a
diff --git a/metadata/md5-cache/media-tv/xmltv-0.5.70 b/metadata/md5-cache/media-tv/xmltv-0.5.70
new file mode 100644
index 000000000000..c58e9460e1f7
--- /dev/null
+++ b/metadata/md5-cache/media-tv/xmltv-0.5.70
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-perl/libwww-perl-5.65 >=dev-perl/XML-Parser-2.34 >=dev-perl/XML-Twig-3.10 >=dev-perl/Date-Manip-5.42 >=dev-perl/XML-Writer-0.6 virtual/perl-Memoize virtual/perl-Storable >=dev-perl/Lingua-Preferred-0.2.4 >=dev-perl/Term-ProgressBar-2.03 virtual/perl-IO-Compress dev-perl/Unicode-String dev-perl/TermReadKey dev-perl/File-Slurp >=dev-lang/perl-5.6.1 dev-perl/XML-LibXML dev-perl/XML-TreePP ar? ( dev-perl/HTML-Tree >=dev-perl/HTML-Parser-3.34 dev-perl/HTTP-Cookies dev-perl/TimeDate ) ch_search? ( dev-perl/HTML-Tree >=dev-perl/HTML-Parser-3.34 ) dk? ( dev-perl/JSON dev-perl/IO-stringy dev-perl/DateTime ) dtvla? ( dev-perl/HTML-Tree dev-perl/HTTP-Cookies dev-perl/TimeDate ) es_laguiatv? ( dev-perl/HTML-Tree ) eu_dotmedia? ( dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent ) eu_epg? ( dev-perl/Archive-Zip dev-perl/DateTime-Format-Strptime >=dev-perl/HTML-Parser-3.34 dev-perl/IO-stringy ) fi? ( dev-perl/HTML-Tree ) fi_sv? ( dev-perl/IO-stringy dev-perl/HTML-Tree dev-perl/DateTime ) fr? ( dev-perl/DateTime-TimeZone dev-perl/HTML-Tree dev-perl/DateTime >=dev-perl/HTML-Parser-3.34 ) huro? ( dev-perl/HTML-Tree ) is? ( dev-perl/XML-DOM dev-perl/XML-LibXSLT ) na_dd? ( dev-perl/SOAP-Lite ) na_dtv? ( >=dev-perl/HTML-Parser-3.34 dev-perl/DateTime dev-perl/HTTP-Cookies ) na_tvmedia? ( dev-perl/XML-LibXML ) nl? ( dev-perl/HTTP-Cache-Transparent dev-perl/HTML-Tree dev-perl/DateTime >=dev-perl/HTML-Parser-3.34 dev-perl/TimeDate ) pt_meo? ( dev-perl/XML-LibXML dev-perl/DateTime ) se_swedb? ( dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent ) se_tvzon? ( dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent ) tr? ( dev-perl/URI dev-perl/HTTP-Cache-Transparent dev-perl/DateTime dev-perl/HTTP-Cookies dev-perl/TimeDate ) uk_bleb? ( dev-perl/IO-stringy dev-perl/Archive-Zip ) uk_tvguide? ( dev-perl/HTML-Tree dev-perl/URI dev-perl/HTTP-Cache-Transparent dev-perl/DateTime dev-perl/TimeDate ) zz_sdjson? ( dev-perl/DateTime-Format-ISO8601 virtual/perl-Digest-SHA dev-perl/JSON dev-perl/List-MoreUtils dev-perl/libwww-perl virtual/perl-Storable dev-perl/Try-Tiny ) tv_check? ( dev-perl/Tk dev-perl/Tk-TableMatrix ) tv_combiner? ( dev-perl/XML-LibXML ) dev-lang/perl:=
+DESCRIPTION=Set of utilities to manage TV listings stored in the XMLTV format
+EAPI=6
+HOMEPAGE=http://xmltv.org
+IUSE=ar ch_search dk dtvla es_laguiatv eu_dotmedia eu_epg fi fi_sv fr fr_kazer huro il is it na_dd na_dtv na_tvmedia nl no_gf pt_meo se_swedb se_tvzon tr uk_bleb uk_tvguide tv_check tv_combiner tv_pick_cgi zz_sdjson
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-perl/libwww-perl-5.65 >=dev-perl/XML-Parser-2.34 >=dev-perl/XML-Twig-3.10 >=dev-perl/Date-Manip-5.42 >=dev-perl/XML-Writer-0.6 virtual/perl-Memoize virtual/perl-Storable >=dev-perl/Lingua-Preferred-0.2.4 >=dev-perl/Term-ProgressBar-2.03 virtual/perl-IO-Compress dev-perl/Unicode-String dev-perl/TermReadKey dev-perl/File-Slurp >=dev-lang/perl-5.6.1 dev-perl/XML-LibXML dev-perl/XML-TreePP dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://sourceforge/xmltv/xmltv-0.5.70.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=bed7118ca52f83c6124754e94f5e23ae
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index e0fe6b2c948a..e2f2adb4e730 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/icinga-1.14.0-r1 b/metadata/md5-cache/net-analyzer/icinga-1.14.0-r1
index 1a083e9002fc..c47c2f92531a 100644
--- a/metadata/md5-cache/net-analyzer/icinga-1.14.0-r1
+++ b/metadata/md5-cache/net-analyzer/icinga-1.14.0-r1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/icinga/icinga-core/archive/v1.14.0/icinga-1.14.0.tar.gz
 _eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=f07ec0d90e4a3d43bf2a42bd845aedfc
+_md5_=348f0805b969fc7cbd998d429907ab34
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 449f2588f705..30c587f209ab 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/ldns-utils-1.7.0 b/metadata/md5-cache/net-dns/ldns-utils-1.7.0
index c043a3152cc8..d37634b79dcb 100644
--- a/metadata/md5-cache/net-dns/ldns-utils-1.7.0
+++ b/metadata/md5-cache/net-dns/ldns-utils-1.7.0
@@ -4,9 +4,9 @@ DESCRIPTION=Set of utilities to simplify various dns(sec) tasks
 EAPI=5
 HOMEPAGE=http://www.nlnetlabs.nl/projects/ldns/
 IUSE=+dane ecdsa examples gost ssl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=BSD
 RDEPEND=>=net-libs/ldns-1.7.0[dane?,ecdsa?,gost?,ssl?] examples? ( net-libs/libpcap )
 SLOT=0
 SRC_URI=http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.0.tar.gz
-_md5_=707695de682a2d42623341c6317bae84
+_md5_=8f0b66dc90268ff7d54f160cf29e70c6
diff --git a/metadata/md5-cache/net-dns/pdns-4.0.4 b/metadata/md5-cache/net-dns/pdns-4.0.4
deleted file mode 100644
index 198382a1b928..000000000000
--- a/metadata/md5-cache/net-dns/pdns-4.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst
-DEPEND=libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= botan? ( =dev-libs/botan-1.10*[threads] ) lua? ( dev-lang/lua:= ) luajit? ( dev-lang/luajit:= ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 ) sqlite? ( dev-db/sqlite:3 ) opendbx? ( dev-db/opendbx ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1 dev-libs/geoip ) tinydns? ( >=dev-db/tinycdb-0.77 ) protobuf? ( dev-libs/protobuf ) virtual/pkgconfig doc? ( app-doc/doxygen )
-DESCRIPTION=The PowerDNS Daemon
-EAPI=6
-HOMEPAGE=https://www.powerdns.com/
-IUSE=botan debug doc geoip ldap libressl lua luajit mydns mysql opendbx postgres protobuf remote sqlite systemd tools tinydns test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= botan? ( =dev-libs/botan-1.10*[threads] ) lua? ( dev-lang/lua:= ) luajit? ( dev-lang/luajit:= ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 ) sqlite? ( dev-db/sqlite:3 ) opendbx? ( dev-db/opendbx ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1 dev-libs/geoip ) tinydns? ( >=dev-db/tinycdb-0.77 ) protobuf? ( dev-libs/protobuf )
-REQUIRED_USE=mydns? ( mysql ) ?? ( lua luajit )
-SLOT=0
-SRC_URI=https://downloads.powerdns.com/releases/pdns-4.0.4.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1e0764789e07c9e96b9522fff82e90e9
diff --git a/metadata/md5-cache/net-dns/pdns-4.0.4-r1 b/metadata/md5-cache/net-dns/pdns-4.0.4-r1
deleted file mode 100644
index c1b815f451ae..000000000000
--- a/metadata/md5-cache/net-dns/pdns-4.0.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst
-DEPEND=libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= botan? ( =dev-libs/botan-1.10*[threads] ) lua? ( dev-lang/lua:= ) luajit? ( dev-lang/luajit:= ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 ) sqlite? ( dev-db/sqlite:3 ) opendbx? ( dev-db/opendbx ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1 dev-libs/geoip ) tinydns? ( >=dev-db/tinycdb-0.77 ) protobuf? ( dev-libs/protobuf ) virtual/pkgconfig doc? ( app-doc/doxygen )
-DESCRIPTION=The PowerDNS Daemon
-EAPI=6
-HOMEPAGE=https://www.powerdns.com/
-IUSE=botan debug doc geoip ldap libressl lua luajit mydns mysql opendbx postgres protobuf remote sqlite systemd tools tinydns test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= botan? ( =dev-libs/botan-1.10*[threads] ) lua? ( dev-lang/lua:= ) luajit? ( dev-lang/luajit:= ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 ) sqlite? ( dev-db/sqlite:3 ) opendbx? ( dev-db/opendbx ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1 dev-libs/geoip ) tinydns? ( >=dev-db/tinycdb-0.77 ) protobuf? ( dev-libs/protobuf )
-REQUIRED_USE=mydns? ( mysql ) ?? ( lua luajit )
-SLOT=0
-SRC_URI=https://downloads.powerdns.com/releases/pdns-4.0.4.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=78a95bb43a181bbd9d59d25ebba848aa
diff --git a/metadata/md5-cache/net-dns/pdns-recursor-4.0.6 b/metadata/md5-cache/net-dns/pdns-recursor-4.0.6
deleted file mode 100644
index 4a7732c5a709..000000000000
--- a/metadata/md5-cache/net-dns/pdns-recursor-4.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst setup
-DEPEND=lua? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:= ) protobuf? ( dev-libs/protobuf >=dev-libs/boost-1.42:= ) systemd? ( sys-apps/systemd:0= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= virtual/pkgconfig
-DESCRIPTION=The PowerDNS Recursor
-EAPI=6
-HOMEPAGE=https://www.powerdns.com/
-IUSE=libressl lua luajit protobuf systemd
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=lua? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:= ) protobuf? ( dev-libs/protobuf >=dev-libs/boost-1.42:= ) systemd? ( sys-apps/systemd:0= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= !<net-dns/pdns-2.9.20-r1
-REQUIRED_USE=?? ( lua luajit )
-SLOT=0
-SRC_URI=https://downloads.powerdns.com/releases/pdns-recursor-4.0.6.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=8219e397f7dce121726e8733cf5b0bc3
diff --git a/metadata/md5-cache/net-dns/pdns-recursor-4.0.6-r1 b/metadata/md5-cache/net-dns/pdns-recursor-4.0.6-r1
deleted file mode 100644
index d70e4590fce5..000000000000
--- a/metadata/md5-cache/net-dns/pdns-recursor-4.0.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst setup
-DEPEND=lua? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:= ) protobuf? ( dev-libs/protobuf >=dev-libs/boost-1.42:= ) systemd? ( sys-apps/systemd:0= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= virtual/pkgconfig
-DESCRIPTION=The PowerDNS Recursor
-EAPI=6
-HOMEPAGE=https://www.powerdns.com/
-IUSE=libressl lua luajit protobuf systemd
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=lua? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:= ) protobuf? ( dev-libs/protobuf >=dev-libs/boost-1.42:= ) systemd? ( sys-apps/systemd:0= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= !<net-dns/pdns-2.9.20-r1
-REQUIRED_USE=?? ( lua luajit )
-SLOT=0
-SRC_URI=https://downloads.powerdns.com/releases/pdns-recursor-4.0.6.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c8a94aa6f9a1d170847500f0b3b47e1b
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index e865596cec77..e16eb3cabb5a 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/iroffer-dinoex-3.30 b/metadata/md5-cache/net-irc/iroffer-dinoex-3.30
index 008cb511e784..44cdb406a41a 100644
--- a/metadata/md5-cache/net-irc/iroffer-dinoex-3.30
+++ b/metadata/md5-cache/net-irc/iroffer-dinoex-3.30
@@ -11,4 +11,4 @@ REQUIRED_USE=admin? ( http ) gnutls? ( ssl )
 SLOT=0
 SRC_URI=http://iroffer.dinoex.net/iroffer-dinoex-3.30.tar.gz http://iroffer.dinoex.net/HISTORY/iroffer-dinoex-3.30.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	l10n	2c2e15383ba891d642f51896a7f0ecfe	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=3963157a77305ffc5d2af7d184794ba3
+_md5_=18aecf21724bf7064981ac0b6c7d2871
diff --git a/metadata/md5-cache/net-irc/quassel-0.12.4 b/metadata/md5-cache/net-irc/quassel-0.12.4
index 47a305a0ca66..89b8ba3fa60b 100644
--- a/metadata/md5-cache/net-irc/quassel-0.12.4
+++ b/metadata/md5-cache/net-irc/quassel-0.12.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile config configure install postinst prepare setup test
-DEPEND=sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl?] ) !qt5? ( dev-qt/qtcore:4[ssl?] ) monolithic? ( qt5? ( dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[qt5,ssl] ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) ) !qt5? ( dev-qt/qtscript:4 crypt? ( app-crypt/qca:2[qt4,ssl] ) postgres? ( dev-qt/qtsql:4[postgres] ) !postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) ) syslog? ( virtual/logger ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)] dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) phonon? ( media-libs/phonon[qt5(+)] ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) webkit? ( dev-qt/qtwebkit:5 ) ) !qt5? ( dev-qt/qtgui:4 ayatana? ( dev-libs/libindicate-qt ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt4] dev-qt/qtdbus:4 kde? ( kde-frameworks/kdelibs:4 kde-frameworks/oxygen-icons:* ) ) phonon? ( media-libs/phonon[qt4] ) ) ) !monolithic? ( server? ( qt5? ( dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[qt5,ssl] ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) ) !qt5? ( dev-qt/qtscript:4 crypt? ( app-crypt/qca:2[qt4,ssl] ) postgres? ( dev-qt/qtsql:4[postgres] ) !postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) ) syslog? ( virtual/logger ) ) X? ( qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)] dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) phonon? ( media-libs/phonon[qt5(+)] ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) webkit? ( dev-qt/qtwebkit:5 ) ) !qt5? ( dev-qt/qtgui:4 ayatana? ( dev-libs/libindicate-qt ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt4] dev-qt/qtdbus:4 kde? ( kde-frameworks/kdelibs:4 kde-frameworks/oxygen-icons:* ) ) phonon? ( media-libs/phonon[qt4] ) ) ) ) qt5? ( dev-qt/linguist-tools:5 kde-frameworks/extra-cmake-modules ) sys-devel/make >=dev-util/cmake-3.7.2 virtual/pkgconfig
+DEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl?] sys-libs/zlib monolithic? ( dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[qt5(+),ssl] ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) dev-qt/qtgui:5 dev-qt/qtwidgets:5 dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)] dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) phonon? ( media-libs/phonon[qt5(+)] ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) webkit? ( dev-qt/qtwebkit:5 ) ) !monolithic? ( server? ( dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[qt5(+),ssl] ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) ) X? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)] dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) phonon? ( media-libs/phonon[qt5(+)] ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) webkit? ( dev-qt/qtwebkit:5 ) ) ) dev-qt/linguist-tools:5 kde-frameworks/extra-cmake-modules sys-devel/make >=dev-util/cmake-3.7.2 virtual/pkgconfig
 DESCRIPTION=Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity
 EAPI=6
 HOMEPAGE=http://quassel-irc.org/
-IUSE=ayatana crypt dbus debug kde monolithic phonon postgres qt5 +server snorenotify +ssl syslog webkit X
+IUSE=crypt dbus debug kde monolithic phonon postgres +server snorenotify +ssl syslog webkit X
 KEYWORDS=amd64 ~arm ~ppc x86 ~amd64-linux ~sparc-solaris
 LICENSE=GPL-3
-RDEPEND=sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl?] ) !qt5? ( dev-qt/qtcore:4[ssl?] ) monolithic? ( qt5? ( dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[qt5,ssl] ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) ) !qt5? ( dev-qt/qtscript:4 crypt? ( app-crypt/qca:2[qt4,ssl] ) postgres? ( dev-qt/qtsql:4[postgres] ) !postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) ) syslog? ( virtual/logger ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)] dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) phonon? ( media-libs/phonon[qt5(+)] ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) webkit? ( dev-qt/qtwebkit:5 ) ) !qt5? ( dev-qt/qtgui:4 ayatana? ( dev-libs/libindicate-qt ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt4] dev-qt/qtdbus:4 kde? ( kde-frameworks/kdelibs:4 kde-frameworks/oxygen-icons:* ) ) phonon? ( media-libs/phonon[qt4] ) ) ) !monolithic? ( server? ( qt5? ( dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[qt5,ssl] ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) ) !qt5? ( dev-qt/qtscript:4 crypt? ( app-crypt/qca:2[qt4,ssl] ) postgres? ( dev-qt/qtsql:4[postgres] ) !postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) ) syslog? ( virtual/logger ) ) X? ( qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)] dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) phonon? ( media-libs/phonon[qt5(+)] ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) webkit? ( dev-qt/qtwebkit:5 ) ) !qt5? ( dev-qt/qtgui:4 ayatana? ( dev-libs/libindicate-qt ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt4] dev-qt/qtdbus:4 kde? ( kde-frameworks/kdelibs:4 kde-frameworks/oxygen-icons:* ) ) phonon? ( media-libs/phonon[qt4] ) ) ) )
-REQUIRED_USE=|| ( X server monolithic ) ayatana? ( || ( X monolithic ) ) crypt? ( || ( server monolithic ) ) dbus? ( || ( X monolithic ) ) kde? ( || ( X monolithic ) phonon ) phonon? ( || ( X monolithic ) ) postgres? ( || ( server monolithic ) ) qt5? ( !ayatana ) snorenotify? ( qt5 || ( X monolithic ) ) syslog? ( || ( server monolithic ) ) webkit? ( qt5 || ( X monolithic ) )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl?] sys-libs/zlib monolithic? ( dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[qt5(+),ssl] ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) dev-qt/qtgui:5 dev-qt/qtwidgets:5 dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)] dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) phonon? ( media-libs/phonon[qt5(+)] ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) webkit? ( dev-qt/qtwebkit:5 ) ) !monolithic? ( server? ( dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[qt5(+),ssl] ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) ) X? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)] dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) phonon? ( media-libs/phonon[qt5(+)] ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) webkit? ( dev-qt/qtwebkit:5 ) ) )
+REQUIRED_USE=|| ( X server monolithic ) crypt? ( || ( server monolithic ) ) dbus? ( || ( X monolithic ) ) kde? ( || ( X monolithic ) phonon ) phonon? ( || ( X monolithic ) ) postgres? ( || ( server monolithic ) ) snorenotify? ( || ( X monolithic ) ) syslog? ( || ( server monolithic ) ) webkit? ( || ( X monolithic ) )
 SLOT=0
 SRC_URI=http://quassel-irc.org/pub/quassel-0.12.4.tar.bz2
 _eclasses_=cmake-utils	485ec8c8e86e1c95f8f27515544a1aba	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=096c269c255a2c1aee9a7c9346ad6652
+_md5_=3d5d8873b71521c96419085c84737604
diff --git a/metadata/md5-cache/net-irc/quassel-9999 b/metadata/md5-cache/net-irc/quassel-9999
index b21056d609e1..ef9cd0a3cb50 100644
--- a/metadata/md5-cache/net-irc/quassel-9999
+++ b/metadata/md5-cache/net-irc/quassel-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=sys-libs/zlib dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl?] monolithic? ( dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[qt5,ssl] ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 breeze? ( kde-frameworks/breeze-icons:5 ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)] dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) oxygen? ( kde-frameworks/oxygen-icons:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) !monolithic? ( server? ( dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[qt5,ssl] ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) ) X? ( dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 breeze? ( kde-frameworks/breeze-icons:5 ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)] dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) oxygen? ( kde-frameworks/oxygen-icons:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) ) dev-qt/linguist-tools:5 kde-frameworks/extra-cmake-modules sys-devel/make >=dev-util/cmake-3.7.2 virtual/pkgconfig >=dev-vcs/git-1.8.2.1
+DEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl?] sys-libs/zlib monolithic? ( dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[qt5(+),ssl] ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 breeze? ( kde-frameworks/breeze-icons:5 ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)] dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) oxygen? ( kde-frameworks/oxygen-icons:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) !monolithic? ( server? ( dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[qt5(+),ssl] ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) ) X? ( dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 breeze? ( kde-frameworks/breeze-icons:5 ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)] dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) oxygen? ( kde-frameworks/oxygen-icons:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) ) dev-qt/linguist-tools:5 kde-frameworks/extra-cmake-modules sys-devel/make >=dev-util/cmake-3.7.2 virtual/pkgconfig >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity
 EAPI=6
 HOMEPAGE=http://quassel-irc.org/
 IUSE=+breeze crypt +dbus debug kde monolithic oxygen postgres +server snorenotify +ssl syslog urlpreview X
 LICENSE=GPL-3
-RDEPEND=sys-libs/zlib dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl?] monolithic? ( dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[qt5,ssl] ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 breeze? ( kde-frameworks/breeze-icons:5 ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)] dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) oxygen? ( kde-frameworks/oxygen-icons:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) !monolithic? ( server? ( dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[qt5,ssl] ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) ) X? ( dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 breeze? ( kde-frameworks/breeze-icons:5 ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)] dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) oxygen? ( kde-frameworks/oxygen-icons:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl?] sys-libs/zlib monolithic? ( dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[qt5(+),ssl] ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 breeze? ( kde-frameworks/breeze-icons:5 ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)] dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) oxygen? ( kde-frameworks/oxygen-icons:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) !monolithic? ( server? ( dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[qt5(+),ssl] ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) ) X? ( dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 breeze? ( kde-frameworks/breeze-icons:5 ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)] dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) oxygen? ( kde-frameworks/oxygen-icons:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) )
 REQUIRED_USE=|| ( X server monolithic ) crypt? ( || ( server monolithic ) ) kde? ( || ( X monolithic ) ) monolithic? ( || ( breeze oxygen ) ) postgres? ( || ( server monolithic ) ) snorenotify? ( || ( X monolithic ) ) syslog? ( || ( server monolithic ) ) X? ( || ( breeze oxygen ) )
 SLOT=0
 _eclasses_=cmake-utils	485ec8c8e86e1c95f8f27515544a1aba	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=217489d4fd085cc115215a5bb080373a
+_md5_=7cb8cec54dd9aa03991ef4ac745ec5e1
diff --git a/metadata/md5-cache/net-irc/weechat-2.0 b/metadata/md5-cache/net-irc/weechat-2.0
new file mode 100644
index 000000000000..9a20bd070acf
--- /dev/null
+++ b/metadata/md5-cache/net-irc/weechat-2.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:* ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) doc? ( >=dev-ruby/asciidoctor-1.5.4 dev-util/source-highlight ) nls? ( >=sys-devel/gettext-0.15 ) test? ( dev-util/cpputest ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Portable and multi-interface IRC client
+EAPI=6
+HOMEPAGE=https://weechat.org/
+IUSE=doc nls +ssl test linguas_cs linguas_de linguas_es linguas_fr linguas_hu linguas_it linguas_ja linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_tr guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fset +fifo +logger +relay +scripts +spell +trigger +xfer +irc 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
+KEYWORDS=~amd64 ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:* ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://weechat.org/files/src/weechat-2.0.tar.xz
+_eclasses_=cmake-utils	485ec8c8e86e1c95f8f27515544a1aba	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c27971a312672a8fd36c083926c17b38
diff --git a/metadata/md5-cache/net-irc/weechat-9999 b/metadata/md5-cache/net-irc/weechat-9999
index eae2e15bc4ca..90ca5bef9f4a 100644
--- a/metadata/md5-cache/net-irc/weechat-9999
+++ b/metadata/md5-cache/net-irc/weechat-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) doc? ( >=dev-ruby/asciidoctor-1.5.4 dev-util/source-highlight ) nls? ( >=sys-devel/gettext-0.15 ) test? ( dev-util/cpputest ) sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
+DEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:* ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) doc? ( >=dev-ruby/asciidoctor-1.5.4 dev-util/source-highlight ) nls? ( >=sys-devel/gettext-0.15 ) test? ( dev-util/cpputest ) sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Portable and multi-interface IRC client
 EAPI=6
 HOMEPAGE=https://weechat.org/
-IUSE=doc nls +ssl test linguas_cs linguas_de linguas_es linguas_fr linguas_hu linguas_it linguas_ja linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_tr guile lua +perl +python ruby tcl +alias +buflist +charset +exec +fifo +logger +relay +scripts +spell +trigger +xfer +irc 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
+IUSE=doc nls +ssl test linguas_cs linguas_de linguas_es linguas_fr linguas_hu linguas_it linguas_ja linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_tr guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fset +fifo +logger +relay +scripts +spell +trigger +xfer +irc 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
 LICENSE=GPL-3
-RDEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
+RDEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:* ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 RESTRICT=test
 SLOT=0
 _eclasses_=cmake-utils	485ec8c8e86e1c95f8f27515544a1aba	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=25dd37bfece4a9207753c1508620ce99
+_md5_=c27971a312672a8fd36c083926c17b38
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 440e4bad54ef..46fe8939379c 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/ldns-1.7.0-r1 b/metadata/md5-cache/net-libs/ldns-1.7.0-r1
index 5f237dff6cd3..a750f646d00d 100644
--- a/metadata/md5-cache/net-libs/ldns-1.7.0-r1
+++ b/metadata/md5-cache/net-libs/ldns-1.7.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=a library with the aim to simplify DNS programming in C
 EAPI=5
 HOMEPAGE=http://www.nlnetlabs.nl/projects/ldns/
 IUSE=+dane doc +ecdsa gost libressl python +ssl static-libs vim-syntax abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dane? ( !libressl? ( >=dev-libs/openssl-1.0.1e:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ecdsa? ( !libressl? ( >=dev-libs/openssl-1.0.1e:0[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gost? ( !libressl? ( >=dev-libs/openssl-1.0.1e:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1e:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 REQUIRED_USE=ecdsa? ( ssl ) python? ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=ed53e92d3cf8539c3d6f5f9994c9b705
+_md5_=b6f7916af9596bbaafb8e99ab2be33a1
diff --git a/metadata/md5-cache/net-libs/zeromq-4.2.2-r2 b/metadata/md5-cache/net-libs/zeromq-4.2.2-r2
index 8f0b4ed7657a..689963df9017 100644
--- a/metadata/md5-cache/net-libs/zeromq-4.2.2-r2
+++ b/metadata/md5-cache/net-libs/zeromq-4.2.2-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A brokerless kernel
 EAPI=6
 HOMEPAGE=http://www.zeromq.org/
 IUSE=doc pgm +sodium static-libs test unwind elibc_Darwin
-KEYWORDS=amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-3
 RDEPEND=!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) ) sodium? ( dev-libs/libsodium:= ) pgm? ( =net-libs/openpgm-5.2.122 )
 SLOT=0/5
 SRC_URI=https://github.com/zeromq/libzmq/releases/download/v4.2.2/zeromq-4.2.2.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=072287f5ac354076dc69e0794b7f220c
+_md5_=5490f4312a04bc33a83d5dbca86b404f
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 4dc8a81cf999..24c2c436a731 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/wget-1.19.2-r2 b/metadata/md5-cache/net-misc/wget-1.19.2-r2
new file mode 100644
index 000000000000..ee74ea037cc4
--- /dev/null
+++ b/metadata/md5-cache/net-misc/wget-1.19.2-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=!static? ( idn? ( >=net-dns/libidn2-0.14 ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) app-arch/xz-utils virtual/pkgconfig static? ( idn? ( >=net-dns/libidn2-0.14[static-libs(+)] ) pcre? ( dev-libs/libpcre[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs(+)] ) !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl[static-libs(+)] ) ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) ) test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) dev-lang/perl dev-perl/HTTP-Daemon dev-perl/HTTP-Message dev-perl/IO-Socket-SSL ) nls? ( sys-devel/gettext )
+DESCRIPTION=Network utility to retrieve files from the WWW
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/wget/
+IUSE=debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=!static? ( idn? ( >=net-dns/libidn2-0.14 ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) )
+REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
+SLOT=0
+SRC_URI=mirror://gnu/wget/wget-1.19.2.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=94f46aa58c1510d421d0e609e9df1d66
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2017.12.02 b/metadata/md5-cache/net-misc/youtube-dl-2017.12.02
new file mode 100644
index 000000000000..86e72f1a78ef
--- /dev/null
+++ b/metadata/md5-cache/net-misc/youtube-dl-2017.12.02
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=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(-)] test? ( dev-python/nose[coverage(+)] ) 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=Download videos from YouTube.com (and more sites...)
+EAPI=6
+HOMEPAGE=https://rg3.github.com/youtube-dl/
+IUSE=+offensive test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=public-domain
+RDEPEND=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(-)] 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 )
+SLOT=0
+SRC_URI=http://youtube-dl.org/downloads/2017.12.02/youtube-dl-2017.12.02.tar.gz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=dc65130309857818b981580dd61fc4e3
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 0dec69f4c1b1..ed0c46c4c561 100644
--- a/metadata/md5-cache/net-proxy/Manifest.gz
+++ b/metadata/md5-cache/net-proxy/Manifest.gz
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.8.0 b/metadata/md5-cache/net-proxy/haproxy-1.8.1
index 5b37bd9f4735..44e74c782664 100644
--- a/metadata/md5-cache/net-proxy/haproxy-1.8.0
+++ b/metadata/md5-cache/net-proxy/haproxy-1.8.1
@@ -9,6 +9,6 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0
-SRC_URI=http://haproxy.1wt.eu/download/1.8/src/haproxy-1.8.0.tar.gz
+SRC_URI=http://haproxy.1wt.eu/download/1.8/src/haproxy-1.8.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=e8d8bdcd844c76c66a0e5e2aa9777dca
+_md5_=6cea8415c447ff91c01b4a3deb87b7d6
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 0b6bf963b5ca..82bb4445ef36 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/kvpnc-0.9.6a-r2 b/metadata/md5-cache/net-vpn/kvpnc-0.9.6a-r2
deleted file mode 100644
index 77cb69855095..000000000000
--- a/metadata/md5-cache/net-vpn/kvpnc-0.9.6a-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libgcrypt:0 sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.7.2 dev-util/automoc virtual/pkgconfig >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
-DESCRIPTION=KDE frontend for various VPN clients
-EAPI=5
-HOMEPAGE=https://userbase.kde.org/KVpnc
-IUSE=debug l10n_ar l10n_br l10n_cs l10n_da l10n_de l10n_el l10n_en-GB l10n_eo l10n_es l10n_et l10n_eu l10n_fr l10n_ga l10n_gl l10n_hi l10n_hne l10n_it l10n_ja l10n_ka l10n_lt l10n_ms l10n_nb l10n_nds l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt l10n_pt-BR l10n_ro l10n_ru l10n_sv l10n_tr l10n_uk l10n_zh-CN l10n_zh-TW
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libgcrypt:0 kde-frameworks/oxygen-icons l10n_ar? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ar(+)] ) l10n_br? ( >=kde-apps/kde4-l10n-4.4:4[l10n_br(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[l10n_en-GB(+)] ) l10n_eo? ( >=kde-apps/kde4-l10n-4.4:4[l10n_eo(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[l10n_et(+)] ) l10n_eu? ( >=kde-apps/kde4-l10n-4.4:4[l10n_eu(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_gl(+)] ) l10n_hi? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hi(+)] ) l10n_hne? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hne(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ja(+)] ) l10n_ka? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ka(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[l10n_lt(+)] ) l10n_ms? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ms(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nl(+)] ) l10n_nn? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nn(+)] ) l10n_pa? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pa(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ru(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[l10n_zh-TW(+)] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
-SLOT=4
-SRC_URI=http://download.gna.org/kvpnc/kvpnc-0.9.6a-kde4.tar.bz2 http://download.gna.org/kvpnc/kvpnc-0.9.6-kde4-locale.tar.bz2
-_eclasses_=cmake-utils	485ec8c8e86e1c95f8f27515544a1aba	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d76ee7889fd4762fe6a054c8f893ad43
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 4ac6874be4e6..b53d22632acd 100644
--- a/metadata/md5-cache/sci-electronics/Manifest.gz
+++ b/metadata/md5-cache/sci-electronics/Manifest.gz
diff --git a/metadata/md5-cache/sci-electronics/ngspice-26 b/metadata/md5-cache/sci-electronics/ngspice-26
index df0252cd30c4..5ac273d8950e 100644
--- a/metadata/md5-cache/sci-electronics/ngspice-26
+++ b/metadata/md5-cache/sci-electronics/ngspice-26
@@ -4,10 +4,10 @@ DESCRIPTION=The Next Generation Spice (Electronic Circuit Simulator)
 EAPI=3
 HOMEPAGE=http://ngspice.sourceforge.net
 IUSE=X debug readline
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~x64-macos
 LICENSE=BSD GPL-2
 RDEPEND=sys-libs/ncurses readline? ( >=sys-libs/readline-5.0 ) X? ( x11-libs/libXaw x11-libs/libXt x11-libs/libX11 sci-visualization/xgraph )
 SLOT=0
 SRC_URI=mirror://sourceforge/ngspice/ngspice-26.tar.gz mirror://sourceforge/ngspice/ngspice-26-manual.pdf
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=b59ec7f0c3f9a53237c74590adb5e439
+_md5_=61f9e4f18583daa5a784184f9c259620
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 58c36f179886..4519b7b5ee9f 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/hdf5-1.10.1 b/metadata/md5-cache/sci-libs/hdf5-1.10.1
new file mode 100644
index 000000000000..52d38fd45910
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/hdf5-1.10.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=mpi? ( virtual/mpi[romio] ) szip? ( virtual/szip ) zlib? ( sys-libs/zlib:0= ) sys-devel/libtool:2 >=sys-devel/autoconf-2.69 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 fortran? ( virtual/fortran )
+DESCRIPTION=General purpose library and file format for storing scientific data
+EAPI=5
+HOMEPAGE=http://www.hdfgroup.org/HDF5/
+IUSE=cxx debug examples fortran fortran2003 mpi static-libs szip threads zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=NCSA-HDF
+RDEPEND=mpi? ( virtual/mpi[romio] ) szip? ( virtual/szip ) zlib? ( sys-libs/zlib:0= ) fortran? ( virtual/fortran )
+REQUIRED_USE=cxx? ( !mpi ) mpi? ( !cxx ) threads? ( !cxx !mpi !fortran ) fortran2003? ( fortran )
+SLOT=0/1.10.1
+SRC_URI=http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.1/src/hdf5-1.10.1.tar.bz2
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=841c91e6739f5aaec93a4736e973d9ec
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index d6e7df60c0c0..b1b78f7f963f 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-1.1.383 b/metadata/md5-cache/sci-mathematics/rstudio-1.1.383
new file mode 100644
index 000000000000..a3ee98a2f0a5
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/rstudio-1.1.383
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=app-text/pandoc dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.63:= >=dev-libs/mathjax-2.7.0 dev-libs/openssl:0 sys-apps/util-linux >=sys-devel/clang-3.5.0:* sys-libs/zlib >=virtual/jre-1.8:= x11-libs/pango !dedicated? ( >=dev-qt/qtcore-5.4:5 >=dev-qt/qtdeclarative-5.4:5 >=dev-qt/qtdbus-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtnetwork-5.4:5 >=dev-qt/qtopengl-5.4:5 >=dev-qt/qtpositioning-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] >=dev-qt/qtsensors-5.4:5 >=dev-qt/qtsql-5.4:5 >=dev-qt/qtsvg-5.4:5 >=dev-qt/qtwebchannel-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxml-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 server? ( virtual/pam ) ) dedicated? ( virtual/pam ) app-arch/unzip dev-java/ant-core >=virtual/jdk-1.8:= virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=IDE for the R language
+EAPI=6
+HOMEPAGE=http://www.rstudio.org https://github.com/rstudio/rstudio/
+IUSE=dedicated server elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=AGPL-3
+RDEPEND=app-text/pandoc dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.63:= >=dev-libs/mathjax-2.7.0 dev-libs/openssl:0 sys-apps/util-linux >=sys-devel/clang-3.5.0:* sys-libs/zlib >=virtual/jre-1.8:= x11-libs/pango !dedicated? ( >=dev-qt/qtcore-5.4:5 >=dev-qt/qtdeclarative-5.4:5 >=dev-qt/qtdbus-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtnetwork-5.4:5 >=dev-qt/qtopengl-5.4:5 >=dev-qt/qtpositioning-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] >=dev-qt/qtsensors-5.4:5 >=dev-qt/qtsql-5.4:5 >=dev-qt/qtsvg-5.4:5 >=dev-qt/qtwebchannel-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxml-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 server? ( virtual/pam ) ) dedicated? ( virtual/pam ) >=dev-java/java-config-2.2.0-r3
+SLOT=0
+SRC_URI=https://github.com/rstudio/rstudio/archive/v1.1.383.tar.gz -> rstudio-1.1.383.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.7.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-java-2.37.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-2.37.0.jar https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip https://dev.gentoo.org/~gienah/distfiles/packrat-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rmarkdown-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/shinyapps-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz
+_eclasses_=cmake-utils	485ec8c8e86e1c95f8f27515544a1aba	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	pax-utils	4f95120230a315c8caaabeb2307b7eee	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5df11f3c1c8fa21f8f1984dbe9ea61cc
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 980f3f55df97..c58ea859c8a8 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/guix-0.13.0 b/metadata/md5-cache/sys-apps/guix-0.13.0-r1
index 813a4c49e259..c9aa2e042ba9 100644
--- a/metadata/md5-cache/sys-apps/guix-0.13.0
+++ b/metadata/md5-cache/sys-apps/guix-0.13.0-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=dev-libs/libgcrypt:0= >=dev-scheme/guile-2[regex,networking,threads] dev-scheme/guile-json net-libs/gnutls[guile] sys-libs/zlib app-arch/bzip2 dev-db/sqlite >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/libgcrypt:0= >=dev-scheme/guile-2:=[regex,networking,threads] dev-scheme/guile-json net-libs/gnutls[guile] sys-libs/zlib app-arch/bzip2 dev-db/sqlite >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=GNU package manager (nix sibling)
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/guix/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-libs/libgcrypt:0= >=dev-scheme/guile-2[regex,networking,threads] dev-scheme/guile-json net-libs/gnutls[guile] sys-libs/zlib app-arch/bzip2 dev-db/sqlite
+RDEPEND=dev-libs/libgcrypt:0= >=dev-scheme/guile-2:=[regex,networking,threads] dev-scheme/guile-json net-libs/gnutls[guile] sys-libs/zlib app-arch/bzip2 dev-db/sqlite
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu-alpha/guix/guix-0.13.0.tar.gz mirror://gnu-alpha/guix/bootstrap/aarch64-linux/20170217/guile-2.0.14.tar.xz -> guix-bootstrap-aarch64-linux-20170217-guile-2.0.14.tar.xz.bootstrap mirror://gnu-alpha/guix/bootstrap/armhf-linux/20150101/guile-2.0.11.tar.xz -> guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap mirror://gnu-alpha/guix/bootstrap/i686-linux/20131110/guile-2.0.9.tar.xz -> guix-bootstrap-i686-linux-20131110-guile-2.0.9.tar.xz.bootstrap mirror://gnu-alpha/guix/bootstrap/mips64el-linux/20131110/guile-2.0.9.tar.xz -> guix-bootstrap-mips64el-linux-20131110-guile-2.0.9.tar.xz.bootstrap mirror://gnu-alpha/guix/bootstrap/x86_64-linux/20131110/guile-2.0.9.tar.xz -> guix-bootstrap-x86_64-linux-20131110-guile-2.0.9.tar.xz.bootstrap
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=ae0eaae2fd8b748c357c537ff47fa42d
+_md5_=83b7fdaebf395aa02e0da0ffb8c1f490
diff --git a/metadata/md5-cache/sys-apps/iproute2-4.14.1 b/metadata/md5-cache/sys-apps/iproute2-4.14.1
index 2cdc2c7cabc1..e36fb5d66700 100644
--- a/metadata/md5-cache/sys-apps/iproute2-4.14.1
+++ b/metadata/md5-cache/sys-apps/iproute2-4.14.1
@@ -10,4 +10,4 @@ RDEPEND=!net-misc/arpd !minimal? ( net-libs/libmnl virtual/libelf ) iptables? (
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/net/iproute2/iproute2-4.14.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=722ee7531305f67986428f1c8312c009
+_md5_=47b23db1bad5ae6904a5594fc8169839
diff --git a/metadata/md5-cache/sys-apps/iproute2-4.14.1-r1 b/metadata/md5-cache/sys-apps/iproute2-4.14.1-r1
index 2cdc2c7cabc1..e36fb5d66700 100644
--- a/metadata/md5-cache/sys-apps/iproute2-4.14.1-r1
+++ b/metadata/md5-cache/sys-apps/iproute2-4.14.1-r1
@@ -10,4 +10,4 @@ RDEPEND=!net-misc/arpd !minimal? ( net-libs/libmnl virtual/libelf ) iptables? (
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/net/iproute2/iproute2-4.14.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=722ee7531305f67986428f1c8312c009
+_md5_=47b23db1bad5ae6904a5594fc8169839
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 93034c5649d5..e2c355e1c7ab 100644
--- a/metadata/md5-cache/sys-auth/Manifest.gz
+++ b/metadata/md5-cache/sys-auth/Manifest.gz
diff --git a/metadata/md5-cache/sys-auth/elogind-233.7-r1 b/metadata/md5-cache/sys-auth/elogind-233.7-r1
index f1257d9413df..d4e4d28b6d57 100644
--- a/metadata/md5-cache/sys-auth/elogind-233.7-r1
+++ b/metadata/md5-cache/sys-auth/elogind-233.7-r1
@@ -11,4 +11,4 @@ RDEPEND=sys-apps/util-linux sys-libs/libcap virtual/libudev:= acl? ( sys-apps/ac
 SLOT=0
 SRC_URI=https://github.com/elogind/elogind/archive/v233.7.tar.gz -> elogind-233.7.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e219bdc8f780e5ca6a70506bbf72bff9
+_md5_=4609b29a576eca2e9da4e548ae5df4c8
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 58afa626f77e..5e7bb63edb17 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/corosync-2.3.5 b/metadata/md5-cache/sys-cluster/corosync-2.3.5
index 2ee438ce35bf..a94070879e67 100644
--- a/metadata/md5-cache/sys-cluster/corosync-2.3.5
+++ b/metadata/md5-cache/sys-cluster/corosync-2.3.5
@@ -4,10 +4,10 @@ DESCRIPTION=OSI Certified implementation of a complete cluster engine
 EAPI=6
 HOMEPAGE=http://www.corosync.org/
 IUSE=doc infiniband static-libs systemd xml
-KEYWORDS=amd64 ~hppa ppc ppc64 x86
+KEYWORDS=amd64 hppa ppc ppc64 x86
 LICENSE=BSD-2 public-domain
 RDEPEND=!sys-cluster/heartbeat infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) dev-libs/nss >=sys-cluster/libqb-0.14.4
 SLOT=0
 SRC_URI=http://build.clusterlabs.org/corosync/releases/corosync-2.3.5.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=535986b8530da020fd0ef1de966da658
+_md5_=3f7b34d716c1e9837cc3a55005c75d18
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 1f17bced1b90..413a2f27cfd3 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.14_rc1 b/metadata/md5-cache/sys-kernel/git-sources-4.14_rc1
deleted file mode 100644
index b76cd776a617..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-4.14_rc1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/patch-2.7.5 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=5
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.14_rc1
-SRC_URI=https://git.kernel.org/torvalds/p/v4.14-rc1/v4.13 -> patch-4.14-rc1.patch mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=8406adf09cb48d9eec2277c1c9f9c041
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.14_rc2 b/metadata/md5-cache/sys-kernel/git-sources-4.14_rc2
deleted file mode 100644
index ee8377e0d985..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-4.14_rc2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/patch-2.7.5 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=5
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.14_rc2
-SRC_URI=https://git.kernel.org/torvalds/p/v4.14-rc2/v4.13 -> patch-4.14-rc2.patch mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=8406adf09cb48d9eec2277c1c9f9c041
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.14_rc3 b/metadata/md5-cache/sys-kernel/git-sources-4.14_rc3
deleted file mode 100644
index 2186c6e0a66e..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-4.14_rc3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/patch-2.7.5 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=5
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.14_rc3
-SRC_URI=https://git.kernel.org/torvalds/p/v4.14-rc3/v4.13 -> patch-4.14-rc3.patch mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=8406adf09cb48d9eec2277c1c9f9c041
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.14_rc5 b/metadata/md5-cache/sys-kernel/git-sources-4.14_rc5
deleted file mode 100644
index ce240f2d4787..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-4.14_rc5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/patch-2.7.5 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=5
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.14_rc5
-SRC_URI=https://git.kernel.org/torvalds/p/v4.14-rc5/v4.13 -> patch-4.14-rc5.patch mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=8406adf09cb48d9eec2277c1c9f9c041
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.14_rc6 b/metadata/md5-cache/sys-kernel/git-sources-4.14_rc6
deleted file mode 100644
index 90cea2c3200d..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-4.14_rc6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/patch-2.7.5 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=5
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.14_rc6
-SRC_URI=https://git.kernel.org/torvalds/p/v4.14-rc6/v4.13 -> patch-4.14-rc6.patch mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=8406adf09cb48d9eec2277c1c9f9c041
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.14_rc7 b/metadata/md5-cache/sys-kernel/git-sources-4.14_rc7
deleted file mode 100644
index f573285eba2e..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-4.14_rc7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/patch-2.7.5 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=5
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.14_rc7
-SRC_URI=https://git.kernel.org/torvalds/p/v4.14-rc7/v4.13 -> patch-4.14-rc7.patch mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=8406adf09cb48d9eec2277c1c9f9c041
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.14_rc8 b/metadata/md5-cache/sys-kernel/git-sources-4.14_rc8
deleted file mode 100644
index 85d6f23339fc..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-4.14_rc8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/patch-2.7.5 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=5
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.14_rc8
-SRC_URI=https://git.kernel.org/torvalds/p/v4.14-rc8/v4.13 -> patch-4.14-rc8.patch mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=8406adf09cb48d9eec2277c1c9f9c041
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.14_rc4 b/metadata/md5-cache/sys-kernel/git-sources-4.15_rc2
index a4c1eb2b2515..155f22b649a9 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-4.14_rc4
+++ b/metadata/md5-cache/sys-kernel/git-sources-4.15_rc2
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.14_rc4
-SRC_URI=https://git.kernel.org/torvalds/p/v4.14-rc4/v4.13 -> patch-4.14-rc4.patch mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz
+SLOT=4.15_rc2
+SRC_URI=https://git.kernel.org/torvalds/p/v4.15-rc2/v4.14 -> patch-4.15-rc2.patch mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=8406adf09cb48d9eec2277c1c9f9c041
+_md5_=4d61b1c207ae9c2b0f6de60fc1485bad
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.14.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.14.9999
index af749d75f6d2..e95202b1123f 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.14.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.14.9999
@@ -9,4 +9,4 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.14.9999
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=dfc08a08e9d5dc1fde1f12f3048e3a1c
+_md5_=42a7377bfd0899f7045885338ab11929
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index af378fc63af5..c3779730a2f1 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.82 b/metadata/md5-cache/x11-libs/libdrm-2.4.82
index af83f76cfd29..196a24abe09d 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.82
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.82
@@ -4,11 +4,11 @@ DESCRIPTION=X.Org libdrm library
 EAPI=5
 HOMEPAGE=https://dri.freedesktop.org/
 IUSE=video_cards_amdgpu video_cards_exynos video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_tegra video_cards_vc4 video_cards_vivante video_cards_vmware libkms valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs
-KEYWORDS=alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha ~amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-libs/libpthread-stubs-0.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.82.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=9855c44146728b9f98f208baa5b43cbd
+_md5_=58f9d6b92a96b20022d7d1dc5b998eb7
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index fa26716c18a5..c3c82eae1577 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 34188 BLAKE2B 32cc4e181d63a37168d787671b95b0d67f02097dd510b9e670aaa11654e9610f0fff06d04b6b12baa34ea52d3d0bc7928b9bb37f79dcf6d1c40b9e842925b992 SHA512 a6dd5556496c75237a730271b276457afa4d6cd49223c94c1cd210c02a9b8206730390c4b42c5de2d22de8b3f8b31c59fc24c91e9900bfdf70ec28f5fd2d05c9
-TIMESTAMP 2017-12-03T15:08:44Z
+TIMESTAMP 2017-12-04T11:08:47Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlokE3xfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlolLL9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBHcBAAiv2Qtdh/DI8YSX1T0Xd6+zFJcjCNdpmUNyzsx+9PmFQ4AHEDVD1ibs7F
-AAaRq/fRjX0xCSc3zfe2mxJGm0qHZlQZuM5SudrAPV0Fbq9BBGDoR2899G4JuaNA
-YmQ9U5vH8HhYe7/ktTU2yYJz70XPyYqG9F7PfWIouPt1TWjUvZzfEwYXvg3uJ0SP
-UtDfdDJCAJBbUtqQRosY+fY6jX1srmrJPRtnoYewKbOnQNKsQajhCU0uRjwT46L1
-f3Ifl06jqhdwbHPHrcmIcxgNjzhlHN7EUNP4I/xLi8uhLUz0c8L34F4OenNUwMj2
-1LSjuhNcWOcbTL505JNuxM0dy8bav5PywNK00gZX13pG+y41xrEvpUgG8DESiqF3
-2YgZh0l4fBCtKZ2kf1UyTJgo3XWfx1xpV0O9ZGW11lctGkpiC35bh0kfCH8kge9m
-5MtXqDGCntd/S9anPGpslzlyQM1NF4Lf3ARKr+UNxvevuc2Wy4h2lIkogePQON10
-QHYF0KUUnnlHXQHSEuZxixnC0xTQ3WRYkyfaKAJM+vMQaqEpgTNGSC0Zs4BA2L8o
-G+l53vkz0/FZItGXUCY4x53w5zbVF3mGLvKG+JzH1M9YQwXndyT/YKu+vdDeI6xH
-mbUV8sD9l0hNfEypgp1Op0rpYS//t5mgaq3LdbTJzkvRrKXCAyU=
-=ftDu
+klCmdw/6A8gkHRi0OZjjzKX7ka+nKHkrw//T7tKSDoosavC/1gllxqtA2P6ZgiKa
+nMXi6BEzYcZn6quT/pWCUZlcA40TVjo/pnrTifn7e2k66fv5GkjZVKYmJOp2ADUd
+IEO5UAc9uVNtN7XQyw4NeocRnsVDX8G5dp93x6KDifGVBXoOwy+dGLbQ2oA8Mwp9
+eusQHXo0OEp+9G/CMv7sagMh+QjZjo1dCpOqlQ+MAFAFghZGjseMAmJjt4ET9xcW
+lqcUD1m1a/tLT8Rn/FUTIiuqvahutOueI128JeflrlKwy4nKDpvC/PFjUzm0hQHe
+DWNs68++0huC9ywuCbSNm+dxoGQasq8RL3HZGPnPYRSqqjIZi/vwrPDvyP0y93Rk
+kMsKYNicr8nsiZFtfi9h6fxbEUn8BEXx+Op5e3+F4vr9rtIaPfbJ7BjtBYiEuKAh
+VQbBvGIE92ABaqx+mk7bVd9pPtd/MCA4jwxezkvMmMVY46ExjCgrzg16X6U5WJmi
+rG9LBJSR/qt5zWC+aEm2r2Xn7RhHWpdAQYe1Eh/mrMrRDVBZqtH/kBB/E1q0sTSI
+bPY+vRziPN3D79HsX7LIUL4TusU2bbGklp5ifzf1VmyCuwFqMZb5rn+xIZ6g2Es0
+hEyooMSpasYMRF5dNq4uu0z7Xk/muxOFk4z6qUsvvkry6ejjQRY=
+=o/qo
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 4282eb9dc1ea..82e09928f62e 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 03 Dec 2017 15:08:40 +0000
+Mon, 04 Dec 2017 11:08:43 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 800a9b1e2228..7ca9d2b9256e 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Dec  3 15:08:40 UTC 2017
+Mon Dec  4 11:08:43 UTC 2017
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 8d1aafc1439d..36f2412f5b08 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 03 Dec 2017 15:15:01 +0000
+Mon, 04 Dec 2017 11:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index f183c6c7aa75..d6697bd964da 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-9e1d5b3b8a869b7b5ecc76f69246d6f7e58b580a 1512312853 2017-12-03T14:54:13+00:00
+e20b9a2e6dc90668626ab08db3d8225d0f5d1a2a 1512384767 2017-12-04T10:52:47+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 45efaff243b9..2cda9b51002c 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1512313501 Sun 03 Dec 2017 03:05:01 PM UTC
+1512385501 Mon 04 Dec 2017 11:05:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 4282eb9dc1ea..82e09928f62e 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 03 Dec 2017 15:08:40 +0000
+Mon, 04 Dec 2017 11:08:43 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 597d6ae41bbf..8ce5c674fa20 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index ab939953bb4d..4e443b191cdd 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -9,6 +9,6 @@ DIST CVE-2015-8010_1.13.3.patch 177807 BLAKE2B c3832442d2953f28793236cd29c537041
 DIST icinga-1.13.4.tar.gz 18741576 BLAKE2B fccc88c8749d405e29961e5a1510bec7f920fc43910be757668392098f4ff19ed9f659de911f97e150eea8bd8cfd7a60b440704bdcd9aba450ba1ea29222d1cf SHA512 245f94facfcbb125ed6be26a2544292b7ce6d59a6d38374b7ef1b24b2ca3deaaff56720542c3747d36ab4998b88b367ca40bbd061491e0770e21505bd7c0a1d6
 DIST icinga-1.14.0.tar.gz 20779347 BLAKE2B 65899e99fdc57563aa1dee6f19572c032c5ab6e2aa7093482bd6d6068b4d066d3630ce9bf1396efcb65592d4f25292149178dac81a2a0b775745f70b7409bcc0 SHA512 f02c60c2bd1d3dff4a5a42f9d3c3362ada421f2cd83362b3cdd05f59b0aafe4f61255b621afed1fbf959415545a94ce6b3124bf2ffac22f0f2bdb8a67e75ad7a
 EBUILD icinga-1.13.4.ebuild 7956 BLAKE2B 656e1db2b2d7ae0d1b7ccb2eb931565212732e2530542c1bb81cdc293f79bcc7909cc80964e475e29bd40a93abded0377dd3fcbb01640bbaa1dd846716053459 SHA512 ec0b90e102cc5f0b282731f923c15b259c4581f35eaed8eafd13678f9455754f808004b38c0f03eb723ff61fcffb51750f90163e6c4b2b5c887a286e029c429f
-EBUILD icinga-1.14.0-r1.ebuild 7690 BLAKE2B 944178a531f71617ee1c9a546d83e62636e306281a1578f14b1b125eddc7b0bd99858abb60ff3a87be419c71d4a0c6846c095178344c687aa70c2040f9388df8 SHA512 7fda9feaffb708bb911ddec60f72311ce90b383ec936bf7e13a927f073dc63d07dbd4422d8e0250c619a82a09587e39868eb1bbc9f265f409e6c67dee9a0551c
+EBUILD icinga-1.14.0-r1.ebuild 7691 BLAKE2B d8b0cb7ca1d92107adb0a0e34053cb7928e40146df6f6092497c1c73ce3fcbfab53ba856a58b4b61f6fd2c23a1f15023d609e7c92c6209c0916441ce7a520ade SHA512 b3778bcc58c99ff27d3c801a45c57027aa431d9edb8c2b4bb7d7119e1a8a0cbe36218553a5226510d0b9122cd196241230d488caf313ca56fae2475df0f8c21a
 EBUILD icinga-1.14.0.ebuild 7920 BLAKE2B d5fe3a133c5733b7116376e4ca7c64ca7c621a6dfea314c6464e40d11004151a647594ca9502dff679236d7783d85465fab5b48efdb833d8421243462065dc42 SHA512 ef73833c299d5dba38c489e77a8faf22356949bc7599f5e6da2d3540921015507410062227d7330a42155b32e3d84cca252b4366fc43e735d39f3c6a3d1111cd
 MISC metadata.xml 853 BLAKE2B 6825b192328f944e2389f221e4dbf5fffea45f1cb650866a8240e53c723ae9b40473e092d48003844fd99b65db4e6ddc7747eddbf7239e7cf4ecddfcca375eb8 SHA512 1aad02d84c0e90f4f0f5ed54e326d9a14e77f5146b3ba9293279e009f45900a69e1b2fcc9f54cb02111f05bb2aef0370cda1b4bc4fffa4fc4dd0c2a073e0a92b
diff --git a/net-analyzer/icinga/icinga-1.14.0-r1.ebuild b/net-analyzer/icinga/icinga-1.14.0-r1.ebuild
index bf0de98f741b..681ce94efa8d 100644
--- a/net-analyzer/icinga/icinga-1.14.0-r1.ebuild
+++ b/net-analyzer/icinga/icinga-1.14.0-r1.ebuild
@@ -165,7 +165,7 @@ src_install() {
 
 	if use eventhandler ; then
 		dodir /etc/icinga/eventhandlers
-		fowners icinga:icinga /etc/icinga/eventhandlers
+#		fowners icinga:icinga /etc/icinga/eventhandlers
 	fi
 
 	keepdir /etc/icinga
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 3364218bd71a..72251d795d3d 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/ldns-utils/Manifest b/net-dns/ldns-utils/Manifest
index 39fbeff98288..abf684f6c9e4 100644
--- a/net-dns/ldns-utils/Manifest
+++ b/net-dns/ldns-utils/Manifest
@@ -4,5 +4,5 @@ DIST ldns-1.6.17.tar.gz 1315403 SHA256 8b88e059452118e8949a2752a55ce59bc71fa5bc4
 DIST ldns-1.7.0.tar.gz 1304424 SHA256 c19f5b1b4fb374cfe34f4845ea11b1e0551ddc67803bd6ddd5d2a20f0997a6cc SHA512 8a4e48bcc2a244b92447a9830b60efbb656fb7955f3559ef2eb6f8e724c4c0208776350c44ccf7dcf1ffe0b7b9d9ccc4cbddc5bc16e8888db494ab4d0bce3bd8 WHIRLPOOL 4450b94dd3e2586230f1691b626947cad7ac2031e343d1e522343570d5b713cfd4bacd52e91713139a88c2fe2406f5f42594d2da0a0474c807f47fd2e98726b1
 EBUILD ldns-utils-1.6.12.ebuild 1351 BLAKE2B c2d36cf2b3924821904af1632d3df395d92ec0835030cce8f03d150478ccae743be26e795ab9e6e7a104771bd7119832efcfe05f1b9f9790472d25a91a457d57 SHA512 74b2120348484901b4736f10cc4fc4f36b4ae728fb3173623c8e5274205c1bbe5b6d535ddf62c20e367fedbcdc0591a870fae871ac99679325267a67721b3829
 EBUILD ldns-utils-1.6.17.ebuild 1138 BLAKE2B 0731e3377961d21b35e5a4237d72079a24b22ed76a24efd8deb0d275f9c54ca40968901802b7a25d1033a4fbc6e0f8322775ff23f81263766a6e65e8c9ef6f7d SHA512 3ae6b8549ed43e1957127129094ece798f1e7f64dae5521f83eeb59a37bc72ae7e97963b68fadf3c5446c8c019d3800ce06f7e29acaf2c6e748750aed6db03d0
-EBUILD ldns-utils-1.7.0.ebuild 1142 BLAKE2B 1a8143506d627b87c68178845bd4bfdd709046bfada6140f17a0c55753d948d31730bef39aa66cf419cf3cd789d1569831337b7d3a36af7d361f4e2a5bae74e1 SHA512 728a69b608ee8d9388ca6331f1da4e6e0e5932f6380fc788fbc9787aabba5e3acc35bbe6462f10173e08ea9f0cd6cec600e18812aa542ffb0039ca3408d6a1b7
+EBUILD ldns-utils-1.7.0.ebuild 1141 BLAKE2B 5938f2ca325891402df628c7894c20c23c837dd40809b54d9d345ed0ee5f5c7f424fdb5cba1db5ded4aea4f689fb9d77d96fd96e056776b707f0ef37ad41a531 SHA512 3273c75d7b8ae67b746083afe6c5c682adf689950363539323e3a42acb6ce7324236e01dff68a8f8c6d8735a6e5d5ee952401c82bd7d0a50c1f7bed14c5d36d6
 MISC metadata.xml 742 BLAKE2B 78bcba18e70bea755bab35347639a1a529961e91b709b789c045db918525939e9fdb4a7adb6dd7801c64bd02090503d5b3edbe444fbf34615ec3ebb5342d2288 SHA512 a0c0fc0a7dd05890fa9b2d6bf99c5b96990d76993d27d18a382ab69e1200aa5f472865c5de928575d773f70ef21314519bc46a1d2a138da34d569bf56a7d8748
diff --git a/net-dns/ldns-utils/ldns-utils-1.7.0.ebuild b/net-dns/ldns-utils/ldns-utils-1.7.0.ebuild
index 804bffc870e2..b2c6d80b3b45 100644
--- a/net-dns/ldns-utils/ldns-utils-1.7.0.ebuild
+++ b/net-dns/ldns-utils/ldns-utils-1.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/ldns/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="+dane ecdsa examples gost ssl"
 
 DEPEND=">=net-libs/ldns-${PV}[dane?,ecdsa?,gost?,ssl?]
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 475a17d4ef1a..8f3f572b6337 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,13 +1,8 @@
-AUX CVE-2017-15090-4.0.6.patch 659 BLAKE2B b710ca3c84f5b7d7936155a67f8d3fd82ad6b58f0edf69079498a1896f5ab4a3387fb4c6c9999a726b38e439b506f6ebbcec53866b556f3d0e297c30ffe8f50a SHA512 ce747ae0c747d70597bf3b386db0390c34dce03d6dab98f7f30e43fa21a87f133e66438bf53bcd66ae364cdc451dc4469b95bf479540b90c7282ba4cf150f3ad
-AUX CVE-2017-15092-4.0.6.patch 2798 BLAKE2B 6770cb303a86457338776abb95d198315f643c96337f857ab83979ae5978b52210621fdee557d9c0ba07d457b8eadfb88dca994fbd8bab6fcdf885948a5c4c97 SHA512 d4d22dd0ee26fd750e517796cda7c0517c0e05743b8acff013e48f3c9b3748c5301ecb8e781ecae966c58cc96fe202375c55a5c3593fb475d526fbd079ff971a
 AUX CVE-2017-15093-4.0.6.patch 1581 BLAKE2B b3604c997b30805bf883879a65e30a96bfeef52eb04fbe7b741c2a41884134c145059359daed0db7d419eadc76909366d19af719a1cb0a978319028c6cbb4614 SHA512 e367895d54c0fe989812195bef0e904c79e16d5bcb1239b074e9587d0e69bab2ae4d675a74c485179c5bb3d4e18fd1f8d505bae0ef1dc72b3a649db596f8c222
 AUX CVE-2017-15094-4.0.6.patch 1031 BLAKE2B 7be45cc770e92fb156b563e32855576ec79f230edd751e14d5bb6b55b859a83acfb9cad30f1e4dace94c316895241a2da2f46e9335b1f3138b4cbd535e62131f SHA512 164370b3667fbe8f19c55068a5d250651ef9873df05d4516f093f98a9bd8f1cd48e95530b2e8cca3b5c54c26bdde8718d7dcd739c922c8d25ac25d2418642393
 AUX pdns-recursor-r1 1135 BLAKE2B 90f28d33c126882e5b5e29209ec12f336797720832f7750262329cc5d47fefdf8bcb5208807e47638037a704abbbebd0ee2b1380a3d1d54feab6d4900c250176 SHA512 9dce3cd454ed6b61af8d70c90a8464c60d16eb8342ffc46558f5dcc5089c77aff4581f208684ddb25c4512ce6f39c54afaf267dcade667d812511ae3fa3a1f48
-DIST pdns-recursor-4.0.6.tar.bz2 1105423 BLAKE2B 50cc52f118630d4d8ce9876c2e11494a3c972ec90003c40fea36801eb08bd8b6173f876e6f53eb672ad8ff3da04e669946740a50f653a21459f25c1137d91297 SHA512 2203fd96469deded1da677344485da221eec036b1ad9fb418a89cd4477d73f2a6fcf984a39b574561df6946f440ddf1982de20cd39d7204da9c27e74216d1159
 DIST pdns-recursor-4.0.7.tar.bz2 1107546 BLAKE2B 3ccda73878599e3ade69e4dc6b0787e588a8403fb7cacfbe574409513b8723cbfd29a3c73d857120def801da60a4bedbc0f0c396e6642adb0287204cde301331 SHA512 0c8873adcce5ed9b41f161bc71635da23496b4ae48dbffff7dcdf9c5181e720f9aa94e18bd64e0dff9fa03eae8410dc93585a74d13f0c16d38b0d1c0f4146bb2
 DIST pdns-recursor-4.1.0-rc3.tar.bz2 1191353 BLAKE2B fcbc6f08f962c9c2f459448770406734eff2caab43b615690e9d910b65327e45182aa2c9bcadadeaa6eb3984a8cb463849d5e001ffb98bb618966da5b8557a8a SHA512 141e3fcbf5e7c81ae0228fb7a15c599ef5ae41e2c2d169e2f7b4f57c6c832ac40d3e20302d219ba565c4a514b1297906684247a1a56cd740e3ea0bff4a7da51d
-EBUILD pdns-recursor-4.0.6-r1.ebuild 1775 BLAKE2B 68e4f90e18abfede00cc903b32013ea89e608bbb1b9cbdb1003fd24f02bb278bd9c7c30c58f7416976cc702e7330064c6c2d327dec29ca069465b2972cd10c38 SHA512 ffd7d04fa63cb931ed3c4171e4e0ec2de8d1665c897382117d8e20b26a46e61b4e900a406c751e5848fd1c673102b93ecb8f29631da8c8e8553814f36169abc3
-EBUILD pdns-recursor-4.0.6.ebuild 1698 BLAKE2B bf67849d5f47c1f0d148596aea3fbc4268ad6696761f76f7fdb3b3b574708b01a464f12ae2a6c1df8979d60ec0cb877542dbf927af91bb2709e4510ce675a691 SHA512 358312b26fad4c6f2c473b7756f9c6d71c77045d6c7d0e92a10555848bc1643d9fc59454f61f8286d0891d181a1f6b20eeae055598dc7b150ba06faa0af44650
 EBUILD pdns-recursor-4.0.7.ebuild 1698 BLAKE2B bf67849d5f47c1f0d148596aea3fbc4268ad6696761f76f7fdb3b3b574708b01a464f12ae2a6c1df8979d60ec0cb877542dbf927af91bb2709e4510ce675a691 SHA512 358312b26fad4c6f2c473b7756f9c6d71c77045d6c7d0e92a10555848bc1643d9fc59454f61f8286d0891d181a1f6b20eeae055598dc7b150ba06faa0af44650
 EBUILD pdns-recursor-4.1.0_rc3-r1.ebuild 1889 BLAKE2B e8a915231e5cdaf6cfcd64d4e78a56b183cb7a37a41262c275d203d00b62de05a8975aa7574ec46ccc089aeeeeafa497b6755a344e718bf9d2db75dd5d09f635 SHA512 216143fbd3c7c869ec09f0bc0fc0785d8f5ca2335c53028d8942cf97e3b25aa0cfc08921130589f97ebea642ba505b908a126921bea60f095d377d4f44453227
 MISC metadata.xml 1076 BLAKE2B 4f68267d5dfcf3cff38f306f440ed2e9a7f5193c14c1029bcfcbbfca4f8f310c94969001c781e1b78a14cec2a6e313e44d82bebbd9694fe46f97759372e63711 SHA512 374be5aa98c4bab340d8d63c859ab08a392e926fbb4d55e1f5a2967d41c401d13d5e8d5997c0790c3b8f96662b56e4492343248d7c8e0a067dc7eaf3f4b56e95
diff --git a/net-dns/pdns-recursor/files/CVE-2017-15090-4.0.6.patch b/net-dns/pdns-recursor/files/CVE-2017-15090-4.0.6.patch
deleted file mode 100644
index fa0bfd099abf..000000000000
--- a/net-dns/pdns-recursor/files/CVE-2017-15090-4.0.6.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ru pdns-recursor-4.0.6.orig/validate-recursor.cc pdns-recursor-4.0.6/validate-recursor.cc
---- pdns-recursor-4.0.6.orig/validate-recursor.cc	2017-07-04 17:43:07.000000000 +0200
-+++ pdns-recursor-4.0.6/validate-recursor.cc	2017-11-02 18:29:16.612520450 +0100
-@@ -87,6 +87,11 @@
-     bool first = true;
-     for(const auto& csp : cspmap) {
-       for(const auto& sig : csp.second.signatures) {
-+
-+        if (!csp.first.first.isPartOf(sig->d_signer)) {
-+          return increaseDNSSECStateCounter(Bogus);
-+        }
-+
-         vState newState = getKeysFor(sro, sig->d_signer, keys); // XXX check validity here
- 
-         if (newState == Bogus) // No hope
diff --git a/net-dns/pdns-recursor/files/CVE-2017-15092-4.0.6.patch b/net-dns/pdns-recursor/files/CVE-2017-15092-4.0.6.patch
deleted file mode 100644
index 1425c33586c2..000000000000
--- a/net-dns/pdns-recursor/files/CVE-2017-15092-4.0.6.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff -ru pdns-recursor-4.0.6.orig/html/local.js pdns-recursor-4.0.6/html/local.js
---- pdns-recursor-4.0.6.orig/html/local.js	2017-07-04 17:43:07.000000000 +0200
-+++ pdns-recursor-4.0.6/html/local.js	2017-11-02 18:26:04.624586674 +0100
-@@ -63,7 +63,7 @@
- 
- 	$.getJSON(qstring,
- 		  function(data) {
--		      var bouw="<table><tr><th>Number</th><th>Domain</th><th>Type</th></tr>";
-+		      var table = $('<table><tr><th>Number</th><th>Domain</th><th>Type</th></tr></table>');
- 		      var num=0;
- 		      var total=0, rest=0;
- 		      $.each(data["entries"], function(a,b) {
-@@ -75,12 +75,26 @@
- 			  if(b[1].length > 25)
- 			      b[1]=b[1].substring(0,25);
- 
--			  bouw=bouw+("<tr><td>"+b[0]+"</td><td>"+b[1]+"</td><td>"+b[2]+"</td></tr>");
--		      });
--		      bouw+="<tr><td>"+rest+"</td><td>Rest</td></tr>";
--		      bouw=bouw+"</table>";
--		      $("#queryring").html(bouw);
--
-+			  var line = $('<tr />');
-+			  var number = $('<td />');
-+			  number.text(b[0]);
-+			  var domain = $('<td />');
-+			  domain.text(b[1]);
-+			  var type = $('<td />');
-+			  type.text(b[2]);
-+			  line.append(number);
-+			  line.append(domain);
-+			  line.append(type);
-+			  table.append(line);
-+                      });
-+		      var line = $('<tr />');
-+		      var number = $('<td />');
-+		      number.text(rest);
-+		      var label = $('<td>Rest</td>');
-+		      line.append(number);
-+		      line.append(label);
-+		      table.append(line);
-+		      $("#queryring").html(table);
- 		  });
- 
- 	filtered=$("#filter2").is(':checked')
-@@ -91,7 +105,7 @@
- 
- 	$.getJSON(qstring, 
- 		  function(data) {
--		      var bouw="<table><tr><th>Number</th><th>Servfail domain</th><th>Type</th></tr>";
-+		      var table = $('<table><tr><th>Number</th><th>Servfail domain</th><th>Type</th></tr></table>');
- 		      var num=0, total=0, rest=0;
- 		      $.each(data["entries"], function(a,b) {
- 			  total+=b[0];
-@@ -101,11 +115,26 @@
- 			  }
- 			  if(b[1].length > 25)
- 			      b[1]=b[1].substring(0,25);
--			  bouw=bouw+("<tr><td>"+b[0]+"</td><td>"+b[1]+"</td><td>"+b[2]+"</td></tr>");
-+			  var line = $('<tr />');
-+			  var number = $('<td />');
-+			  number.text(b[0]);
-+			  var domain = $('<td />');
-+			  domain.text(b[1]);
-+			  var type = $('<td />');
-+			  type.text(b[2]);
-+			  line.append(number);
-+			  line.append(domain);
-+			  line.append(type);
-+			  table.append(line);
- 		      });
--		      bouw+="<tr><td>"+rest+"</td><td>Rest</td></tr>";
--		      bouw=bouw+"</table>";
--		      $("#servfailqueryring").html(bouw);
-+		      var line = $('<tr />');
-+		      var number = $('<td />');
-+		      number.text(rest);
-+		      var label = $('<td>Rest</td>');
-+		      line.append(number);
-+		      line.append(label);
-+		      table.append(line);
-+		      $("#servfailqueryring").html(table);
- 
- 		  });
- 
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.0.6-r1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.0.6-r1.ebuild
deleted file mode 100644
index 30f31e4cc5bb..000000000000
--- a/net-dns/pdns-recursor/pdns-recursor-4.0.6-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs flag-o-matic eutils versionator
-
-DESCRIPTION="The PowerDNS Recursor"
-HOMEPAGE="https://www.powerdns.com/"
-SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="libressl lua luajit protobuf systemd"
-REQUIRED_USE="?? ( lua luajit )"
-
-DEPEND="lua? ( >=dev-lang/lua-5.1:= )
-	luajit? ( dev-lang/luajit:= )
-	protobuf? (
-		dev-libs/protobuf
-		>=dev-libs/boost-1.42:=
-	)
-	systemd? ( sys-apps/systemd:0= )
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:= )
-	>=dev-libs/boost-1.35:="
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/_/-}
-
-PATCHES=(
-	"${FILESDIR}"/CVE-2017-{15090,15092,15093,15094}-4.0.6.patch
-)
-
-pkg_setup() {
-	filter-flags -ftree-vectorize
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/powerdns \
-		$(use_enable systemd) \
-		$(use_with lua) \
-		$(use_with luajit) \
-		$(use_with protobuf)
-}
-
-src_install() {
-	default
-
-	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
-
-	# set defaults: setuid=nobody, setgid=nobody
-	sed -i \
-		-e 's/^# set\([ug]\)id=$/set\1id=nobody/' \
-		-e 's/^# quiet=$/quiet=on/' \
-		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
-		"${D}"/etc/powerdns/recursor.conf
-
-	newinitd "${FILESDIR}"/pdns-recursor-r1 pdns-recursor
-
-	keepdir /var/lib/powerdns
-}
-
-pkg_postinst() {
-	local old
-
-	for old in ${REPLACING_VERSIONS}; do
-		version_compare ${old} 4.0.0-r1
-		[[ $? -eq 1 ]] || continue
-
-		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
-		ewarn "to pdns-recursor, please update your runlevels accordingly."
-
-		break
-	done
-}
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.0.6.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.0.6.ebuild
deleted file mode 100644
index 8ad027121b3c..000000000000
--- a/net-dns/pdns-recursor/pdns-recursor-4.0.6.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs flag-o-matic eutils versionator
-
-DESCRIPTION="The PowerDNS Recursor"
-HOMEPAGE="https://www.powerdns.com/"
-SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="libressl lua luajit protobuf systemd"
-REQUIRED_USE="?? ( lua luajit )"
-
-DEPEND="lua? ( >=dev-lang/lua-5.1:= )
-	luajit? ( dev-lang/luajit:= )
-	protobuf? (
-		dev-libs/protobuf
-		>=dev-libs/boost-1.42:=
-	)
-	systemd? ( sys-apps/systemd:0= )
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:= )
-	>=dev-libs/boost-1.35:="
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/_/-}
-
-pkg_setup() {
-	filter-flags -ftree-vectorize
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/powerdns \
-		$(use_enable systemd) \
-		$(use_with lua) \
-		$(use_with luajit) \
-		$(use_with protobuf)
-}
-
-src_install() {
-	default
-
-	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
-
-	# set defaults: setuid=nobody, setgid=nobody
-	sed -i \
-		-e 's/^# set\([ug]\)id=$/set\1id=nobody/' \
-		-e 's/^# quiet=$/quiet=on/' \
-		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
-		"${D}"/etc/powerdns/recursor.conf
-
-	newinitd "${FILESDIR}"/pdns-recursor-r1 pdns-recursor
-
-	keepdir /var/lib/powerdns
-}
-
-pkg_postinst() {
-	local old
-
-	for old in ${REPLACING_VERSIONS}; do
-		version_compare ${old} 4.0.0-r1
-		[[ $? -eq 1 ]] || continue
-
-		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
-		ewarn "to pdns-recursor, please update your runlevels accordingly."
-
-		break
-	done
-}
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 263294c9bd0a..819f25029a82 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -1,11 +1,7 @@
-AUX CVE-2017-15091-4.0.4.patch 1127 BLAKE2B 0fd529b76fdfbb0c6f534f46eb1130ea66d349e4241680459bbeb3a87bc34f34e8485850639986754264005de094dca758e9f7c6cf6d8b86184337a918327b37 SHA512 78d991e755ca9e94eea7f027fff2e2cef7a7e290c1fafd74ee2821880b004c55237334e4b1ea307032be5bfd6d20843640d711e2c0b6b9a932786ac571c4eb0a
 AUX dnsdomain2.schema 6640 BLAKE2B d3efc6bc16390f35979f1184632e7184cf403453422888e2cb44fa4fed7891241919a39c8c6f539a61de032654650a45ea548a6983777ea1bfe029e817f2c315 SHA512 ac16f8d528d6138d3c2cbf997fd8fbb467d388aa63eb6ed4e7780a3dad11ea885b91252ff0809b1d2cf7d5200814b8963aab890af84741ea86d35b2f5955a7ea
 AUX pdns-r1 2533 BLAKE2B 0d4af8f9cd4568cde40b44c72cb10a29662daa514df1a1d8174dd02f2ad4324cb7c99a05736bac7cbe80e1b9081832cac95d8c482eb4d1a8c344a6b55da623e3 SHA512 6392f59f82b82621b6cab6823f7761cd875bc6818c48db846df289057c02d8119a1024c5ecdf70a5ca8a55c00a2c3c56240d36b42cc038a25e8616ab9b966dd6
-DIST pdns-4.0.4.tar.bz2 1320327 BLAKE2B 5c11a0245408f8448b41ed4229718e6f7244e0c8f36b60b07c280f82c7dea0065cce93c3814b3a396666be8d3b012ad4eb646cf55f531d22ce325190e0fd6e22 SHA512 4ef4705cd990b03976775167c7c37850d45907e198549feda5f5701172e008e3f1f74a35a9bebdb24b63dec15ff63cb2cc9dfc8f92e4e1012e0539c5a88b845b
 DIST pdns-4.0.5.tar.bz2 1323468 BLAKE2B 7e10cc98177bfa4f81888e2598ab4f0ce83ee45e6349372c065940424a74015302da879536dea8346fe7b86f35c0524a5449489bdf71d1a091b7c6a82fac4b6f SHA512 4b0fa932c1d9caf35b988916447aa21c64ebe2a58bdd84417cf09321a21b264cf1057206dc6993a45a3b591eb1dfa49463710c06b6bdfaf6fb17ae6dec6086d9
 DIST pdns-4.1.0.tar.bz2 1116905 BLAKE2B 91ec0f0cfa70966ff71dfb6302ed01355120ca1429d3c610c4abfb1b964cff78a6332700991bc259387e9095be03d3850da41750e93bb3ffe3db0e23562d156c SHA512 4b2b42f4893f8aac3cf07a6c8a3c999cb728a5907a710f1a5c9c8d08377ecb63e202e5eececbefc069c8f1d97a29b2aa607da7cf2bcc6335a72222418e409e77
-EBUILD pdns-4.0.4-r1.ebuild 4201 BLAKE2B d54e8e387ba8b5d623bf81ac09914ff40b9dcb0cf470ed9ac47c1fafa87d0a8f7bb9a18678b5cef4f891ad229014e574267de5dbcd2a77a197afbfe907a1337f SHA512 bf382471ddb2de96a0ecff1076402c1d5a0f1b5f40d9dd61640049ef979339235549452b75b68de0fed4aac31e5bc038be77b8f8801a244d4f6e6c320c47bf7e
-EBUILD pdns-4.0.4.ebuild 4144 BLAKE2B a5a33e8b5af9d03165cd3984b4626963d8bec9ea3414164006ced76bf3b2eedf6219f79f4dd4384df819be309641be1e7474ff51bccd950a9cf72aa7fd808830 SHA512 2491bd5013165ef666ca5c077c5d6330d016ba8d87950e6875fbdf780d212624616569a708ab6bdb7016ad10bfee18605d9136541d92166253a50e4ea0729ba0
 EBUILD pdns-4.0.5.ebuild 4121 BLAKE2B e6614c7eea00e1e91826a20d25c4b440e4333a500fbd661f3b7c19f795e98b6e9b5d8f68222d2186cdd77edf387ae63b6b2861d3c7f6d55d982fe0f7f8c4c3fe SHA512 c6bc8aeec70b28faec1c7b0e77245e59a4a9903d621a2fc0ae149889e1661d3c210a2bd12286834a34efbd0343a929ebaed0931143630abb1a293ce7cd92df72
 EBUILD pdns-4.1.0.ebuild 4139 BLAKE2B 3b1c1baf7910e0b72d4c27ca34efb03e87d0983ac85a400adbe76d071edb5c274c68012365ac51b2af2a0c7442675e0a69a0e18e892b5115960093252076475b SHA512 befcd3c0e7e71a73e7c46e76592b71d843ec9b042029f60c952e6b4c9e1860d85cb910d29b40e7e5740c1e88f2314756fd251dec829c146120aaad9147c47853
 MISC metadata.xml 1451 BLAKE2B 69fede20eb18ba4d8bf397c51528a5b5ea4869802215c9851b21b4f71dd3545f7eb358e5e7581e23e5b5df67b29ec96d7da0caa69719951302d614b87f90f10b SHA512 ea054e8d7bdf7d4251ce00c342fda57fc3785a7ba8a8cd3ccd95c86eb8e1b5fbe155997210b67f65bcddab81e39ae136a99e61adf32de55e066d81f89ea50323
diff --git a/net-dns/pdns/files/CVE-2017-15091-4.0.4.patch b/net-dns/pdns/files/CVE-2017-15091-4.0.4.patch
deleted file mode 100644
index a9506af8ef95..000000000000
--- a/net-dns/pdns/files/CVE-2017-15091-4.0.4.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ru pdns-4.0.4.orig/pdns/ws-auth.cc pdns-4.0.4/pdns/ws-auth.cc
---- pdns-4.0.4.orig/pdns/ws-auth.cc	2017-06-22 22:07:25.000000000 +0200
-+++ pdns-4.0.4/pdns/ws-auth.cc	2017-11-02 18:07:20.986764858 +0100
-@@ -860,7 +860,7 @@
- static void apiServerZoneAxfrRetrieve(HttpRequest* req, HttpResponse* resp) {
-   DNSName zonename = apiZoneIdToName(req->parameters["id"]);
- 
--  if(req->method != "PUT")
-+  if(req->method != "PUT" || ::arg().mustDo("api-readonly"))
-     throw HttpMethodNotAllowedException();
- 
-   UeberBackend B;
-@@ -879,7 +879,7 @@
- static void apiServerZoneNotify(HttpRequest* req, HttpResponse* resp) {
-   DNSName zonename = apiZoneIdToName(req->parameters["id"]);
- 
--  if(req->method != "PUT")
-+  if(req->method != "PUT" || ::arg().mustDo("api-readonly"))
-     throw HttpMethodNotAllowedException();
- 
-   UeberBackend B;
-@@ -1191,7 +1191,7 @@
- }
- 
- void apiServerCacheFlush(HttpRequest* req, HttpResponse* resp) {
--  if(req->method != "PUT")
-+  if(req->method != "PUT" || ::arg().mustDo("api-readonly"))
-     throw HttpMethodNotAllowedException();
- 
-   DNSName canon = apiNameToDNSName(req->getvars["domain"]);
diff --git a/net-dns/pdns/pdns-4.0.4-r1.ebuild b/net-dns/pdns/pdns-4.0.4-r1.ebuild
deleted file mode 100644
index 9fa2350de534..000000000000
--- a/net-dns/pdns/pdns-4.0.4-r1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils multilib user toolchain-funcs versionator
-
-DESCRIPTION="The PowerDNS Daemon"
-HOMEPAGE="https://www.powerdns.com/"
-SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# other possible flags:
-# db2: we lack the dep
-# oracle: dito (need Oracle Client Libraries)
-# xdb: (almost) dead, surely not supported
-
-IUSE="botan debug doc geoip ldap libressl lua luajit mydns mysql opendbx postgres protobuf remote sqlite systemd tools tinydns test"
-
-REQUIRED_USE="mydns? ( mysql ) ?? ( lua luajit )"
-
-RDEPEND="
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:= )
-	>=dev-libs/boost-1.35:=
-	botan? ( =dev-libs/botan-1.10*[threads] )
-	lua? ( dev-lang/lua:= )
-	luajit? ( dev-lang/luajit:= )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )
-	ldap? ( >=net-nds/openldap-2.0.27-r4 )
-	sqlite? ( dev-db/sqlite:3 )
-	opendbx? ( dev-db/opendbx )
-	geoip? ( >=dev-cpp/yaml-cpp-0.5.1 dev-libs/geoip )
-	tinydns? ( >=dev-db/tinycdb-0.77 )
-	protobuf? ( dev-libs/protobuf )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}"/${P/_/-}
-
-PATCHES=(
-	"${FILESDIR}"/CVE-2017-15091-4.0.4.patch
-)
-
-src_configure() {
-	local dynmodules="pipe bind" # the default backends, always enabled
-
-	#use db2 && dynmodules+=" db2"
-	use ldap && dynmodules+=" ldap"
-	use lua && dynmodules+=" lua"
-	use mydns && dynmodules+=" mydns"
-	use mysql && dynmodules+=" gmysql"
-	use opendbx && dynmodules+=" opendbx"
-	#use oracle && dynmodules+=" goracle oracle"
-	use postgres && dynmodules+=" gpgsql"
-	use remote && dynmodules+=" remote"
-	use sqlite && dynmodules+=" gsqlite3"
-	use tinydns && dynmodules+=" tinydns"
-	use geoip && dynmodules+=" geoip"
-	#use xdb && dynmodules+=" xdb"
-
-	econf \
-		--disable-static \
-		--sysconfdir=/etc/powerdns \
-		--libdir=/usr/$(get_libdir)/powerdns \
-		--with-modules= \
-		--with-dynmodules="${dynmodules}" \
-		--with-pgsql-includes=/usr/include \
-		--with-pgsql-lib=/usr/$(get_libdir) \
-		--with-mysql-lib=/usr/$(get_libdir) \
-		$(use_enable botan botan1.10) \
-		$(use_enable debug verbose-logging) \
-		$(use_enable test unit-tests) \
-		$(use_enable tools) \
-		$(use_enable systemd) \
-		$(use_with lua) \
-		$(use_with luajit) \
-		$(use_with protobuf) \
-		${myconf}
-}
-
-src_compile() {
-	default
-	use doc && emake -C codedocs codedocs
-}
-
-src_install() {
-	default
-
-	mv "${D}"/etc/powerdns/pdns.conf{-dist,}
-
-	fperms 0700 /etc/powerdns
-	fperms 0600 /etc/powerdns/pdns.conf
-
-	# set defaults: setuid=pdns, setgid=pdns
-	sed -i \
-		-e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \
-		"${D}"/etc/powerdns/pdns.conf
-
-	newinitd "${FILESDIR}"/pdns-r1 pdns
-
-	keepdir /var/empty
-
-	use doc && dohtml -r codedocs/html/.
-
-	# Install development headers
-	insinto /usr/include/pdns
-	doins pdns/*.hh
-	insinto /usr/include/pdns/backends/gsql
-	doins pdns/backends/gsql/*.hh
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/dnsdomain2.schema
-	fi
-
-	prune_libtool_files --all
-}
-
-pkg_preinst() {
-	enewgroup pdns
-	enewuser pdns -1 -1 /var/empty pdns
-}
-
-pkg_postinst() {
-	elog "PowerDNS provides multiple instances support. You can create more instances"
-	elog "by symlinking the pdns init script to another name."
-	elog
-	elog "The name must be in the format pdns.<suffix> and PowerDNS will use the"
-	elog "/etc/powerdns/pdns-<suffix>.conf configuration file instead of the default."
-
-	if use ldap ; then
-		ewarn "The official LDAP backend module is only compile-tested by upstream."
-		ewarn "Try net-dns/pdns-ldap-backend if you have problems with it."
-	fi
-
-	local old
-	for old in ${REPLACING_VERSIONS}; do
-		version_compare ${old} 3.2
-		[[ $? -eq 1 ]] || continue
-
-		ewarn "To fix a security bug (bug #458018) had the following"
-		ewarn "files/directories the world-readable bit removed (if set):"
-		ewarn "  ${EPREFIX}/etc/powerdns"
-		ewarn "  ${EPREFIX}/etc/powerdns/pdns.conf"
-		ewarn "Check if this is correct for your setup"
-		ewarn "This is a one-time change and will not happen on subsequent updates."
-		chmod o-rwx "${EPREFIX}"/etc/powerdns/{,pdns.conf}
-
-		break
-	done
-}
diff --git a/net-dns/pdns/pdns-4.0.4.ebuild b/net-dns/pdns/pdns-4.0.4.ebuild
deleted file mode 100644
index 43c8063885e7..000000000000
--- a/net-dns/pdns/pdns-4.0.4.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils multilib user toolchain-funcs versionator
-
-DESCRIPTION="The PowerDNS Daemon"
-HOMEPAGE="https://www.powerdns.com/"
-SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# other possible flags:
-# db2: we lack the dep
-# oracle: dito (need Oracle Client Libraries)
-# xdb: (almost) dead, surely not supported
-
-IUSE="botan debug doc geoip ldap libressl lua luajit mydns mysql opendbx postgres protobuf remote sqlite systemd tools tinydns test"
-
-REQUIRED_USE="mydns? ( mysql ) ?? ( lua luajit )"
-
-RDEPEND="
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:= )
-	>=dev-libs/boost-1.35:=
-	botan? ( =dev-libs/botan-1.10*[threads] )
-	lua? ( dev-lang/lua:= )
-	luajit? ( dev-lang/luajit:= )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )
-	ldap? ( >=net-nds/openldap-2.0.27-r4 )
-	sqlite? ( dev-db/sqlite:3 )
-	opendbx? ( dev-db/opendbx )
-	geoip? ( >=dev-cpp/yaml-cpp-0.5.1 dev-libs/geoip )
-	tinydns? ( >=dev-db/tinycdb-0.77 )
-	protobuf? ( dev-libs/protobuf )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}"/${P/_/-}
-
-src_configure() {
-	local dynmodules="pipe bind" # the default backends, always enabled
-
-	#use db2 && dynmodules+=" db2"
-	use ldap && dynmodules+=" ldap"
-	use lua && dynmodules+=" lua"
-	use mydns && dynmodules+=" mydns"
-	use mysql && dynmodules+=" gmysql"
-	use opendbx && dynmodules+=" opendbx"
-	#use oracle && dynmodules+=" goracle oracle"
-	use postgres && dynmodules+=" gpgsql"
-	use remote && dynmodules+=" remote"
-	use sqlite && dynmodules+=" gsqlite3"
-	use tinydns && dynmodules+=" tinydns"
-	use geoip && dynmodules+=" geoip"
-	#use xdb && dynmodules+=" xdb"
-
-	econf \
-		--disable-static \
-		--sysconfdir=/etc/powerdns \
-		--libdir=/usr/$(get_libdir)/powerdns \
-		--with-modules= \
-		--with-dynmodules="${dynmodules}" \
-		--with-pgsql-includes=/usr/include \
-		--with-pgsql-lib=/usr/$(get_libdir) \
-		--with-mysql-lib=/usr/$(get_libdir) \
-		$(use_enable botan botan1.10) \
-		$(use_enable debug verbose-logging) \
-		$(use_enable test unit-tests) \
-		$(use_enable tools) \
-		$(use_enable systemd) \
-		$(use_with lua) \
-		$(use_with luajit) \
-		$(use_with protobuf) \
-		${myconf}
-}
-
-src_compile() {
-	default
-	use doc && emake -C codedocs codedocs
-}
-
-src_install() {
-	default
-
-	mv "${D}"/etc/powerdns/pdns.conf{-dist,}
-
-	fperms 0700 /etc/powerdns
-	fperms 0600 /etc/powerdns/pdns.conf
-
-	# set defaults: setuid=pdns, setgid=pdns
-	sed -i \
-		-e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \
-		"${D}"/etc/powerdns/pdns.conf
-
-	newinitd "${FILESDIR}"/pdns-r1 pdns
-
-	keepdir /var/empty
-
-	use doc && dohtml -r codedocs/html/.
-
-	# Install development headers
-	insinto /usr/include/pdns
-	doins pdns/*.hh
-	insinto /usr/include/pdns/backends/gsql
-	doins pdns/backends/gsql/*.hh
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/dnsdomain2.schema
-	fi
-
-	prune_libtool_files --all
-}
-
-pkg_preinst() {
-	enewgroup pdns
-	enewuser pdns -1 -1 /var/empty pdns
-}
-
-pkg_postinst() {
-	elog "PowerDNS provides multiple instances support. You can create more instances"
-	elog "by symlinking the pdns init script to another name."
-	elog
-	elog "The name must be in the format pdns.<suffix> and PowerDNS will use the"
-	elog "/etc/powerdns/pdns-<suffix>.conf configuration file instead of the default."
-
-	if use ldap ; then
-		ewarn "The official LDAP backend module is only compile-tested by upstream."
-		ewarn "Try net-dns/pdns-ldap-backend if you have problems with it."
-	fi
-
-	local old
-	for old in ${REPLACING_VERSIONS}; do
-		version_compare ${old} 3.2
-		[[ $? -eq 1 ]] || continue
-
-		ewarn "To fix a security bug (bug #458018) had the following"
-		ewarn "files/directories the world-readable bit removed (if set):"
-		ewarn "  ${EPREFIX}/etc/powerdns"
-		ewarn "  ${EPREFIX}/etc/powerdns/pdns.conf"
-		ewarn "Check if this is correct for your setup"
-		ewarn "This is a one-time change and will not happen on subsequent updates."
-		chmod o-rwx "${EPREFIX}"/etc/powerdns/{,pdns.conf}
-
-		break
-	done
-}
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index e3c5884609cf..a7a046548a49 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/iroffer-dinoex/Manifest b/net-irc/iroffer-dinoex/Manifest
index 5430bfa545fa..36c23eb44ab1 100644
--- a/net-irc/iroffer-dinoex/Manifest
+++ b/net-irc/iroffer-dinoex/Manifest
@@ -3,8 +3,8 @@ AUX iroffer-dinoex-Werror.patch 498 BLAKE2B 85fe030eaa77f9691a8b5000b7ffc9ede2b1
 AUX iroffer-dinoex.conf 378 BLAKE2B 802cb152669d41a081d3400bad38da39fc73f083dc0ea5528861cb15581a2f62341fe1085c247b04f70e82943226895d8677013ae0900b6f50129702552468e2 SHA512 6dee05c4fdc5d8e62c9ac76406a7e85f1e944bb2b1f82237422f01002c6adceaf4f05073c3e378e3f61000652814292639640e1dcc2a0dbcd2bd68a76687d634
 AUX iroffer-dinoex.init 1130 BLAKE2B ccd6615cd7c5c61532ccad49f5b69d5d6049d01af958b76a1c2e4f0588939d59b24fec040a6f74f961fb1f7d2b8c4a4adf5898fcb2137f741bfb9c27c1d7cfc7 SHA512 5fdae78dac704cfc8594fff417e0d223069d2a3f33536043550aef4f7143a3cdb69e6ae102d21cd14b97e3ccf61c6d1c11fbb3a87c3e1a1096fa40e36a1c772a
 AUX iroffer-dinoex.logrotate 173 BLAKE2B 855d14769a53f81135a2de494b90eeadbe487a9f9f29d45fe948b88b9798baf81a5832e8a89cc477826c6c51d7dde0459ab3d97249eb91d434f5b4c0686c0720 SHA512 6eb9a7f1949720a7d1544b90a22a190ad868b77d3ed604c5ec3acdc62e5711353d84a8e10dbfa332c4ceab13fedc3fa06d1679ce95d4612443a055f04f310015
-DIST iroffer-dinoex-3.29.tar.gz 537027 SHA256 d96c307062552878d7594e280eef3a8669b4af955f1efe1d6e3e7ad660f9a6fb SHA512 bac4feaa0db11de3faed0beb7302cb090d3a6629a6c299bd1b4ee136bce7290f1a9fa998aab909f1fafe54f5577bed90f487d4b2592521a87d5d9ae7512eecb0 WHIRLPOOL 2917244bfc2c0d05f5660b767dfa39da6099e5388dedea5c2578a483fc52747959c296f65a71cd3a8a24740afca1c3fab8e7825052fec4ac5eadce558917fcd7
+DIST iroffer-dinoex-3.29.tar.gz 537027 BLAKE2B f6dddd60b5e4e837cfb56c450ee32249607375a386f9215a9a4eb34e7696c066b6c817ae956c044bbc208f69a73967df5aee9835b2a94ca70a849045ff11f37d SHA512 bac4feaa0db11de3faed0beb7302cb090d3a6629a6c299bd1b4ee136bce7290f1a9fa998aab909f1fafe54f5577bed90f487d4b2592521a87d5d9ae7512eecb0
 DIST iroffer-dinoex-3.30.tar.gz 541131 BLAKE2B ea61113dffcd14b162153aa03c55a203d8ccd99e8f81de53a9ab8543bd91e948509281f753a8f332445eec102b6bd2b51972ff8bedb8b574b55b9325f6969269 SHA512 e45dc3dd901cbb73a9d59cd5a672834c7b6527864eb3385121856af562680a0f91e8846e8690fc60a6349dc4c4fc1cf190d3ac01813c6c045ef18147d61b7d4d
 EBUILD iroffer-dinoex-3.29.ebuild 2646 BLAKE2B b3db2502ebb186836894b1c8bf2083792623c0f6d2009241e432bb33ac0fc3716e684e44dcd4a7c9012989576d9667a14e4ef3631142a65a79af6bd5d602d76f SHA512 d47ffa947ae63147ce8939ce99f63114f9593b32f23d3a34d0ba3567bee14bb3d2ebcd14ae608fc0c841cc88d38abe7c2e57a06a54da0fbb3befd38af32b859e
-EBUILD iroffer-dinoex-3.30.ebuild 2648 BLAKE2B d880209f7e4bc2e5d20934e6830eea8a4073006df0e2985636615dc5f43f3a3df8aece75c37506720b032ddb28c7908057de09d935fa4a9df91cee11fef24919 SHA512 fab31e35c82ed99d975c464b5a36e8cb1735c4886f9a525a0fe5c842043098c048f3da01480721007c410e979c09ceb89717ab39922dd1fd69f5d29c2ceb4f2d
+EBUILD iroffer-dinoex-3.30.ebuild 2654 BLAKE2B 0d00c4f5ef9339ffb88729313ed2c2522ae06c56e74cc9e0962f793e0a32c21223064e4f5ed4d8c8b5469cef67632cf19171c9e8f3adcc43269867d05131bbe7 SHA512 5101cf63561a1b87763568f94d06efd192e25ca4176d2a8ef31774f796f9c4f092b321c3d8f31bfa671c69bc98fccd15e750c0fe361f025ed4a8cc179f1184ad
 MISC metadata.xml 795 BLAKE2B a6290795083bbd2c847fce5f5fb16c0cdc65f459642dec45f0be9f364a3c2d61579fb96ad0c5ee72c255a02d5ab2f32257ec669cbdaa7304d83830fcfcd083b4 SHA512 9e0690f67c3039e88a122fc149049bbb604958d3f5a4d07fe80b67845a7e8005f79901ade56ab4e55ffab885d3fefb1aac16419b4c56c206479f9e97edf062b3
diff --git a/net-irc/iroffer-dinoex/iroffer-dinoex-3.30.ebuild b/net-irc/iroffer-dinoex/iroffer-dinoex-3.30.ebuild
index 1c2432e193f8..f9ffa93b3675 100644
--- a/net-irc/iroffer-dinoex/iroffer-dinoex-3.30.ebuild
+++ b/net-irc/iroffer-dinoex/iroffer-dinoex-3.30.ebuild
@@ -42,7 +42,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-config.patch"\
+	epatch "${FILESDIR}/${PN}-3.29-config.patch"\
 	       "${FILESDIR}/${PN}-Werror.patch"
 	epatch_user
 	l10n_find_plocales_changes "" 'help-admin-' '.txt'
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 44ac065dcc4d..49645ef72e66 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -4,7 +4,7 @@ AUX quasselcore.conf-r1 333 BLAKE2B 67586dc8a62e94131d11d81502f09387026f98b7452a
 AUX quasselcore.init 1742 BLAKE2B c9449f721df267ce826cadd52e21341762324e8ee9826c64f8d31af0e0edd28fda5b26ae06c0b667038a3b88e98b4694ce13dbc3a9b43844e0cbcd437f52e8e1 SHA512 eddd620b43439becc3f714854b7d1c9f9a65b4784325b11298c94c9f15b6e1fe2547f566f8ae2ebf1134d6361228bdb047964df3ae439d540d57d8864cdecd6d
 AUX quasselcore.init-r1 490 BLAKE2B 66ac809f427009bf9841d23a12d10f87563f970919a61737c96582c89ca97cbdf93aa89baa59e77dc6cfd377b634ddde3a6d5d5862e9246e4b984c5f35abb66f SHA512 71b2381e834d86a29269516270fe2463adfe59de16d9916d9cc496959e6931719262bf980763662bfb309acb79c6508ae33c61ceacd53be912d3161105ba0c69
 AUX quasselcore.service 189 BLAKE2B a115a98b17f4e59f2bbae584ac998cb16729977b617feb7b76696fcb682c1bc2d88cc40847ed1b20dce04dd8702b86a406ce0117304501c203453d1d30667e47 SHA512 3f0e15582dca70ca11beddb50aa6c6d993d4283ff89dc83a84b1acf2c0d2edba306fdab30eb05937f363cf507e34b7f884e0852d88be68748b68ac7b4013b776
-DIST quassel-0.12.4.tar.bz2 3742639 SHA256 93e4e54cb3743cbe2e5684c2fcba94fd2bc2cd739f7672dee14341b49c29444d SHA512 66bc12a9634534e6492787172a199c774ef1642d1ddb268c24ed96608698628bca7b278021a006a4db76783b19b1e1dead9d019bb8a6cbe1e12b8857792e7b92 WHIRLPOOL 13a6078aa8f0a3d039e9c240c870a13744b3eb3324f45508f62a37aa8da13c0b00f94f53fe2602762503459a1110e3796673c104397b37297390cc406f2eaa66
-EBUILD quassel-0.12.4.ebuild 5569 BLAKE2B 0027cd1b74df4be64a07e5850a75a709e1bd2bb454d043cf4340235a443b1bbacd268a9edaaa31b28a24a893747e5a9d1cf2a72a8b9be1060c54a5255f2363dd SHA512 5ccaeb6cb5f237d2fdd3b03102b410d71b029333c73938acc8a07edba21abbb521d7b01568a5c118c2176f65e5116f2bea3b1716841aeec262e76b1672ad56a7
-EBUILD quassel-9999.ebuild 4677 BLAKE2B 87e9fc3a5daffa954a96901e1e6f41bccdad1671f52bcc9f4065bda9a3ba8e6b48a942d7177379702ffde90569eb6ca359a729a9345a61a1ee1a921ef09f689b SHA512 bb9cba8ce7b1389e51ab42c76e14419ec8b5adce5716cff68c4faec7343580099a24a8af5f38f8d4efa4931a224b8924a32bf88bce9cd1ca4d075cbe8fc7359f
+DIST quassel-0.12.4.tar.bz2 3742639 BLAKE2B 855caaf3eb5373008dc3c6f673b68aa1bbb601541ba5eb6c9402f421ec6b1dc933c58785181ca8b3f2fd899ba91a873458ede06f0fda2a3e970980f395742be2 SHA512 66bc12a9634534e6492787172a199c774ef1642d1ddb268c24ed96608698628bca7b278021a006a4db76783b19b1e1dead9d019bb8a6cbe1e12b8857792e7b92
+EBUILD quassel-0.12.4.ebuild 4724 BLAKE2B 2b5be22d3e552e9a94925c4e67cf50be43003fb5bcccfa988e4b0ea5dafa3374d3702222ceb467dece1ae87599c7886c210556739be0067351e3acbcdafa69cc SHA512 1612344383ea25f8cdb45464d87cfb594f1685adcf26e48582772e1e2a8464ed0194ad37ff00368483df47d37377f4c01100c32533f8c6590e2f924452d00a96
+EBUILD quassel-9999.ebuild 4680 BLAKE2B 65d7071a43218d38d24cade3ea698de0b889f4d8d06e946c3dfcac3a520f8f8f8551e301f97e8dd1a73ddb528670498686898f6eb81bb7667fa96f789f97baff SHA512 0cd29bee4dd56a7131a4f7c1ab30017c8aac833f635fce9c720516c98011ab425de3fb24a9e43b5af46523842023cce111333e1518bf43d699a4df249920e603
 MISC metadata.xml 1942 BLAKE2B 1a23788288146f7149de03e99463403ae7d365df1fd421fc85af9c3bee4ebc5a2575c94958b570f32bb8fb056461a879cf4e80d65063ef0f2ba124d2305f4f10 SHA512 abf82cf9fe2bd552c1b26591e20da212cc3a118f6fb4ac92df8340d6ad5c7b6757e9290f8c6e8175dd95384b385dfd0399d6693d7fe6dc480b5a6d6f9b851d05
diff --git a/net-irc/quassel/quassel-0.12.4.ebuild b/net-irc/quassel/quassel-0.12.4.ebuild
index 4b8e4eb39bec..fea12b014b0b 100644
--- a/net-irc/quassel/quassel-0.12.4.ebuild
+++ b/net-irc/quassel/quassel-0.12.4.ebuild
@@ -15,69 +15,43 @@ HOMEPAGE="http://quassel-irc.org/"
 LICENSE="GPL-3"
 KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~sparc-solaris"
 SLOT="0"
-IUSE="ayatana crypt dbus debug kde monolithic phonon postgres qt5 +server
+IUSE="crypt dbus debug kde monolithic phonon postgres +server
 snorenotify +ssl syslog webkit X"
 
 SERVER_RDEPEND="
-	qt5? (
-		dev-qt/qtscript:5
-		crypt? ( app-crypt/qca:2[qt5,ssl] )
-		postgres? ( dev-qt/qtsql:5[postgres] )
-		!postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
-	)
-	!qt5? (
-		dev-qt/qtscript:4
-		crypt? ( app-crypt/qca:2[qt4,ssl] )
-		postgres? ( dev-qt/qtsql:4[postgres] )
-		!postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
-	)
+	dev-qt/qtscript:5
+	crypt? ( app-crypt/qca:2[qt5(+),ssl] )
+	postgres? ( dev-qt/qtsql:5[postgres] )
+	!postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	syslog? ( virtual/logger )
 "
 
 GUI_RDEPEND="
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dbus? (
-			>=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
-			dev-qt/qtdbus:5
-		)
-		kde? (
-			kde-frameworks/kconfigwidgets:5
-			kde-frameworks/kcoreaddons:5
-			kde-frameworks/knotifications:5
-			kde-frameworks/knotifyconfig:5
-			kde-frameworks/ktextwidgets:5
-			kde-frameworks/kwidgetsaddons:5
-			kde-frameworks/kxmlgui:5
-			kde-frameworks/sonnet:5
-		)
-		phonon? ( media-libs/phonon[qt5(+)] )
-		snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
-		webkit? ( dev-qt/qtwebkit:5 )
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dbus? (
+		>=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
+		dev-qt/qtdbus:5
 	)
-	!qt5? (
-		dev-qt/qtgui:4
-		ayatana? ( dev-libs/libindicate-qt )
-		dbus? (
-			>=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt4]
-			dev-qt/qtdbus:4
-			kde? (
-				kde-frameworks/kdelibs:4
-				kde-frameworks/oxygen-icons:*
-			)
-		)
-		phonon? ( media-libs/phonon[qt4] )
+	kde? (
+		kde-frameworks/kconfigwidgets:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/knotifications:5
+		kde-frameworks/knotifyconfig:5
+		kde-frameworks/ktextwidgets:5
+		kde-frameworks/kwidgetsaddons:5
+		kde-frameworks/kxmlgui:5
+		kde-frameworks/sonnet:5
 	)
+	phonon? ( media-libs/phonon[qt5(+)] )
+	snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
+	webkit? ( dev-qt/qtwebkit:5 )
 "
 
 RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5[ssl?]
 	sys-libs/zlib
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5[ssl?]
-	)
-	!qt5? ( dev-qt/qtcore:4[ssl?] )
 	monolithic? (
 		${SERVER_RDEPEND}
 		${GUI_RDEPEND}
@@ -88,26 +62,22 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	qt5? (
-		dev-qt/linguist-tools:5
-		kde-frameworks/extra-cmake-modules
-	)
+	dev-qt/linguist-tools:5
+	kde-frameworks/extra-cmake-modules
 "
 
 DOCS=( AUTHORS ChangeLog README )
 
 REQUIRED_USE="
 	|| ( X server monolithic )
-	ayatana? ( || ( X monolithic ) )
 	crypt? ( || ( server monolithic ) )
 	dbus? ( || ( X monolithic ) )
 	kde? ( || ( X monolithic ) phonon )
 	phonon? ( || ( X monolithic ) )
 	postgres? ( || ( server monolithic ) )
-	qt5? ( !ayatana )
-	snorenotify? ( qt5 || ( X monolithic ) )
+	snorenotify? ( || ( X monolithic ) )
 	syslog? ( || ( server monolithic ) )
-	webkit? ( qt5 || ( X monolithic ) )
+	webkit? ( || ( X monolithic ) )
 "
 
 pkg_setup() {
@@ -122,17 +92,13 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package ayatana IndicateQt)
-		$(cmake-utils_use_find_package crypt QCA2)
 		$(cmake-utils_use_find_package crypt QCA2-QT5)
-		$(cmake-utils_use_find_package dbus dbusmenu-qt)
 		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
 		-DWITH_KDE=$(usex kde)
 		-DWITH_OXYGEN=$(usex !kde)
 		-DWANT_MONO=$(usex monolithic)
-		$(cmake-utils_use_find_package phonon Phonon)
 		$(cmake-utils_use_find_package phonon Phonon4Qt5)
-		-DUSE_QT5=$(usex qt5)
+		-DUSE_QT5=ON
 		-DWANT_CORE=$(usex server)
 		$(cmake-utils_use_find_package snorenotify LibsnoreQt5)
 		-DWITH_WEBKIT=$(usex webkit)
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 7bf54b67a40a..dc4527b4df87 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -19,7 +19,7 @@ IUSE="+breeze crypt +dbus debug kde monolithic oxygen postgres +server snorenoti
 
 SERVER_RDEPEND="
 	dev-qt/qtscript:5
-	crypt? ( app-crypt/qca:2[qt5,ssl] )
+	crypt? ( app-crypt/qca:2[qt5(+),ssl] )
 	postgres? ( dev-qt/qtsql:5[postgres] )
 	!postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	syslog? ( virtual/logger )
@@ -50,9 +50,9 @@ GUI_RDEPEND="
 "
 
 RDEPEND="
-	sys-libs/zlib
 	dev-qt/qtcore:5
 	dev-qt/qtnetwork:5[ssl?]
+	sys-libs/zlib
 	monolithic? (
 		${SERVER_RDEPEND}
 		${GUI_RDEPEND}
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 6c0327c50046..ab79b259d9aa 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,5 +1,7 @@
 AUX weechat-1.2-tinfo.patch 874 BLAKE2B 5b720aaf45d1ff7f7792ca21ff79919b258fe16cdb19c7c7892abd3d702c86911a2c46519b84d7d71db40d89158b3662c93327e382a342bd2146dab98f4cbaed SHA512 89b5689654a6bcb41c5ca9c0f579a1619ada2bf5a1f46ec7d9e8755786499fadff2ce30469d169a295692889c421aa365919a3a7b4c5092e0889def2564b1790
 DIST weechat-1.9.1.tar.xz 1877428 SHA256 c2991fc616a9b1ac155e7f2591922421b49924ea45e4e5b64622dcb7f38522fd SHA512 552e9248e86db7fe53cd6539084e6c5e8548b8858b27c02326d04925d81ef09e123225af5c1f5550b262be5a1249fd8750fdda8d9877c3df918cc30b5e0953fa WHIRLPOOL 01513b276a77cf6849c6dd96945ecc069e00094be6d00d83f8884943bb7dc29b66938b6a3c5d42ed338e31633c397e6ce0fd875d5365e6a2748ecb72c490fa79
+DIST weechat-2.0.tar.xz 1967636 BLAKE2B b4ee37a7c8da4cd724ada44f454979326ec1186254d197c538de13c148b52988ddeff23d432240404516c8f81d8588347c6ea5313572b4815d716f80e82f85a4 SHA512 771618c09fb24182f86304af8c12e158e3d97afbc51219d1f4c5f9ec102aac15c4511a6301141d47f67e385f41bf0ba91e3df795ffdd78a19d1f6a5b1121e951
 EBUILD weechat-1.9.1.ebuild 3917 BLAKE2B d1c8ab83d7ef18b1dd6458b240926dfa1499d0ee495c3fe90303490a69cc74755250bf4f4493e8a621eb892876c03b1ba15843879377b1de9851993046cc8594 SHA512 279b30076a4b16256f3c0fd96b1b3a1a61b0c6a50e5a0ca41aed001ff76142d6ead95e60a2cb16548e38d7959aab3ec7b5a8b70739baa0f7f20c8f3c66305a47
-EBUILD weechat-9999.ebuild 3630 BLAKE2B 25049de2e1d7955b53e544216dda502e70e95fc39d1ed355055146e4104b148b45996f8ab640c1b0ce782f9e578a713433951b64b7e0e0603a98b5b201895d4a SHA512 53cdd729444cf0273904093e931d45ba9d91181c576e06a2017998279136931041b246317d570a0cbc5d50d35082ee4aa592b15c561338372b228717576c800c
-MISC metadata.xml 863 BLAKE2B 2f3e69da4310adecbced76f256911604a77f0330c00d1097d6329a688839c1238af0c82e9af9c2734871d82d5916f0474d118f0b07bd6fae2c09dcff5566b8a4 SHA512 6cf4ee3adf9c431508b28da64aeac1679eb30a16ce20cae401b84696b2d39715f2daaf7f6e9df7d505f32e9231cdf6243b8afd5c6e834603fbb36c482c05f603
+EBUILD weechat-2.0.ebuild 4016 BLAKE2B 0fcf13ce72cf6cc15b6e3422011e3e49c038b0953b41b01e7fa51438452176e97d1cfe31212d47a759488b82fe3355e5fec5b1514ae49ffafdf08373096d90d4 SHA512 75f18121a2d241c6fa478470c50f0c7a49327f60f2edea8dfa00c217d2846cd79f1a0165bc975648f6a8cf0d09f172200da6a14268cab27b863adad1df9c43e5
+EBUILD weechat-9999.ebuild 4016 BLAKE2B 0fcf13ce72cf6cc15b6e3422011e3e49c038b0953b41b01e7fa51438452176e97d1cfe31212d47a759488b82fe3355e5fec5b1514ae49ffafdf08373096d90d4 SHA512 75f18121a2d241c6fa478470c50f0c7a49327f60f2edea8dfa00c217d2846cd79f1a0165bc975648f6a8cf0d09f172200da6a14268cab27b863adad1df9c43e5
+MISC metadata.xml 903 BLAKE2B 74f1e6930fb209c9d74ca9ff7a8c0b82900c8aac369612ef4c16cc4393fabe24770bc1734d20b261dfcfc021259e1df9e555e1d53605296e0847939d3ce41c40 SHA512 26d85549cc0b0e61cb576a50740cd289432dca90ff92e0d0162a430ff89959233aa002dee0018780e51607cdae85a866ac6db77fe22d2c8631590a33a05ff5d5
diff --git a/net-irc/weechat/metadata.xml b/net-irc/weechat/metadata.xml
index e04464bc80b1..39474809b461 100644
--- a/net-irc/weechat/metadata.xml
+++ b/net-irc/weechat/metadata.xml
@@ -5,16 +5,17 @@
 		<email>radhermit@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name="alias">Enable plugin for alias control.</flag>
-		<flag name="buflist">Enable buflist plugin.</flag>
-		<flag name="charset">Enable encoding conversions.</flag>
-		<flag name="exec">Enable exec plugin.</flag>
-		<flag name="fifo">Enable FIFO support (sh pipes).</flag>
-		<flag name="logger">Enable support for logging.</flag>
+		<flag name="alias">Enable plugin for alias control</flag>
+		<flag name="buflist">Enable buflist plugin</flag>
+		<flag name="charset">Enable encoding conversions</flag>
+		<flag name="exec">Enable exec plugin</flag>
+		<flag name="fset">Enable fast set plugin</flag>
+		<flag name="fifo">Enable FIFO support (sh pipes)</flag>
+		<flag name="logger">Enable support for logging</flag>
 		<flag name="relay">Enable relay plugin (experimental)</flag>
-		<flag name="scripts">Build infrastructure for scripting.</flag>
-		<flag name="trigger">Enable trigger plugin.</flag>
-		<flag name="xfer">Enable xfer plugin support.</flag>
-		<flag name="irc">Enable IRC protocol support.</flag>
+		<flag name="scripts">Build infrastructure for scripting</flag>
+		<flag name="trigger">Enable trigger plugin</flag>
+		<flag name="xfer">Enable xfer plugin support</flag>
+		<flag name="irc">Enable IRC protocol support</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-irc/weechat/weechat-2.0.ebuild b/net-irc/weechat/weechat-2.0.ebuild
new file mode 100644
index 000000000000..59575ed9f9d6
--- /dev/null
+++ b/net-irc/weechat/weechat-2.0.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit python-single-r1 cmake-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
+else
+	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="Portable and multi-interface IRC client"
+HOMEPAGE="https://weechat.org/"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+NETWORKS="+irc"
+PLUGINS="+alias +buflist +charset +exec +fset +fifo +logger +relay +scripts +spell +trigger +xfer"
+# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
+SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
+LANGS=" cs de es fr hu it ja pl pt pt_BR ru tr"
+IUSE="doc nls +ssl test ${LANGS// / linguas_} ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/libgcrypt:0=
+	net-misc/curl[ssl]
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	charset? ( virtual/libiconv )
+	guile? ( >=dev-scheme/guile-2.0 )
+	lua? ( dev-lang/lua:0[deprecated] )
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl:= )
+	php? ( >=dev-lang/php-7.0:* )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) )
+	ssl? ( net-libs/gnutls )
+	spell? ( app-text/aspell )
+	tcl? ( >=dev-lang/tcl-8.4.15:0= )
+"
+DEPEND="${RDEPEND}
+	doc? (
+		>=dev-ruby/asciidoctor-1.5.4
+		dev-util/source-highlight
+	)
+	nls? ( >=sys-devel/gettext-0.15 )
+	test? ( dev-util/cpputest )
+"
+
+DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
+
+# tests need to be fixed to not use system plugins if weechat is already installed
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.2-tinfo.patch )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# fix libdir placement
+	sed -i \
+		-e "s:lib/:$(get_libdir)/:g" \
+		-e "s:lib\":$(get_libdir)\":g" \
+		CMakeLists.txt || die "sed failed"
+
+	# install only required translations
+	local i
+	for i in ${LANGS} ; do
+		if ! use linguas_${i} ; then
+			sed -i \
+				-e "/${i}.po/d" \
+				po/CMakeLists.txt || die
+		fi
+	done
+
+	# install only required documentation ; en always
+	for i in $(grep add_subdirectory doc/CMakeLists.txt \
+			| sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do
+		if ! use linguas_${i} ; then
+			sed -i \
+				-e '/add_subdirectory('${i}')/d' \
+				doc/CMakeLists.txt || die
+		fi
+	done
+
+	# install docs in correct directory
+	sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		# fix linking error on Darwin
+		sed -i "s/+ get_config_var('LINKFORSHARED')//" \
+			cmake/FindPython.cmake || die
+		# allow to find the plugins by default
+		sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
+			src/core/wee-config.c || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_NCURSES=ON
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_GNUTLS=$(usex ssl)
+		-DENABLE_LARGEFILE=ON
+		-DENABLE_ALIAS=$(usex alias)
+		-DENABLE_ASPELL=$(usex spell)
+		-DENABLE_BUFLIST=$(usex buflist)
+		-DENABLE_CHARSET=$(usex charset)
+		-DENABLE_EXEC=$(usex exec)
+		-DENABLE_FSET=$(usex fset)
+		-DENABLE_FIFO=$(usex fifo)
+		-DENABLE_IRC=$(usex irc)
+		-DENABLE_LOGGER=$(usex logger)
+		-DENABLE_RELAY=$(usex relay)
+		-DENABLE_SCRIPT=$(usex scripts)
+		-DENABLE_SCRIPTS=$(usex scripts)
+		-DENABLE_PERL=$(usex perl)
+		-DENABLE_PHP=$(usex php)
+		-DENABLE_PYTHON=$(usex python)
+		-DENABLE_RUBY=$(usex ruby)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_TCL=$(usex tcl)
+		-DENABLE_GUILE=$(usex guile)
+		-DENABLE_JAVASCRIPT=OFF
+		-DENABLE_TRIGGER=$(usex trigger)
+		-DENABLE_XFER=$(usex xfer)
+		-DENABLE_DOC=$(usex doc)
+		-DENABLE_TESTS=$(usex test)
+	)
+
+	if use python; then
+		python_export PYTHON_LIBPATH
+		mycmakeargs+=(
+			-DPYTHON_EXECUTABLE="${PYTHON}"
+			-DPYTHON_LIBRARY="${PYTHON_LIBPATH}"
+		)
+	fi
+
+	cmake-utils_src_configure
+}
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index 674f4cb5e57f..59575ed9f9d6 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
 else
 	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Portable and multi-interface IRC client"
@@ -21,9 +21,9 @@ LICENSE="GPL-3"
 SLOT="0"
 
 NETWORKS="+irc"
-PLUGINS="+alias +buflist +charset +exec +fifo +logger +relay +scripts +spell +trigger +xfer"
+PLUGINS="+alias +buflist +charset +exec +fset +fifo +logger +relay +scripts +spell +trigger +xfer"
 # dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
-SCRIPT_LANGS="guile lua +perl +python ruby tcl"
+SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
 LANGS=" cs de es fr hu it ja pl pt pt_BR ru tr"
 IUSE="doc nls +ssl test ${LANGS// / linguas_} ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -38,6 +38,7 @@ RDEPEND="
 	lua? ( dev-lang/lua:0[deprecated] )
 	nls? ( virtual/libintl )
 	perl? ( dev-lang/perl:= )
+	php? ( >=dev-lang/php-7.0:* )
 	python? ( ${PYTHON_DEPS} )
 	ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) )
 	ssl? ( net-libs/gnutls )
@@ -95,6 +96,15 @@ src_prepare() {
 
 	# install docs in correct directory
 	sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		# fix linking error on Darwin
+		sed -i "s/+ get_config_var('LINKFORSHARED')//" \
+			cmake/FindPython.cmake || die
+		# allow to find the plugins by default
+		sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
+			src/core/wee-config.c || die
+	fi
 }
 
 src_configure() {
@@ -108,6 +118,7 @@ src_configure() {
 		-DENABLE_BUFLIST=$(usex buflist)
 		-DENABLE_CHARSET=$(usex charset)
 		-DENABLE_EXEC=$(usex exec)
+		-DENABLE_FSET=$(usex fset)
 		-DENABLE_FIFO=$(usex fifo)
 		-DENABLE_IRC=$(usex irc)
 		-DENABLE_LOGGER=$(usex logger)
@@ -115,6 +126,7 @@ src_configure() {
 		-DENABLE_SCRIPT=$(usex scripts)
 		-DENABLE_SCRIPTS=$(usex scripts)
 		-DENABLE_PERL=$(usex perl)
+		-DENABLE_PHP=$(usex php)
 		-DENABLE_PYTHON=$(usex python)
 		-DENABLE_RUBY=$(usex ruby)
 		-DENABLE_LUA=$(usex lua)
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 3674db50a366..ce0ace816194 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index 45611d1ca2a6..b4f527f17ec3 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -5,5 +5,5 @@ DIST ldns-1.6.17.tar.gz 1315403 SHA256 8b88e059452118e8949a2752a55ce59bc71fa5bc4
 DIST ldns-1.7.0.tar.gz 1304424 BLAKE2B 2f37aa2d00c1d9cf18711bd4f873f4722df01c4f4d0f627e054f04b2473c0fbf19449e293a130d5c8b98dcebafeb3d7b3f5923ae0244bd80139cea77f2171e06 SHA512 8a4e48bcc2a244b92447a9830b60efbb656fb7955f3559ef2eb6f8e724c4c0208776350c44ccf7dcf1ffe0b7b9d9ccc4cbddc5bc16e8888db494ab4d0bce3bd8
 EBUILD ldns-1.6.17-r1.ebuild 2502 BLAKE2B b1b54f8308b887e0f3e06d0bdc993cc29e7dc89a660dab105b943cc125025f545796917b940861c11afd311e5c2351be8d941689c2fb2e0b2a80b684cb7ab85a SHA512 30aa360319dd0e9e3a4095fa988ed940a899af72b448b2d4d33fa18f57eee3557eaa20fcc4988deb7821d7ec6a12de88a9f687edb7b964883ffd51e58d14ae83
 EBUILD ldns-1.6.17.ebuild 2196 BLAKE2B 5edd80744d5bed7892bb56a5a80305e04780cebd8ef064f3c2f63494eb46eaba4a7580ec285cce6d32e273b3b162024a0388503364abdca6ac0dc7f9e20e6df6 SHA512 70b0785d6380ae4ce03702a5ce396b00275e7dd1548abc96a49444a23e9e370aabc7585d5683fabfca6f512f70ce5acdb7e793d72417a451582920d1f9a7fad5
-EBUILD ldns-1.7.0-r1.ebuild 2627 BLAKE2B 4ac0c275ed48430c628c56161df20de18ee2570ee42db3398e8c2d74bc4f4c81e331dc2c5d91efe058619b499ccd55c7a6e5f4d1fcc19d44d5139de36e918786 SHA512 481d5636bf8a93bceb841f0ce3e1baee9b016a6d197a673cdbe9092442063595b47846ed548bcc63d316d9cef4e6a3c569f6dd5638fbf75e672f9959e74cf9cf
+EBUILD ldns-1.7.0-r1.ebuild 2626 BLAKE2B 5054fda848a4549bcc1177205f16c044414b8863a651c0678413b04317bbcf6f4615f8cff7b6eaf645af37ed4d770ac08d47508b7751b5c749b9ac261dd2565f SHA512 603036ca5bbc95c939fd3d8054fb57997d3599a6e23a120c77f0d22a4a8fa72c09b8eb13edfd316e76e4b205705d2ffaa9eaa993aa4e721989a7fb6aa812bbc3
 MISC metadata.xml 743 BLAKE2B 31fe371130dca55cc2950a0892ddf2e97f1c7260b57e893932c14d2af254b1c9272a678a4365762247b5fd7a6e2e6c1a58dd326f3837e0e12389bb08f493562a SHA512 b8d5c5fd107fb7dd7dc2d7d19fbb91a07a2a619b6c9ddd9146d9359c06ed96059c87d169b7c2022760e4117283372c01b6f5231edf975bbab9c72a3ee8347f35
diff --git a/net-libs/ldns/ldns-1.7.0-r1.ebuild b/net-libs/ldns/ldns-1.7.0-r1.ebuild
index bf79053b40bf..b9e14ecdb68b 100644
--- a/net-libs/ldns/ldns-1.7.0-r1.ebuild
+++ b/net-libs/ldns/ldns-1.7.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+dane doc +ecdsa gost libressl python +ssl static-libs vim-syntax"
 
 # configure will die if ecdsa is enabled and ssl is not
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index 1ee99a056bc3..248143ce95c8 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -2,14 +2,14 @@ AUX zeromq-3.2.3-unused-variable.patch 4012 BLAKE2B 8ce02ae0eb5696977e65ee286874
 AUX zeromq-4.2.0-dl-backport.patch 897 BLAKE2B 50f413fe321240146a6d27e1aa9cc27220984720d2dc41724cf2cc11a322be5d1d37764e52963c0d1b0de7bb754223d4c3102771f9d014c4a9593f6e83097b97 SHA512 db7ef6485040e158aabd2e5f5c49fbc02ba918415b3cd670baf7287a35ec67a8dd4d3509c30f7a00c88582e544f3cef886f99ecf218656cc8c3cd285fb221256
 AUX zeromq-4.2.1-disable-experimental-zmq_poll-implementation.patch 1317 BLAKE2B 70fe7193f858b58c05b64a98db8f93f6c468293098abab21fac4e0aa5c003c3803823447e05c01c01eecb12c01fa9945913b2ee31179355d733ce0477372fdd0 SHA512 d75375a201e98be533d04cd29997cf28e81d3af958fad91acf5e8d9284c7b3d3d7d7b6a593fc752f6b50048c21d1fb9a7fd99d449f155e509fef9d35260f7188
 AUX zeromq-4.2.2-optional-libunwind.patch 2246 BLAKE2B 7a9eeb5ec8c5d0dd1f8a8d7832aae5c54e9b9f6e8757b3defae513f0c7b7f689b79c58da397631c4a93324033f363de54b563466eda814e5bd4887714d2533d3 SHA512 275175d2ed21654a224b55b7508dbee9e362929fa31fc33e8c20f303f6280a8416275143896e3541492b8d6187a559c805a38b31eae5ac14083905a50d5b8bdc
-DIST zeromq-2.2.0.tar.gz 1899104 SHA256 6e2f4183e5259eeb67025b00116d900491fb71581e8e085373b51c3bc9571ae1 SHA512 fb3cf421b2dc48c31956b3e3ee4ab6ebc743deec3bf626c2238a1996c8c51be87260bd6aa662793a1f0c34dcda9b3146763777bb162dfad6fec4ca7acc403b2e WHIRLPOOL b35a6f0cdcff34ec188c989354fb53ee44f22ebb8d830f904447b4fa32ddd17de157998c2733a42ff0a6c1355f0ab2e0639e7666c7e983839e1dbde2188dcef5
-DIST zeromq-3.2.3.tar.gz 2072758 SHA256 e134c1aaf829dd77bca9dc0fa199ba31095a581bd0d3dda5fc59523b9f401238 SHA512 34ffb6aa645f62bd1158a8f2888bf92929ccf90917a6c50ed51ed1240732f498522e164d1536f26480c87ad5457fe614a93bf0e15f2f89b0b168e64a30de68ca WHIRLPOOL 14ba025abe6db59d6e8d1dd9df23f88e0171721bb046b9e2cf0cd7a5a6e9034980808d346fe10e755e367302cfbb670912576071345233148711815237fa176e
+DIST zeromq-2.2.0.tar.gz 1899104 BLAKE2B 1c02629e33151db11c529d538ce519dae7f3426ee13f8a2b840960779cd7514f7cc3257983704f2c392a00ad62f4a955bc33fcbdadb8bada3858753a1790ab41 SHA512 fb3cf421b2dc48c31956b3e3ee4ab6ebc743deec3bf626c2238a1996c8c51be87260bd6aa662793a1f0c34dcda9b3146763777bb162dfad6fec4ca7acc403b2e
+DIST zeromq-3.2.3.tar.gz 2072758 BLAKE2B ee295219e4709396f5a7e2774f8f6e53ad081c8b83302d9fe163d5523b6060401251c9ecc0bd423168ccbe156d6a0e26454515cf50780e5c8a07f9f6f4d50ee5 SHA512 34ffb6aa645f62bd1158a8f2888bf92929ccf90917a6c50ed51ed1240732f498522e164d1536f26480c87ad5457fe614a93bf0e15f2f89b0b168e64a30de68ca
 DIST zeromq-3.2.5.tar.gz 2082960 SHA256 09653e56a466683edb2f87ee025c4de55b8740df69481b9d7da98748f0c92124 SHA512 3682204e5a47824d149968e62fbf9768134370e4f7debbbf8f2bfa24bdd0a781e50c4a9b4231af8a0c4bab61839169100525a91472448ef180a9672342e10a3f WHIRLPOOL a8afa70760fa1fa9382f4694beabfe50f5c8098b1f81d5c62c926cd3073fd25946f6b8d1236e903e6644a9fff783116e131f1f87a5b92d16a6e91e05bd7f6e75
-DIST zeromq-4.1.1.tar.gz 1383196 SHA256 43d61e5706b43946aad4a661400627bcde9c63cc25816d4749c67b64c3dab8db SHA512 6f626c89e573900d3b094ea6058693dee290eb9e4039a8a03d61d41b1d8976ed5596027ca76a43f371dbf86820edfbd56a84ecfab6864adfeee73035df7b5353 WHIRLPOOL b72f9118a0422bb2a6cc99e490085715739e7438fe88fb556b85e6da70a995c92ad0cdde296e02e31c02979458ad4bb6962ff0acd4f5642273659c29b43892e9
-DIST zeromq-4.1.6.tar.gz 799771 SHA256 02ebf60a43011e770799336365bcbce2eb85569e9b5f52aa0d8cc04672438a0a SHA512 c04a6bb7a719687d8e8e5e8a103f93ab75ead3fcd3516e6089959e4f02cff7c18e9d7a8696af4245d434b45e6aa6e2ca8f73d98db058df621bca3def97bf7af1 WHIRLPOOL 5c266d2f257584a606f7ec1d4d00a5c2d7a636814f33ce2a1bfd19a4ca650c5fa86527d70948bb4e04b20bd5e068ffd29a2bf63f9979459bf825c23e55340abb
-DIST zeromq-4.2.0.tar.gz 1046254 SHA256 53b83bf0ee978931f76fa9cb46ad4affea65787264a5f3d140bc743412d0c117 SHA512 3b6f0a1869fb1663ea40b3c3aa088b81399a35c051e4ade2b30bbac60bfceefe6b4403248a4635fb31d33767c1e478342f61c47b0ffdb4501419c13590ebeb96 WHIRLPOOL 432a8b04a28bd371a85c79dfd79d498808af8afe0e4d8b9bd903eef9d4f5e9c09c165484ee651b1a54e2e416bb324e39bee2db3a5880e216a7472c56c6e64190
-DIST zeromq-4.2.1.tar.gz 1243428 SHA256 27d1e82a099228ee85a7ddb2260f40830212402c605a4a10b5e5498a7e0e9d03 SHA512 6ef52edff930be34451e81bd21a7e23f08e135c8e10e006d0a6146e7fa4171e9dcf9065f77c33cb0c0db4c16cff4a50cab2a9d612e306490a02bc6a4a913ba6a WHIRLPOOL f86f2ea735f398b489fcba145dc3f98bf3b50e8cc26ccb91e0c57998c13aa030765634a82be5e24f6d63ad346fcf1214d42983788eee236f0d5409181b67f910
-DIST zeromq-4.2.2.tar.gz 1236437 SHA256 5b23f4ca9ef545d5bd3af55d305765e3ee06b986263b31967435d285a3e6df6b SHA512 d78813a61ce3311a1f8c230f7da0f5aedc97ef4b792afb6d398c5710da239348c0c7a67bdfeb38a7ab0282af498f1ed173649aff4add1bc35f0ef1b66f965443 WHIRLPOOL ebf95d311265db34420932aa0a1e112c1354ef0501dde6a5317792568156e9bb1c88e31e8009f3594a0f1b7c71a2ad1eac0993c6adcaaa8baf945f30c4039171
+DIST zeromq-4.1.1.tar.gz 1383196 BLAKE2B f0c5e05a11288f28b97a27894479287652c1152d12906764f060372e7a4c7e6a70daea047d7f07ec2ac919d61ba04b65b1f8e316a474e93164c0dba86c3b7ac7 SHA512 6f626c89e573900d3b094ea6058693dee290eb9e4039a8a03d61d41b1d8976ed5596027ca76a43f371dbf86820edfbd56a84ecfab6864adfeee73035df7b5353
+DIST zeromq-4.1.6.tar.gz 799771 BLAKE2B 91ecc39122199846bfe0d9ea49c2acc076d0f827cee55c1b35fcb9d56a8bc1d174789829d5e672bba77fee442f996ca56f69385ece156fb759c363b1dc38cf43 SHA512 c04a6bb7a719687d8e8e5e8a103f93ab75ead3fcd3516e6089959e4f02cff7c18e9d7a8696af4245d434b45e6aa6e2ca8f73d98db058df621bca3def97bf7af1
+DIST zeromq-4.2.0.tar.gz 1046254 BLAKE2B d14bad19861cef7bfd58f571118e5dce89afecf1b80c05c6089f7669b702c38a93825e736e73988cae3f2ce90ab4a3fc28dc34b5ca2e6ff0a12707eb238bc05e SHA512 3b6f0a1869fb1663ea40b3c3aa088b81399a35c051e4ade2b30bbac60bfceefe6b4403248a4635fb31d33767c1e478342f61c47b0ffdb4501419c13590ebeb96
+DIST zeromq-4.2.1.tar.gz 1243428 BLAKE2B 2112f127d5e9624861adad455e77c21b17db09123adbe6473e86575a63ca1c21634078cce9af13e9ea1cc24e68658ae56172d98f24478161c14c5be56a922739 SHA512 6ef52edff930be34451e81bd21a7e23f08e135c8e10e006d0a6146e7fa4171e9dcf9065f77c33cb0c0db4c16cff4a50cab2a9d612e306490a02bc6a4a913ba6a
+DIST zeromq-4.2.2.tar.gz 1236437 BLAKE2B 7104f8ad28cc00f1ba6d6cb5dbb9aa466971c73a513e206eee77db293f4e4845106910d539363dc0c21de7e83885056453a530c941c38e19c5ec1fa836e1bca0 SHA512 d78813a61ce3311a1f8c230f7da0f5aedc97ef4b792afb6d398c5710da239348c0c7a67bdfeb38a7ab0282af498f1ed173649aff4add1bc35f0ef1b66f965443
 EBUILD zeromq-2.2.0.ebuild 1309 BLAKE2B bba1deacc16911ea6b6d3e9ffaf877942e2a4483b222220ed12f7ebd4e8848ffbe8f277c818e7cb706ecaaccb07741f3c38a1414935e88f8451f5e931dee837b SHA512 175a18d212a1966dceb29be017c1a018e5aa032c2cc176bd328b64106ae39287fc188a28c0e4242d9627f9957c7302c830749f0e396cb030ee30e929400e1b2e
 EBUILD zeromq-3.2.3.ebuild 1520 BLAKE2B 81d008fa3fab31485ee72e5669479f7a730b14c2f20af29dd51e9bda168ee4dba9057a43214addec88f6b6c5960899898351b234f352464854a63a79b0d0fbe7 SHA512 1bb6da7c444a4377fe716d6a0702d12b2e23128418cd38820d2093da7bf0b14d9a3d7e85b17e283ec49bdedf5f5214d6723b23869d431c8fff82b816d3499fc4
 EBUILD zeromq-3.2.5.ebuild 1463 BLAKE2B 029a0f442cc651fa2fdd77d2917906062e851b7e1fea9f65cd6b247772a1eb33324ee95a753838c449eec47816d8d558bc0834418ecba14d48c9e6710632319f SHA512 1f0eaf965e38c837b94618b4d8c5308f11eef575d7e9c5cdace67768a11783c706b8a946df75a61554be45d480b6be282b8dd64c81f4db60c5cd658238a472fa
@@ -18,6 +18,6 @@ EBUILD zeromq-4.1.6.ebuild 1154 BLAKE2B ffd8644f36d38741f6b26d833a22424c0b1d24b5
 EBUILD zeromq-4.2.0-r1.ebuild 1268 BLAKE2B 0d2da48e27b0c84c45772307e24502f0a66eafe75e384b4977d28e5dfb500ba07a32179b48b0795dcbc76227892849bcc2d571e1f97e0a4f8dca6bf120dd13f8 SHA512 e899d165a43f8d07a1f653e046483219f1dc1827e946c48490af8ce7a156e229a7041a4051076a3584d3768fbc80f8220d8453e7f5e8c0129abf86f411c098a1
 EBUILD zeromq-4.2.1.ebuild 1209 BLAKE2B 88a85bc62cedded0176d93e46d231cea694faf27efce8f8d30912937418e0cec4e8faff3d5150d5f6edd8c57d61be2d07cb76eefcccd269c4f9fd64dd77920d5 SHA512 d748d27548088f9121f1b3143fed334f5d69527a2868f46d6a1cc74daf0e6164801573d2c4065b9383245ec686680245dc46a036e1e6432d7f138f7a39136154
 EBUILD zeromq-4.2.2-r1.ebuild 1380 BLAKE2B 30394e0c22a77aeae94d990f688ab2fc13663be68bcd8ae10e48ceb7316a75a5b1fa15528f5e92f02e9315e8ca536ae591d08671754b0bc6577fdf8bddb4082e SHA512 5ce25d3196c4be51420af99b4590d54c79b687d74a3b64ee44b1322bbce829e3e04b99ea5cb840f1f991f36cc12f9080806aa91666ba183372dee6963442b7d9
-EBUILD zeromq-4.2.2-r2.ebuild 1518 BLAKE2B eb86233c0f326abb0d7ef62c3ac2cc5ea13bdd0c3f7f44dd6b770582d9fbc8815563038588c60c4bc95f8a208fbcef251933fdeba3888fbf3b6472699111fdaf SHA512 34b6d885475c3129452ddbec7f524ca44f296df3fbcf9dac505955fdf2579cb51b6ec2acf717e69961705a145d0277862cfab82cfd0a9deb31dc7224ea8cdecf
+EBUILD zeromq-4.2.2-r2.ebuild 1517 BLAKE2B 8ccd7d358bf0a16e310c642e058111aea44c46aec9ef37427d1bf3fcf32711e134a51ae7840ab1e3768250e26577f7d634d69604642fd7479b0c72481d0a9984 SHA512 205efb9467010f2ca545d019daeda7af8fc9031cee054caebe3d987c711cab2812e82a5adb584b7a646eed17af785bac407da13677f2685d5f680b1f09a54070
 EBUILD zeromq-4.2.2.ebuild 1217 BLAKE2B 9de51f8af0843322ca7aead2aca32e7b6b862b0299e62ab2678d2893740ccc964db6e1be93554469af84f9f97502b9bdfb36f61c4075d32d2fa2c5f571b5b350 SHA512 097c10c8db5d2526d8eb5b0958d92be09c842373aad9b22dfa4c8d26cc6fa982440d28b8ac1ddabf1bce0e4a8f5e71ba16ebeecd7de02304ccdf2e5509da655c
 MISC metadata.xml 1349 BLAKE2B 18a6db436dc83ddf5fbd62fedd61cbf98893970d536f176d61fad63aa2c04030b3d6f8fe2cae1edaff8bc918be07aad7370bd87ff6df0a838d7a4b94618dd1c8 SHA512 420989e7e605b7bcd1ee608d7e0ac06c563d3e37d01629963d7b6182eb3c187ca9667676ec73f267e15e35809d9552bc0d4407958d74d790381a3e45e1814296
diff --git a/net-libs/zeromq/zeromq-4.2.2-r2.ebuild b/net-libs/zeromq/zeromq-4.2.2-r2.ebuild
index 9385961fb2c8..eae427ca0c8d 100644
--- a/net-libs/zeromq/zeromq-4.2.2-r2.ebuild
+++ b/net-libs/zeromq/zeromq-4.2.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/5"
-KEYWORDS="amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc pgm +sodium static-libs test unwind elibc_Darwin"
 
 RDEPEND="
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 60f689f32fda..f7b70d296719 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index fd32cd8fbaeb..3ed23802a244 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -4,10 +4,12 @@ AUX wget-1.19.1-CVE-2017-13090.patch 1167 BLAKE2B 384c34c1999d564cf769998eaaef7a
 AUX wget-1.19.1-fix-Perl-warnings-in-tests.patch 3666 BLAKE2B ac176a5172f000ab32f62bfb8b6ff9c661b23b4d7525aaa37cf4018a7c1d9fe6b25359d1e46e9d83774a9b27dbf398f4040b9bf0fe0bb89438006a88158541bd SHA512 9f1b7ffded3422c995a51e346e3957024f4b5435cf51d491f3d4816620376539bffe2d3a7d7dcd03ca99828f06a21ebaa846b3a1755cd020a29f166c0fa2f7d9
 AUX wget-1.19.1-fix-Python-test-suite.patch 8721 BLAKE2B 7109cd205ae2ef07da8954093f8a3b7583944ba1dc965529b702e4db7c11df6c7d0765b8e22e231432f38d04f1d4c6a9b7521b65c050cabf0cff71f44130527d SHA512 e7905dc70c59e9c6b2fcc6c1a058fe98e8681492f034f2cd00aac5f1674d7dca0520bcf30d8b2563983bcb4388c6e35f66e772f833a364810f523784f8de3b19
 AUX wget-1.19.2-fix-segfault-due-to-derefencing-null-ptr.patch 2148 BLAKE2B 0eae4ae98a081764b271f7b4c83f1100d957a77ab48d0eea7b6ce4ffa79ffc1ee88523c801603a8c2eee5c7b33382bcec0c6d6fd48ed1a731af6f2a7ebae8671 SHA512 35d6d3dd10da123b4aeca1888b690439c8e3f20754e44be987e04c3966cacb1663833d8e7ddfe0067ba300ee6393833c2f6a7611bc3518eabb84649216cf4c33
-DIST wget-1.19.1.tar.xz 2111756 SHA256 0c950b9671881222a4d385b013c9604e98a8025d1988529dfca0e93617744cd2 SHA512 00864d225439bcb7c5af01d7ef19efa615427812d3320ab3f4c8f62c38191e837b1392397843f935d7dc5860a4d0ce89ee31f2730c4a729402f1f2bf3e5f64e5 WHIRLPOOL 2a4bd80f1e7134637227609f532ee3385472a6895ff22efeface42d082072a09abaa5dd2d8653bfdab015de801d31426b01d73ab5dd1a6864b84c29dc8e72462
-DIST wget-1.19.2.tar.gz 4349267 SHA256 4f4a673b6d466efa50fbfba796bd84a46ae24e370fa562ede5b21ab53c11a920 SHA512 a0f8afcc0767a8fd1acd64b1b1b27d177bc938e70cc3709c1b3faa6c1426ec926642cd8e49d292cec0268ee507683539b5152072110106de5a728a03efd8cedd WHIRLPOOL 64398a8fc132a21d81d6fd7c97335739525fb8b31eca4aa4aa7048f251691c05ad1f004c36d6e633abf02d174ffefcb2176213e68fefb76bce505d247940af3a
+AUX wget-1.92.2-openssl-1.1.0-r1.patch 2426 BLAKE2B 92f533614e9e01b974b06ea7ffc3c7240dd576161ef84d3ac0dcccc279088fb1e55045668a2d275159618c26de07274e4d4e1857ecdcaf36c745e471b174a0eb SHA512 e8fc99f46b5ea3df12cc3af29e075e52cec7f79b65981d1f0aebdcca02741cff2379290d6781e8380d915c7fb8cb29541d0d0f961bf55785ea4cbc7984cece35
+DIST wget-1.19.1.tar.xz 2111756 BLAKE2B e5dcaa791f78bb2d7de19a6f689430cd692e1232b7392102936e5f3b4e3592861bcfc78e27df0c4b02a9002ce4c755e765a0a51749670464789fc9f07f8787f7 SHA512 00864d225439bcb7c5af01d7ef19efa615427812d3320ab3f4c8f62c38191e837b1392397843f935d7dc5860a4d0ce89ee31f2730c4a729402f1f2bf3e5f64e5
+DIST wget-1.19.2.tar.gz 4349267 BLAKE2B 3622d39ea477d4137bd7f2a443d141d8832e2e1adf4dceb5c396aea782fee31bd69ad2b49771062f25c57e6a21701f844077000dfa175e89eae26cf4c3fdca09 SHA512 a0f8afcc0767a8fd1acd64b1b1b27d177bc938e70cc3709c1b3faa6c1426ec926642cd8e49d292cec0268ee507683539b5152072110106de5a728a03efd8cedd
 EBUILD wget-1.19.1-r1.ebuild 3197 BLAKE2B 49b65323072fdc2a08c8bfb38656ce3f207bcb5f3cdc5cb8eda3a189b935561e85129a26f63f7d1762599d8916ad6e8594531e4cb6f7497235704fdc55597829 SHA512 bf0b1c2275c6252f8f17c630aa9bb89e9276097f1fa74cf9d56d67c3ea099851ae64cd08996653493dadc39e31737fbeed88f5fc8cc0cbf1313b0b23e824befc
 EBUILD wget-1.19.1-r2.ebuild 3375 BLAKE2B 2f4a81d38e42f68d269d10700962892c3a68255b445271dcfdd818d18bb83e18621197e23f97fb29c87041c227c96e1a4cfd33437e011df653de2e8a8ae72146 SHA512 a3015289d35284d0290049f2f80ae3835359d6292c4f2c7f486ae3c37d132733a20fda5eaf27e87c6af5d6e4c3d6ff6c7045cb9f6bc1d70ca924c301cee6eb2a
 EBUILD wget-1.19.2-r1.ebuild 3261 BLAKE2B 7ec99a0ac31be122ed386a220c2286f88e67cea3bc22a9ff797681fa62e8f5e756f5be37220f38e1cc660da9967f9f20a61dc90a8e4255ff89bbc5d4f849cc2f SHA512 d073c5925ca2c947702a493d27affae2fd58ff69d70cf95056f011c02e305ee9e4e2829eb65353c059f677b252d379cac2a97f34d5614b8a2ddefecc4fda49b6
+EBUILD wget-1.19.2-r2.ebuild 3312 BLAKE2B c1d176288d7b68c46bc611db01d7329c99ffae676cfe8ac54a490a102eb6bf1194ca73600c95b5a0d4a9d92d696e276daf324a943f5d6eb977b88a66cce0e30a SHA512 9522cd93591a914a00c7e0f8f505e0e233464448fad7ae92c159e26b70f9347b3b977d7ad08967fe5cd4c0da8c3ecc96aec31220f6953e2b00896370b0c438e1
 EBUILD wget-1.19.2.ebuild 3118 BLAKE2B 43f5233b48ae7ace63fd0927938377d4ed7c5a8ca7fbaf94ada87bc0e8c5382f1ae9a4c872f7190c0b3fc090bbf27c71da7362bc5aa239cd5460796fcff5b4de SHA512 e4a6f74d9e7feddab9d9849e32f75f8a383e648b592ec0beb79c20a560c9e0156e4494059a3f95afe3135538e460abc0f5966b4002549e2c94ae572f2ef71738
 MISC metadata.xml 570 BLAKE2B 00d529ba0b6bcee7b6fc3937de69ead007ac57458c1afecf12cdd84a09637055d55725498e3c648311a494566eab32acc8d2e3de622086a4b599b5b40d0a2d1b SHA512 add9378a31ae7abc66d8dc6bfc3d355af3eb683ce177e68fbcbedb4b69435d7254b4cac1897d3b8267bddb23467e8f4bb16e439c09a4f91be16845b1113e055c
diff --git a/net-misc/wget/files/wget-1.92.2-openssl-1.1.0-r1.patch b/net-misc/wget/files/wget-1.92.2-openssl-1.1.0-r1.patch
new file mode 100644
index 000000000000..79f33b157599
--- /dev/null
+++ b/net-misc/wget/files/wget-1.92.2-openssl-1.1.0-r1.patch
@@ -0,0 +1,80 @@
+--- a/src/openssl.c
++++ b/src/openssl.c
+@@ -174,11 +174,16 @@ ssl_init (void)
+ {
+   SSL_METHOD const *meth;
+   long ssl_options = 0;
++#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L)
++  int ssl_proto_version = 0;
++#endif
+ 
+ #if OPENSSL_VERSION_NUMBER >= 0x00907000
+   if (ssl_true_initialized == 0)
+     {
++#if OPENSSL_API_COMPAT < 0x10100000L
+       OPENSSL_config (NULL);
++#endif
+       ssl_true_initialized = 1;
+     }
+ #endif
+@@ -202,8 +207,12 @@ ssl_init (void)
+   CONF_modules_load_file(NULL, NULL,
+       CONF_MFLAGS_DEFAULT_SECTION|CONF_MFLAGS_IGNORE_MISSING_FILE);
+ #endif
++#if OPENSSL_API_COMPAT >= 0x10100000L
++  OPENSSL_init_ssl(0, NULL);
++#else
+   SSL_library_init ();
+   SSL_load_error_strings ();
++#endif
+ #if OPENSSL_VERSION_NUMBER < 0x10100000L
+   SSLeay_add_all_algorithms ();
+   SSLeay_add_ssl_algorithms ();
+@@ -229,16 +238,31 @@ ssl_init (void)
+       ssl_options |= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
+       break;
+     case secure_protocol_tlsv1:
++#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L)
++      meth = TLS_client_method();
++      ssl_proto_version = TLS1_VERSION;
++#else
+       meth = TLSv1_client_method ();
++#endif
+       break;
+ 
+ #if OPENSSL_VERSION_NUMBER >= 0x10001000
+     case secure_protocol_tlsv1_1:
++#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L)
++      meth = TLS_client_method();
++      ssl_proto_version = TLS1_1_VERSION;
++#else
+       meth = TLSv1_1_client_method ();
++#endif
+       break;
+ 
+     case secure_protocol_tlsv1_2:
++#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L)
++      meth = TLS_client_method();
++      ssl_proto_version = TLS1_2_VERSION;
++#else
+       meth = TLSv1_2_client_method ();
++#endif
+       break;
+ #else
+     case secure_protocol_tlsv1_1:
+@@ -262,8 +286,15 @@ ssl_init (void)
+   if (!ssl_ctx)
+     goto error;
+ 
++#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L)
+   if (ssl_options)
+     SSL_CTX_set_options (ssl_ctx, ssl_options);
++#endif
++
++#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >=0x10100000L)
++  if (ssl_proto_version)
++    SSL_CTX_set_min_proto_version(ssl_ctx, ssl_proto_version);
++#endif
+ 
+   /* OpenSSL ciphers: https://www.openssl.org/docs/apps/ciphers.html
+    * Since we want a good protection, we also use HIGH (that excludes MD4 ciphers and some more)
diff --git a/net-misc/wget/wget-1.19.2-r2.ebuild b/net-misc/wget/wget-1.19.2-r2.ebuild
new file mode 100644
index 000000000000..b1bda330b2e4
--- /dev/null
+++ b/net-misc/wget/wget-1.19.2-r2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit flag-o-matic python-any-r1 toolchain-funcs
+
+DESCRIPTION="Network utility to retrieve files from the WWW"
+HOMEPAGE="https://www.gnu.org/software/wget/"
+SRC_URI="mirror://gnu/wget/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
+REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.19.2-fix-segfault-due-to-derefencing-null-ptr.patch
+	"${FILESDIR}"/${PN}-1.92.2-openssl-1.1.0-r1.patch )
+
+# Force a newer libidn2 to avoid libunistring deps. #612498
+LIB_DEPEND="idn? ( >=net-dns/libidn2-0.14[static-libs(+)] )
+	pcre? ( dev-libs/libpcre[static-libs(+)] )
+	ssl? (
+		gnutls? ( net-libs/gnutls:0=[static-libs(+)] )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+			libressl? ( dev-libs/libressl[static-libs(+)] )
+		)
+	)
+	uuid? ( sys-apps/util-linux[static-libs(+)] )
+	zlib? ( sys-libs/zlib[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	static? ( ${LIB_DEPEND} )
+	test? (
+		${PYTHON_DEPS}
+		dev-lang/perl
+		dev-perl/HTTP-Daemon
+		dev-perl/HTTP-Message
+		dev-perl/IO-Socket-SSL
+	)
+	nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# revert some hack that breaks linking, bug #585924
+	if [[ ${CHOST} == *-darwin* ]] \
+	|| [[ ${CHOST} == *-solaris* ]] \
+	|| [[ ${CHOST} == *-uclibc* ]] \
+	|| [[ ${CHOST} == *-cygwin* ]] \
+	; then
+		sed -i \
+			-e 's/^  LIBICONV=$/:/' \
+			configure || die
+	fi
+}
+
+src_configure() {
+	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
+	# the included gnutls -- force ioctl.h to include this header
+	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1
+
+	if use static ; then
+		append-ldflags -static
+		tc-export PKG_CONFIG
+		PKG_CONFIG+=" --static"
+	fi
+
+	# There is no flag that controls this.  libunistring-prefix only
+	# controls the search path (which is why we turn it off below).
+	# Further, libunistring is only needed w/older libidn2 installs,
+	# and since we force the latest, we can force off libunistring. #612498
+	ac_cv_libunistring=no \
+	econf \
+		--disable-assert \
+		--disable-rpath \
+		--without-included-libunistring \
+		--without-libunistring-prefix \
+		$(use_enable debug) \
+		$(use_enable idn iri) \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_enable ntlm) \
+		$(use_enable pcre) \
+		$(use_enable ssl digest) \
+		$(use_enable ssl opie) \
+		$(use_with idn libidn) \
+		$(use_with ssl ssl $(usex gnutls gnutls openssl)) \
+		$(use_with uuid libuuid) \
+		$(use_with zlib)
+}
+
+src_install() {
+	default
+
+	sed -i \
+		-e "s:/usr/local/etc:${EPREFIX}/etc:g" \
+		"${ED}"/etc/wgetrc \
+		"${ED}"/usr/share/man/man1/wget.1 \
+		"${ED}"/usr/share/info/wget.info \
+		|| die
+}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index c4b7eeaaa15f..455be246476e 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,8 +1,10 @@
 DIST youtube-dl-2017.03.16.tar.gz 2631620 BLAKE2B 2aff8710a296140a4329b0f8e7f57526684ca114ba39a7397eef81b1b79b4b5dfae685c1f0011cddf8569d8df1e50111bbce7f12647c067972c79ea3b116b2ff SHA512 f3b8942f6b2be3b1cfd4bddfb74c17bad48c8ef4bea34114970ecb9d65b5a3dcbe71beba6d7c2dbda168371bbb2e8bbaddce58039bd9d158bf23950a2a88123c
 DIST youtube-dl-2017.11.15.tar.gz 2834012 BLAKE2B fd93e3923f99874be58681a886c09e31ac10063975ab636badf27e59b44743c72cddf05e3a431c49ffd0f7b40f9b005f4d90feff85d4ca889dee80833300b076 SHA512 e10c0d53db7fdfb02610b53f54046c0a9354b305ba05c5d00a43649a283a6449263f66ff56171d52cf18f906c6aeccc25dc48ea708b4b1bb2b8323b937abca96
 DIST youtube-dl-2017.11.26.tar.gz 2839867 BLAKE2B c4f1b9739283fb4016ff0892bdcb0db86f1ddc88842553d76159fe4312e70e7145085f3b6a1bfc157d7f5811f28eb1ab79661db701a3366be12be2357b464f19 SHA512 ecf1eb88b37e271505a50709a468afcc6048f00bc6531e8df1eb064dcea62ad6fa2a5a9016d1d106e56b9d3b9904325e133491ca124e06ec64e6f4a5902a2368
+DIST youtube-dl-2017.12.02.tar.gz 2845664 BLAKE2B b7b3479b32d9a4d9ee73d1a06337789e080c464ff63eb4c604eb976a5e9f4822a456207de99f2c77b012c722d1cadfe52ac08f2c4a78c5defab797b3f813bc87 SHA512 46a103f8659166ebb79f5055cc435008fcd98b00cff4bfe0680cb4eebc34598edc6a05e73bf6a22647edce007afbcfd61bef6064adc8c2e0eab3fb2b9ee748a3
 EBUILD youtube-dl-2017.03.16.ebuild 2381 BLAKE2B bbf217461544a08786e3ba044e9b704354133dde4197d05ad92a8cdfd2e402dd0c013964da8b7971475a31ced7db734c89ef3ea33991b0227980d4025490c0fa SHA512 b47b7f8c00e04879aaac6bc70621d28f9e6e153b618bd246f95a2b11f8f09bf77cfefc5f0869b379759edf68a8f5d4afded6425032a9efdb8a1cbf44a23e9862
 EBUILD youtube-dl-2017.11.15.ebuild 2379 BLAKE2B 34ee4dfda07511e1f1e27576b967341bba6329312751cf5bc49fd54fe1bd6c2a5444ca0b82a25c15a40901b7a2edf743cfbb08e3bfcfca72e9dc5afe420605ed SHA512 f3996f3fe5ff5d92025a1adf594db099114e1a9a2e831d26fa8472c1cea1e3792a81996407b0349f244aeba1489f6ea1b757aaab827d5af55a6cad5a18a8eddf
 EBUILD youtube-dl-2017.11.26-r1.ebuild 3267 BLAKE2B 3227b519ffc0d8ee64afb3d67c2d4cdbae5a0a89af64f6a0fcb714e73f81031ba94c1af601e4d5ec9c3a0f01e6bac8a6e0c07b4d4a0596af985f72a96a1d884d SHA512 7eccbe2a3f18ee560043684aa0ff1868923adb79b6b2e35ab0da782920cfdf5e8b67b154c703918c23e23954b29c040438d60d9dfccbcbfa660c2d58885db96c
+EBUILD youtube-dl-2017.12.02.ebuild 3286 BLAKE2B 27dc317b224b7be4752e59ada595412101e6b5d5efa8baf703a61d690b92cc128a6c18e67a741cbced16a7be017555d038e54cebe832cc8980e0314ef3657c78 SHA512 0d49a470d4be463db904d18b3d37adbd5445900f2e0be45912c86a951942c158e3bba9fe4faa8976432d76e6438f199915583c6fb7cec9e5323680363a442d34
 EBUILD youtube-dl-99999999.ebuild 2089 BLAKE2B df876c715ffaa403d175515951e751611df0cb89e815515b045bebb29add327aa0df50f25303864e1ff0abe8f19a53718e9d20c64dd9d3ead549ad57125376d0 SHA512 a390ee79a77aa98603ca01a702df6621ac4630e62e7afd089e065bd4468fc38bfd13bba365e28916024f0eb9e92627133281985f57692432522aeb4671a0cf11
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2017.12.02.ebuild b/net-misc/youtube-dl/youtube-dl-2017.12.02.ebuild
new file mode 100644
index 000000000000..b94326c98c67
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2017.12.02.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://rg3.github.com/youtube-dl/"
+SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="+offensive test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-python/nose[coverage(+)] )
+"
+
+S="${WORKDIR}/${PN}"
+
+python_prepare_all() {
+	if ! use offensive; then
+		sed -i -e "/..version../s|'$|+gentoo.no.offensive.sites'|g" \
+			youtube_dl/version.py || die
+		# these have single line import statements
+		local xxx=(
+			alphaporno anysex behindkink camwithher chaturbate eporner
+			eroprofile extremetube foxgay goshgay hellporno hentaistigma
+			hornbunny keezmovies lovehomeporn mofosex motherless myvidster
+			porn91 porncom pornflip pornhd pornotube pornovoisines pornoxo
+			ruleporn sexu slutload spankbang spankwire sunporno thisav tube8
+			vporn watchindianporn xbef xnxx xtube xvideos xxxymovies youjizz
+			youporn
+		)
+		# these have multi-line import statements
+		local mxxx=(
+			drtuber fourtube pornhub redtube tnaflix xhamster
+		)
+		# do single line imports
+		sed -i \
+			-e $( printf '/%s/d;' ${xxx[@]} ) \
+			youtube_dl/extractor/extractors.py \
+			|| die
+
+		# do multiple line imports
+		sed -i \
+			-e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
+			youtube_dl/extractor/extractors.py \
+			|| die
+
+		sed -i \
+			-e $( printf '/%s/d;' ${mxxx[@]} ) \
+			youtube_dl/extractor/generic.py \
+			|| die
+
+		rm \
+			$( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
+			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
+			test/test_age_restriction.py \
+			|| die
+	fi
+
+	eapply_user
+
+	distutils-r1_python_prepare_all
+}
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+python_test() {
+	emake test
+}
+
+python_install_all() {
+	dodoc README.txt
+	doman ${PN}.1
+
+	newbashcomp ${PN}.bash-completion ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins youtube-dl.zsh _youtube-dl
+
+	insinto /usr/share/fish/completions
+	doins youtube-dl.fish
+
+	distutils-r1_python_install_all
+
+	rm -r "${ED}"/usr/etc || die
+	rm -r "${ED}"/usr/share/doc/youtube_dl || die
+}
+
+pkg_postinst() {
+	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
+	elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
+	elog
+	elog "${PN} works fine on its own on most sites. However, if you want"
+	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
+	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
+	elog "videos can be retrieved in a higher quality format without sound."
+	elog "${PN} will detect whether avconv/ffmpeg is present and"
+	elog "automatically pick the best option."
+
+	elog
+	elog "Videos or video formats streamed via RTMP protocol can only be"
+	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
+	elog "Downloading MMS and RTSP videos requires either mplayer"
+	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
+}
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index fa53ec13c1ba..b3ff7c1b7e30 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 5a0e7e6fde93..3f7f043acb93 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,5 +1,4 @@
 AUX haproxy-1.7-contrib.patch 1066 BLAKE2B 0fa639be8c0b816566f140970a73b360d58e38654744102609115184ca99828b78ec795ab75fe7af0fdf1af4d8f7f869498d8d712c34707732459bb984d63409 SHA512 a26846f3d970b288e6ba8c2cc67190242b41101ebb1b3b14a8ce543109b79d30a1f3257e1b2767033b3208dd223c1597b8a21824c622f16349bc849e9034f631
-AUX haproxy-1.8-contrib.patch 2763 BLAKE2B 89052df94bc6bb3255774791dbec7e1e091e47cb00e5beafc9347193bff0ac29bece83da352ef079f93848f049255dd3a2adf12a3cbcc19e71468af7146c764c SHA512 6279d1c5df16c255857fc5b521efb899d15b7940a4d4584b61c0da98821f05ba5f0b50ef54e62030a2772f91c4ee1230262f617617d4632346aa90982d0a629f
 AUX haproxy.confd 610 BLAKE2B 89c6ea0c2f623bbe7aa80a4f42de1d7fb38a2fa6e9edb5b9c758ee1c5140e750fa6be046e4854c94806a609bd3b487f2553bfeafb1db43871032731425b54f59 SHA512 80a6e109432c7e751e9e1063853f73d3269c4c3967728a90cf94230cb32308b396f9f9ad7795b74b919dae4f61e5a29a9ae7badf0908148accbe0e8ca2238913
 AUX haproxy.initd-r2 978 BLAKE2B b91b4cbd1ff95dc4dabcd62646b2ad03b4cfac253c89326c8e3e38e6c60f3c2175a01aa204ad284e072ce120f1552451b79755a017cf7a2b4ae55b80734b6931 SHA512 039f14980fd6acba7db76abb3c0e0f341bd1a741b126aa956ef2d07670a8e8d79176e378d8c1545701ec11d9779ca0f57298052f74912c58de7801fb06810e73
 AUX haproxy.initd-r6 1705 BLAKE2B af8b9ad2fcb499d7fec97fe4210af8685a15881aa98634551bad8ec90bd2fe412a7af337fcb5f3ced7715433fb1d98fa175ecb83fa61108802973976109a7c6d SHA512 59693dfb0ae004559e57fb751ebd4abc85a982733699230ff51aa94a2bb7db9875bc63f6a03355b7434448736beb513e923b2ad9c70661f4110e4b2ad2bba753
@@ -8,7 +7,7 @@ DIST haproxy-1.5.19.tar.gz 1362834 SHA256 e00ae2a633da614967f2e3ebebdb817ec537cb
 DIST haproxy-1.6.11.tar.gz 1574029 SHA256 62fe982edb102a9f55205792bc14b0d05745cc7993cd6bee5d73cd3c5ae16ace SHA512 73ff1c7301197b3bd75a3b1355787419676854d132ce2dcdacb2a296e297dcdfc52b0c571a4fb715e369f1126e1a58196fabb21f828c880f15904032da78e434 WHIRLPOOL 4454c51da89bb089579aefcf54093fd4c09b42918e81e41772d263ebc19f243a37b42135a02c4012705e4cc31370f377cf0b429e81707f307cffe9ed23f5183b
 DIST haproxy-1.6.13.tar.gz 1580214 SHA256 7d318583f3a1bf185e857bd40449004b29c95547c89bbb36718f284e29502a1b SHA512 ffed3b347e0cd9cefdc379c91890a3c104d6848b976a9f28984878a9c2d05ca7ddea678f7a93f75cb9d29ae2be921e5a5bd295b1a8771765b099d1c619ded7a3 WHIRLPOOL 70176ee090dacbbdc822c74bba137589f168482c560734c06b98dc23b4d957ed1e016309f11f25a0b486bc6917633455f1174dc6688d6aef53667c61b83a9ff3
 DIST haproxy-1.7.9.tar.gz 1748159 BLAKE2B 6826ad3519ff300fb1c91992014834543f971fade8a8b89956d4cd1fc0000b1b3e259586a21ee9fa8ca0ee1f4520517dfc328d83d7a858f469f0366df6e3da43 SHA512 d1ed791bc9607dbeabcfc6a1853cf258e28b3a079923b63d3bf97504dd59e64a5f5f44f9da968c23c12b4279e8d45ff3bd39418942ca6f00d9d548c9a0ccfd73
-DIST haproxy-1.8.0.tar.gz 2036854 BLAKE2B c7cebcb3e27f61f8fd65e084c8557c6ecbde07a9517c5950330b315cc76a4ced86272ca7b75a292380a867229be5e2b4e65514d4daae276472fa4d6a7919798c SHA512 7461c49cc00e7d6baf08dad9aba77e2b5cbbb532a902131838b0cc670a9ea85232f2da7187c3463c3bb76ca6955e17ce7eeec57378c002aaac3cf1dfbaf6cceb
+DIST haproxy-1.8.1.tar.gz 2038215 BLAKE2B 85365fd581a665ec08eaf799a22cecdb95c59485f4846544aafdce38fce3819778d5adb3a652e9b5560973fef4acd348d13f1d545ccd7abf7c9bc67ce1c82049 SHA512 c59bbd144afae01a3802065bf507dc1ca70f09e7112a9f502474ec6758d3ccab084550372562d2906f1e0b9509464e316ca6f95e3575d7273aba49f350791caa
 EBUILD haproxy-1.5.14.ebuild 3269 BLAKE2B fed37e73d128612260d8266045891a5e271ba399ee61af005409ab07b089297f4ca39adb67c50e0721efa9b7cdc112f0d5d30a65cb60ac027684ddb69e606c9c SHA512 41d1cfec30d177661f4402143ccf1335f5407adeb9f1581ea866011b1ec26c99da67fb2edd33e71e96b64665fa9c62641fd4b5dc1cd1383cc49877a0ce4292b4
 EBUILD haproxy-1.5.19-r2.ebuild 3283 BLAKE2B 698bb63a7c0b97aa62e1c3b12de9689ababa6407dc98870bd73fed0d7aad4f2e08f13faf466aa40d8c420618dcd82e2292a54b4a779772a8e106e7f88194c7b0 SHA512 f8056a851fb9800bcced3827d1294b8b81115c5da3ae603067bb4d10e276c9e053823ba72ebabf21955a7fe241911256e87d4f086eb029a5c1e3d144c15ebfc3
 EBUILD haproxy-1.6.11-r2.ebuild 4672 BLAKE2B 74b3adb390a7fa1d596e8e91f4ca5fbb46d7dfd201527956a514a3f0855f575b2fc1115b388126d8e54a1a80f13b5b62acb59f53eb92a5bd9ef3f02ab3867c38 SHA512 843c39796ab641d5036dc2f1d151da41acc5820713dd2c2857c551d684b0a5922abead4e9c2afb031bb75635842e9ead645ced6d9cebfa97ccc2f719caed8c58
@@ -16,5 +15,5 @@ EBUILD haproxy-1.6.13-r3.ebuild 4608 BLAKE2B e0dca86f8ee6c089a066cf876a0444468c4
 EBUILD haproxy-1.6.9999-r2.ebuild 4632 BLAKE2B bae769008fcc70608d96b1b620d2b561b1f6bc6fc1eb0e6b49c42b20786532f489749947ee7f77aa9dcbf72ca58456e39323fe8e0b5713cbb3a9156318d62201 SHA512 ce18238aeedbdb806fe7f36d7af3d2725e137d20760f7d8812e0c16c8d2f09998800a2809849745176d2d3139c580e9c843454a8006d6115c03608f7828df950
 EBUILD haproxy-1.7.9-r1.ebuild 4632 BLAKE2B bae769008fcc70608d96b1b620d2b561b1f6bc6fc1eb0e6b49c42b20786532f489749947ee7f77aa9dcbf72ca58456e39323fe8e0b5713cbb3a9156318d62201 SHA512 ce18238aeedbdb806fe7f36d7af3d2725e137d20760f7d8812e0c16c8d2f09998800a2809849745176d2d3139c580e9c843454a8006d6115c03608f7828df950
 EBUILD haproxy-1.7.9999-r2.ebuild 4632 BLAKE2B bae769008fcc70608d96b1b620d2b561b1f6bc6fc1eb0e6b49c42b20786532f489749947ee7f77aa9dcbf72ca58456e39323fe8e0b5713cbb3a9156318d62201 SHA512 ce18238aeedbdb806fe7f36d7af3d2725e137d20760f7d8812e0c16c8d2f09998800a2809849745176d2d3139c580e9c843454a8006d6115c03608f7828df950
-EBUILD haproxy-1.8.0.ebuild 5060 BLAKE2B a8ee1bcd2cb8c3d014dcf5829c822eb0558d898225ccba2fb5789bb0a760cbad2da3adf94eb93af12d810c5f2ea70a6707419ad11d44ba9ecdd4ed8de3446487 SHA512 30124108ce3f09ecb91f83f87e4485687b7f05c78d6a584053cf0d7bbca98e55d38e6154a6220c2b43d76b6949feec4088995f528260ec327b1c28a5d30f0d79
+EBUILD haproxy-1.8.1.ebuild 4890 BLAKE2B 8b9a39786819f7354aabcd727a4bebaa5df077af417641ce990860d59ff0f6e4308758cfd17a1eea91f6fa2fd54d864dc9b2bf442277cd8caa21ef3a8ef4c865 SHA512 20f73269d7438b815b1a3bad3b9731ec1dc8f4835990eab0038e0879a1be77a8875133bc3149ee10aecae77de15d7d15dbaf3f9d76e271af8acd06487421f44c
 MISC metadata.xml 2071 BLAKE2B 303b68ae0788743ec5a8d893e69a87fd2d22188b2166f75c23cd2a47c06e69bfe43745016fafd64b5b298f7b56453fcbfb6b4d9bfede1e08e0c603bce7b0955f SHA512 4ac7fd3dcae2293fa3cdb54fba7dfd9cfbc28f5fca33442dd970861ca26672a0b21d825d36099fbf234831a403fb41eabe02d48eca2a971eaef857516427394b
diff --git a/net-proxy/haproxy/files/haproxy-1.8-contrib.patch b/net-proxy/haproxy/files/haproxy-1.8-contrib.patch
deleted file mode 100644
index a3e336a57734..000000000000
--- a/net-proxy/haproxy/files/haproxy-1.8-contrib.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From c702537864f7e062d18f4ccce3e29d14d4ccf05f Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@gentoo.org>
-Date: Thu, 30 Nov 2017 10:11:36 +0100
-Subject: [PATCH] Fix LDFLAGS vs. LIBS re linking order
-
-Signed-off-by: Christian Ruppert <idl0r@gentoo.org>
----
- contrib/mod_defender/Makefile | 5 ++---
- contrib/modsecurity/Makefile  | 5 ++---
- contrib/spoa_example/Makefile | 5 ++---
- 3 files changed, 6 insertions(+), 9 deletions(-)
-
-diff --git a/contrib/mod_defender/Makefile b/contrib/mod_defender/Makefile
-index ac17774d..efc7d7f6 100644
---- a/contrib/mod_defender/Makefile
-+++ b/contrib/mod_defender/Makefile
-@@ -28,9 +28,8 @@ EVENT_INC := /usr/include
- endif
-
- CFLAGS  += -g -Wall -pthread
--LDFLAGS += -lpthread  $(EVENT_LIB) -levent_pthreads -lapr-1 -laprutil-1 -lstdc++ -lm
- INCS += -I../../include -I../../ebtree -I$(MOD_DEFENDER_SRC) -I$(APACHE2_INC) -I$(APR_INC) -I$(EVENT_INC)
--LIBS =
-+LIBS += -lpthread  $(EVENT_LIB) -levent_pthreads -lapr-1 -laprutil-1 -lstdc++ -lm
-
- CXXFLAGS = -g -std=gnu++11
- CXXINCS += -I$(MOD_DEFENDER_SRC) -I$(MOD_DEFENDER_SRC)/deps -I$(APACHE2_INC) -I$(APR_INC)
-@@ -43,7 +42,7 @@ CXXSRCS = $(wildcard $(MOD_DEFENDER_SRC)/*.cpp)
- CXXOBJS = $(patsubst %.cpp, %.o, $(CXXSRCS))
-
- defender: $(OBJS) $(CXXOBJS)
--	$(LD) -o $@ $^ $(LDFLAGS) $(LIBS)
-+	$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
-
- install: defender
-	install defender $(DESTDIR)$(BINDIR)
-diff --git a/contrib/modsecurity/Makefile b/contrib/modsecurity/Makefile
-index bb918c30..aa0d6e38 100644
---- a/contrib/modsecurity/Makefile
-+++ b/contrib/modsecurity/Makefile
-@@ -34,14 +34,13 @@ EVENT_INC := /usr/include
- endif
-
- CFLAGS  += -g -Wall -pthread
--LDFLAGS += -lpthread  $(EVENT_LIB) -levent_pthreads -lcurl -lapr-1 -laprutil-1 -lxml2 -lpcre -lyajl
- INCS += -I../../include -I../../ebtree -I$(MODSEC_INC) -I$(APACHE2_INC) -I$(APR_INC) -I$(LIBXML_INC) -I$(EVENT_INC)
--LIBS =
-+LIBS += -lpthread  $(EVENT_LIB) -levent_pthreads -lcurl -lapr-1 -laprutil-1 -lxml2 -lpcre -lyajl
-
- OBJS = spoa.o modsec_wrapper.o
-
- modsecurity: $(OBJS)
--	$(LD) $(LDFLAGS) $(LIBS) -o $@ $^ $(MODSEC_LIB)/standalone.a
-+	$(LD) $(LDFLAGS) -o $@ $^ $(MODSEC_LIB)/standalone.a $(LIBS)
-
- install: modsecurity
-	install modsecurity $(DESTDIR)$(BINDIR)
-diff --git a/contrib/spoa_example/Makefile b/contrib/spoa_example/Makefile
-index d04a01e1..c44c2b87 100644
---- a/contrib/spoa_example/Makefile
-+++ b/contrib/spoa_example/Makefile
-@@ -6,15 +6,14 @@ CC = gcc
- LD = $(CC)
-
- CFLAGS  = -g -O2 -Wall -Werror -pthread
--LDFLAGS = -lpthread -levent -levent_pthreads
- INCS += -I../../ebtree -I./include
--LIBS =
-+LIBS = -lpthread -levent -levent_pthreads
-
- OBJS = spoa.o
-
-
- spoa: $(OBJS)
--	$(LD) $(LDFLAGS) $(LIBS) -o $@ $^
-+	$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
-
- install: spoa
-	install spoa $(DESTDIR)$(BINDIR)
---
-2.13.6
diff --git a/net-proxy/haproxy/haproxy-1.8.0.ebuild b/net-proxy/haproxy/haproxy-1.8.1.ebuild
index 80e41f24b2ab..258b51e7e7d4 100644
--- a/net-proxy/haproxy/haproxy-1.8.0.ebuild
+++ b/net-proxy/haproxy/haproxy-1.8.1.ebuild
@@ -50,8 +50,6 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/${MY_P}"
 
 DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-version_is_at_least 1.7.0 $PV && PATCHES=( "${FILESDIR}"/haproxy-1.7-contrib.patch )
-version_is_at_least 1.8.0 $PV && PATCHES=( "${FILESDIR}"/haproxy-1.8-contrib.patch )
 CONTRIBS=( halog iprange )
 # ip6range is present in 1.6, but broken.
 version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 91b86d1b7ca7..e758ee222ecf 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/kvpnc/Manifest b/net-vpn/kvpnc/Manifest
index 74df8c8c201a..65fa7ebacae5 100644
--- a/net-vpn/kvpnc/Manifest
+++ b/net-vpn/kvpnc/Manifest
@@ -5,6 +5,5 @@ AUX kvpnc-0.9.6a-kicon.patch 2273 BLAKE2B bf9fa922c7f14a86a29ec92c8b50cadd1b62b7
 AUX kvpnc-0.9.6a-scriptsec.patch 1017 BLAKE2B 942c72a8bb84371dd43b7ff5b413918f242f5b9709281340c68cb0bdedd9bdb17f9537e4889f598f116efe6e266adfb44207d0ff028232ad089de88fdee94643 SHA512 517d69e5f4b2911f3ef3fc165eb242b11075b46ef7e25d7f0b311da20bfdb14ebb56d91fa2a052330ee928a04e2299a4a01020a5eac270f31d020f2ca0672595
 DIST kvpnc-0.9.6-kde4-locale.tar.bz2 2020192 SHA256 a675f9ed3d66e7fa94a0fd530fa60521d0ef739043bcfe2702be77b0299a47c7 SHA512 a2e5c7f465ec77e61f882cb2a45da7da3c868de164e8cdefe2a987d9040e1762ebd6f3e089f008dfcc7f7fad47b9847c059d615c94a995805af0ca3f1fd4d209 WHIRLPOOL 03b5a49027d024cb2645ea481735223f1551d65fed027690619f75ed38c05ecdc3b31b73e4e1d4309450088b709e35535081c614e4a9136d2da8fc954d739a15
 DIST kvpnc-0.9.6a-kde4.tar.bz2 579425 SHA256 6bf8c1f13f8d54f73f7ebb4102f912a5ebc01697ea36975977de8e57c97771f3 SHA512 e30e3fcb9729a378c84d636c7efe0e45ce7d15bcfab2f5f6cd4e37951de1db10c343e5e14dc13aafc4d540058ebc2ca0c2ad30c555fd78f0de552107d13d2467 WHIRLPOOL 8dadbf4fa0ba3790d8545a05cf9db5e462ba1d5a72c898faeee556d7e071c71e2cfaf81a07b5ff17a790399f044b87d1dc56f43799c7f58df049cf43829896cf
-EBUILD kvpnc-0.9.6a-r2.ebuild 1189 BLAKE2B c150c9d42339cba288b231862edab0891a6036cf7532573f852ccb502d68e9736a82950fadc622c10eea3992194551145504d3601e2c9a4f10376a64aa561f61 SHA512 4bd09a81923bfd53ca4b4b120f3bc823258556f11407c23537ade2a31dd6fdd806ed175f286bdcd639282e002ac89e3c5af31bd354611c781cdb4a97926e187e
 EBUILD kvpnc-0.9.6a-r3.ebuild 1299 BLAKE2B 3695793a25a4f706ae07b2f13a83b4cff73b48e9a93635dd215b5fc426c9de5f756dabe2f36800aae4d88bc355edb6063034deb859a604660dd5b14fefbee97c SHA512 8f937093bb1b52431851411ce45d962dce070b3973f7a9e045408548ae79a4df04fb704e980db1ba82ed10b4b897eebe5883f7c0b630405017bfa12a7f92ebd9
 MISC metadata.xml 255 BLAKE2B c034706780f889b331e993d25fc5b7127e47555bef2e7cdc2c49d289154ec119175d3557ac86bca6dfa3de9275549c1adc08ff8480b0d5e862fa426eb2ea3d51 SHA512 8b2fdb47579200da9614f4dd4397bfbbf59c42fb6fc0509a1875f32458a67650d7a54e5bc621acc0accf7c17c1973941719284dff783208448abd61527d644c1
diff --git a/net-vpn/kvpnc/kvpnc-0.9.6a-r2.ebuild b/net-vpn/kvpnc/kvpnc-0.9.6a-r2.ebuild
deleted file mode 100644
index 4b9e050da5a2..000000000000
--- a/net-vpn/kvpnc/kvpnc-0.9.6a-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KDE_LINGUAS="ar br cs da de el en_GB eo es et eu fr ga gl hi hne it ja ka lt
-ms nb nds nl nn pa pl pt pt_BR ro ru sv tr uk zh_CN zh_TW"
-inherit kde4-base
-
-DESCRIPTION="KDE frontend for various VPN clients"
-HOMEPAGE="https://userbase.kde.org/KVpnc"
-SRC_URI="http://download.gna.org/kvpnc/${P}-kde4.tar.bz2
-	http://download.gna.org/kvpnc/${P/a}-kde4-locale.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND="
-	dev-libs/libgcrypt:0
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-S=${WORKDIR}/${P}-kde4
-
-PATCHES=(
-	"${FILESDIR}/${P}-scriptsec.patch"
-	"${FILESDIR}/${P}-gcc47.patch"
-	"${FILESDIR}/${P}-ifconfig.patch"
-)
-
-src_prepare() {
-	mv -vf "${WORKDIR}"/${P/a}-kde4-locale/po . || die
-
-	echo "find_package ( Msgfmt REQUIRED )" >> CMakeLists.txt || die
-	echo "find_package ( Gettext REQUIRED )" >> CMakeLists.txt || die
-	echo "add_subdirectory ( po )" >> CMakeLists.txt || die
-
-	sed -i \
-		-e "s:0.9.2-svn:${PV}:" \
-		CMakeLists.txt || die
-
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=( "-DWITH_libgcrypt=ON" )
-	kde4-base_src_configure
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index ea14b7597eb6..996d4a22ac2a 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask
index a17fb4b3d133..4583a6859f62 100644
--- a/profiles/arch/arm/use.mask
+++ b/profiles/arch/arm/use.mask
@@ -50,7 +50,7 @@ openexr
 gimp
 
 # No hardware to test by the team
-dvb
+hdhomerun
 ios
 ipod
 
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index d769855edd54..585577535da5 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -86,6 +86,7 @@ dev-vcs/subversion kwallet
 games-arcade/jumpnbump kde
 kde-apps/katepart handbook
 kde-frameworks/kdelibs handbook policykit
+net-irc/quassel kde
 net-libs/libproxy kde
 sys-auth/polkit kde
 sys-block/gparted kde
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index f9284d17fab6..524ae4fe94db 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -117,8 +117,3 @@ media-libs/coin simage
 #nixnut <nixnut@gentoo.org> (24 jan 2009)
 #don't want zemberek for enchant for ppc32
 app-text/enchant zemberek
-
-# Chí-Thanh Christopher Nguyễn (11 Jul 2016)
-# Requires unkeyworded kde-frameworks packages
-net-irc/quassel qt5
-
diff --git a/profiles/package.mask b/profiles/package.mask
index 11593fcd0fb1..f015ed7c839e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,6 +30,23 @@
 #--- END OF EXAMPLES ---
 
 # Andreas Sturmlechner <asturm@gentoo.org> (03 Dec 2017)
+# Dead upstreams, depending on dead qt3support/qt4.
+# Masked for removal in 30 days. Bug #631788
+games-board/capicity
+games-board/kcheckers
+games-board/qgo
+games-board/holdingnuts
+games-board/qcheckers
+games-emulation/virtualjaguar
+games-emulation/dboxfe
+games-kids/cubetest
+games-kids/crayon-physics
+games-misc/ggencoder
+games-misc/qlife
+games-puzzle/bubble-chains
+games-puzzle/jag
+
+# Andreas Sturmlechner <asturm@gentoo.org> (03 Dec 2017)
 # Dead upstream, depends on dead qt4.
 # Masked for removal in 30 days. Bug #639254
 x11-misc/qtnotifydaemon
diff --git a/profiles/targets/desktop/make.defaults b/profiles/targets/desktop/make.defaults
index f082bb9b8a5a..9546f24ac8fd 100644
--- a/profiles/targets/desktop/make.defaults
+++ b/profiles/targets/desktop/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-USE="a52 aac acpi alsa bluetooth branding cairo cdda cdr consolekit cups dbus dri dts dvd dvdr emboss encode exif fam firefox flac gif glamor gpm gtk jpeg lcms ldap libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qt3support qt4 qt5 sdl spell startup-notification svg tiff truetype vorbis udev udisks unicode upower usb wxwidgets X xcb x264 xml xv xvid"
+USE="a52 aac acpi alsa bluetooth branding cairo cdda cdr consolekit cups dbus dri dts dvd dvdr emboss encode exif fam firefox flac gif glamor gpm gtk jpeg lcms ldap libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qt3support qt5 sdl spell startup-notification svg tiff truetype vorbis udev udisks unicode upower usb wxwidgets X xcb x264 xml xv xvid"
diff --git a/profiles/targets/desktop/package.use b/profiles/targets/desktop/package.use
index 6deb7a1f0a44..5d4dbf769ea9 100644
--- a/profiles/targets/desktop/package.use
+++ b/profiles/targets/desktop/package.use
@@ -1,6 +1,18 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (03 Dec 2017)
+# Integration for Qt4-based applications
+kde-plasma/plasma-desktop qt4
+
+# Andreas Sturmlechner <asturm@gentoo.org> (03 Dec 2017)
+# Required by kde-frameworks/kdelibs
+app-crypt/qca qt4
+dev-libs/libdbusmenu-qt qt4
+media-libs/phonon qt4
+media-libs/phonon-vlc qt4
+sys-auth/polkit-qt qt4
+
 # Andreas Sturmlechner <asturm@gentoo.org> (30 Nov 2017)
 # Not required, but makes life easier with Qt; bug #457934
 app-arch/unzip natspec
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index c9eb9c14b840..c9bd4da9e88e 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -166,6 +166,7 @@ app-admin/sudo:openssl - Use SHA2 from dev-libs/openssl instead of sudo's intern
 app-admin/sudo:sendmail - Allow sudo to send emails with sendmail
 app-admin/sysklogd:logrotate - use app-admin/logrotate for rotating logs rather than custom cron scripts
 app-admin/syslog-ng:amqp - Enable support for AMQP destinations
+app-admin/syslog-ng:http - Enable support for HTTP destinations
 app-admin/syslog-ng:json - Enable support for JSON template formatting via dev-libs/json-c
 app-admin/syslog-ng:mongodb - Enable support for mongodb destinations
 app-admin/syslog-ng:pacct - Enable support for reading Process Accounting files (EXPERIMENTAL, Linux only)
@@ -3524,7 +3525,6 @@ kde-apps/step:qalculate - Enable the libqalculate library for unit conversion
 kde-frameworks/frameworkintegration:appstream - Enable AppStream software metadata support
 kde-frameworks/kconfigwidgets:man - Build and install man pages
 kde-frameworks/kded:man - Build and install man pages
-kde-frameworks/kdelibs:opengl - Enable OpenGL support for Plasma (GLApplet)
 kde-frameworks/kdelibs:qt3support - Enable kde3support/qt3support for very old applications
 kde-frameworks/kdesignerplugin:designer - Build KF5 widgets plugin for QtDesigner
 kde-frameworks/kdesignerplugin:webkit - Build kdewebkit plugin for QtDesigner
@@ -3671,6 +3671,7 @@ mail-client/nail:kerberos - If network is enabled, this adds support for GSSAPI
 mail-client/nail:net - Enable support for network protocols (POP, IMAP and SMTP). If you only need to send mail with the local Transport Agent, disabling this will get you support for only /usr/sbin/sendmail call.
 mail-client/nail:ssl - If network is enabled, this adds support for S/MIME and SSL/TLS-powered protocols through dev-libs/openssl.
 mail-client/neomutt:berkdb - Enable BDB (Berkley DB) backend for header caching
+mail-client/neomutt:crypt - Add support for encryption -- using mcrypt or gpg where applicable
 mail-client/neomutt:gdbm - Enable GDBM (GNU dbm) backend for header caching
 mail-client/neomutt:gpg - Enable support for app-crypt/gpgme
 mail-client/neomutt:gpgme - Build gpgme backend to support S/MIME, PGP/MIME and traditional/inline PGP
@@ -4843,6 +4844,7 @@ media-tv/xmltv:uk_bleb - Britain tv listing grabber
 media-tv/xmltv:uk_rt - Britain alternative tv listing grabber
 media-tv/xmltv:uk_tvguide - UK and Ireland tv listing grabber using TV Guide website
 media-tv/xmltv:za - South Africa tv listing grabber
+media-tv/xmltv:zz_sdjson - Grabber for schedulesDirect.org SD-JSON service (many countries)
 media-video/aegisub:uchardet - Enable charset discovery via app-i18n/uchardet
 media-video/aravis:X - Build the GTK+-based video viewer for aravis. This requires GStreamer and a few plugins but technically not the GST plugin for aravis.
 media-video/aravis:gstreamer - Build the GStreamer plugin for aravis, but not the video viewer.
@@ -5878,17 +5880,18 @@ net-irc/unrealircd:showlistmodes - Display channel modes in /LIST (only configur
 net-irc/unrealircd:shunnotices - Enable notifying a user when un-shunned
 net-irc/unrealircd:topicisnuhost - Enable displaying nick!user@host as topic setter
 net-irc/unrealircd:usermod - Enable /set* and /chg* commands
-net-irc/weechat:alias - Enable plugin for alias control.
-net-irc/weechat:buflist - Enable buflist plugin.
-net-irc/weechat:charset - Enable encoding conversions.
-net-irc/weechat:exec - Enable exec plugin.
-net-irc/weechat:fifo - Enable FIFO support (sh pipes).
-net-irc/weechat:irc - Enable IRC protocol support.
-net-irc/weechat:logger - Enable support for logging.
+net-irc/weechat:alias - Enable plugin for alias control
+net-irc/weechat:buflist - Enable buflist plugin
+net-irc/weechat:charset - Enable encoding conversions
+net-irc/weechat:exec - Enable exec plugin
+net-irc/weechat:fifo - Enable FIFO support (sh pipes)
+net-irc/weechat:fset - Enable fast set plugin
+net-irc/weechat:irc - Enable IRC protocol support
+net-irc/weechat:logger - Enable support for logging
 net-irc/weechat:relay - Enable relay plugin (experimental)
-net-irc/weechat:scripts - Build infrastructure for scripting.
-net-irc/weechat:trigger - Enable trigger plugin.
-net-irc/weechat:xfer - Enable xfer plugin support.
+net-irc/weechat:scripts - Build infrastructure for scripting
+net-irc/weechat:trigger - Enable trigger plugin
+net-irc/weechat:xfer - Enable xfer plugin support
 net-irc/znc:daemon - Allow znc to run as a system-wide service. Installs an init script and creates a znc user:group.
 net-irc/znc:zlib - Enable mod_deflate-like gzip support for znc's web interface using sys-libs/zlib.
 net-libs/aqbanking:chipcard - Enable support for DDV/RSA-chipcards
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index d06604871082..33f15cc4731d 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/ngspice/Manifest b/sci-electronics/ngspice/Manifest
index 0d1f5bfe7962..0d80ab43a460 100644
--- a/sci-electronics/ngspice/Manifest
+++ b/sci-electronics/ngspice/Manifest
@@ -1,4 +1,5 @@
-DIST ngspice-26-manual.pdf 2141771 SHA256 30b4fde001d012b0350aae3ba64892fb2f315d04f6761b95abd79f4b7c4cd85d SHA512 1c160aeef61d8091a6d788677bcf7ea682393cc886d5d535f87bb800cdae4f095cbf1e833babadea481956b904b4bdb688cc18b80d9d6a29cab33a54275abab1 WHIRLPOOL 7e9be918599599da3bd6fc754afdc453e1cc6171cabe2afe05da2be24433b4c1ee46728c29995dc62d04d08f966a441a853aa231b37b55e7bcfd587832dcb5b1
-DIST ngspice-26.tar.gz 6925987 SHA256 51e230c8b720802d93747bc580c0a29d1fb530f3dd06f213b6a700ca9a4d0108 SHA512 eb6a81df90de803c9f7544e8d0de7cc413aac169f69d1dec5cc6d2e667b66d42aede7f14c75bcdd10288be0c2ac07863fd4028b9fe59f2f515d680c2ffa41cab WHIRLPOOL cb356ee817fa00ab4a195c8380445adddf6426b5b08ca7c9af1bd96e6f43f3643bc6e4d2d9a7e4a3f3a79f43aa40b0da08721c2e42365c79b5f2e6bad6aef669
-EBUILD ngspice-26.ebuild 2572 BLAKE2B 27bea3d8e0b649ec2af457c498b34f1315b1c1031451a8da75c9d6434ebe5c8364c4088a6f9c7691203459ff1b5c2ba6a72bb16a4c69d6b3dc83d5ab68a3ce55 SHA512 548cdb913056660678e2347dbbe6004d5d6cbf93305678bae2d75678b7fe6db7e2364102932ea81607f8178185e4f541b3b2a46accfa6eda23fa1e89046f67f6
+AUX ngspice-26-respect-ldflags.patch 728 BLAKE2B 7646de91df0a49ab6f5dc6fe58ed5f4044d80a8e5730dddc249dd5c4fb45aff5bf6b8c9bd249edf6bf9bcd16d501334c5116fceea6d181befc846c084d0521aa SHA512 8183ec06e05d9fc22322e8ddef96b72f83681344abf1d9d150fc2058bf906b0eebb83e97c7f39cd74afe316a49ad7a779a3f61f6cd3a79ca967ce037c84bcb98
+DIST ngspice-26-manual.pdf 2141771 BLAKE2B 16956c46640de4696f7197997b170a2b1aad9b2f9fbe299b801de100d8aaca949b5be6f259e353a168ae90d992d91ff65e8a819b49fdf509fae98ec7dfa610d7 SHA512 1c160aeef61d8091a6d788677bcf7ea682393cc886d5d535f87bb800cdae4f095cbf1e833babadea481956b904b4bdb688cc18b80d9d6a29cab33a54275abab1
+DIST ngspice-26.tar.gz 6925987 BLAKE2B 8f8e54000234ea3896a55863df99b6ce83ad322e3049845e0a817635ebfebdc8398e6fa4831727c4798a8d9dce1b1c2a01354505e48dc0b2db9e9036aa2ae5aa SHA512 eb6a81df90de803c9f7544e8d0de7cc413aac169f69d1dec5cc6d2e667b66d42aede7f14c75bcdd10288be0c2ac07863fd4028b9fe59f2f515d680c2ffa41cab
+EBUILD ngspice-26.ebuild 2548 BLAKE2B 533c7db0e236b11332e1f2b572d14b745daa5ce655ad000ad5ef2b5c7cb1248b46f8ad929c8de29de04b5891e4ce15f1361add1f0ff340a8b8db826e1d2b46cd SHA512 89d650f33921f5eba3faede8ae79c5f914e7b1e4d3c192e0bd824ee32ca54c6a0a587a30937bb3c56f1e369fbd8a387f61d381f9fb7e1b3fb9ac05e2ae67f18b
 MISC metadata.xml 535 BLAKE2B 53be75db949e7b32e1ab6eed9ed8ff23acecab02d3018ce2f7e13933fbc2d2a48b085722b52dd9188fa98541c4efdebfdfa111f97bbda5abcf8f9b799c2ee83f SHA512 000662a5b7881c4e2aef407bc63730edfa24360fd49ba8fc4811bbf6a643503d782c36de292084131231600de8a707833952a032c885a0df02985bcb99df8444
diff --git a/sci-electronics/ngspice/files/ngspice-26-respect-ldflags.patch b/sci-electronics/ngspice/files/ngspice-26-respect-ldflags.patch
new file mode 100644
index 000000000000..31fe300b105f
--- /dev/null
+++ b/sci-electronics/ngspice/files/ngspice-26-respect-ldflags.patch
@@ -0,0 +1,31 @@
+--- ngspice-26/src/xspice/icm/makedefs.in
++++ ngspice-26/src/xspice/icm/makedefs.in
+@@ -44,16 +44,19 @@
+ LIBS = -lm
+ 
+ # Flags to use when linking shared library
+-LDFLAGS = -shared
+ ifeq ($(ISMINGW), 1)
+-  LDFLAGS = -shared @LDFLAGS@
+-endif
+-ifeq "$(strip $(uname))" "Darwin"
+-  LDFLAGS = -bundle -flat_namespace -undefined suppress
+-endif
+-ifeq "$(strip $(uname))" "SunOS"
+-  ifneq "$(CC)" "gcc"
+-    LDFLAGS = -G
++  LDFLAGS += -shared @LDFLAGS@
++else
++  ifeq "$(strip $(uname))" "Darwin"
++    LDFLAGS += -bundle -flat_namespace -undefined suppress
++  else
++    ifeq "$(strip $(uname))" "SunOS"
++      ifneq "$(CC)" "gcc"
++        LDFLAGS += -G
++      else
++        LDFLAGS += -shared
++      endif
++    endif
+   endif
+ endif
+ 
diff --git a/sci-electronics/ngspice/ngspice-26.ebuild b/sci-electronics/ngspice/ngspice-26.ebuild
index 6150e239ac6d..3c185422f418 100644
--- a/sci-electronics/ngspice/ngspice-26.ebuild
+++ b/sci-electronics/ngspice/ngspice-26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="3"
@@ -13,7 +13,7 @@ LICENSE="BSD GPL-2"
 
 SLOT="0"
 IUSE="X debug readline"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x64-macos"
 
 DEPEND="sys-libs/ncurses
 	readline? ( >=sys-libs/readline-5.0 )
@@ -25,9 +25,9 @@ DEPEND="sys-libs/ncurses
 RDEPEND="$DEPEND"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-respect-ldflags.patch
 	sed -e '/CFLAGS=/s: -s::' -i configure.ac || die "sed failed"
 	sed -e 's/_CFLAGS -O2/_CFLAGS/' -i configure.ac || die "sed failed"
-	sed -e 's/LDFLAGS =/LDFLAGS +=/' -i src/xspice/icm/makedefs.in || die "sed failed"
 	sed -e '/AM_INIT_AUTOMAKE/s:-Werror::' -i configure.ac || die "sed failed"
 	# builds also with ncurses[tinfo] (bug #458128)
 	sed -e 's/ncurses termcap/ncurses termcap tinfo/g' -i configure.ac || die
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 2fca9729d8fe..027fe99a7758 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index 0bc0a2bfe307..f24b72f9757e 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -2,6 +2,8 @@ AUX hdf5-1.8.13-no-messing-ldpath.patch 1141 BLAKE2B d7d186e4c00acb9fd3d44beb1d8
 AUX hdf5-1.8.15-implicits.patch 1050 BLAKE2B 9a019e69e9e02c487c5cf460380aaff08c672354f5d3c623c36daacf2e107a5b9f6fcfc1c380eed6adb62d2e9cdffbe8cbec13928e35ec8e5742e1d26114bcf3 SHA512 e3cfc3e3c01b8eafe426a3ebb87a4880d326b88d15897ce6d50b47456d69c0ef0888ad7f839928eb1fd283eb617f63869c2051d46669986bb5ed30afa6181088
 AUX hdf5-1.8.9-mpicxx.patch 494 BLAKE2B 148d87af064e2ba28c918c8db39ece0782a179803e4c38c5cd5eaba81a673bb8aa3699a48e80a7ae2d4579ac0261cc21d5509e46661ada9a69f444a58eb45ecd SHA512 8b4c39e40591860652547ea8ff205230da7d67488233e911cbcb3416eab561f2529c65bc5e7c9c812bf4298812346f47f9209e5f69f7e8f66ad587306a5b477b
 AUX hdf5-1.8.9-static_libgfortran.patch 429 BLAKE2B 9e1c544a453c09b3498a7d9d3e8090c928571776934c4dd6b426cbdb2783ed8f47185d6ee0c73ede6b4f14e27459ef5e1412112e9d897daa2dc57f1ad5fb0b24 SHA512 af97c54469a90bf3b0e8ec1218d4ca95822ac0cbc7120114979fc467fe3114743c74f4d4e16f0c10b1cd82d40880ef482f6fd34e1effc7c621b981ad466204f9
-DIST hdf5-1.8.18.tar.bz2 10081294 SHA256 01c6deadf4211f86922400da82c7a8b5b50dc8fc1ce0b5912de3066af316a48c SHA512 01f6d14bdd3be2ced9c63cc9e1820cd7ea11db649ff9f3a3055c18c4b0fffe777fd23baad536e3bce31c4d76fe17db64a3972762e1bb4d232927c1ca140e72b2 WHIRLPOOL c1ea97aa30ded9f3129edf47cfda3b7e371aa21fcb2fc409005818f69ed0f0ac41a19e28ec38a5da2c417ef98033f197292169c88f7db81dd94244b016ab2595
+DIST hdf5-1.10.1.tar.bz2 11769617 BLAKE2B 66ad762aed90cea9e58a9735bf0e189d78befc40cac0e566586e967f2b3ba6f5bf8a6bfd12a2f4062f8b20900c16d467c34134c17dedfd8f345cb96bd853a2fe SHA512 266b0e2f28c5fd540099a4955244ddb8c03aca3ad40d626358643f033a6ae5e9266a1d6c1d60925c7d42d24d28a1549d3305fe8ddb42cec2379af7231b93e554
+DIST hdf5-1.8.18.tar.bz2 10081294 BLAKE2B cf0d0c8a41576bcf816460eaabcfab29cfffba240721a64fe584c42fbb322470f29fb93c8513f7bbdedeeb392c2fe64cd3261b47b47de5b01828dae0b1929cd3 SHA512 01f6d14bdd3be2ced9c63cc9e1820cd7ea11db649ff9f3a3055c18c4b0fffe777fd23baad536e3bce31c4d76fe17db64a3972762e1bb4d232927c1ca140e72b2
+EBUILD hdf5-1.10.1.ebuild 2945 BLAKE2B 53e2a2b3912a0d87d9ada29fb32a9d254394bc1002f9c1c83fa48a8488713fbfd08d4e86b5814490cb5a28f172de551efd06ba1020a6bf97ec3bb9635010a1cc SHA512 48c40588d0c458957f36e475d45a40614405c728a363c61b24d19db7c9219027ac885dbb9f780489fd9745f83697f7912c36cd27138bb0ad3655e2ea31f7912a
 EBUILD hdf5-1.8.18.ebuild 3366 BLAKE2B 5ea79bd8cfd5664c92de2cfb62c826500b1847290684a9ad3a1bda7ac2aa33d2d428b59ce9f7f1bfb17637472742804ddb98f9018386ebfbdff33c2023d942e4 SHA512 54e66dc074fd9b0fe9ad23f23234fc20e79c6ed9e9759d6964cb8e4d3e79321c08b4539a814f2fae2c935bb9358549115a884b8f55719fb77744fd26ad680867
 MISC metadata.xml 822 BLAKE2B ab9bf739575f9758fa521e9640438b345379373884ffd25a021a15589b7016d519f01d4d4d39dc5c8efbd271fbeb89d584b3d627e2b0d90cecf55d36747447cf SHA512 5e6cb47fcf2e704887a375f527b447075a36a51225cc2bdf10892bff5cce548599dd6f04a36ae2e31f691bd635dd6cc5d1455729e05923a8992d95fb27716164
diff --git a/sci-libs/hdf5/hdf5-1.10.1.ebuild b/sci-libs/hdf5/hdf5-1.10.1.ebuild
new file mode 100644
index 000000000000..5980c67ccda2
--- /dev/null
+++ b/sci-libs/hdf5/hdf5-1.10.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+FORTRAN_NEEDED=fortran
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils eutils fortran-2 flag-o-matic toolchain-funcs multilib versionator prefix
+
+MY_P=${PN}-${PV/_p/-patch}
+MAJOR_P=${PN}-$(get_version_component_range 1-2 ${PV})
+
+DESCRIPTION="General purpose library and file format for storing scientific data"
+HOMEPAGE="http://www.hdfgroup.org/HDF5/"
+SRC_URI="http://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P}.tar.bz2"
+
+LICENSE="NCSA-HDF"
+SLOT="0/${PV%%_p*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="cxx debug examples fortran fortran2003 mpi static-libs szip threads zlib"
+
+REQUIRED_USE="
+	cxx? ( !mpi ) mpi? ( !cxx )
+	threads? ( !cxx !mpi !fortran )
+	fortran2003? ( fortran )"
+
+RDEPEND="
+	mpi? ( virtual/mpi[romio] )
+	szip? ( virtual/szip )
+	zlib? ( sys-libs/zlib:0= )"
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool:2
+	>=sys-devel/autoconf-2.69"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.9-static_libgfortran.patch
+	"${FILESDIR}"/${PN}-1.8.9-mpicxx.patch
+	"${FILESDIR}"/${PN}-1.8.13-no-messing-ldpath.patch
+	"${FILESDIR}"/${PN}-1.8.15-implicits.patch
+)
+
+pkg_setup() {
+	tc-export CXX CC AR # workaround for bug 285148
+	if use fortran; then
+		use fortran2003 && FORTRAN_STANDARD=2003
+		fortran-2_pkg_setup
+	fi
+	if use mpi; then
+		if has_version 'sci-libs/hdf5[-mpi]'; then
+			ewarn "Installing hdf5 with mpi enabled with a previous hdf5 with mpi disabled may fail."
+			ewarn "Try to uninstall the current hdf5 prior to enabling mpi support."
+		fi
+		export CC=mpicc
+		use fortran && export FC=mpif90
+	elif has_version 'sci-libs/hdf5[mpi]'; then
+		ewarn "Installing hdf5 with mpi disabled while having hdf5 installed with mpi enabled may fail."
+		ewarn "Try to uninstall the current hdf5 prior to disabling mpi support."
+	fi
+}
+
+src_prepare() {
+	# respect gentoo examples directory
+	sed \
+		-e "s:hdf5_examples:doc/${PF}/examples:g" \
+		-i $(find . -name Makefile.am) $(find . -name "run*.sh.in") || die
+	sed \
+		-e '/docdir/d' \
+		-i config/commence.am || die
+	if ! use examples; then
+		sed -e '/^install:/ s/install-examples//' \
+			-i Makefile.am || die #409091
+	fi
+	# enable shared libs by default for h5cc config utility
+	sed -i -e "s/SHLIB:-no/SHLIB:-yes/g" tools/src/misc/h5cc.in || die
+	hprefixify m4/libtool.m4
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		--enable-deprecated-symbols
+		$(use debug && echo --enable-build-mode=debug || echo --enable-build-mode=production)
+		$(use_enable debug codestack)
+		$(use_enable cxx)
+		$(use_enable fortran)
+		$(use_enable fortran2003)
+		$(use_enable mpi parallel)
+		$(use_enable threads threadsafe)
+		$(use_with szip szlib)
+		$(use_with threads pthread)
+		$(use_with zlib)
+	)
+	autotools-utils_src_configure
+}
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 68c058496c1d..0b0312227b43 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index 3700ebd47d29..a176f281d525 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -17,8 +17,10 @@ DIST packrat-0.98.1000.tar.gz 97677 SHA256 c2da99ea6b62fd460f36b76f6c9b91865c428
 DIST rmarkdown-0.98.1000.tar.gz 1423820 SHA256 56e9f964f805627f6d6face9bf09e6435be4cc48321447ad4041fee86d6f88b4 SHA512 df3540c24c87930fe55bff2ffe67c86c219800cb00ed72ba9451ecd0d0cad411548a78c1a04b9a2e301e853616dcb77e09129c4e48ade6f16d3f14b7ea7e4852 WHIRLPOOL 51098cd48a12a61da312fc1cc96927626db4a19cc069c88f615dd20abe40f52a7b1ac1325b52b1922110ffa76a7f255d9ff2a75cd05d3de01d1b96f0c8286790
 DIST rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz 197051 SHA256 e1e3e1f799eb8be679be9a2ed5aad7e9ce6cd603e3cb43fdc242490f0c311113 SHA512 208dc349f4aa7613ecf94939aba60d22d3a06972344b526c9b6c951015571f5922927bca08db571a7b8a268e42609a4f558f01278c9685f6da2ffc66a1f95ade WHIRLPOOL 4e3d64de00a98190c435d76f12a401d30950fdc7590b6bcc886ae50d4771825d39f93ea2bdcb4a9db026361c522f16f11297ff89dcb15c35f9471c1abf4f4e2c
 DIST rstudio-1.1.368.tar.gz 20197144 SHA256 586573707a488b5f528680b932ba5f8ea6d07667cc5ae6426104e2abf5ddab75 SHA512 39cdf583d7dcd22338916cc0ea4f90681580e41663b2d3e04b2e650759c6b030c85ee111cdfe1f717f931932a9b7ca423a21585d69a785f056f754f6d50399a1 WHIRLPOOL e18ff21823638d458179819e0b0b234b80be2f095f5b7bf5b9ac0190b078f0d7acb51e8896cbfcf1ce33cd203ed4e9fbe097aac6eee62515cace1d2f08c08219
+DIST rstudio-1.1.383.tar.gz 20196702 BLAKE2B 5164230a92618e4252269ad0016b200294d1e7fa502cc49aa694486cda098ee7ffc65e6c74a87d891d0532f5cc15d1552aa86d04047d07b4f275cbc4d2758647 SHA512 3f637f9bce2c1ad1a4ed3e74287da722190a4e12b0cace6ffcca271977d49dcecca9365f2064366aad94e87851593cab83fa9361e9a9222a9f67fe9451f31ed2
 DIST selenium-java-2.37.0.zip 24625928 SHA256 0eebba65d8edb01c1f46e462907c58f5d6e1cb0ddf63660a9985c8432bdffbb7 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779 WHIRLPOOL eb6659aae26f3c78b6f998546b23d0636c9d00ed8a7f985db1463ac4bd483ccb3e643d84e2ca0f59e0636a8de79eb552ff1d68eb6f9c06907029f7552d8f7777
 DIST selenium-server-standalone-2.37.0.jar 34730734 SHA256 97bc8c699037fb6e99ba7af570fb60dbb1b7ce30cde2448287a44ef65b13023e SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018 WHIRLPOOL 20640591534f31f24825a9ed139589b182e8b60d86541bf0be104d3cc0280983f6566bd0459f2253ac3875b48a2798b205bac8f815a119fff6db625ce9bbc29e
 DIST shinyapps-0.98.1000.tar.gz 910095 SHA256 b95c512ae0a0fb4335878d9cfcf9073e2cb3ccfed73543abe27ea8878ed36d57 SHA512 3162317c4c20cfc1497e952a8235867084d629ae88407e6c465b3e208adb1dc97abfe6b9922e0374ddf4c8e38a76e112942bd312c54a66f74e6f2a3fe4c0a07c WHIRLPOOL ecc2bce78387cb42e9989163d8fca29220e66f085acde3323417058aebb624dafa8c0e1873c7d79e67324cbd5aad250ef9fcdbbc8f659d64482233b95d898a15
 EBUILD rstudio-1.1.368.ebuild 8385 BLAKE2B f548f080c2787cbb01095cc5482ce29196da85734a61cd6fad51441ffc58b2224d98f7099469beba8b9ff91e8298ccb56467bd98068a3b49d684e75ba63e9a2d SHA512 99b9393eb641b77b794392dc7a56087a34e7cc970427286ae90121776dafe8e1184d06100d95c1ef3a14770ff7f08016d9c31ca0dc0f4750ffd92ab8c105c9a2
+EBUILD rstudio-1.1.383.ebuild 8320 BLAKE2B c5733d0e0822c106205247a01592dc94ead46caf0a4820055af9d9767709650b0a1ae9349db8216e9219ad0091031b670fba1aad6a2bdd6c298ada9040bff78a SHA512 f33ad0cb1c061be1d49153609f611752e1615e464f59351de73c3e47da6eb6de5328e62b4e5c52c65ac9585dc95583c80dd26e4a779e9ce87e1aee50e772763c
 MISC metadata.xml 590 BLAKE2B 53dc62775e118c9c26ee05e20ee1da1ac31b6a6b74cf7dac410856fe4e0cce40fbb800c7a03e60f59e14442baf3aad866ad42616ad5fbb5724f7f6d8c1636eea SHA512 7111442aaa52da1e554c34f824113ec0e227798dd11b0ea9148b81e7a31c08b2a527b9995e3adb9363c7a4f2a8594f30cbd4a179545bf31d69f07d5558c20f52
diff --git a/sci-mathematics/rstudio/rstudio-1.1.383.ebuild b/sci-mathematics/rstudio/rstudio-1.1.383.ebuild
new file mode 100644
index 000000000000..7b4808efd4e6
--- /dev/null
+++ b/sci-mathematics/rstudio/rstudio-1.1.383.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils user cmake-utils gnome2-utils pam versionator xdg-utils java-pkg-2 pax-utils qmake-utils
+
+# TODO
+# * package gin and gwt
+# * use dict from tree, linguas
+# * do src_test (use junit from tree?)
+
+# update from scripts in dependencies/common
+# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt
+GWT_VER=2.7.0
+GIN_VER=1.5
+SELENIUM_VER=2.37.0
+CHROMEDRIVER_VER=2.7
+# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc
+PANDOC_VER=1.13.1
+# ls dependencies/common/*.tar.gz
+PACKRAT_VER=0.98.1000
+RMARKDOWN_VER=0.98.1000
+SHINYAPPS_VER=0.98.1000
+RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
+
+DESCRIPTION="IDE for the R language"
+HOMEPAGE="
+	http://www.rstudio.org
+	https://github.com/rstudio/rstudio/"
+SRC_URI="
+	https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar
+	https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux
+	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
+	https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz
+"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="dedicated server"
+
+QT_VER=5.4
+QT_SLOT=5
+RDEPEND="
+	app-text/pandoc
+	dev-haskell/pandoc-citeproc
+	>=dev-lang/R-2.11.1
+	>=dev-libs/boost-1.63:=
+	>=dev-libs/mathjax-2.7.0
+	dev-libs/openssl:0
+	sys-apps/util-linux
+	>=sys-devel/clang-3.5.0:*
+	sys-libs/zlib
+	>=virtual/jre-1.8:=
+	x11-libs/pango
+	!dedicated? (
+		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5]
+		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
+		server? ( virtual/pam )
+	)
+	dedicated? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-java/ant-core
+	>=virtual/jdk-1.8:=
+	virtual/pkgconfig"
+#	test? ( dev-java/junit:4 )
+
+PATCHES=(
+		"${FILESDIR}/${PN}-0.99.879-prefs.patch"
+		"${FILESDIR}/${PN}-1.0.44-paths.patch"
+		"${FILESDIR}/${PN}-1.1.357-clang-pandoc.patch"
+		"${FILESDIR}/${PN}-0.98.490-linker_flags.patch"
+		"${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch"
+		"${FILESDIR}/${PN}-1.0.44-systemd.patch"
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz gwt-${GWT_VER}.zip
+	cd "${S}" || die
+	mkdir -p src/gwt/lib/{gin,gwt} \
+		dependencies/common/dictionaries \
+		src/gwt/lib/selenium/${SELENIUM_VER} \
+		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die
+	mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die
+	unzip -qd src/gwt/lib/gin/${GIN_VER} \
+		"${DISTDIR}"/gin-${GIN_VER}.zip || die
+	unzip -qd dependencies/common/dictionaries \
+		"${DISTDIR}"/core-dictionaries.zip || die
+	unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \
+		"${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die
+	cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \
+		src/gwt/lib/selenium/${SELENIUM_VER}/ || die
+	cp "${DISTDIR}"/chromedriver-linux \
+		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die
+	cd dependencies/common || die
+	unpack packrat-${PACKRAT_VER}.tar.gz
+	unpack rmarkdown-${RMARKDOWN_VER}.tar.gz
+	unpack shinyapps-${SHINYAPPS_VER}.tar.gz
+	unpack rsconnect_${RSCONNECT_VER}.tar.gz
+	cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \
+		. || die
+}
+
+src_prepare() {
+	default
+	java-pkg-2_src_prepare
+	egit_clean
+
+	# Enable CMake to install our .service file for systemd usage
+	mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die
+	cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die
+
+	# Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using
+	# this sed hack for now. ~RMH
+	sed -i \
+		-e "s|DISTRO_SHARE|\"share/${PN}\"|g" \
+		src/cpp/server/ServerOptions.cpp \
+		src/cpp/session/SessionOptions.cpp || die
+
+	# use mathjax from system
+	ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-26 || die
+
+	# make sure icons and mime stuff are with prefix
+	sed -i \
+		-e "s:/usr:${EPREFIX}/usr:g" \
+		CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
+
+	# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
+	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \
+		-i src/cpp/server/ServerOptions.cpp \
+		|| die
+
+	# Set the rsession.conf file location for Gentoo prefix
+	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \
+		-i src/cpp/session/SessionOptions.cpp \
+		|| die
+
+	# dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
+	# It provides a library that has its version number appended to the end,
+	# which is difficult to handle in cmake, as find_library does not support
+	# searching for wildcard library names. So I find the library name from the
+	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
+	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
+	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
+				   $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
+					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
+						   -e 's@LIBS \*= -l@@')
+	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
+		-i "${S}"/src/cpp/desktop/CMakeLists.txt \
+		|| die
+
+	# The git commit for tag: git rev-list -n 1 v0.99.903
+	sed -e 's@git ARGS rev-parse HEAD@echo ARGS 0eb2d8ea28ebc1ac6ac327e023becb6133b679c4@'\
+		-i "${S}"/CMakeLists.txt \
+		"${S}"/CMakeGlobals.txt \
+		|| die
+}
+
+src_configure() {
+	export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1)
+	export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2)
+	export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3)
+
+	local mycmakeargs=(
+		-DDISTRO_SHARE=share/${PN}
+		-DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
+		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
+		-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
+		-DRSTUDIO_VERIFY_R_VERSION=FALSE
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+	# P: /root/.oracle_jre_usage.
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_compile
+}
+
+src_install() {
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_install
+	pax-mark m "${ED}usr/bin/rstudio"
+	doconfd "${FILESDIR}"/rstudio-server.conf
+	dodir /etc/rstudio
+	insinto /etc/rstudio
+	doins "${FILESDIR}"/rsession.conf
+	dosym "${ROOT}etc/conf.d/rstudio-server.conf" "${ROOT}etc/rstudio/rserver.conf"
+	if use dedicated || use server; then
+		dopamd src/cpp/server/extras/pam/rstudio
+		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
+	fi
+}
+
+pkg_preinst() {
+	use dedicated || gnome2_icon_savelist
+	java-pkg-2_pkg_preinst
+}
+
+pkg_postinst() {
+	use dedicated || { xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+		gnome2_icon_cache_update ;}
+
+	if use dedicated || use server; then
+		enewgroup rstudio-server
+		enewuser rstudio-server -1 -1 -1 rstudio-server
+	fi
+}
+
+pkg_postrm() {
+	use dedicated || { xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+		gnome2_icon_cache_update ;}
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 09fd59c3dadd..d7d89eb7e70e 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/guix/Manifest b/sys-apps/guix/Manifest
index 81f5965995bf..596fe2008a66 100644
--- a/sys-apps/guix/Manifest
+++ b/sys-apps/guix/Manifest
@@ -2,13 +2,13 @@ AUX guix-0.12.0-AR.patch 245 BLAKE2B 5f73182271233de6f8d857f6c6db1f8a46801f078ac
 AUX guix-0.12.0-no-json-crate.patch 1234 BLAKE2B 0faa8e597c3b8d983e093b502f0b9a60836923ac0c9a84ba6684e2bfa1e77c221e7dcf34e14fae81c6b7df7c1b238a7134373a5ec2bc9ae37d0fd616a047fc6c SHA512 6c382181a7598ddb889be2cee712ebfe852b422c1f55c1e298658fd0a3270265dfeaff07d07eaf87c3e1fa79c35dc82d1d3e998413f0cabdfdda85ae56ff005d
 AUX guix-0.13.0-default-daemon.patch 2888 BLAKE2B 8f94b392167691338a9645697bfec6fc9299245f954dcd45ca3460bf627df7a1aef4d72594925b1ce6d8b656b48bfc37b5565932449482ccf8df1d4bb60105ac SHA512 011e047be6634f6e8b8fce46330c42571b505e05b1c5dcae40889bace64c7211af17d48ec4b817f46d3f9bf6109cb7bfce67823fd4add93e707d1aa8fec0dfcd
 AUX guix-daemon.initd 404 BLAKE2B ac539e478e463d862004613321e1f5bab32c371c701ee9f4378d71f34824b4a2831efd665c42969caf84e88eccc9bc1e1c12ff1abc971046ef30fb7cddec4cc1 SHA512 546e322b593cfd71d295b6f19fb336c988f05b1a459ca4b776c6aa129cfdec0004c85aee983cd7536a1bdd14e3edfcb25574b79a76a8134328c72fb1c83c8278
-DIST guix-0.12.0.tar.gz 15823786 SHA256 6201e21186a7098af256d97562662d95353b1047799b9b216e1dd6e7692dfec9 SHA512 d61cb289d3773977400fa3c49869f30a3feb5e0364368017b9b8eaadee814c5c31897be398d6ff142349337334eb51cb6d0354bee27c0365de69ce1a09e858d3 WHIRLPOOL 9515967a05a449f24da49e95340a60fb91cc471fcc532ce6cfaaea82c9161e3a65a1adc4d95e9997f019565243ca385845edc484981adfc5956112092687a0ec
-DIST guix-0.13.0.tar.gz 18490387 SHA256 b28d52c25ba2fff53be51d7b0027f69ca52416c26b4a0100a40221b73d63a3be SHA512 39d4e627f69850da650448b72008c1b73cbda0286d6b805bb1ea14d72eb49c5f6bdf30755b791a8b9cbb94e91ce8c1f360963250587591ce1a47db457c901daf WHIRLPOOL 365b1a74fe63bbb30605b13697d13703cbc10d12af925baefedb74d0694329ca1219630b9931e07394404c41c79d48554b61af57d408d0bdfa753e4055e0093a
-DIST guix-bootstrap-aarch64-linux-20170217-guile-2.0.14.tar.xz.bootstrap 2948976 SHA256 3939909f24dcb955621aa7f81ecde6844bea8a083969c2d275c55699af123ebe SHA512 b3a5b457017357dedb71db98ef089ac90ca2b88ec5dbf0cec6c829dff7167c5478797a8d14850dd2d951713632c2859950be6c5eb029e6f6c224eecef97efd27 WHIRLPOOL 12c7a27f1fcc6491f95fb663bf630b844a33068460a71827cf67e2cfb579ba4021d7cc41b151b4d9073a9ec3b1406688426c8d8b998163b2e01ad473a0b16b96
-DIST guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap 2717576 SHA256 e551d05d4d385d6706ab8d574856a087758294dc90ab4c06e70a157a685e23d6 SHA512 d546e2c0f676a49af482caae6f5575c7937647a81d37e49ad8be6fe12d58989cb825b5e12f2da28aff4649ee1a198ffb8f4a0beea65835a60aefaa905e87e337 WHIRLPOOL c8aa4c4743768477d3a495fbdbe9d4818e9860411f4df73843a149c8659105f921501d0a5dfc2d121fa872a23f543174c84f864dce1eff69d175c456bdb5efb9
-DIST guix-bootstrap-i686-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2656076 SHA256 b757cd46bf13ecac83fb8e955fb50096ac2d17bb610ca8eb816f29302a00a846 SHA512 f2b257e5b10dcd7421273d8d04782a2bd733781094dd963bf5bd8294604dbd158ea25cbc383a227edce84de968a962ec834226ebdd137a2e1857e2191bfada8c WHIRLPOOL 270f3602e8ea10f28ab003aed28b3d19ab971c69029d1d71f7fe9601d5120222baf245e3e48910dbeedf1469227d59beb8190f23bdd2ef070390467e3f49b8c9
-DIST guix-bootstrap-mips64el-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2734180 SHA256 994680f0001346864aa2c2cc5110f380ee7518dcd701c614291682b8e948f73b SHA512 8c4be098a31f63d56e7d35c174ce4095ba8317662c365d44c005980b38ba499461926754a4659e699ab271bb841c9da514f1a36b812d881c212a5f12177d73c0 WHIRLPOOL f247e65cc558057ba65aa7c554f07d9ec76de2fcc4828038b1d1d89b8c5449a803fd7942812e85fced8200f1af5d981b5cff7fa53cd026335c0ba906ced251f4
-DIST guix-bootstrap-x86_64-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2885996 SHA256 037b103522a2d0d7d69c7ffd8de683dfe5bb4b59c1fafd70b4ffd397fd2f57f0 SHA512 96efc583f42f6c7647bc026e2d2a96d603e7bea12ca02f6bcc65e819b9966082ac4c9f7e42f64536ff42a988e4766e695d87a82c73dd97d80745975a05badb23 WHIRLPOOL 61b623c961dc3b9f4c59f4d208c1302ea98d640b915cc53dce90551c3f48f9844381bb674d4d835421a44a71d903dc90c38a0f7a17ccc049ec388a4e948239b6
+DIST guix-0.12.0.tar.gz 15823786 BLAKE2B 96e1156a4ee32ec1500afd5529bade5408f538ea5280817efb1c31b6563e8aeefb554e82e9e4227198bf43e7b440aa062dd31cb607974f22859097e8f072dc84 SHA512 d61cb289d3773977400fa3c49869f30a3feb5e0364368017b9b8eaadee814c5c31897be398d6ff142349337334eb51cb6d0354bee27c0365de69ce1a09e858d3
+DIST guix-0.13.0.tar.gz 18490387 BLAKE2B e146f7a414f91076eafebe122c0abd772c1c2a562da015e952f978e97528c099905c1e7157e659633e644cbbd7066feac021550d52cb76d5999ff464fb685f2f SHA512 39d4e627f69850da650448b72008c1b73cbda0286d6b805bb1ea14d72eb49c5f6bdf30755b791a8b9cbb94e91ce8c1f360963250587591ce1a47db457c901daf
+DIST guix-bootstrap-aarch64-linux-20170217-guile-2.0.14.tar.xz.bootstrap 2948976 BLAKE2B 3337e52c2db259af98a6ed0eb418a6cd388e11e09c277c460e14edb7065d0170fd544415ccb72db1b1b2559fe700ce313698aed11846271052460f9af51f499a SHA512 b3a5b457017357dedb71db98ef089ac90ca2b88ec5dbf0cec6c829dff7167c5478797a8d14850dd2d951713632c2859950be6c5eb029e6f6c224eecef97efd27
+DIST guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap 2717576 BLAKE2B b7461803f0b3943ef1c855b02f4eef55ef96479cd453fb7ee11518159deca65f741d9c3384598a2fdb0b05b7a9023fb6983a5a3a6ccc204b0c6ac1328f3203cc SHA512 d546e2c0f676a49af482caae6f5575c7937647a81d37e49ad8be6fe12d58989cb825b5e12f2da28aff4649ee1a198ffb8f4a0beea65835a60aefaa905e87e337
+DIST guix-bootstrap-i686-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2656076 BLAKE2B a2c0c82ac3ba4ff5265a506bbe644dc6a61a38cec243e34e8d3bde2d543a4d7221aa921f57f057eb5379aea4e9fd462f0bee7df7e61e4e6381c93401948a9b11 SHA512 f2b257e5b10dcd7421273d8d04782a2bd733781094dd963bf5bd8294604dbd158ea25cbc383a227edce84de968a962ec834226ebdd137a2e1857e2191bfada8c
+DIST guix-bootstrap-mips64el-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2734180 BLAKE2B 8ac6d9cfb59b1e2214c112fa7bfe865966cd06cb0214f360dc337a54e16cb59e4e3aa6da0662a52e6bceedfbb2a9ebb0eb62fe08491e5761912e2ee17b7ecd48 SHA512 8c4be098a31f63d56e7d35c174ce4095ba8317662c365d44c005980b38ba499461926754a4659e699ab271bb841c9da514f1a36b812d881c212a5f12177d73c0
+DIST guix-bootstrap-x86_64-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2885996 BLAKE2B c16595fcb821468d5d293201046642dd4f0b149bb5e64f7b784f29f513ce26243b9747a8eefee3128e813a9b4b27a6a60a1693706b3fcb8cbb238fb4ad6e56c1 SHA512 96efc583f42f6c7647bc026e2d2a96d603e7bea12ca02f6bcc65e819b9966082ac4c9f7e42f64536ff42a988e4766e695d87a82c73dd97d80745975a05badb23
 EBUILD guix-0.12.0-r3.ebuild 3445 BLAKE2B 9995e6507e61c40040dfbf5d10d39f8eae83bd6b2b442cd09545ed196a5d77e81111a2ac0170dee4fba9f20a2b6bfde3aad320c93d4b17ac07c4cc4c1537f514 SHA512 a6d02045dff6a3c0b0aa5a778a70af7b14e0163b400107a88d90ab245fac26bd85e645a972e43732fb862d546ce00143af161edce297f86cb72ab147d5ffce12
-EBUILD guix-0.13.0.ebuild 3583 BLAKE2B 7e96025f088e394e53fa3f7599d05b32ffbf01c0a50149df1775dca7d9516ff0179ec776069f1618207fdce4c363efc6171df1e3c3e59946c9949ddc140fc2a1 SHA512 1aa470bfb7c4403ecf21973aab4167c7dec55b33098baa9c4d7019ead3d7ca5cd5487d4b387aafc631ccfd9ebe6b839e6cb81f048aa752fdb94eebd602aca322
+EBUILD guix-0.13.0-r1.ebuild 3585 BLAKE2B d78dc51abf4be7d3b0558fa9b96fd6696c4f35a83b3b2b28638d8a4de2dfedb8536477e077e5e8f3ecb1e27b95dc2e3e60fe61faad4deb88c922513b1ee3ca5a SHA512 500a6e19aabde2fe9259171a46b4214ab278548e8415e96dd4fcedcc332e30c6aaef58a4b3c2d02c2c40fc1f282fcf1c32e0113de1cbc2a3dc95bbb87a8e640c
 MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
diff --git a/sys-apps/guix/guix-0.13.0.ebuild b/sys-apps/guix/guix-0.13.0-r1.ebuild
index 54b553a520cc..1c93756b4d8d 100644
--- a/sys-apps/guix/guix-0.13.0.ebuild
+++ b/sys-apps/guix/guix-0.13.0-r1.ebuild
@@ -52,7 +52,7 @@ RESTRICT=test # complains about size of config.log and refuses to start tests
 
 RDEPEND="
 	dev-libs/libgcrypt:0=
-	>=dev-scheme/guile-2[regex,networking,threads]
+	>=dev-scheme/guile-2:=[regex,networking,threads]
 	dev-scheme/guile-json
 	net-libs/gnutls[guile]
 	sys-libs/zlib
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index ab3a2760fb28..d8306df2fdf6 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -20,8 +20,8 @@ EBUILD iproute2-4.11.0.ebuild 3986 BLAKE2B 0103b40fa4c1104421e3fac2d002cb8422498
 EBUILD iproute2-4.12.0.ebuild 4212 BLAKE2B 8b40329be710f3d8461429dd94a5a4d4d29cff3b2bdec2a69870e4b24db9726f81885dac49e9afe3aecbca99d9039077a5553e87f5558c91cfb08ed903adfaca SHA512 d66105200c18892f642ab4c43fe3d72ab8cbfd7b1c212eb2b6d04b2e16f8389a1b5244abed85fbbefe4da90bf2604c57f6a0e13601b268b04609cf31c73da897
 EBUILD iproute2-4.13.0.ebuild 4213 BLAKE2B 4a238544e35502f785f0916ec5bd255787b01fe5368d169d380778a5d514bd39784968073bcfaf2a2a7abaaf14c0fe85ec46f5374b204b46be887f750c823d62 SHA512 9e3d7ac9347a9e92ece5f6d737b688bd76136600264c888e449e0738c53a58de45a3459b1bd94f150bf2147f5232a8fefe571985bc2227f0d29322f8657d1039
 EBUILD iproute2-4.14.0.ebuild 4150 BLAKE2B 2c218117921dbae1ac920bd3eaede84faf2e6983fdc26c158b4e8405ee0cc9620eb1fdba31aeae169a813e080edbba57fae958bd9429fd0e804a8245cdcfe195 SHA512 1a1c39f742febf5b064bd471e0ea3ed018f81018895833962e110c60d00b3f85351dbb9db5557ad43b3f1988dff0e5bbad69d307ccc6fe1ea637a24e171dc690
-EBUILD iproute2-4.14.1-r1.ebuild 4150 BLAKE2B 2c218117921dbae1ac920bd3eaede84faf2e6983fdc26c158b4e8405ee0cc9620eb1fdba31aeae169a813e080edbba57fae958bd9429fd0e804a8245cdcfe195 SHA512 1a1c39f742febf5b064bd471e0ea3ed018f81018895833962e110c60d00b3f85351dbb9db5557ad43b3f1988dff0e5bbad69d307ccc6fe1ea637a24e171dc690
-EBUILD iproute2-4.14.1.ebuild 4150 BLAKE2B 2c218117921dbae1ac920bd3eaede84faf2e6983fdc26c158b4e8405ee0cc9620eb1fdba31aeae169a813e080edbba57fae958bd9429fd0e804a8245cdcfe195 SHA512 1a1c39f742febf5b064bd471e0ea3ed018f81018895833962e110c60d00b3f85351dbb9db5557ad43b3f1988dff0e5bbad69d307ccc6fe1ea637a24e171dc690
+EBUILD iproute2-4.14.1-r1.ebuild 3928 BLAKE2B 62ebf9cb809f16249dc923faa766c4ee5e907ae12f056184fb6e125a681ce20a644f6d59a2c3d0391fc2eae8c1e5da0de5bf36ba140994ad569297f0659400dd SHA512 1ea1ae406f9c86e119abcba8e4d0109643dea7c26c710531710234dd36babd862b5d6db9c4cb47fabebca5d3683bacc9e68f3fd40b37b45968965130a6084c59
+EBUILD iproute2-4.14.1.ebuild 3928 BLAKE2B 62ebf9cb809f16249dc923faa766c4ee5e907ae12f056184fb6e125a681ce20a644f6d59a2c3d0391fc2eae8c1e5da0de5bf36ba140994ad569297f0659400dd SHA512 1ea1ae406f9c86e119abcba8e4d0109643dea7c26c710531710234dd36babd862b5d6db9c4cb47fabebca5d3683bacc9e68f3fd40b37b45968965130a6084c59
 EBUILD iproute2-4.4.0.ebuild 3874 BLAKE2B 38518bb4f4610a04231e03a0068b0cd232477202c2efeeab9c42883a155707d74535e7398347316bff6d4c7833ebe6893fcac246fc756780febd6e4b61f0a486 SHA512 d21f5f77a404fc3ecd70728c64af64a24080044a4634cb68078699e628120c1cba2c2b508cd34ad92e9202ccdac01596a6e988635b5c1a1e0113815d893a217a
 EBUILD iproute2-4.5.0.ebuild 3887 BLAKE2B 6788057f29e49ba641f790c571035d2a489a238a2821b3b5fe12c0973fa4c2aeef703826379944defe3b9997b889c071ce51f7ffe0ab5eeff68b644ced49faeb SHA512 a5d957f6660e3d1444a46511f8040f0bc7eb7a489a087e49e90a4e1d356f5346cb39a5dfdc98411d5e3eb1d6aca9e6d88f815ea133d501e5a640e099ef8e9ecc
 EBUILD iproute2-4.6.0.ebuild 3997 BLAKE2B 4f2a0cf508475c2763b08f8cbe865d8dee51fadacffd070625a54e8419784706ca64918462284be1e9a641e4fbcef27e54bed13cdb91927ce7bac63132520ad2 SHA512 7e90c8bc70a9f3cf477389aa881d58f7e16a8d0a73dce93d0e5aa33d977c549715e0ae86583292bfe2797ef7792ed0ddad6b2bfb7a68d940bc4240313c565617
diff --git a/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild b/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild
index 53f669c34617..b5e65df66954 100644
--- a/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild
@@ -51,14 +51,6 @@ src_prepare() {
 		)
 	fi
 
-	# Local uclibc-ng compat fix until uclibc-ng upstream can sync
-	# netinet/in.h with glibc.  Resolves #626546.
-	if use elibc_uclibc ; then
-		PATCHES+=(
-			"${FILESDIR}"/${PN}-4.12.0-uclibc-ng-add-ipproto_mh.patch
-		)
-	fi
-
 	default
 
 	sed -i \
diff --git a/sys-apps/iproute2/iproute2-4.14.1.ebuild b/sys-apps/iproute2/iproute2-4.14.1.ebuild
index 53f669c34617..b5e65df66954 100644
--- a/sys-apps/iproute2/iproute2-4.14.1.ebuild
+++ b/sys-apps/iproute2/iproute2-4.14.1.ebuild
@@ -51,14 +51,6 @@ src_prepare() {
 		)
 	fi
 
-	# Local uclibc-ng compat fix until uclibc-ng upstream can sync
-	# netinet/in.h with glibc.  Resolves #626546.
-	if use elibc_uclibc ; then
-		PATCHES+=(
-			"${FILESDIR}"/${PN}-4.12.0-uclibc-ng-add-ipproto_mh.patch
-		)
-	fi
-
 	default
 
 	sed -i \
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 28f4f4222915..c81a0537db34 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index 71e3ca57a104..78b3dbce3799 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -1,8 +1,9 @@
 AUX elogind-226.4-docs.patch 355 BLAKE2B 6e2ffcfe0e4b8d8822cb41133302757cc02c09298dd53cb4eb277b3e3200764f6beb90d4a702870e00d0ff5338cb5a0a7d228a563a6f9c51fb340e4c63650a59 SHA512 dc942f190ea2064e194808db7c6ede618d536778f1b574658ddb9c0aa4a106f6129cc18000eaa63aeca1b16ad28fe5f5dbee441bd93436ae62eb4740236f94ae
+AUX elogind-233.7-xlocale.h.patch 746 BLAKE2B 82dd29dbbc9269879bd9d641b3735d781f7c61980c6749aa611083a26cf8344d8a3e7cf01557b41f696cd7f079c4f31822efb26efb64e131cd364a9e76ce28a5 SHA512 90fa911c0ea7bc49893473e3068206a4c83e35982eb15316bf8f07644e98d3248767ee2d8723e0a7f37177b047ee21d1fdc1593f87dab9e8e8bdebe04c9bb47f
 AUX elogind.conf.in 218 BLAKE2B 7ee0a72c4a628a233fdbb2d3104487859aaa7e5c4f2624e5a4eafb37ed90fb8f64349b1a8acc92e69ec618496bb7f6263b7a5d0fe15a1afe1c03f5955743f079 SHA512 2c62ab28d7db9cd52489069f80363159000385a25dd7f2afe5a03598a0b7a1f61af7c18df71f6286e72f5966e55b62a4029e30cb786dd813bb201b9e20adccd7
 AUX elogind.init 490 BLAKE2B 71c102f89a71a2963da50b153d8696a9480d81caa48e8422e7f39614e9bfb0b09037bc4dea202c3735e170140752429dd54747b99941d861453b4714dcb98819 SHA512 60fe1cb55ec0f605f06fb3744a0300accebfc14c4ecd24b7db2e8b0cb1537e816a4a4ccbc4b2eeac45e2f3ca8942dd10d24bdcd814cccbc2ceed198b2657238a
-DIST elogind-233.7.tar.gz 957308 SHA256 8854f29a53d1305dc1c264635b1e970cfcbcc32507af8ef35de4a9b447f79e0b SHA512 c4ca84d45c289131f2b9d698d0e010fb368da39e80a9a972822148509644727a5e420ec2c68dc896bd250e81bdb125b4d760b0a65a4444365c81af2da9555a78 WHIRLPOOL 597f43c47ff630ec408f99c3d7e88622fc179f542772d800af09691734882bede81ab2d54ea51de21de08be568500477e2688579f9d244ddc11bd282a6678fce
+DIST elogind-233.7.tar.gz 957308 BLAKE2B 65361c349771bdb3e28b417e5f5c180505209f215edce316e8131bdc78cb7a1b56c0285df8aa3fd6998c6ea2c349d9892a4f791b59f9ae245819492783099d61 SHA512 c4ca84d45c289131f2b9d698d0e010fb368da39e80a9a972822148509644727a5e420ec2c68dc896bd250e81bdb125b4d760b0a65a4444365c81af2da9555a78
 DIST elogind-234.4.tar.gz 973370 BLAKE2B 4fe00d2e22e3f94dfb6385fe61825be72ad2200f1368807ea816a971104cf384e3508ecf2877fa08394c6d0259874b2ceb7c4014f9e861dcd3b19c01bcd04602 SHA512 2df4fa318074d4f5e5dbba353cf817068a2703ffed40cdeae4cba2dea4ee143d1c5fc076b19419f1c4299392088c2c14b430d8aa1ded03b62117311802305d5e
-EBUILD elogind-233.7-r1.ebuild 2941 BLAKE2B bb2b36092014397a2674a678945a06dbfbb88d4630bf9c3e519f66b10ce8dc191d443f91a6d73478a45caf37b1ae318540610967c83da7cb85e5f7fc73e52da2 SHA512 269dbe822cbec66c32e30ba3a1009bb88a089447ad8015c6e568d1e86ff1d820891eda818666aa13aeb6c56edff46b841d0f16091e42be1c4560229fb62efe88
+EBUILD elogind-233.7-r1.ebuild 2978 BLAKE2B d62324cfa19609e903c508c34f1ee423656c8a222a0a0bc7fa3103a7c3c0288ea797be6108e381a08b1dd811db00de047571ce1d502e8bc53bcb643f8b55f063 SHA512 f5125a3d1f72d664ca66e7358ac7454bccc2775da23ce75363c74a90174d3d079476b52fb72caa316b488da64577aec1a0b07ae702d0cacd0714e2c92b4c659a
 EBUILD elogind-234.4-r1.ebuild 2922 BLAKE2B 277308df2fcacb0a31a9b8441fff11bf3a838244bb43ec463471bcdb55b8c7384d21a662ac0127aa2b506808efc94512edadad80824cc14bf911f38399255661 SHA512 6905190b3a9c5dbbb70bf31a48898a9492605e096532167633f7d6528f149f4e908081cf5b52a11e7cfabbe85ea7068fb0d224d0a4129671fc731d8fb4dfd56f
 MISC metadata.xml 379 BLAKE2B fc63654412fa4cb02122205ad53d29ed35153457c5dd5c5ab8fa3c3dbfcc7c00b2704220d4cb9040f8d6f794bbb9bd0f8cb9be80d410efb6cf85eeee8ce46503 SHA512 30be0eb7903ffb83d9e24fbcacc8db09c0f8cd7187df5f75b2c12fb5cfae1110d52f29aba502ea92af53df02451cc40e0f3789382f87a16bd281f06e9cad6c68
diff --git a/sys-auth/elogind/elogind-233.7-r1.ebuild b/sys-auth/elogind/elogind-233.7-r1.ebuild
index 6a9df040c51d..bd3cac33ad8b 100644
--- a/sys-auth/elogind/elogind-233.7-r1.ebuild
+++ b/sys-auth/elogind/elogind-233.7-r1.ebuild
@@ -40,7 +40,10 @@ PDEPEND="
 	policykit? ( sys-auth/polkit )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-226.4-docs.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-226.4-docs.patch"
+	"${FILESDIR}/${P}-xlocale.h.patch"
+)
 
 pkg_setup() {
 	local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SECURITY_SMACK
diff --git a/sys-auth/elogind/files/elogind-233.7-xlocale.h.patch b/sys-auth/elogind/files/elogind-233.7-xlocale.h.patch
new file mode 100644
index 000000000000..c95890aac405
--- /dev/null
+++ b/sys-auth/elogind/files/elogind-233.7-xlocale.h.patch
@@ -0,0 +1,27 @@
+From 96eb328e90fa272a66b2feb0bfb57c73154dbd9c Mon Sep 17 00:00:00 2001
+From: Matija Skala <mskala@gmx.com>
+Date: Wed, 15 Mar 2017 13:21:10 +0100
+Subject: [PATCH] fix includes
+
+linux/sockios.h is needed for the SIOCGSTAMPNS macro
+
+xlocale.h is included indirectly in glibc and doesn't even exist in
+other libcs
+---
+ src/basic/parse-util.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
+index cfdb29aba..c38e14d96 100644
+--- a/src/basic/parse-util.c
++++ b/src/basic/parse-util.c
+@@ -23,9 +23,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#if defined(__GLIBC__)
+-#  include <xlocale.h>
+-#endif // defined(__GLIBC__)
+ 
+ #include "alloc-util.h"
+ //#include "extract-word.h"
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 7bfe1d524bbf..79e133f86e60 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/corosync/Manifest b/sys-cluster/corosync/Manifest
index 7cd5916eed49..41c2e17fc9aa 100644
--- a/sys-cluster/corosync/Manifest
+++ b/sys-cluster/corosync/Manifest
@@ -15,6 +15,6 @@ EBUILD corosync-1.3.5.ebuild 1288 BLAKE2B c1adb94e02e97a1a97943aa6966f41e3ce5ce1
 EBUILD corosync-1.4.7.ebuild 1401 BLAKE2B d1503c43ee0088af6801c1a7f00a20390d3299e247b5506ef0eaa0e66019e5999a663ffe94af10a456835acb878ac719820b83b02f95155beef6e9ceef073365 SHA512 8bf1780dd11d8dc4937261e37192f77b49797089c407612ee6510a97c954bb56eddbd42952abd653478e8a5dd9b96270d2247dd035a46151fc13543659c49b34
 EBUILD corosync-2.3.3.ebuild 1926 BLAKE2B 5171b894ebabbb3c14e786985851a1d1b83833cbc470825e4dcc8d54bd0eb645a7ea26a8b377b8198532c5b437c889431d6a3f81ef9ca433db2871b9a10b2755 SHA512 4717b0c7c6a8be4d849d528fd0819b8d43b4e16770ffc9022d0ebe837e2c2845a955276912b32a9796faa3d274f6a076dd3cd320503519f76bb2f31f95c42f51
 EBUILD corosync-2.3.4-r1.ebuild 1926 BLAKE2B 7357e0385bad23ad81cf6bc5a48590cba619e18fa759e0d63c7e676be84664f90596c50908daca7531bc7da06c309fa6c34aab8f690958bde87609a1844c6f4a SHA512 115d63649487c591284afbccdac27f6297bb8df7874062098a232a0bd516ede0163151f8be6b420ee8de11e84fe4f5d315cdb7dbb3e603d57b7489947d63e17b
-EBUILD corosync-2.3.5.ebuild 2053 BLAKE2B 0ba9873daacfa91856c9f74bd578fe12636f1e7cbdf2355ce360396f6d6b84c95d15854ffdf52b2ae714140ab8e491ea3b20e2d9b538d741b78312e4c588987d SHA512 3d9519b80c99d764d3e1976ae04e7275dc62940cdfe6c0c16bc72979aff73453b85ac255b96b403ad0a83f630882645c1d3e6238894f52f8a52289b61fdf8aa7
+EBUILD corosync-2.3.5.ebuild 2052 BLAKE2B 884a7252bfa4d6295957bfb9d23e40a545f82e4c749f6905b1cf9dac97c215e3c84eeb3d185e6ab2cbc4c082052a9a18f2d95fc2d97fb8cf29cdcfa0077ffa72 SHA512 8415aec44086036714b824be3285cbee49a5c3987771ac04c971b3f9f0f0b09a045775c2095d6044357d76b7c44d9c75205f27a109596dd6586cc5f4fb67984c
 EBUILD corosync-2.4.2.ebuild 2015 BLAKE2B d9f795ea7681c0151a679fb112a37d21ae466568be0771e055aa814ce8d2935213c391ff46bd8a87034f6b0ec8eb6e28f6961a1832124ed38ccf3df13ab9372a SHA512 ff992052dc4e7c704f48e4835883954296126ae8f0f06969170171786ac8563405340741fd708a36216aa3ed69b3c34f51bfde5725571b85155868da49de3d6b
 MISC metadata.xml 536 BLAKE2B 6142b3791636feb99744d3c7018dd6da482c9388e785ffa983649672e331fa6fef95fab34656dcddb3d74d02085794485d088c7a8cbc3cf3bb89ed24712dfe42 SHA512 67e61ff660ec5cdd483835bb496a28a9739295398c27665214db044ed98d44f16a28ef8c0a2f0184688408297594272333371a5229a07a4829b6713ebdced95a
diff --git a/sys-cluster/corosync/corosync-2.3.5.ebuild b/sys-cluster/corosync/corosync-2.3.5.ebuild
index beebf9585386..089004f78b9f 100644
--- a/sys-cluster/corosync/corosync-2.3.5.ebuild
+++ b/sys-cluster/corosync/corosync-2.3.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://build.clusterlabs.org/corosync/releases/${P}.tar.gz"
 
 LICENSE="BSD-2 public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 hppa ppc ppc64 x86"
 IUSE="doc infiniband static-libs systemd xml"
 
 # TODO: support those new configure flags
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index e6118a3ed177..a2afc3eaacfc 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autogen/Manifest b/sys-devel/autogen/Manifest
index 8241d4263da3..ee605580ccc7 100644
--- a/sys-devel/autogen/Manifest
+++ b/sys-devel/autogen/Manifest
@@ -1,8 +1,8 @@
 AUX autogen-5.18.4-tmp-log.patch 500 BLAKE2B 131982c73b5fe2a0bf3515fcd8ead7df4149af7b9ab4f899dea0966f927319ee156d3748151b359c9be6e1a6f50b0a64a4330bbf3af985f048228024a1ececf2 SHA512 7467f09109b16aef1ce72e294e627a16bf46d861ecbbf467c3a7317e440a18cdea100d32f3fdbd37ef6140dd65b1b57523983b08b25c331e229ddd132e3b3824
 AUX autogen-5.18.4_fix_format.test_for_dash.patch 777 BLAKE2B 22621c5c825c47b94a8d28e6f471f3abc522761ce31a535bf357236eea1f71c546d9e025a879bf05719283147a4b3be83b8ee889f9aceda4597ee86f08c27a23 SHA512 4ac158532ad3e65219d0f8476acf05678d552b9fd13c3299e703a6979723e10fef2b87051983ae280609a6497ba2829e6197a97b18b54b2446ad106c6b9f1ae1
 DIST autogen-5.18.10.tar.xz 1017960 SHA256 4e248e02c50404ea5c5fc29027d26600f895a9eae7ea5ef851be2c8587abc148 SHA512 cfb06566aebe2aa833f2a032c513aa1d57a803eee82f03d6f6fe3806a0f570d5dbf8331015d2afde89a3d4e4c967b6a367d3e2820addb3ff6a5ac6d481a058be WHIRLPOOL 2eae849d10083da05e0c42931b5f52a9e6ab0f548473a3812e089515ec5ed76dc94008466ab6f4e5bcf5c220898aa7ffba6ecdcbde7d8fbe0134daf45788994a
-DIST autogen-5.18.12.tar.xz 1018412 SHA256 be3ba62e883185b6ee8475edae97d7197d701d6b9ad9c3d2df53697110c1bfd8 SHA512 46de5910e2786a9b0ec96989d3e11be3ed12e5600f01d6fa9291bfbfae42a66994aeca2949837b471827ae3285ec4caafb42bc19ca91146cd7ea7a355aaffd03 WHIRLPOOL 73be676646d29563214de40921d0750bebaf2418d22c2830d6c0bd4287493375b7fbc3f1576425f449d937e16235985f7e7120ed44e8d48486439e7fb317fa33
-DIST autogen-5.18.4.tar.xz 1017936 SHA256 7fbaff0c25035aee5b96913de2c83d9a5cc973b8dc08d6b7489ecbcfd72eb84b SHA512 a02363484de5019bd90fb6f2cf52b1b9556d6cf310c62a68830d0b2408ea4870d3c262fe5d1c27e3586ed3af4a7487d7422ad117760ac2a01ef3cfcfc1f2bfb6 WHIRLPOOL 109cb5637558f8e16cbb9afcb629a9bbd3d5ceae6b897a00101fce99b1a39b06ecc497d9b43441e40b58981dd2402027e89ce6ae76da73b73db934c64bca2b63
+DIST autogen-5.18.12.tar.xz 1018412 BLAKE2B f8ac1efbd6c6afdaa248e3063cf43fe0d32da6bd1160397f8bf736970f15047c70772a6e21d6010c8103aecce6ea2c3d90a63b9c5cbd6199a97c82384630a341 SHA512 46de5910e2786a9b0ec96989d3e11be3ed12e5600f01d6fa9291bfbfae42a66994aeca2949837b471827ae3285ec4caafb42bc19ca91146cd7ea7a355aaffd03
+DIST autogen-5.18.4.tar.xz 1017936 BLAKE2B bc2b4d7143642baa923c49bfe37d60c0d3a0a3a09a9af504c5dc865f1054e4d510ca3144737c2098a75189a7335bc560ec26318689ebf6d1291969d5a081cfa2 SHA512 a02363484de5019bd90fb6f2cf52b1b9556d6cf310c62a68830d0b2408ea4870d3c262fe5d1c27e3586ed3af4a7487d7422ad117760ac2a01ef3cfcfc1f2bfb6
 EBUILD autogen-5.18.10.ebuild 1155 BLAKE2B 5247ebdb86d1a049087ed0bb2b2ac0efef3d3a07e26943d035971c2bb55fc554d7dccd9c45b98355ae5a234a254c7744e29907e2e3467b7aeec878eed5991efb SHA512 ac21f0960ae9196d5214c125b2a55c2d8b0608b23d1f07d76dec31cec55eb1d158c46898d4f632cb67168a193820a40d364231a84268b3369f2d5b4fa2b82faa
 EBUILD autogen-5.18.12.ebuild 1155 BLAKE2B 5247ebdb86d1a049087ed0bb2b2ac0efef3d3a07e26943d035971c2bb55fc554d7dccd9c45b98355ae5a234a254c7744e29907e2e3467b7aeec878eed5991efb SHA512 ac21f0960ae9196d5214c125b2a55c2d8b0608b23d1f07d76dec31cec55eb1d158c46898d4f632cb67168a193820a40d364231a84268b3369f2d5b4fa2b82faa
 EBUILD autogen-5.18.4-r1.ebuild 1005 BLAKE2B dfeaef4b16c1f5d595f1de1bd45f708396b989bbe758572d44e3ca31ecda300c593c44402ccaba478f9469af9b186c1dc3e5a3ee09f2a1ee0837142bcd9597cd SHA512 753f60ae9aec07e18d7aff99579760b046e0009d2a98c330aba1333263c70a063b78b2187395cc15988430829616036f4548d44a4c31bb9ab0ab6235acd06ab6
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index fb8fcf630e88..70c3b42b5b17 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index c512b566ec05..5168c31c53d2 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -1,21 +1,6 @@
-DIST linux-4.13.tar.xz 100579888 BLAKE2B 2f8be07d403071b097b019c43fa332bc7d4805dee633a6fdffe5a99d5475015ca9e4881e7f4cbfd36f8c451bacf423436364ea3d9f25b8723a29a178dededb2b SHA512 a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
-DIST patch-4.14-rc1.patch 49971200 SHA256 bdda6ba668374a3d5790a30a5bc12c674b199be16fb37646f896827359e3b006 SHA512 6937508f1eb09d428c1e74123c94d303281f89c1bfb8884555c9d5e463b98b0fe84a7fd11f5b1e7bff3b8ed1925ed896f42d64745c71a2685599d3fd385b2efd WHIRLPOOL 18fdd10b5def278a91910e56ebd7083e5d54e972c53b78ef1ab04f24d423f96f7ad337f5ee542d30e75150897b20b2620073773f85db984b2db59cf71d350226
-DIST patch-4.14-rc2.patch 50397184 SHA256 05c079b902c0b886cdb27c37d38e52f3d8ae7dd66092aedf3e1d9a385cef97dd SHA512 af089483e9351d75c65b880ec0448555b4c5887d7ceb78a574bcf539d1773cfc35a56251d41ddc7aeaf67dee4e0705db7286e2990caaa7ecc5d18cf8eb4effaa WHIRLPOOL 5a50fa248027ccca2178338779205e2f29a0187b34175bf0b40a81be37c9013ef2b3929ddfced7a74786b43614dc672c2e09d676a415ce1e1ef4d42657234c79
-DIST patch-4.14-rc3.patch 50656199 SHA256 45b73aefcf8e9e7de6282bb0107b83aec8a345d5653111e30fbd8be398906eb7 SHA512 8fd1a56254be222963e8878a5d357012b13dc280eca3c147a03aa50f28457baad7100834e074f325ee62a18648b790d92e4978ef36e8dd538306cd1a2ddc7319 WHIRLPOOL b32b0c16c20af1912e54e367cd93eec61776914228e3cde3a4b38f89122f3338251eff8f831f359f4d27c8ed25ddef130f68c03067550dcab24245d092bce95d
-DIST patch-4.14-rc4.patch 51066860 SHA256 eadd18c5df62a14abe2614b702ef2aab45f352c64aa3532b236def04bfc70461 SHA512 1d7ef59ecb329513bb9cef3d3736d6211a5bb7310ad2ca2c2d50873ff3a64075840f0fea9869b2606ed6cc4e5fb14ffec232ddd354f3a626bcf1bf3ae01b3e9c WHIRLPOOL f4a165c0bc3fe3155c11314ff6342ca69a5a84782a904b5a66107225820fad3264ba3bac3416986f0e23bace1a2802f3a9a675ee4e74147f0e4e48201f59859d
-DIST patch-4.14-rc5.patch 51247202 SHA256 376bb637ec96ac3e1ebdf4a29ef69327238e954f871bc15660c0f2ae366df8d1 SHA512 56cf0a920c5f78051fe16f1fff06f3e6216ceab97634f064ccb085ec1eedf142cb8f8e1903d967ac05b0dd49fec28e073ea8bda332263818535a8439d286d5d4 WHIRLPOOL 67f2a29aa37e6a3ac144b8bd13ddfbe1824e97ad9733e0fb48f2bd009bd0fa31ae1ce878bf07b7fd0edd43552a78e9676ef6ba58b39a8c0612bbc9893d5b5fc1
-DIST patch-4.14-rc6.patch 51559410 SHA256 519f148591b719fda9ec74c0ad284f9eca5268587ddca01faaea4eb25126a58c SHA512 129741872167058f2c215822820dbd890855b99e6ebf05b5d904e67592472f3ac5089bc4ce8d5493ad4571148d200f1e3ae0108cd37d54f43638998f13530bfc WHIRLPOOL 31a186e1a54a3868b431c8999daaef238b8af9430ebff7185ae6b0ff4de8558bd8c1396fa481c18febdb17797d0d103635318f5165fd1cd95af0178f951f3e74
-DIST patch-4.14-rc7.patch 51715185 SHA256 35e1f2d42c383c5796331c08a9536e2bd1604ee284ce063a41c567fa3fc582e0 SHA512 4b33b60a223359936e546498f9651f7bad21528beac404ca580ba6fd725fe6637845a80ba1079fa0cf4c6f614768d4b361e1e1b04ce7edde6dde686e623f1ed1 WHIRLPOOL e266a98b221fc84d73a3073f934137cbb077224f784f029f65a5f25108dc4ffedd5b1a548cde6f5396dec32343bd74ec97c502207b74f5b99c5dd97c06b1d334
-DIST patch-4.14-rc8.patch 55459153 SHA256 cbaced25b4361ad9fafea5398f525922cb0b869ddbfa306d18a66918b6ce1eec SHA512 01c1630044973e6c2ff1d6bc84cefda77fa15955d1c41170d2c9e3dd9ae980f699b2ee1dce2aa7924cfe1533e6ae9be65a2327f498cc0872e50247b936a7834b WHIRLPOOL ac8ba0f2f164ac06d956a38f1d381a73ac88a051e96afa525ceb4424547bda8463c82f91d527ff87b620dd9cf6cbd2b943fa20a2853c69f00cb8768d4bbc625a
 DIST patch-4.15-rc1.patch 43506905 BLAKE2B b6126c5f86574042d1c1dc3f305eea3453b24a7049458d720d2a7826ad0070ff4f7db930e46969bd5696bbba74008e58217ff742ba1c2ef67c94a2795a64c31e SHA512 ede06f733521cc274456f62b01441ec6194425c0455d937db9324275978fc855372aefbf19d895e8bfbe11dcfe2145dff672c9c3b693315fb9c8e14b280fd43a
-EBUILD git-sources-4.14_rc1.ebuild 1179 BLAKE2B 8135a1ca6e86806d17d65f911db8b17feee3ae52c19768875dd036b239c13bf6a50484f9f12107227d0d16cdbffd5519c9d5ec5efa98ff5d587675045d57a01f SHA512 b2aca5887a1626e24097d7616935cce46403b4268dd720e6815c4013913be6eb591a00f2cefe6a6332949c3fa43fd23eddcdd924455f30c834e430d0874db9da
-EBUILD git-sources-4.14_rc2.ebuild 1179 BLAKE2B 8135a1ca6e86806d17d65f911db8b17feee3ae52c19768875dd036b239c13bf6a50484f9f12107227d0d16cdbffd5519c9d5ec5efa98ff5d587675045d57a01f SHA512 b2aca5887a1626e24097d7616935cce46403b4268dd720e6815c4013913be6eb591a00f2cefe6a6332949c3fa43fd23eddcdd924455f30c834e430d0874db9da
-EBUILD git-sources-4.14_rc3.ebuild 1179 BLAKE2B 8135a1ca6e86806d17d65f911db8b17feee3ae52c19768875dd036b239c13bf6a50484f9f12107227d0d16cdbffd5519c9d5ec5efa98ff5d587675045d57a01f SHA512 b2aca5887a1626e24097d7616935cce46403b4268dd720e6815c4013913be6eb591a00f2cefe6a6332949c3fa43fd23eddcdd924455f30c834e430d0874db9da
-EBUILD git-sources-4.14_rc4.ebuild 1179 BLAKE2B 8135a1ca6e86806d17d65f911db8b17feee3ae52c19768875dd036b239c13bf6a50484f9f12107227d0d16cdbffd5519c9d5ec5efa98ff5d587675045d57a01f SHA512 b2aca5887a1626e24097d7616935cce46403b4268dd720e6815c4013913be6eb591a00f2cefe6a6332949c3fa43fd23eddcdd924455f30c834e430d0874db9da
-EBUILD git-sources-4.14_rc5.ebuild 1179 BLAKE2B 8135a1ca6e86806d17d65f911db8b17feee3ae52c19768875dd036b239c13bf6a50484f9f12107227d0d16cdbffd5519c9d5ec5efa98ff5d587675045d57a01f SHA512 b2aca5887a1626e24097d7616935cce46403b4268dd720e6815c4013913be6eb591a00f2cefe6a6332949c3fa43fd23eddcdd924455f30c834e430d0874db9da
-EBUILD git-sources-4.14_rc6.ebuild 1179 BLAKE2B 8135a1ca6e86806d17d65f911db8b17feee3ae52c19768875dd036b239c13bf6a50484f9f12107227d0d16cdbffd5519c9d5ec5efa98ff5d587675045d57a01f SHA512 b2aca5887a1626e24097d7616935cce46403b4268dd720e6815c4013913be6eb591a00f2cefe6a6332949c3fa43fd23eddcdd924455f30c834e430d0874db9da
-EBUILD git-sources-4.14_rc7.ebuild 1179 BLAKE2B 8135a1ca6e86806d17d65f911db8b17feee3ae52c19768875dd036b239c13bf6a50484f9f12107227d0d16cdbffd5519c9d5ec5efa98ff5d587675045d57a01f SHA512 b2aca5887a1626e24097d7616935cce46403b4268dd720e6815c4013913be6eb591a00f2cefe6a6332949c3fa43fd23eddcdd924455f30c834e430d0874db9da
-EBUILD git-sources-4.14_rc8.ebuild 1179 BLAKE2B 8135a1ca6e86806d17d65f911db8b17feee3ae52c19768875dd036b239c13bf6a50484f9f12107227d0d16cdbffd5519c9d5ec5efa98ff5d587675045d57a01f SHA512 b2aca5887a1626e24097d7616935cce46403b4268dd720e6815c4013913be6eb591a00f2cefe6a6332949c3fa43fd23eddcdd924455f30c834e430d0874db9da
+DIST patch-4.15-rc2.patch 44097969 BLAKE2B b0ebb776063a83eda0dab583a4c53cb19366dcc50ac32dc12eb7de7a033a8b8671f66f587ad34a62864958d111e16e1efe336e8fef0b6b188bccaaecce8d9451 SHA512 a1833e28b7e513c71c6a14e3caf6c1709ebb2c4cb9804ec31a4d0afd2a6b3f339f5fd6523197459f6a96d0b9b4ba4885e188a88365b1d195a8e38ced3c2910cb
 EBUILD git-sources-4.15_rc1.ebuild 1179 BLAKE2B d39c295f0236a43b21562e0ae3cf4948c4600e92597847fb4d5e7b3bd85812f521a9e03b8fdcd9f289ae290317e6f282bfd744c6ec0838dc75a6a2f3a13a8706 SHA512 3508bb056d2eff50de33dab587fd4a17f251e0655d947c369dcdf55a1d6ebf438bb64e44beb99a4dd1c6e6d4f80db1b4072f208da4836906aea3e4a3d5208f17
+EBUILD git-sources-4.15_rc2.ebuild 1179 BLAKE2B d39c295f0236a43b21562e0ae3cf4948c4600e92597847fb4d5e7b3bd85812f521a9e03b8fdcd9f289ae290317e6f282bfd744c6ec0838dc75a6a2f3a13a8706 SHA512 3508bb056d2eff50de33dab587fd4a17f251e0655d947c369dcdf55a1d6ebf438bb64e44beb99a4dd1c6e6d4f80db1b4072f208da4836906aea3e4a3d5208f17
 MISC metadata.xml 647 BLAKE2B 49e79ab62f697fd3e7dcdc63376cc3412f8d91afe7a6219a2402551ce48b67ca5b707a501ee4401437d44dd3b7ee77b861fb3a5d0d55d766e2b9734697f3cff0 SHA512 4a673cd7f8ca3ee46bbf065d87337efa6ee77218781f25ce8b3924b9a90ca3cf10435b6f667d49ad16ba50662f82d107696622b3e55c707d56689ae0c5d2eda9
diff --git a/sys-kernel/git-sources/git-sources-4.14_rc1.ebuild b/sys-kernel/git-sources/git-sources-4.14_rc1.ebuild
deleted file mode 100644
index 7f2595c38a35..000000000000
--- a/sys-kernel/git-sources/git-sources-4.14_rc1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="4.13"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.5"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-4.14_rc2.ebuild b/sys-kernel/git-sources/git-sources-4.14_rc2.ebuild
deleted file mode 100644
index 7f2595c38a35..000000000000
--- a/sys-kernel/git-sources/git-sources-4.14_rc2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="4.13"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.5"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-4.14_rc4.ebuild b/sys-kernel/git-sources/git-sources-4.14_rc4.ebuild
deleted file mode 100644
index 7f2595c38a35..000000000000
--- a/sys-kernel/git-sources/git-sources-4.14_rc4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="4.13"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.5"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-4.14_rc5.ebuild b/sys-kernel/git-sources/git-sources-4.14_rc5.ebuild
deleted file mode 100644
index 7f2595c38a35..000000000000
--- a/sys-kernel/git-sources/git-sources-4.14_rc5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="4.13"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.5"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-4.14_rc6.ebuild b/sys-kernel/git-sources/git-sources-4.14_rc6.ebuild
deleted file mode 100644
index 7f2595c38a35..000000000000
--- a/sys-kernel/git-sources/git-sources-4.14_rc6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="4.13"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.5"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-4.14_rc7.ebuild b/sys-kernel/git-sources/git-sources-4.14_rc7.ebuild
deleted file mode 100644
index 7f2595c38a35..000000000000
--- a/sys-kernel/git-sources/git-sources-4.14_rc7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="4.13"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.5"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-4.14_rc8.ebuild b/sys-kernel/git-sources/git-sources-4.14_rc8.ebuild
deleted file mode 100644
index 7f2595c38a35..000000000000
--- a/sys-kernel/git-sources/git-sources-4.14_rc8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="4.13"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.5"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-4.14_rc3.ebuild b/sys-kernel/git-sources/git-sources-4.15_rc2.ebuild
index 7f2595c38a35..163014d38b8d 100644
--- a/sys-kernel/git-sources/git-sources-4.14_rc3.ebuild
+++ b/sys-kernel/git-sources/git-sources-4.15_rc2.ebuild
@@ -7,7 +7,7 @@ K_NOUSENAME="yes"
 K_NOSETEXTRAVERSION="yes"
 K_NOUSEPR="yes"
 K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="4.13"
+K_BASE_VER="4.14"
 K_EXP_GENPATCHES_NOUSE="1"
 K_FROM_GIT="yes"
 ETYPE="sources"
diff --git a/sys-kernel/raspberrypi-sources/Manifest b/sys-kernel/raspberrypi-sources/Manifest
index a285b8c8bac0..37af7a653980 100644
--- a/sys-kernel/raspberrypi-sources/Manifest
+++ b/sys-kernel/raspberrypi-sources/Manifest
@@ -2,7 +2,7 @@ EBUILD raspberrypi-sources-4.10.9999.ebuild 596 BLAKE2B 71b9c1ce56b19b2cc02da142
 EBUILD raspberrypi-sources-4.11.9999.ebuild 596 BLAKE2B 71b9c1ce56b19b2cc02da1427e72e65f70ba0291f914f16c37ddd6fd222d073a20e49c63fca2dee587124cbc88f7d3a1b255680a9383f6d4d7e3ee6736f1e0d8 SHA512 62abbe62608ccfbcca9233aa1550fc36ee75c1e41abe4b2604169f02d30f8ae7675fec5c083e11607e3550e1cafcb9cbdeb1e50176cc71c54a377cd9e84b8df1
 EBUILD raspberrypi-sources-4.12.9999.ebuild 596 BLAKE2B 71b9c1ce56b19b2cc02da1427e72e65f70ba0291f914f16c37ddd6fd222d073a20e49c63fca2dee587124cbc88f7d3a1b255680a9383f6d4d7e3ee6736f1e0d8 SHA512 62abbe62608ccfbcca9233aa1550fc36ee75c1e41abe4b2604169f02d30f8ae7675fec5c083e11607e3550e1cafcb9cbdeb1e50176cc71c54a377cd9e84b8df1
 EBUILD raspberrypi-sources-4.13.9999.ebuild 596 BLAKE2B 71b9c1ce56b19b2cc02da1427e72e65f70ba0291f914f16c37ddd6fd222d073a20e49c63fca2dee587124cbc88f7d3a1b255680a9383f6d4d7e3ee6736f1e0d8 SHA512 62abbe62608ccfbcca9233aa1550fc36ee75c1e41abe4b2604169f02d30f8ae7675fec5c083e11607e3550e1cafcb9cbdeb1e50176cc71c54a377cd9e84b8df1
-EBUILD raspberrypi-sources-4.14.9999.ebuild 596 BLAKE2B 71b9c1ce56b19b2cc02da1427e72e65f70ba0291f914f16c37ddd6fd222d073a20e49c63fca2dee587124cbc88f7d3a1b255680a9383f6d4d7e3ee6736f1e0d8 SHA512 62abbe62608ccfbcca9233aa1550fc36ee75c1e41abe4b2604169f02d30f8ae7675fec5c083e11607e3550e1cafcb9cbdeb1e50176cc71c54a377cd9e84b8df1
+EBUILD raspberrypi-sources-4.14.9999.ebuild 641 BLAKE2B 90c9b9cc8bc29ae66f5fb3413c7bd2410deeea37cb62c84606ad5e7b8bdcd27f70510667d13f363f27f89d78a76e601a89a92fbb407747488f015ed55c12d61d SHA512 5bb8238133dd3545223c4f3a52149067282439c5cf52c288bd8dd989029b37d95a960901d90d140ef9d8a7b761db4c44140cd537cb6d49412f72cc6ab5df8164
 EBUILD raspberrypi-sources-4.4.9999.ebuild 596 BLAKE2B 71b9c1ce56b19b2cc02da1427e72e65f70ba0291f914f16c37ddd6fd222d073a20e49c63fca2dee587124cbc88f7d3a1b255680a9383f6d4d7e3ee6736f1e0d8 SHA512 62abbe62608ccfbcca9233aa1550fc36ee75c1e41abe4b2604169f02d30f8ae7675fec5c083e11607e3550e1cafcb9cbdeb1e50176cc71c54a377cd9e84b8df1
 EBUILD raspberrypi-sources-4.9.9999.ebuild 596 BLAKE2B 71b9c1ce56b19b2cc02da1427e72e65f70ba0291f914f16c37ddd6fd222d073a20e49c63fca2dee587124cbc88f7d3a1b255680a9383f6d4d7e3ee6736f1e0d8 SHA512 62abbe62608ccfbcca9233aa1550fc36ee75c1e41abe4b2604169f02d30f8ae7675fec5c083e11607e3550e1cafcb9cbdeb1e50176cc71c54a377cd9e84b8df1
 MISC metadata.xml 325 BLAKE2B 2a0b3d4b29d2e35b8b7661cc9394225b382421976e4ffd8f5ad4f974fba6a20de8dc3873e04a50747b37e90621ebd6ebe13541e06739f436f2667be848eedb45 SHA512 6c30b4064bfb8f336e667fec13f80091c1fbc9fbd9058b2b2e1203de9e0deb70845281cc1e657fe326fe34c716126a9107aa01a4cac20000f567304b1cdb0c33
diff --git a/sys-kernel/raspberrypi-sources/raspberrypi-sources-4.14.9999.ebuild b/sys-kernel/raspberrypi-sources/raspberrypi-sources-4.14.9999.ebuild
index 779550859383..11c6e6acc9be 100644
--- a/sys-kernel/raspberrypi-sources/raspberrypi-sources-4.14.9999.ebuild
+++ b/sys-kernel/raspberrypi-sources/raspberrypi-sources-4.14.9999.ebuild
@@ -12,9 +12,9 @@ detect_version
 detect_arch
 
 inherit git-r3 versionator
-EGIT_REPO_URI=https://github.com/raspberrypi/linux.git
-EGIT_PROJECT="raspberrypi-linux.git"
+EGIT_REPO_URI="https://github.com/raspberrypi/linux.git -> raspberrypi-linux.git"
 EGIT_BRANCH="rpi-$(get_version_component_range 1-2).y"
+EGIT_CHECKOUT_DIR="${WORKDIR}/linux-${PV}-raspberrypi"
 
 DESCRIPTION="Raspberry PI kernel sources"
 HOMEPAGE="https://github.com/raspberrypi/linux"
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index f958de74e5e1..cab66b8e4381 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index e9fa6dc36422..8a40bc4be6ff 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -11,7 +11,7 @@ EBUILD libdrm-2.4.75.ebuild 2025 BLAKE2B 8c6cc9c132bed3b238cd64d86a5dc842d5db3cc
 EBUILD libdrm-2.4.79.ebuild 2034 BLAKE2B 025ec6bbd64910fb74d116dcd1e646fbcb0bef1c316928ebe48be3f5e922abbb1e306da895db8ac4e0c1ba1b57a083c3e4004f3cbacf7052b67abb13ff23d7a8 SHA512 9d8d83f85a204ed6859affbaa80413f399eeeb5b9981de542cd301e8201136325d1237d0ef74682381f7441e9dace713bef5fc6eb00addf27b37bfbbd3cac70c
 EBUILD libdrm-2.4.80.ebuild 2039 BLAKE2B 73dc5b990db3f99863de5ca880cffb87a3faeb29cb182949884345f08ccb76b21b4afba4c1cbe032a435143c4ffd3df89ce05a291294ccfeb47dfecb45c62de1 SHA512 2676f7d59c5020432269cfe7450b8b544e73478e9667c0fb7627fc5d09d662675e31218a70d8190a0426381688a7e8d30afe2d3b957a2cd04395540e097913bb
 EBUILD libdrm-2.4.81.ebuild 2047 BLAKE2B 8a85b781c074d3ab093d2439310486887dd110d08c8ef8ef2b17772d6c5b2c0b7aaa16b6615fed9882104c94af08e5505374a4e35e394c35fde0cc11023492ff SHA512 29413925b0da7b31b3171ebbca51896e77772a0e4fd405c2154aaac5b3efb07d522939708f01818ff9d4305991af257c4757964baed1edf13c9fc1f3f4ea9e4f
-EBUILD libdrm-2.4.82.ebuild 2040 BLAKE2B 4acd839b5cd1638e8ab8b7f36e56fc87bc86f751051ba60d09567c752aa7dc9f9279d93b2481b57cba54d3dc6e018c9091c32d9e57b8b04490f128b5a0ecd65d SHA512 9b0fedff6e4de2fe6700f412eb3a805d718530735f367c28738d5a76b88e46af0ab781d54b64168da3ff9c56e2c09de0881bc4206c5cf34f36998834ad5ac3f2
+EBUILD libdrm-2.4.82.ebuild 2039 BLAKE2B 145e78a15dbe2daf2ee754e2ef09c565d8b886b697d3f173c99a03790ccf76bdcd362d5dcaf5d89a4a4976931e375afec7b0cdf7e3b40ce7192debcb294f1f84 SHA512 d36835f8c74eac3d188d38e8ff5959ea05795e6a6d8bd2965e7f42a521aa2576c35216a6a47ac15ca21d63d325449bf2d04017af4fc3debd9600f3c26309aaab
 EBUILD libdrm-2.4.84.ebuild 2047 BLAKE2B 8a85b781c074d3ab093d2439310486887dd110d08c8ef8ef2b17772d6c5b2c0b7aaa16b6615fed9882104c94af08e5505374a4e35e394c35fde0cc11023492ff SHA512 29413925b0da7b31b3171ebbca51896e77772a0e4fd405c2154aaac5b3efb07d522939708f01818ff9d4305991af257c4757964baed1edf13c9fc1f3f4ea9e4f
 EBUILD libdrm-2.4.85.ebuild 2047 BLAKE2B 8a85b781c074d3ab093d2439310486887dd110d08c8ef8ef2b17772d6c5b2c0b7aaa16b6615fed9882104c94af08e5505374a4e35e394c35fde0cc11023492ff SHA512 29413925b0da7b31b3171ebbca51896e77772a0e4fd405c2154aaac5b3efb07d522939708f01818ff9d4305991af257c4757964baed1edf13c9fc1f3f4ea9e4f
 EBUILD libdrm-2.4.87.ebuild 2047 BLAKE2B 8a85b781c074d3ab093d2439310486887dd110d08c8ef8ef2b17772d6c5b2c0b7aaa16b6615fed9882104c94af08e5505374a4e35e394c35fde0cc11023492ff SHA512 29413925b0da7b31b3171ebbca51896e77772a0e4fd405c2154aaac5b3efb07d522939708f01818ff9d4305991af257c4757964baed1edf13c9fc1f3f4ea9e4f
diff --git a/x11-libs/libdrm/libdrm-2.4.82.ebuild b/x11-libs/libdrm/libdrm-2.4.82.ebuild
index e71d0e9ab282..720ef2fa14c3 100644
--- a/x11-libs/libdrm/libdrm-2.4.82.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.82.ebuild
@@ -14,7 +14,7 @@ else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
 fi
 
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
 for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"