gentoo resync : 20.10.2017

422 files changed, 4111 insertions, 6356 deletions

diff --git a/app-admin/augeas/Manifest b/app-admin/augeas/Manifest
index 705a9d1b1fe5..5d0179960ae3 100644
--- a/app-admin/augeas/Manifest
+++ b/app-admin/augeas/Manifest
@@ -1,9 +1,3 @@
-AUX augeas-0.10.0-gets.patch 548 SHA256 10b57fbb769625d8677bf07f400cf94589b15a2f5244fad35b4b18a36dbca58c SHA512 cde05c4905613be475a051aab93f7bf9d5733c44e6d946a82ae39423dd51f21c98485e41a000dd54c750b3c4fcb1cf6b64237ebd708bbc91d0d37c10f346ec21 WHIRLPOOL 974cd4e4993ec13334c06fdea8afb173d8cdb921de306184507e196bc227803c331a9ae0c3e7a99234c86b80e939d2ee900a041421f6d7bc29a1173c0649efbb
-AUX augeas-0.10.0-libxml2-pkgconfig.patch 635 SHA256 ee4aea080eca0e1de6b93fc7ffc9e4105bafc9625f67d77e3490ab43f58463db SHA512 69d8398e0a6dce8959af0a83ab3e3767be1a9c5dda9b3ba03e6305a79b05df04652f76ff087dd5e82a2d46af9d042df0937b2ec885ca39ca2a05ad4df1fb84be WHIRLPOOL 7db91af93c5bf6b62a0ba808a2f01325e93e5719a58ab8591da2f035001544907c56047151641973c9a542d3e04cbc67de1c2794abfa000b58c54c27889c1669
-AUX augeas-0.10.0-test.patch 1991 SHA256 42fcbbc1c8dbbe5c5ac3d1e04bbcb3eccce460de491dad4f8142f35f6fdaf33b SHA512 42e1c1b9024aab5f6d425c9fe421a3d5a81fd2e47908ad489aa8ea5044006b6c664810c9f8a12ad355217d4614b653f2a34000cafa8985ddc42632306cfb04a8 WHIRLPOOL 2ed6d9c3537eea7e3de425fc1084ac1b803c4ddf19d9fee7e26ea3796dac43d623a1a6d9f6487537fcf33e242bd35e2e4018ede2b9ddb5d24c24373e079c0455
-AUX augeas-0.10.0-test2.patch 1713 SHA256 d8efe22028a65fc5346742fde4bf27550db06c43a030da83f7c2eada54cc0b0e SHA512 8c8b5d0e1d182a30db1cbb1c61a7594109e569dcb280433314eac4879ee6fc10bb415ecec1d10f7b0e85e5b0c1703774a16b9d4662e2b6c18767d94f37d60eb2 WHIRLPOOL 889923e71151c24b2742307bdead8bfa2c49f70689567028bb9b204c98883510ce046d432f9e7893f58db968d6c239f408b1c0fbca18eb7fdced898393a592dc
-AUX cve-2017-7555.patch 5771 SHA256 c82638220c1136000539db1e084abf10efd0d41e0d02a226e6b6bb8f5bbcce6e SHA512 209364d6d8af5b755f8675b2eff8fa8e240ec364fc97e7a4644f320aad94f64600120d3da7d67a7a4f243acace4a41d13b1dbccfbe0c2021853adb7f3949c8b4 WHIRLPOOL 7714fa4be323f5ff7c8b50fedb48c95bd9f10f2ad26d0480ff2a73eaa3785e206963cc3e44c2ba1207a6e05ddc18a85bd65ca68bc40ec5108510c5ed7f64a74d
-AUX cve-bunch-of-them-symlink.patch 2415 SHA256 4db27194c976fedec981d8db6129422ad03456d80026d4a707b7ebcf74af072e SHA512 a702cce3f448cef9ce42e56d3ce7e6ceb8c5054031e6b1a9465639b4462ab4c7427f826a2783e12e4dc90f2bc6896f473ffc0e4d8d37e6d55cdb0192315eddb1 WHIRLPOOL 2791834ba2eed688451983c4a2544198e81d1fdf16cd6a9fde811cbb075643e0b534006e06561c6125543db1dc00731bc297330c91e1e4dc0367318e96c2a188
 DIST augeas-1.8.1.tar.gz 2165325 SHA256 65cf75b5a573fee2a5c6c6e3c95cad05f0101e70d3f9db10d53f6cc5b11bc9f9 SHA512 80be6dc75e86e2a00c56cb668824ffbe54105b64fad64a2737d980c8ee5ba347a97ddd190a1c712bd07a768ed23a8d07b0eb676033b367632036a8e7f98c976b WHIRLPOOL 71955a1a42294021f69bb9715439b248f341d06b7c2d72a72537abe3f77c8e990453a12ee99ab3ba0c979ad6fd21ef5056c6e85dc8bc01a2e9c5405389030df0
 DIST augeas-1.9.0.tar.gz 2199534 SHA256 2b463d398cabc9b42747aa61d3e83ed6a93ce03d9074cf8e7a7bd3107a668343 SHA512 340aed78ac2df455770735b41f3c10a1cbe40f160e236a735d4580edf5b635afeaf7ddadc10e759e9197c4b233e98b3b6b94a3c2f072aa765c104d64371ce171 WHIRLPOOL 226262afff83c9e3421928b24d0ca067b9971f353d152a5de6fd74d8bdf30259acf63881fe761d4c538f36865c8dcd6679583c12649e2c4545374e30a226b568
 EBUILD augeas-1.8.1.ebuild 1000 SHA256 6a112f872b20c583f7cf1d7acd019f9918a057af2c4f937b69ce5d40506e399e SHA512 47871941fbcb08efce33560c5e8d857fef6e2dff1cdde7c31af6b205517af837840b83664fde9b6943b5ee3c3a367a7709c603b9409397cb79d7f879fedde1a0 WHIRLPOOL 95be95ed87eebccabb97abef577d88ab1fc0db4cb3e807b8bf8a7e8dc0fff80cc59a68c8150a4601060d36f6ced58adbd70cfb18ea552975e59ca30d05556993
diff --git a/app-admin/augeas/files/augeas-0.10.0-gets.patch b/app-admin/augeas/files/augeas-0.10.0-gets.patch
deleted file mode 100644
index 5f754955be6c..000000000000
--- a/app-admin/augeas/files/augeas-0.10.0-gets.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- gnulib/lib/stdio.in.h | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/gnulib/lib/stdio.in.h b/gnulib/lib/stdio.in.h
-index 9091497..fa7e3fb 100644
---- a/gnulib/lib/stdio.in.h
-+++ b/gnulib/lib/stdio.in.h
-@@ -162,7 +162,6 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - "
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
diff --git a/app-admin/augeas/files/augeas-0.10.0-libxml2-pkgconfig.patch b/app-admin/augeas/files/augeas-0.10.0-libxml2-pkgconfig.patch
deleted file mode 100644
index aaa418670154..000000000000
--- a/app-admin/augeas/files/augeas-0.10.0-libxml2-pkgconfig.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From b41deef293841da50a236023bad486ea3f57e4dc Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Sat, 3 Dec 2011 14:21:50 +0000
-Subject: [PATCH] pkg-config: Augeas requires libxml2.
-
----
- augeas.pc.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/augeas.pc.in b/augeas.pc.in
-index c97847d..9e166db 100644
---- a/augeas.pc.in
-+++ b/augeas.pc.in
-@@ -6,6 +6,6 @@ includedir=@includedir@
- Name: augeas
- Version: @VERSION@
- Description: Augeas configuration editing library
--Requires:
-+Requires.private: libxml-2.0
- Libs: -L${libdir} -laugeas @LIBS@
- Cflags: -I${includedir}
--- 
-1.7.6
-
diff --git a/app-admin/augeas/files/augeas-0.10.0-test.patch b/app-admin/augeas/files/augeas-0.10.0-test.patch
deleted file mode 100644
index e2630014f29a..000000000000
--- a/app-admin/augeas/files/augeas-0.10.0-test.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 075f8d35497fb36d9193e5364c055049c66fa5eb Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lubo.rintel@gooddata.com>
-Date: Mon, 9 Jan 2012 18:52:11 +0100
-Subject: [PATCH 1/2] Allow JSON number literals to be followed by whitespace
-
-Add a test case.
-
-Fixes https://fedorahosted.org/augeas/ticket/247
----
- AUTHORS                    |    1 +
- lenses/json.aug            |    2 +-
- lenses/tests/test_json.aug |    3 +++
- 3 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/AUTHORS b/AUTHORS
-index df63f95..e7870f2 100644
---- a/AUTHORS
-+++ b/AUTHORS
-@@ -44,6 +44,7 @@ Contributions by:
-   Bill Pemberton              <wfp5p@virginia.edu>
-   Alan Pevec                  <apevec@redhat.com>
-   Robin Lee Powell            <rlpowell@digitalkingdom.org>
-+  Lubomir Rintel              <lubo.rintel@gooddata.com>
-   Roman Rakus                 <rrakus@redhat.com>
-   Satoru SATOH                <satoru.satoh@gmail.com>
-   Nicolas Valcárcel Scerpella <nvalcarcel@ubuntu.com>
-diff --git a/lenses/json.aug b/lenses/json.aug
-index c22ad90..6ceab09 100644
---- a/lenses/json.aug
-+++ b/lenses/json.aug
-@@ -29,7 +29,7 @@ let str_store =
-   let q =  del "\"" "\"" in
-   q . store /[^"]*/ . q . ws             (* " Emacs, relax *)
- 
--let number = [ label "number" . store /-?[0-9]+(\.[0-9]+)?([eE][+-]?[0-9]+)?/ ]
-+let number = [ label "number" . store /-?[0-9]+(\.[0-9]+)?([eE][+-]?[0-9]+)?/ . ws ]
- let str = [ label "string" . str_store ]
- 
- let const (r:regexp) = [ label "const" . store r . ws ]
-diff --git a/lenses/tests/test_json.aug b/lenses/tests/test_json.aug
-index 0bcd25d..d8b7fa8 100644
---- a/lenses/tests/test_json.aug
-+++ b/lenses/tests/test_json.aug
-@@ -8,6 +8,9 @@ test lns get "true" = { "const" = "true" }
- 
- test lns get "3.141" = { "number" = "3.141" }
- 
-+test lns get "{ \"key\" : 666 }" =
-+  { "dict" { "entry" = "key" { "number" = "666" } } }
-+
- test lns get "[true, 0, \"yo\"]" =
-   { "array" { "const" = "true" } { "number" = "0" } { "string" = "yo" } }
- 
--- 
-1.7.7.5
-
diff --git a/app-admin/augeas/files/augeas-0.10.0-test2.patch b/app-admin/augeas/files/augeas-0.10.0-test2.patch
deleted file mode 100644
index 743ccfdce1fc..000000000000
--- a/app-admin/augeas/files/augeas-0.10.0-test2.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 100a7b38222a63c6435a72b4974b55f39a28989e Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lubo.rintel@gooddata.com>
-Date: Mon, 9 Jan 2012 19:24:41 +0100
-Subject: [PATCH 2/2] Correctly parse empty object and arrays in JSON
-
-Add a test case.
-Fix from David Lutterkort <lutter@redhat.com>.
-
-https://fedorahosted.org/augeas/ticket/248
----
- lenses/json.aug            |    4 ++--
- lenses/tests/test_json.aug |    5 +++++
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/lenses/json.aug b/lenses/json.aug
-index 6ceab09..2645806 100644
---- a/lenses/json.aug
-+++ b/lenses/json.aug
-@@ -37,9 +37,9 @@ let const (r:regexp) = [ label "const" . store r . ws ]
- let value0 = str | number | const /true|false|null/
- 
- let fix_value (value:lens) =
--  let array = [ label "array" . lbrack . Build.opt_list value comma . rbrack ] in
-+  let array = [ label "array" . lbrack . (Build.opt_list value comma)? . rbrack ] in
-   let pair = [ label "entry" . str_store . colon . value ] in
--  let obj = [ label "dict" . lbrace . Build.opt_list pair comma . rbrace ] in
-+  let obj = [ label "dict" . lbrace . (Build.opt_list pair comma)? . rbrace ] in
-   (str | number | obj | array | const /true|false|null/)
- 
- (* Typecheck finitely deep nesting *)
-diff --git a/lenses/tests/test_json.aug b/lenses/tests/test_json.aug
-index d8b7fa8..aec7d4c 100644
---- a/lenses/tests/test_json.aug
-+++ b/lenses/tests/test_json.aug
-@@ -30,6 +30,11 @@ test lns get "{ \"0\": true, \"1\":false }" =
- test lns get "{\"menu\": \"entry one\"}" =
-   { "dict" { "entry" = "menu" { "string" = "entry one" } } }
- 
-+test lns get "[ ]" =
-+  { "array" }
-+
-+test lns get "{}" =
-+  { "dict" }
- 
- let s = "{\"menu\": {
-   \"id\": \"file\",
--- 
-1.7.7.5
-
diff --git a/app-admin/augeas/files/cve-2017-7555.patch b/app-admin/augeas/files/cve-2017-7555.patch
deleted file mode 100644
index aaacdc2674c0..000000000000
--- a/app-admin/augeas/files/cve-2017-7555.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-From 4cca923b732990bec0c699b2e69911c2221b2498 Mon Sep 17 00:00:00 2001
-From: David Lutterkort <lutter@watzmann.net>
-Date: Fri, 4 Aug 2017 17:13:52 -0700
-Subject: [PATCH] * src/pathx.c (parse_name): correctly handle trailing
- whitespace in names
-
-When a name ended in whitespace, we incorrectly assumed it was always ok to
-trim that whitespace. That is not true if that whitespace is escaped,
-i.e. if the path expression is something like '/x\ '. In that case, the
-name really needs to be literally 'x ', i.e., we can not trim that
-whitespace.
-
-The incorrect behavior led to turning '/x\ ' first into 'x\' and then,
-because we assume that '\' is always followed by a character inside the
-string, when we removed the escaping '\', we would read beyond the end of
-the intermediate string result; if we were lucky, that would lead to a
-crash, otherwise we'd continue with junk.
-
-We now make sure that escaped whitespace at the end of a string does not
-get stripped, avoiding all these headaches.
-
-Fixes RHBZ https://bugzilla.redhat.com/show_bug.cgi?id=1475621
----
- src/pathx.c        | 27 +++++++++++++++++++------
- tests/test-xpath.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 80 insertions(+), 6 deletions(-)
-
-diff --git a/src/pathx.c b/src/pathx.c
-index d292cb30..9a2f9c76 100644
---- a/src/pathx.c
-+++ b/src/pathx.c
-@@ -1710,6 +1710,16 @@ int pathx_escape_name(const char *in, char **out) {
-     return 0;
- }
- 
-+/* Return true if POS is preceded by an odd number of backslashes, i.e., if
-+ * POS is escaped. Stop the search when we get to START */
-+static bool backslash_escaped(const char *pos, const char *start) {
-+    bool result=false;
-+    while (pos-- > start && *pos == '\\') {
-+        result = !result;
-+    }
-+    return result;
-+}
-+
- /*
-  * NameNoWS ::= [^][|/\= \t\n] | \\.
-  * NameWS   ::= [^][|/\=] | \\.
-@@ -1719,11 +1729,14 @@ static char *parse_name(struct state *state) {
-     const char *s = state->pos;
-     char *result;
- 
-+    /* Advance state->pos until it points to the first character that is
-+     * not part of a name. */
-     while (*state->pos != '\0' && strchr(name_follow, *state->pos) == NULL) {
--        /* This is a hack: since we allow spaces in names, we need to avoid
--         * gobbling up stuff that is in follow(Name), e.g. 'or' so that
--         * things like [name1 or name2] still work.
--         */
-+        /* Since we allow spaces in names, we need to avoid gobbling up
-+         * stuff that is in follow(Name), e.g. 'or' so that things like
-+         * [name1 or name2] still work. In other words, we'll parse 'x frob
-+         * y' as one name, but for 'x or y', we consider 'x' a name in its
-+         * own right. */
-         if (STREQLEN(state->pos, " or ", strlen(" or ")) ||
-             STREQLEN(state->pos, " and ", strlen(" and ")))
-             break;
-@@ -1738,10 +1751,12 @@ static char *parse_name(struct state *state) {
-         state->pos += 1;
-     }
- 
--    /* Strip trailing white space */
-+    /* Strip trailing white space. Make sure we respect escaped whitespace
-+     * and don't strip it as in "x\\ " */
-     if (state->pos > s) {
-         state->pos -= 1;
--        while (isspace(*state->pos) && state->pos >= s)
-+        while (isspace(*state->pos) && state->pos > s
-+               && !backslash_escaped(state->pos, s))
-             state->pos -= 1;
-         state->pos += 1;
-     }
-diff --git a/tests/test-xpath.c b/tests/test-xpath.c
-index 3e418e5f..82986474 100644
---- a/tests/test-xpath.c
-+++ b/tests/test-xpath.c
-@@ -355,6 +355,62 @@ static int test_wrong_regexp_flag(struct augeas *aug) {
-     return -1;
- }
- 
-+static int test_trailing_ws_in_name(struct augeas *aug) {
-+    int r;
-+
-+    printf("%-30s ... ", "trailing_ws_in_name");
-+
-+    /* We used to incorrectly lop escaped whitespace off the end of a
-+     * name. Make sure that we really create a tree node with label 'x '
-+     * with the below set, and look for it in a number of ways to ensure we
-+     * are not lopping off trailing whitespace. */
-+    r = aug_set(aug, "/ws\\ ", "1");
-+    if (r < 0) {
-+        fprintf(stderr, "failed to set '/ws ': %d\n", r);
-+        goto fail;
-+    }
-+    /* We did not create a node with label 'ws' */
-+    r = aug_get(aug, "/ws", NULL);
-+    if (r != 0) {
-+        fprintf(stderr, "created '/ws' instead: %d\n", r);
-+        goto fail;
-+    }
-+
-+    /* We did not create a node with label 'ws\t' (this also checks that we
-+     * don't create something like 'ws\\' by dropping the last whitespace
-+     * character. */
-+    r = aug_get(aug, "/ws\\\t", NULL);
-+    if (r != 0) {
-+        fprintf(stderr, "found '/ws\\t': %d\n", r);
-+        goto fail;
-+    }
-+
-+    /* But we did create 'ws ' */
-+    r = aug_get(aug, "/ws\\ ", NULL);
-+    if (r != 1) {
-+        fprintf(stderr, "could not find '/ws ': %d\n", r);
-+        goto fail;
-+    }
-+
-+    /* If the whitespace is preceded by an even number of '\\' chars,
-+     * whitespace must be stripped */
-+    r = aug_set(aug, "/nows\\\\ ", "1");
-+    if (r < 0) {
-+        fprintf(stderr, "set of '/nows' failed: %d\n", r);
-+        goto fail;
-+    }
-+    r = aug_get(aug, "/nows\\\\", NULL);
-+    if (r != 1) {
-+        fprintf(stderr, "could not get '/nows\\'\n");
-+        goto fail;
-+    }
-+    printf("PASS\n");
-+    return 0;
-+ fail:
-+    printf("FAIL\n");
-+    return -1;
-+}
-+
- static int run_tests(struct test *tests, int argc, char **argv) {
-     char *lensdir;
-     struct augeas *aug = NULL;
-@@ -398,6 +454,9 @@ static int run_tests(struct test *tests, int argc, char **argv) {
- 
-         if (test_wrong_regexp_flag(aug) < 0)
-             result = EXIT_FAILURE;
-+
-+        if (test_trailing_ws_in_name(aug) < 0)
-+            result = EXIT_FAILURE;
-     }
-     aug_close(aug);
-     free(lensdir);
diff --git a/app-admin/augeas/files/cve-bunch-of-them-symlink.patch b/app-admin/augeas/files/cve-bunch-of-them-symlink.patch
deleted file mode 100644
index 3bd1d95ae42d..000000000000
--- a/app-admin/augeas/files/cve-bunch-of-them-symlink.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 051c73a9a7ffe9e525f6f0a1b8f5198ff8cc6752 Mon Sep 17 00:00:00 2001
-From: Dominic Cleal <dcleal@redhat.com>
-Date: Sat, 11 Aug 2012 20:39:14 +0100
-Subject: [PATCH] Fix regression in permissions of created files
-
-Commit 16387744 changed temporary file creation to use mkstemp, resulting in
-new files being created with 0600 permissions.  For brand new files created
-through Augeas, their permissions stayed at 0600 rather than being set by the
-umask as before.
-
-  * src/transform.c (transform_save): chmod after creating new files to
-    permissions implied by the umask
----
- src/transform.c        | 10 ++++++++++
- tests/test-preserve.sh | 15 ++++++++++++++-
- 2 files changed, 24 insertions(+), 1 deletion(-)
-
-diff --git a/src/transform.c b/src/transform.c
-index a3acd10..1ca3d5f 100644
---- a/src/transform.c
-+++ b/src/transform.c
-@@ -1096,6 +1096,16 @@ int transform_save(struct augeas *aug, struct tree *xfm,
-             err_status = "xfer_attrs";
-             goto done;
-         }
-+    } else {
-+        /* Since mkstemp is used, the temp file will have secure permissions
-+         * instead of those implied by umask, so change them for new files */
-+        mode_t curumsk = umask(022);
-+        umask(curumsk);
-+
-+        if (fchmod(fileno(fp), 0666 - curumsk) < 0) {
-+            err_status = "create_chmod";
-+            return -1;
-+        }
-     }
- 
-     if (tree != NULL)
-diff --git a/tests/test-preserve.sh b/tests/test-preserve.sh
-index 042dab9..9719ac6 100755
---- a/tests/test-preserve.sh
-+++ b/tests/test-preserve.sh
-@@ -59,9 +59,12 @@ if [ $selinux = yes -a xetc_t != "x$act_con" ] ; then
-     exit 1
- fi
- 
--# Check that we create new files without error
-+# Check that we create new files without error and with permissions implied
-+# from the umask
- init_dirs
- 
-+oldumask=$(umask)
-+umask 0002
- $AUGTOOL > /dev/null <<EOF
- set /files/etc/hosts/1/ipaddr 127.0.0.1
- set /files/etc/hosts/1/canonical host.example.com
-@@ -71,6 +74,16 @@ if [ $? != 0 ] ; then
-     echo "augtool failed on new file"
-     exit 1
- fi
-+if [ ! -e $hosts ]; then
-+    echo "augtool didn't create new /etc/hosts file"
-+    exit 1
-+fi
-+act_mode=$(ls -l $hosts | cut -b 1-10)
-+if [ x-rw-rw-r-- != "x$act_mode" ] ; then
-+    echo "Expected mode 0664 due to $(umask) umask but got $act_mode"
-+    exit 1
-+fi
-+umask $oldumask
- 
- # Check that we create new files without error when backups are requested
- init_dirs
--- 
-1.8.5.1
-
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 224c4acced36..99a53d690356 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,6 +1,6 @@
 DIST keepassxc-2.1.4.tar.gz 3345520 SHA256 40a990dbcf442eb3cad99452b58ffd36e5855b39e78f213ea20e99fbc7876701 SHA512 48030eb6df595c73644f43d6222654c5f76962ae5aa2f44ca4dc9c8e45726380c6be4300af7a8279b07c06b70912da444f2b17c5b6c37a91cb239d695e7518d8 WHIRLPOOL da2bdac3e334b48903c6b20532ea4a0af0fe057e10e702ba6a4221e828b8f416d666ff67407b434d38b4cbbe5119d3c8a49927e4d5092f4f62ab49e30981017c
 DIST keepassxc-2.2.1.tar.gz 3880551 SHA256 184663e8b08e081dedf4c9dbdd68bf86ed0f5e32388b4781b7afcf89ef5c8e4d SHA512 bce2a0d6d3ad32bb507afac22670b34c37f5e36de6a30bb7c9b5a523c12bad59d95a414b90608451660fb9ce224279c7658e1892f2b99c673908449cc86e5595 WHIRLPOOL 32a0ede5c150bc4fc54c1b0a8f3c46110a19349d732913bdc9f3bc6492c1998569b2cd7a178ec9bb11e5b8dc9698138d8a7f26000211377a0c90f505605fe54c
-EBUILD keepassxc-2.1.4-r1.ebuild 1505 SHA256 ea39c18e6bd28ac2d3225913c24e98563b5429e8ee09054350991948a6c4c039 SHA512 bebbbbb2c8568b1bac416c936ea7d72cbdc2e2169e77140978bf140013ce56c1e71abb93e8c155cc38622f28c01128f0c791ee98df19a31078ca2fd5775c1c6d WHIRLPOOL eb9a2edac314c0d5187714bf9917b636e686cfb896906451d7c9890f6ba14865d03c475e85b499d75e2220e3b09b0bf6b717e0a1725ffe3e904409d693f1cbb7
+EBUILD keepassxc-2.1.4-r1.ebuild 1540 SHA256 3278a66dd4bc71729f00ab33e6748d467e6f1df0cad860057b8caec0ffedbe7d SHA512 7dcda961fda3b3166b2e38a878e2b2782e604c3373b67c358347746fccfa781082ce1c3417aeb8c1b76b8fc5ae94b38bff1442fc2477267b4a5096afdf1803ea WHIRLPOOL e4c0f0445cb2bed3c0c9b1c91e586ef83be009b608a6ac9850ab89dcdabea388ac862e8dea8afa8097028c649b1a90346ff8b376fdf8366c728bfbb349797ab0
 EBUILD keepassxc-2.2.1-r1.ebuild 1544 SHA256 fe045462fbd25433b4734c1b5aef97c0841f18412ecbf7182afadfb199ca4b0a SHA512 5695e22f30dc7e60c463ea4a0703111839345facb251e896526e4d5cb5d566516b939bc440c94e0a1b68272eeb458f47b8ddf1e529e5eb7037dca4b6698517a8 WHIRLPOOL b950f8b76eada1d6e6199a0e726083cff09fc7e0dfa449fc8ca61176ab631e41b520bc65960c13ce0b82acc6a9f0a68a13f8f94ff334a621637756cea5eb898f
 EBUILD keepassxc-9999.ebuild 1544 SHA256 fe045462fbd25433b4734c1b5aef97c0841f18412ecbf7182afadfb199ca4b0a SHA512 5695e22f30dc7e60c463ea4a0703111839345facb251e896526e4d5cb5d566516b939bc440c94e0a1b68272eeb458f47b8ddf1e529e5eb7037dca4b6698517a8 WHIRLPOOL b950f8b76eada1d6e6199a0e726083cff09fc7e0dfa449fc8ca61176ab631e41b520bc65960c13ce0b82acc6a9f0a68a13f8f94ff334a621637756cea5eb898f
 MISC metadata.xml 819 SHA256 eef8083b85f448c94b9b84f542ac6894cb0d16e91f03a22e27d31cc744667d7d SHA512 b0607500bf25e7d4b504dd7fe0c03cf25f21cc32b79a0fe3a58d847f7ad2647c0452077ad8e16e1b2c63987ef68842b8d673fa0ebe657d918f27e0b163c8957d WHIRLPOOL aa80bba4cfa8cb4e5fadb8e36eced51596072c5a01a20b723742940dd1e7ec12a9ccd908fdf0ec04b8c703b81d6fe520a2f8aea4cae248afa9eafe12076e9914
diff --git a/app-admin/keepassxc/keepassxc-2.1.4-r1.ebuild b/app-admin/keepassxc/keepassxc-2.1.4-r1.ebuild
index 25db9c565d57..1fcb3974c063 100644
--- a/app-admin/keepassxc/keepassxc-2.1.4-r1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.1.4-r1.ebuild
@@ -25,12 +25,14 @@ IUSE="autotype debug http test"
 RDEPEND="
 	dev-libs/libgcrypt:=
 	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5
 	sys-libs/zlib
 	autotype? (
 		dev-qt/qtx11extras:5
+		x11-libs/libX11
 		x11-libs/libXi
 		x11-libs/libXtst
 	)
diff --git a/app-backup/backup-manager/Manifest b/app-backup/backup-manager/Manifest
index e9a63c79c9c1..61e147798e0d 100644
--- a/app-backup/backup-manager/Manifest
+++ b/app-backup/backup-manager/Manifest
@@ -1,8 +1,10 @@
 AUX Makefile-fix.diff 1041 SHA256 e4e394d7dd9297fb0743cebaae718f96d7171d1995ffdd009d156b513a49f11d SHA512 fd5cadb2fb549e51d21dd9929e6e2349b86c462723c667e9f2d3ba914d150f4d605cd44a905bf1e3c9dcab63deb329b9c01af96413cbf0a8c7656a960e068d0d WHIRLPOOL 15624d328591480737b4e400b7b519b012505566d3685d60a5b2ecd93fbd794f024acca577cf6f8267f52243fb27f6f8a4e3c4fcb932eb773857de53d9686dde
 DIST backup-manager-0.7.13.tar.gz 144494 SHA256 842d4e0e95c5ae3a1dd0f12b1911e70e73da9dd850b4bb077ff2e9134f9d89db SHA512 ef43d9b95471299482e3cccd72652930804d85d623ef9ae731b25509504db774380527c42b9de2fe906a730890f1c6f6ab394bcfb917f0a70822a45166edf76f WHIRLPOOL a309f2208824acda34b8efc696136e174b1d3d0418d8ec35a6971aa1644542646725a358bd9c8c8c356379ae6d3d7f6131f2f91e31ca2f3c8261572003e5a15b
+DIST backup-manager-0.7.14.tar.gz 144568 SHA256 ff098edc982fad2db6d22c575d93d5ea0180b61701971fd861779d7489844134 SHA512 7956f39446ffcd39ec2baff0f5599f15e549abac570806905768bac09d431a88a9826a8e30e02e6f5c6186f19b02d50d5101ce5c22a91a43e6d0772e4db57f2f WHIRLPOOL 68fe8e23b23b7112835c88e0923614f44e894ac430f283d7d242698cb35dcaaa6a6d35f098261113bf51166c507ee74b3de9333b9e85594959473e83327ea20e
 DIST backup-manager-0.7.5.tar.gz 159855 SHA256 a7aa04ebec5b8a80d5e75d48121092afb969e1efb252b1ffdbcd28b04225e55a SHA512 3101e695d79c429e5a415a174c12b6217495aaefc0b44ee870bb492eea75ce07dacb766a45c60268a0f7da798d51b46f6d91f33b9d545360f09b92b61329bcef WHIRLPOOL 366e205c15084231fad81af9cbcebca34e7d3637476ba7046dc840d3f54c110469588ddc939c112525bac8d4764a7be2097c1b218f59af752af453091ff8299f
 EBUILD backup-manager-0.7.13-r1.ebuild 963 SHA256 541f0689110575afbf4a4715db4804831476df730e6e24d51166a1cb751d97a2 SHA512 392454776243ffab3c00e557f35c212ce21ed13b5ee67c9427043d78276fd32103b55cded04de3a6add59b7f02750b9d66acab6cd7ba82eabe0d31d66ceee4bb WHIRLPOOL 0d275cadadd82fd9f89601bc3d62f2fb99dce0287665a546c1c678249d5db4766be38b6a341c22a43c1a33aeae4af3a66aeb0e517d9fc96854b660a36733af13
 EBUILD backup-manager-0.7.13.ebuild 962 SHA256 1076d7a387aa5c2dac9b317b1886d12b02b9ae5a4daa639b64ff7afe1c32e85a SHA512 c8253c23e59e21436cffa2bfb6ddbc9bf63821b6e4da68d404e4c2e160e77e9ef5a499a19c8a402b6908b96947164f74680d2a8fb283a289d39a19700ede3ca7 WHIRLPOOL 5f96bbfaf6fffb6f67164d8d6797fe988f36d58ecb160b013e87d007e5440d05365f3d33196194e73693eb816feac99b6c07422378fc64cb6c13bfb87c891297
+EBUILD backup-manager-0.7.14.ebuild 963 SHA256 541f0689110575afbf4a4715db4804831476df730e6e24d51166a1cb751d97a2 SHA512 392454776243ffab3c00e557f35c212ce21ed13b5ee67c9427043d78276fd32103b55cded04de3a6add59b7f02750b9d66acab6cd7ba82eabe0d31d66ceee4bb WHIRLPOOL 0d275cadadd82fd9f89601bc3d62f2fb99dce0287665a546c1c678249d5db4766be38b6a341c22a43c1a33aeae4af3a66aeb0e517d9fc96854b660a36733af13
 EBUILD backup-manager-0.7.5.ebuild 1064 SHA256 6714642bf9c62fd3b7774eea83a59b9056831a81ef1abdc272436d88e3ac5f44 SHA512 1a0940dba01bbcbd71f6363bab0b03346a51017623d2d98ceb86100d6ae9ff235366f13afb16e7dc0102f0dcb373f3d254d6b827aef239543489fb1838319823 WHIRLPOOL d5a08ecef12937352db3a4d1c6417743de149edd7cf7aedf90d8f38ded061f0f718bcca8ec04994ea4bb9b518ed74b270eb0adaefb3575c550fd704958a2a8df
 MISC ChangeLog 4170 SHA256 8a86ff278c497c7d57f7ef5202e601a82578bf90d9cd13dae0a595c79c3e6dac SHA512 cf24cc2abc4a190c68c66704f6bdd7e08cd42a2208bdbc508a708311fdc4b5de05773eac685e4503b1d178f57f8071e245afd5ab091ad2a8315c7074c618b7e8 WHIRLPOOL 98512e9ea78b32b62319a1eda357a621b63d044202e3b5c7016d1a433e9c6411905e09e51c4b466e3648954439e92613cd3d8f27ba986c24f79e3ea490101c76
 MISC ChangeLog-2015 4577 SHA256 8d75af80413a0913199bbf88c5e8b6d848bfb706db46b910f87a8cee03d93fa7 SHA512 19c8d3481d21c8538cb601d4c6d41b398555e0b6c42fd14104e99afdb1d905951681d0ba4ee5bba6bc4a8e369651f1a7de3f987e5eaee20f79088abbea182299 WHIRLPOOL 8594e3e1b348376688793c6619d1a122ae45fcc9f118fd9fa6bf619b53cf12b743b39fee04d51d76f9e94852a6f06fd125a68fac394fe1fb915b21947a7544a4
diff --git a/app-backup/backup-manager/backup-manager-0.7.14.ebuild b/app-backup/backup-manager/backup-manager-0.7.14.ebuild
new file mode 100644
index 000000000000..7f680b293b8f
--- /dev/null
+++ b/app-backup/backup-manager/backup-manager-0.7.14.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+MY_P=Backup-Manager-${PV}
+DESCRIPTION="Backup Manager is a command line backup tool for GNU/Linux"
+HOMEPAGE="https://github.com/sukria/Backup-Manager"
+SRC_URI="https://github.com/sukria/Backup-Manager/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="s3"
+
+DEPEND="dev-lang/perl:=
+	sys-devel/gettext"
+
+RDEPEND="${DEPEND}
+	s3? ( dev-perl/Net-Amazon-S3
+		dev-perl/File-Slurp )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	sed -e "/^PERL5DIR/s/sitelib/vendorlib/" \
+		-e "/sed/s:=\$(DESTDIR)/:=:" \
+		-i Makefile || die
+
+	default
+}
+
+src_compile() {
+	default
+	emake -C po
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+
+	dodir /etc
+	cp -a "${D}"/usr/share/backup-manager/backup-manager.conf.tpl "${D}"/etc/backup-manager.conf || die
+	chmod 0600 "${D}"/etc/backup-manager.conf || die
+}
diff --git a/app-editors/nvi/Manifest b/app-editors/nvi/Manifest
index 746910b086d2..43d53d10adac 100644
--- a/app-editors/nvi/Manifest
+++ b/app-editors/nvi/Manifest
@@ -7,8 +7,6 @@ AUX nvi-1.81.6-printf-types.patch 437 SHA256 6edea4f957d580fb8b624f48d3f21da996c
 AUX nvi-1.81.6-strlen-macro-renaming.patch 18467 SHA256 5803bc981ff835c7f76f1ae23f8709f39b6907fba56f4e9d72a0172aed5a599a SHA512 af3470a3f56ede588439153ca84db331a418eecc08787ce89680e5614020418bfa0cb806530525d08ce65af189cb338162a5d77444c14f36036df3bb0327b196 WHIRLPOOL 14df3913b291c98c7d3d4d4332a94e447c2328409efdba6e81db00a492a889929321e763bea6cdd720d94654af84e344eedeb962100dcd321dbcd773f88631da
 AUX nvi-1.81.6-use_pkgconfig_for_ncurses.patch 945 SHA256 d42027a4ed66cd63d34fe09c38cad2efd0aaafb6b2d84764c55cc76d014d87a7 SHA512 15d524acfc98bfef4d490a5bb985be6d620487b82b997ffc6fae3e0ad90e7c3a392dd67ebe9fb247c758976485937102dd14422d6218ccbb0491018af5c21906 WHIRLPOOL 490bd5d534110e7c193ab91a6d941f3b58a812fe73a251edbfb2e7cf23bc55e71098dad75ff713dcb2c1fa0286dc620616d4ddd8e89955bf9be39b9e97f6ce42
 DIST nvi-1.81.6.tar.bz2 1758309 SHA256 3441b8e3247b2b6dd19b5fd38355fe6593b2a92e960ecb3dd00d676f63d06b59 SHA512 7e203f7ea6723427d18ff55361254991f50d395f89aab2ea52d0902c474acb24c289da7c35d9e907d652145f13483d8a8270f5c8ee72bd723a3b1eaeecc4f9fd WHIRLPOOL e349a09c281bc41b1ff404a9bfa6bc16b7e4b70c45a91efe231e4e766f72f83f5bbae9a901ffc448b8badae21a494fafd3292028f1a3234d8b92085206772375
-EBUILD nvi-1.81.6-r4.ebuild 2268 SHA256 02df7e88cf556e694dee0b7f58d9b44c8840ca7f6a627638c421f49d9a1a054a SHA512 63bce6e982f0ef19c77fc345ada2b4c7f4af991852bd04b1fd8411dddf73091298ed9c8ea4fb2fc54b312bdfffb799d4b9969d942c8eccadb7916f2a70633c90 WHIRLPOOL 715b881f59c998c7392a7ddb24a140d083bba1d60f9fe7b1fad742365cd3c28f028993bbd9958d4b04d7ac1baea671e64bee4b8c013deac8fb9578f1690b7ece
-EBUILD nvi-1.81.6-r6.ebuild 2287 SHA256 8a5b020139c4cf3216cc80a346426a07fa5bf93b8596ffabaa5499872ba941d6 SHA512 70c15e8a90ccc08987fba4c1681d27cbdaed83111b46b8e73ad3310acb8cf2ef3ae385df9829481444ef942bc774f605f33da021ae6c2ea6d1200cbc8b5baee1 WHIRLPOOL 5503865470c5c24b515141024b789491a139db69ab5ea8ca9dfbc333b81e5b5506d871ba0678d8cad26a531619fe70d1169c80385abb8640ce25c3a0a74d0884
 EBUILD nvi-1.81.6-r7.ebuild 2055 SHA256 f9f8a13316c0965a5f8712c24449403af78ad3835136124f6973c0cc8391410c SHA512 969183b259b5638a464a9cccf4deb47834e18ed2643e8c11d470b1c6bdf258d3b49d320982842d1959ee01dfe6896f17847747609fb4e158940a5928e1cf7cc2 WHIRLPOOL 661947b30a486025c3e2e83e56692a49b1d091fa6d4151f7b8af8bfd59ad7a56cc57a5b39d7ceb55f6b51ba35cecb96f6de2577b54a42d758d5f47c68c0b6fe8
 MISC ChangeLog 4269 SHA256 07e281fcd3ab4dbc156eaa05ea8ba21def9d6cef776b16479d8428f497004c89 SHA512 78aaa31c930900e3f79fdf169425e53d2c63a07aa67330cadbe5572144649bd43dca6d438701e686d763aa4d36267dc0a54b08a283d32a355ec225ee27c14630 WHIRLPOOL 28dda32b8d130b6aa56addb53a38e0a73a0a713a4c89ed994c4543a4134335423f3ce545f3851926da874dda3af1c58a7f728302862f8b2ce732db1314d889c3
 MISC ChangeLog-2015 14138 SHA256 2aee382d076cf37e2c80540c40214e8e5f59a9345a010e8b8c7c27ca1edfd0f8 SHA512 c14eb626249d95f33347d93a419dd46f3f2caf71a4b91f9f86547bfc93296f000ce251d64989ef28a91f5022477972b498460eee2efed6d1b891c1a1b8f0be59 WHIRLPOOL 3b3a7b190d571908336434c14b415af9bafc5ecabd2420f9c8cebeb6e2189c0c214c60e121fc59462741b908525f099e73ed7312b754964a85c5bf92da43182e
diff --git a/app-editors/nvi/nvi-1.81.6-r4.ebuild b/app-editors/nvi/nvi-1.81.6-r4.ebuild
deleted file mode 100644
index d73456df60bb..000000000000
--- a/app-editors/nvi/nvi-1.81.6-r4.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools db-use eutils flag-o-matic
-
-DBVERS="4.8.30 4.7 4.6 4.5 4.4 4.3 4.2"
-DBSLOTS=
-DBDEPENDS=
-for DBVER in ${DBVERS}
-do
-	if [[ ${DBVER} = *.*.* ]]; then
-		DBSLOTS="${DBSLOTS} ${DBVER%.*}"
-		DBDEPENDS="${DBDEPENDS} >=sys-libs/db-${DBVER}:${DBVER%.*}"
-	else
-		DBSLOTS="${DBSLOTS} ${DBVER}"
-		DBDEPENDS="${DBDEPENDS} sys-libs/db:${DBVER}"
-	fi
-done
-
-DESCRIPTION="Vi clone"
-HOMEPAGE="https://sites.google.com/a/bostic.com/keithbostic/vi"
-SRC_URI="http://garage.linux.student.kuleuven.be/~skimo/nvi/devel/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
-IUSE="perl tcl unicode"
-
-CDEPEND="|| ( ${DBDEPENDS} )
-	>=sys-libs/ncurses-5.6-r2
-	perl? ( dev-lang/perl )
-	tcl? ( !unicode? ( >=dev-lang/tcl-8.5:0 ) )"
-
-DEPEND="${CDEPEND}
-		virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	app-eselect/eselect-vi"
-
-REQUIRED_USE="tcl? ( !unicode )"
-
-src_prepare() {
-
-	epatch "${FILESDIR}"/${P}-db44.patch
-	epatch "${FILESDIR}"/${P}-db.patch
-	epatch "${FILESDIR}"/${P}-perl-as-needed.patch
-	epatch "${FILESDIR}"/${P}-perl-shortnames.patch
-	epatch "${FILESDIR}"/${P}-ac_config_header.patch
-	epatch "${FILESDIR}"/${P}-use_pkgconfig_for_ncurses.patch
-
-	cd dist || die
-	chmod +x findconfig || die
-
-	append-cppflags -I"$(db_includedir ${DBSLOTS})"
-
-	sed -i -e "s@-ldb@-l$(db_libname ${DBSLOTS})@" configure.in || die
-	rm -f configure || die
-	eautoreconf -Im4
-}
-
-src_configure() {
-	local myconf
-
-	use perl && myconf="${myconf} --enable-perlinterp"
-	use unicode && myconf="${myconf} --enable-widechar"
-	use tcl && ! use unicode && myconf="${myconf} --enable-tclinterp"
-
-	append-cppflags '-D_PATH_MSGCAT="\"/usr/share/vi/catalog/\""'
-
-	pushd dist 2>/dev/null
-	econf \
-		--program-prefix=n \
-		${myconf} \
-		|| die "configure failed"
-	popd 2>/dev/null
-}
-
-src_compile() {
-	pushd dist 2>/dev/null
-	emake || die "make failed"
-	popd 2>/dev/null
-}
-
-src_install() {
-	pushd dist 2>/dev/null
-	emake -j1 DESTDIR="${D}" install || die "install failed"
-	popd 2>/dev/null
-}
-
-pkg_postinst() {
-	einfo "Setting /usr/bin/vi symlink"
-	eselect vi update --if-unset
-}
-
-pkg_postrm() {
-	einfo "Updating /usr/bin/vi symlink"
-	eselect vi update --if-unset
-}
diff --git a/app-editors/nvi/nvi-1.81.6-r6.ebuild b/app-editors/nvi/nvi-1.81.6-r6.ebuild
deleted file mode 100644
index 716ff8d45ba7..000000000000
--- a/app-editors/nvi/nvi-1.81.6-r6.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools db-use flag-o-matic
-
-DBVERS="4.8.30 4.7 4.6 4.5 4.4 4.3 4.2"
-DBSLOTS=
-DBDEPENDS=
-for DBVER in ${DBVERS}
-do
-	if [[ ${DBVER} = *.*.* ]]; then
-		DBSLOTS="${DBSLOTS} ${DBVER%.*}"
-		DBDEPENDS="${DBDEPENDS} >=sys-libs/db-${DBVER}:${DBVER%.*}"
-	else
-		DBSLOTS="${DBSLOTS} ${DBVER}"
-		DBDEPENDS="${DBDEPENDS} sys-libs/db:${DBVER}"
-	fi
-done
-
-DESCRIPTION="Vi clone"
-HOMEPAGE="https://sites.google.com/a/bostic.com/keithbostic/vi"
-SRC_URI="http://garage.linux.student.kuleuven.be/~skimo/nvi/devel/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="perl tcl unicode"
-
-CDEPEND="|| ( ${DBDEPENDS} )
-	>=sys-libs/ncurses-5.6-r2:=
-	perl? ( dev-lang/perl )
-	tcl? ( !unicode? ( >=dev-lang/tcl-8.5:0 ) )"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	app-eselect/eselect-vi"
-
-REQUIRED_USE="tcl? ( !unicode )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-strlen-macro-renaming.patch
-	"${FILESDIR}"/${P}-db44.patch
-	"${FILESDIR}"/${P}-db.patch
-	"${FILESDIR}"/${P}-perl-as-needed.patch
-	"${FILESDIR}"/${P}-perl-shortnames.patch
-	"${FILESDIR}"/${P}-ac_config_header.patch
-	"${FILESDIR}"/${P}-use_pkgconfig_for_ncurses.patch
-	"${FILESDIR}"/${P}-printf-types.patch
-	)
-
-src_prepare() {
-	default
-
-	cd dist || die
-	chmod +x findconfig || die
-
-	mv configure.{in,ac} || die
-	sed -i -e "s@-ldb@-l$(db_libname ${DBSLOTS})@" configure.ac || die
-	sed -i -e "s@^install-\(.*\)-local:@install-\1-hook:@" Makefile.am || die
-	eautoreconf -Im4
-}
-
-src_configure() {
-	local myconf
-
-	use perl && myconf="${myconf} --enable-perlinterp"
-	use unicode && myconf="${myconf} --enable-widechar"
-	use tcl && ! use unicode && myconf="${myconf} --enable-tclinterp"
-
-	append-cppflags '-D_PATH_MSGCAT="\"/usr/share/vi/catalog/\""'
-	append-cppflags -I"$(db_includedir ${DBSLOTS})"
-
-	pushd dist 2>/dev/null || die
-	econf \
-		--program-prefix=n \
-		${myconf}
-	popd 2>/dev/null || die
-}
-
-src_compile() {
-	emake -C dist
-}
-
-src_install() {
-	emake -C dist DESTDIR="${D}" install
-}
-
-pkg_postinst() {
-	einfo "Setting /usr/bin/vi symlink"
-	eselect vi update --if-unset
-}
-
-pkg_postrm() {
-	einfo "Updating /usr/bin/vi symlink"
-	eselect vi update --if-unset
-}
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 07f1ae48e8db..352a5b314a6d 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -5,9 +5,9 @@ AUX elasticsearch.service 1718 SHA256 444bf14b63eb2a702afa313d5d0e8a2c322bfceac7
 AUX elasticsearch.sysctl.d 24 SHA256 d2130d8587c6a8860d51903b5c2f70703da61cddeb42d526fcda20fd0ec9e99c SHA512 9f3d8238edff6704bea06b6535ee8915f4a3c9bdc8389d9d4943bcfa49161b61f9a1ca49dbcc415580438f4396fbc3d58eef301554f9426287606a755ada715c WHIRLPOOL fadf47db434ba8a1533be79adb7c3045315fca661900608f50a608ec6ccd5ab34032e9a15f6b8ec5fc754ef1123ba44c68d93483c2bef8530c8523a925c9b3bd
 AUX elasticsearch.tmpfiles.d 67 SHA256 61f8ff72a46c7da10a076af305ea545765bd149e221e838ba80c38faa6b5609a SHA512 e64c29879a43ad8cd2c272366e62c99b512f49d3cbfe669991c857c5c852aef28d3244040210da54a2f5b346a83e78e385ea86cb97daca76afafe549b80719a0 WHIRLPOOL 11a4e3a3f3fb52331f8f4ed6f0d1e6074601b0fcde818b4f71d36881276f8049dc81bb14a33c1e343623814c8d6e706f37a33456681fc6874d8c77307c963743
 DIST elasticsearch-5.5.2.tar.gz 33485703 SHA256 0870e2c0c72e6eda976effa07aa1cdd06a9500302320b5c22ed292ce21665bf1 SHA512 62048f15b43e38a61e3a19a1599c25cd0d9009cc1172db5b450b04dec349ecd313b1f20e3d1c7ed1c101ae3e6f6c6d2cdf004a9713ad803576277f93e3adbdb9 WHIRLPOOL 3a71cef2858b76b11e1693907e745912a83f23e26c35a3456c6324fc19c317c53d4404e20134b034e41e162c1ea8d58c38bbd4afe0394d886ab32f6b698172ec
-DIST elasticsearch-5.6.2.tar.gz 33766495 SHA256 ef505373fdd85c762dedef0b067ce7b089e177568a57b31e5b4126d8acd47653 SHA512 a20cd6607cc9fd94b37c8592b2aaaede4136349d66175581ccba999bc5a64038387680f471fca600afc2b538e4aecbb9d3ee1f82aa327853d072feff2f950319 WHIRLPOOL 322999b483f7cd84716efb329542ea59228e93cc0a1ef86d5612230a0637ecff44063e488f48e673ffadda0cbcba026374bb2251de6cc8f6a8ce2699399864a2
+DIST elasticsearch-5.6.3.tar.gz 33774486 SHA256 492b7e59d5204b3dc7eb13b611c33b3db36b392bdd6a4c004ba99c6543fc28f9 SHA512 ee57d010e196eb25e5296fe95ab2de5e503d4d66f7eec8c8f6ac2ff9ddbc1a8dc1514202d705e291ee49d3e04650b597a9afc5f92f179b8faa5e2fe3c662f33e WHIRLPOOL bda081e6b91d1076a39e0af75b44d7f877f28178281de1f22c5177abf804c9395dacabb3c93ec93aff65223df42353bc955bbf60e74fb07f99320096dd97173a
 EBUILD elasticsearch-5.5.2.ebuild 1618 SHA256 ee4a9297fab6f32f75d8df993f3cce07906328c3b4ce5fb499c495237c989096 SHA512 0018a5cecab2293bfe43581fcc67bd395e669ed2913a1e40676de420763415ab090589a742b127730ca6b8a467f06f10f3f3d1c2bec87db479909cb1a668f62f WHIRLPOOL 233680704ea7848404d497901ef2ddf723ba4f35915653abb341eda4b03dd378ac37b5950a82e164f2ef6f6ccdccc124d44421e06e9618ecbfcb0ca7d905540b
-EBUILD elasticsearch-5.6.2.ebuild 1618 SHA256 ee4a9297fab6f32f75d8df993f3cce07906328c3b4ce5fb499c495237c989096 SHA512 0018a5cecab2293bfe43581fcc67bd395e669ed2913a1e40676de420763415ab090589a742b127730ca6b8a467f06f10f3f3d1c2bec87db479909cb1a668f62f WHIRLPOOL 233680704ea7848404d497901ef2ddf723ba4f35915653abb341eda4b03dd378ac37b5950a82e164f2ef6f6ccdccc124d44421e06e9618ecbfcb0ca7d905540b
+EBUILD elasticsearch-5.6.3.ebuild 1618 SHA256 ee4a9297fab6f32f75d8df993f3cce07906328c3b4ce5fb499c495237c989096 SHA512 0018a5cecab2293bfe43581fcc67bd395e669ed2913a1e40676de420763415ab090589a742b127730ca6b8a467f06f10f3f3d1c2bec87db479909cb1a668f62f WHIRLPOOL 233680704ea7848404d497901ef2ddf723ba4f35915653abb341eda4b03dd378ac37b5950a82e164f2ef6f6ccdccc124d44421e06e9618ecbfcb0ca7d905540b
 MISC ChangeLog 8202 SHA256 1531683acbf9c20038e964e166b7b748c2ec4f12bb8f219d75cc685b7dc8825b SHA512 54cb8dc75318bc52e9c947cec07f8926fc1f022429e9b784b21b51faba3022c6f07f50dc065e9e90529b30941ced47e9a0c03e801328f7e694f6881b0a89e6bb WHIRLPOOL 2d1c8f0e9be37b76175dda86322581da84e07c6745d7b57dfad300f10e3ecd250a7abc90e1737d699b0844961864fbb10a3be00951dbc29d503ca3abd50cab65
 MISC ChangeLog-2015 5203 SHA256 8aa86f4c8b0c8a0c2d099ff71b4886f6e7be91d4e10e22d6f49d8ba1ab0ee7be SHA512 2326fb4073b91dc0a39d18ca0a81257c8995ce7afa0d53e31db1851dd45b3b3a94f7bfa9dda00a82b5ecaf16ad022e9236a07aebe9f2ee6f3b9b024b179039ed WHIRLPOOL 03f3e445a6f763d6e42d6d13b336ab10b4ee1d64c9119f8da2e03710b180db180e8abb702241edcdc56009992bea3a1ba0395eb096e61fb97930298099e4c4ff
 MISC metadata.xml 493 SHA256 d5758f4d01ca56bdfc258e4935a6cdb891f186c7ca36b96f783065fb23dc68ff SHA512 ce03769abc314d3bf561ff5820a8c8582196e9e6755e1e695dcf1224afbc04b609fdec7a1499d2d7a3aa0a350ad9fea94e0e3b46eff7c3c6150a524edd28d399 WHIRLPOOL a69393456ad8bcfd9f698131a0b6e0bca5d220101b0f3d8a91b716f92bbfe1c5e205bac3bbdb6e5f6e7764a30abfb6a0215440c11f288b3aa40ec6c5506cf608
diff --git a/app-misc/elasticsearch/elasticsearch-5.6.2.ebuild b/app-misc/elasticsearch/elasticsearch-5.6.3.ebuild
index b2ac22fbd6cd..b2ac22fbd6cd 100644
--- a/app-misc/elasticsearch/elasticsearch-5.6.2.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-5.6.3.ebuild
diff --git a/app-office/geierlein/Manifest b/app-office/geierlein/Manifest
index bdbf271119cd..5ec7121dfd24 100644
--- a/app-office/geierlein/Manifest
+++ b/app-office/geierlein/Manifest
@@ -1,9 +1,11 @@
 DIST geierlein-0.9.10.tar.gz 1124924 SHA256 ac1c8cf481beb346488dfb4b053a87de72128884fef39f4cae409ba49bec0bb9 SHA512 d10a97471b3b3620ea993d281fcc1880b09d8a6fbfbbb638e2f036206a05f9daef3ff248d5434e31d9e240f9d9dd8b2e88011449ce3218918ae6bd374ecd62f6 WHIRLPOOL 1e36de28ac49489f7f229b566e6a1f25469626e1b80365d81f6d7aed2e69e7fb8b52befba3389d7c8b8840454d24a9ea9937910445ad668f16fdcfadfe4347ef
 DIST geierlein-0.9.11.tar.gz 1124776 SHA256 6ae358f4855c84a51bc10013bbb0b44877ef384854be2d7f1bb9b18ecc512ce8 SHA512 f82790364990ac08c7a130c44130e4c4ede7fc2d2410181c6b9608ede38b23a881b05c4742bdfe8b101751db8aedef552029a2c719c29fb25234e0fea0b67f20 WHIRLPOOL 1de028b31d2fb1a02da8453b9374643e1b3718c2cdd4b7367294736ffba1f495c95a141333c92aba72a8ffdf212d8682bb2121fdf498a27569dea4d3cda9f6f4
 DIST geierlein-0.9.12.tar.gz 1124901 SHA256 29bc2beddc723f81d5f9972ce07a8f2977f2da305d35bce6ad042b3e0a06b700 SHA512 bbae2fa9e72c278c4f58ca46b0950a33f1637c9d28e46c9bc4f98bf0d2ea2cac462d0c14e394144d6a1686a173163e5a5b5f4edb900bbbf7a96099f92702d249 WHIRLPOOL 29520d511304a4a978abe4c0593ae4fc0e589cd0248d6a54ae824797c77d7a5c36f6571063ac4cd4014bc414c6d716ab5f8c1faf74ec25e538603d892f5dbc0c
+DIST geierlein-0.9.13.tar.gz 1124833 SHA256 9713c821b6b9e2c390ae57bacc85dd7ff33efa925b43d061a3c0edddeb514e86 SHA512 f15bf4a5ca9c6bbdf736377d5a453bff3db961f27b9cef185905bc56e1bee8a5505d0cf181950d31e015b546f3cfb6d7008b8cd9c95d3ec3b22fe306d0b195ed WHIRLPOOL 74dbdb5cf334ecd68d09f9b6c53931c6745c26f684cca32f53e06f556d52e9e81cbb017b16ffeaacd6fe154f6cbe877e45f2997691656df4e8db310847c53108
 EBUILD geierlein-0.9.10.ebuild 656 SHA256 209561779e97af10890176e920c969cb923b8c35633e07649ded9bc454c9eebd SHA512 57bf71b0a6659e44dc46a069756d1ebe5f91d008805db8d80411a114ebe85aa6b1f67e3faa25883421bfc87e8b6134b3734e2df6fea8d676dfc7140de5052cb5 WHIRLPOOL 6a79d3535292613f64de5d4b4734cb9782d8588f5388ab8a39ae6c17f521dab4616b10b0ece952720581fb809e358e7236b454229e5fa1ea994fcbd298b25e26
 EBUILD geierlein-0.9.11.ebuild 656 SHA256 209561779e97af10890176e920c969cb923b8c35633e07649ded9bc454c9eebd SHA512 57bf71b0a6659e44dc46a069756d1ebe5f91d008805db8d80411a114ebe85aa6b1f67e3faa25883421bfc87e8b6134b3734e2df6fea8d676dfc7140de5052cb5 WHIRLPOOL 6a79d3535292613f64de5d4b4734cb9782d8588f5388ab8a39ae6c17f521dab4616b10b0ece952720581fb809e358e7236b454229e5fa1ea994fcbd298b25e26
 EBUILD geierlein-0.9.12.ebuild 656 SHA256 209561779e97af10890176e920c969cb923b8c35633e07649ded9bc454c9eebd SHA512 57bf71b0a6659e44dc46a069756d1ebe5f91d008805db8d80411a114ebe85aa6b1f67e3faa25883421bfc87e8b6134b3734e2df6fea8d676dfc7140de5052cb5 WHIRLPOOL 6a79d3535292613f64de5d4b4734cb9782d8588f5388ab8a39ae6c17f521dab4616b10b0ece952720581fb809e358e7236b454229e5fa1ea994fcbd298b25e26
+EBUILD geierlein-0.9.13.ebuild 656 SHA256 209561779e97af10890176e920c969cb923b8c35633e07649ded9bc454c9eebd SHA512 57bf71b0a6659e44dc46a069756d1ebe5f91d008805db8d80411a114ebe85aa6b1f67e3faa25883421bfc87e8b6134b3734e2df6fea8d676dfc7140de5052cb5 WHIRLPOOL 6a79d3535292613f64de5d4b4734cb9782d8588f5388ab8a39ae6c17f521dab4616b10b0ece952720581fb809e358e7236b454229e5fa1ea994fcbd298b25e26
 MISC ChangeLog 4051 SHA256 957cd22d98277f35399b8302a1c2f1215801b15457923aec2abc4204331a9aeb SHA512 6829e3d37e7129c833ddf114add8132be710114e300539b2a6e50e9540b56fe1463bac6d154757afc3acaf1070c3255b4ad62081d4d423f1d138469f9bc6b3ad WHIRLPOOL cc2be34eca54de7d0efb35770464d05e0851b58789c794bd8044eec76434bedbdaa8ddbd03527a972f9d96bf0088259cddf772e7be4a49c0b84b9c762ecd359c
 MISC ChangeLog-2015 1860 SHA256 181d02d487984100d7dc693af2b2d3ca16aaa0515f44556fb3725762aca14ed2 SHA512 b873510e2db0d38b97c1f46a3270d93f044c29f2e9dfae86ff52d37d6552400df139d024077201d5f352875e4e87294c983655b6c8d9854713c4415537557196 WHIRLPOOL 0922751c9762ccfc89ad005e3f154e6ef0ce28a466423f62bf7565511c7518d4c668cb2cfcc13eefe03183eb814ed3c342834677f588a4b723053ae14753a8e2
 MISC metadata.xml 305 SHA256 ec3a5167b68dd1706199a577599fe5af553e6cdcd777af191671412317edc640 SHA512 6635c3973ef60534da57be92034aa7bf67938d525d0d20e86590e99a238a51f6ed6c548a23bcb4b995c63580aab5d20950fdf33d803bb0ec40f38d997ae89958 WHIRLPOOL d32c47a2ecbc9c51f7f8896e4025153f2faa31be3e2d9d31ed1de6a43b873575dfb866a788924301565b41371df6f39ddf3d00f19ac3948f17be6a768494a1d7
diff --git a/app-office/geierlein/geierlein-0.9.13.ebuild b/app-office/geierlein/geierlein-0.9.13.ebuild
new file mode 100644
index 000000000000..782e682a6819
--- /dev/null
+++ b/app-office/geierlein/geierlein-0.9.13.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Submit tax forms (Umsatzsteuervoranmeldung) to German ELSTER"
+HOMEPAGE="https://stesie.github.com/geierlein/"
+SRC_URI="https://github.com/stesie/geierlein/archive/V${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RDEPEND="|| ( www-client/firefox www-client/firefox-bin )"
+DEPEND=""
+
+# needs nodejs and a couple of modules we don't have packaged
+RESTRICT="test"
+
+src_compile() {
+	emake prefix=/usr
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		prefix=/usr \
+		install || die
+	dodoc README.md
+}
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 71610b86d02a..902b5872be03 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -7,25 +7,14 @@ AUX bash-2.05b-jobs.patch 813 SHA256 021a8b5cb3ae71b160524692fbd5ec0e37384cd3c3a
 AUX bash-2.05b-parallel-build.patch 426 SHA256 74244a0b736396213bb2b9d7dcbc99d21b979d8102b3a04bdd91f65cc5ec7d56 SHA512 1ae173412ef3dad6b874cf6461479a0291e8dce2b0f1464450d41cc5a1e833e66860d7c2ed5c14e55fd082a95fdfa6164ae677aff0192fd2e02f1eedafe06992 WHIRLPOOL c1a6ad3c1dcc053992a68608c9bf3e11895d080343859698f6be06443efb2d0a6fa8445f5b16aaaedb6dd35db29fa48e47bf1f98a890a7ee3c3daeccacd7bcca
 AUX bash-2.05b-protos.patch 692 SHA256 1df3b05232723d00ba0f76bb18233dec2943da63cd72e1161a6ac82592ba5837 SHA512 77a5d48d629cd127db6f7163fd9ee4e67c22b92007cb5e9fc9f51c83427f809dd74f176a521a7d8e342127419c872c01e29b921f48cea5cb8e788ff5f51faaa1 WHIRLPOOL fa54af517ecd99398b81a46996b18f05c7a13191606a0780b01ff56f312ca44590feaaf3ae410773454d28d00fd112213d8780114fa69a51dc78f36cdb825a5a
 AUX bash-2.05b-rbash.patch 616 SHA256 52c6515e8333d7461c5d4b13cd45645a072c5c0258f34f3e03262952589cd60a SHA512 bc4a6132a36b65794843930e34abd199d9c5df7838c49ec3edf47f92e0f09877a31df051689a8267eaadfbb743934c2f4f25ab8a2ca07d1561dd6ec8c337a53f WHIRLPOOL 9cfd3fc03fc4c1adf5b03962aaa346ce831ffaba8aac8206bec9e97a2b500c72fbf81d20de698677a64ff1db1198adf965b66dab81141e75e0a126dc4cf16942
-AUX bash-3.0-afs.patch 633 SHA256 4c4453a7cf5d26099d41a4c473d9f727e6347c693cdace009bcde0fe5aea27c4 SHA512 833515f5b4040ffb7e65b410aa860da73a2bf1d9b4da7ea74ec41581fcb27b0ebafdcbb041abf4c1cebaa3d7b43ee6ea11f7c7ecec5759530ce0184ac6029f3f WHIRLPOOL 6b1e5b03c700183187bc4496296b2938d9c18e5df66e31e8440bdbd49bd2090485b5d966726b157348384e74a8d2a73228da8424332b132be2d76dd2e99e113b
-AUX bash-3.0-crash.patch 1191 SHA256 b082ac3e1ede7327a9147cedcfe3c0dbaa1b05ee6e9eee3ac838216ba7838eb3 SHA512 e9fa172d76e1a3924c4795b7bb26a0487ab50f2d0714178076b6b9f85d7712ffeb4165bd591cac97c4c2288e39fa2bdf3794f29a7f2fd28e2d971041d16ff0a5 WHIRLPOOL f026c11a5fcf72f776207e91dbb48f2c87fc791d36eb83c6e79dbf9fda9aaba0dcfe072d0e7c51a6298b580ffd87006943d96785750a90236ad314de06e78eab
 AUX bash-3.0-darwin-conn.patch 969 SHA256 a99c26c8b6d741e5c042fb4d3e230fb3bf0c88979e806fb1cbea720f0ff0915d SHA512 cc85dbf39df3289e40ba33626d2a0ad511145ea3cc8dcbed136ad128181022bd70c3a4f7f8e3146bcd027d7999deefefe8496d5eb70ff1a70235950a01f9376f WHIRLPOOL 62e6bdd6b9fc6b3b77af2ec605669982bd0ba156a42c910531b3bb7978c4a9cde5d73242a277949bacdd12c89dc5ccdcc45546fec8ed4e07eafdd3e0dee354f6
-AUX bash-3.0-histtimeformat.patch 1784 SHA256 d02e10e0406d2f219903de71e08eb3ce2234f0621b6b5cb977f89e710be4e236 SHA512 36ce1afa92707a4c43f212119fb2562fee0f1283bee94d892869611de1f34869b1dcf737746ac1887c1ee8165079bdb4ae6cb353a3cbefdf1cbbffb8b43a23e6 WHIRLPOOL ccacdd0534b57a83462cc76b55cf24cffa5a768ab5bec2daaf8b7ab89fd5f33fbfe7849fab379509672c95d981f0af94d2daf81f11da2bf45b83793f75484548
-AUX bash-3.0-jobs.patch 1438 SHA256 49e2747fb03cd3beac258fa081edd2fe5f83bb4d18f5bd6318b1154e7857f225 SHA512 d52b64f989e82f45c0305233333d2b004afb3ceda232a2144a56a21310b91749009d89639e323b4b63dcf92aff27c29d425af7e62ff9de9b164072669693ded0 WHIRLPOOL c8a2365f33e4b4f7372c603f05e9be443ebf5e099a56ba6e0a613ebc02a1e403838e9c8585ee5b0f8fb743ee948bc274e7bf2d6f415f5fad1bf6ac869a453020
-AUX bash-3.0-locale.patch 3492 SHA256 4bfa0e70f36519f40098b889bae3dbe87a561e3c6ee7815fbdd76554b48343c3 SHA512 c216b5877eb87660f5f3309280b9852917dad50936261d22611fa7a0f5e26a2efb7383fc13884105fd0798c6576f203396f185e8441a14f03067d5aed6e3f6b3 WHIRLPOOL caad1a7b707d74569d4d65e9aa56905b72399569f58c0744f99b12f5f203e715a1d64ad5447d5942de7d91c88d519db06e03079c730178ec4a5944d9243ee8a2
-AUX bash-3.0-manpage.patch 498 SHA256 0e398ec166852cd6e3dac6e8a2124494ee53376911cff38000381a25ea585685 SHA512 2492344828ad51d52dc4591b0df9e45e38904f5fc1bc6408b14815cf8809641b218c030cca0d830ddf3b18776bbc99e76aa0035b15e6e966ff1aa0a7914121fd WHIRLPOOL 2c41c43432a76b23bb9ed8224efadee5487fcd10e79d3c9a394008181dd391026bedbf0282f428aabea2b80d9d716b3047e383f61f50c30957e7a38b64e6bd83
-AUX bash-3.0-multibyteifs.patch 6099 SHA256 33471606d4363a1eb9f4222f5d2ada2666f538a258d5355182d26cd0aaa7dbc4 SHA512 3c0a5e565dc1f0b38172d6417eded435b1d5482eb8d33beb850b53178130e7d08e1cd6051a08aa93c845902c0ad5d688f8a74671222eb269cae6bddf33a99342 WHIRLPOOL aeb3cc13d6c3ab030dcaa94f9c2d1f1d7e0fb3af5ae3bb536c621bd7cd867bb4dd6a05b5f1ebf11e4b494dc6f1713eb410f48843269dcec883fab06ec6bf8c12
 AUX bash-3.0-pgrp-pipe-fix.patch 462 SHA256 4ebe71e13b42eb2c3cee85d1c2851719b511c287f3124105b3ab881172418d8f SHA512 9d5e647407fd66a8c285568d6af8a171a8cc327b22c08ed903eb783b8a3978e5117ff1a0f4798550a0e4d519347d7068b548377fb60bcf5eff16dfb92aa11d67 WHIRLPOOL 4f9bbce00925f9aa56405cb2ac18adc680554870e408a2dc11bafa192363973d73bc14a56ab30895ebdf4d67f9c9a79063be404b4b7832174f23373f6643dd12
 AUX bash-3.0-protos.patch 1618 SHA256 5b992176914de99ed513ebc87e06a59494744ff294b3f0b0e7918cf9129e9969 SHA512 b129beb6d0e8df83bcd1a2f8a4e56f60fa1d7566355a7ba73cbb4c267f074ce5aa8f5abd5da8bc45529b6101dd3111e3b427d49abe6d64b370704e9608ace099 WHIRLPOOL 0ea9238817393ad288e47bf0c2e8dcbe89a6a524975378592c713d418f76ce0de0b974140f5db0325cf58934891f3043dcab4a4ee5f81d7bb09193772bda3760
-AUX bash-3.0-pwd.patch 717 SHA256 4ac8a723fd25107e65a835fec701ff89e85c8d5f9ba0fb1e2eedca361a5eba3e SHA512 3766c9efab53754292227c21074e0fa176924956664eaa5d33ef562d14e864ac0c06fe0f03a565b0ade0bcbc0c97ec8a532ee7a31567dcca34cf84978f7ab805 WHIRLPOOL 27ddf7e807136f2aa4febc6d5073de4792fd3abf300e14d87a44bdb8754af5b0c179f122c760fdb86b4ceb274d1c8ea92ddbb0ea3d7fbcc070c93895d32026b7
 AUX bash-3.0-rbash.patch 405 SHA256 394269316f292e6dff6d5ea21b930bb1907cbea97e6bb8ccd12b1bc55eabef45 SHA512 b247afab23cef742ec48c19012b79da52c1f1386cdc256a237742cc04f9ce64835a42f833b67ac5ed60424672484e6ffb262d5c80e253290062e21ce39357348 WHIRLPOOL d9bc8d3767b1d88de4d02ad8b5ac6989d8ecaf5b53a265c2351969dea40d3042d4b26688a6fdeb1c4033e566c99786670a1314683c792470c8186c43111d75af
 AUX bash-3.0-read-builtin-pipe.patch 689 SHA256 af3b946bcbc23726e91bfbf23db1d4310b8aebdb6a204659e2e47ac79cce60b5 SHA512 f89717f0b33311a491c3e2e80ac75000a7b92f78febf986324a351107b71dafdeda8bdd3d5c292fb82798355fc21d5d562305ea759815a32bc0e7b1772f8c4d3 WHIRLPOOL 935237860b006d9a1be5709b39a741ff771edeb3a5bf7d6e3e23992074f1e098ae81d6a9b60babccafb638c22d34a92080fed1f08f68a2642850b28c64109f06
 AUX bash-3.0-read-memleak.patch 416 SHA256 c9be95964762fe11cd0154149f02bd0501da9394ea5034dc60ed8d6b2d1db4b9 SHA512 97361f9e14e2547a67da475a0bfd20c1be70534d745845d4918e98665d4182da231923c8365f881561db63b90d5e40def1f1b7f0bc98016c8d8c2e8aeb4e4407 WHIRLPOOL 230fa5d03010df8c7be84d085c4db2c79105752725d9a8f12ad31f7e482492743453273b8b39b2d19f508d02cc890cd2afcf5c07d02c676ccbde2d507970ac86
 AUX bash-3.0-strnlen.patch 4976 SHA256 7be29ac97f1313a1bdb136e255b7d1e768729c7232cdba9b18f7194bc55d5796 SHA512 390845441ad608d0938ca8ed5f9f06f28e6fe45462864072c19b3af302cc6cdb0a7f4fa9f0ee4dadc3ed19a73e06457044be47ad9c327a81f3de4ed7bb70aaf3 WHIRLPOOL d92915dc48285a04321f35d897f457b114cc05261c6e1c3242b08a4f31b6cdb1940f6c65abcd5803bb2a2585031ff6c37cd28d849daad1dcda092371ffefa1f7
-AUX bash-3.0-subshell.patch 1219 SHA256 aa28ee13ec650bf225c4f8f0c59c9e764d0d5033f1fbfc8ac4f129c814c1f525 SHA512 ede172d08b8220f44ba12f803285192b82a505d4d2549914ef563c66d6f19c3a14acd5af3f30fe096dc6c360e9aef71b89f23c468e55c06e61be19d6ce17a68f WHIRLPOOL b76230f3f080cb93dd61e3c1ae1f532e604ec0e6fb1394a3ff89b31af3ce26dbe5b10b3053b80cce63e0099f9a51c9ec9589082a2a63ee84fce8edeaf2264bdd
 AUX bash-3.0-trap-fg-signals.patch 641 SHA256 6a87cba12a8d2873be89c0721dfa405f05508b23841e4b5041a22f57698e1b03 SHA512 5644591aaaf6a2f5e5fa4d41aa4e26c5d53e2efe6ad5838729a2da709e04c539a4a83325f707269d59b5aa0609130dc888ada0b9ec96fe85536800218de8ad6d WHIRLPOOL 48aeafb472ba96caa5ddf61fe5fa3d75ddb42747fd1f5e31e908415d46fc8977651916d507cfe3092ee7a41e873d05e1ff0efc6396c6ddec3beb6f0845422c81
-AUX bash-3.0-ulimit.patch 5226 SHA256 a3912103afc8bb5a4f63ac0e2921971c02e7e84885960352e1ffe8940c3c779d SHA512 1cbf210ceb840a959530506777dc4ffb34862ec6f1bc4b65a68c77c8b1b3ce02168d7283dad8d64e218169125d041a25c4e604c3a4327ceee53f806d77067011 WHIRLPOOL 80ca1f2a21ecc7eb93f25cc3e3a1c29f244deb61c904159f2cfdf5828749a619bcbad27991f549750c573d887ac9c07417bf94598b4de5769afbc0787ab20159
-AUX bash-3.0-volatile-command.patch 512 SHA256 03a22fe666a11f8dc917d0573ceaa785ebb67000ed060c4986e14e9e5353121b SHA512 55511691ed6880d58b54e2ce24d5fe14be2dc1ab8cc3d8ed25068dd8f831202958b7f470b361a294a05c3f202e5df6304cf54978c04dc71e915a959fad218223 WHIRLPOOL 0363ab690966b8871717e1fd7c7283d75d213e67a20d7497afa199b8915fc20e68479d02c8642465327ac99998b5658dcf8d28472d99dbb18800ee4c6aa9234e
 AUX bash-3.1-dev-fd-buffer-overflow.patch 557 SHA256 3124c1540433921e1d39b43bec041c2437962c26bdfb407582ccfec3fbad8cbe SHA512 3db03dc6e8c5fd9542788cb84854a0849a0f87ff07e95adf57aaee21c7edcb1293ae47ad8b83e0e0513431ba9826fcb45b847ccd9d87efb32b91ac7fc0cb415e WHIRLPOOL 1f4c6171b8a3c6f732e10e4fb3f57056909ffa0e02c40ab4d70c521701334d2a682444788ea79004685b1a9f1734e5f52146b32ac02af915aa40fa36129d641d
 AUX bash-3.1-dev-fd-test-as-user.patch 437 SHA256 8831820eb8db6ac47179b49af2a570c26a2ae9fa1f4b195bb956ecc6cf4abf8c SHA512 eb9907741b68513c53128221c240a1325735c1ceec2a4ac0df74ed85126404c3347a3d97181ada5b28686e17600653de9dfadfa9985812049de45741c81876b7 WHIRLPOOL 0fb5eb0ec459f77f71e8b7e19d76e4cd78076812dfdf7a2b72ec93a2ae99ce19bfe6410d5f63a7acd6684450d821a33197a4d53d55c3b980dbb0481ab190287f
 AUX bash-3.1-fix-dash-login-shell.patch 1749 SHA256 c33a999dc92355daf9556eb4d078910b80cb4bddac0ca343e530f85242eea2cd SHA512 f1ec4e9e6c119cba8d7df35d3cdb53b8bcf990b8577d0488a750dfdbd6781413981d2939ff3995977706ed927284aa0049ce36f64a126d6375fbed1210affb7d WHIRLPOOL 8610634cfdf63f1502375c83fd5aaef97780a0f40c2d476fe5b0f2325066046f1c3a4f1e9f7ed6bc62feaec1c61959eab0a74a5996845d31c1c4349663051c29
diff --git a/app-shells/bash/files/bash-3.0-afs.patch b/app-shells/bash/files/bash-3.0-afs.patch
deleted file mode 100644
index f07371c39eb4..000000000000
--- a/app-shells/bash/files/bash-3.0-afs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Ripped from Fedora
-
-- Fixed AFS support for output redirection, so that the correct errors
-  are reported for other filesystems (bug #155373).
-
-https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=155373
-
---- bash-3.0/redir.c.afs	2005-04-20 09:16:15.000000000 +0100
-+++ bash-3.0/redir.c	2005-04-20 09:16:58.000000000 +0100
-@@ -596,7 +596,9 @@
-       fd = open (filename, flags, mode);
- #if defined (AFS)
-       if ((fd < 0) && (errno == EACCES))
--	fd = open (filename, flags & ~O_CREAT, mode);
-+	if ((fd = open (filename, flags & ~O_CREAT, mode)) < 0)
-+	  /* Restore previous errno. */
-+	  errno = EACCES;
- #endif /* AFS */
-     }
- 
diff --git a/app-shells/bash/files/bash-3.0-crash.patch b/app-shells/bash/files/bash-3.0-crash.patch
deleted file mode 100644
index 984e85d82ed3..000000000000
--- a/app-shells/bash/files/bash-3.0-crash.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-> Machine Type: i686-pc-linux-gnu
-> 
-> Bash Version: 3.0
-> Patch Level: 0
-> Release Status: release
-> 
-> Description:
->         GNU bash, version 3.00.0(1)-release (i686-pc-linux-gnu)
->         (and
->         GNU bash, version 2.05b.0(1)-release (i386-redhat-linux-gnu)
-> 
->         dumps a core because of a null pointer "in make_bare_word 
->         at make_cmd.c:90" (see gdb output below)
-
-Thanks for the report.  Here's a quick fix:
-
-*** arrayfunc.c~	Sat Nov  6 15:08:29 2004
---- arrayfunc.c	Mon Jan 31 11:56:21 2005
-***************
-*** 709,713 ****
-  	  return ((char *)NULL);
-  	}
-!       else if (var == 0)
-  	return ((char *)NULL);
-        else if (array_p (var) == 0)
---- 709,713 ----
-  	  return ((char *)NULL);
-  	}
-!       else if (var == 0 || value_cell (var) == 0)
-  	return ((char *)NULL);
-        else if (array_p (var) == 0)
-
-
-Chet
-
--- 
-``The lyf so short, the craft so long to lerne.'' - Chaucer
-( ``Discere est Dolere'' -- chet )
-						Live...Laugh...Love
-Chet Ramey, ITS, CWRU    chet@po.cwru.edu    http://tiswww.tis.cwru.edu/~chet/
-
-
-_______________________________________________
-Bug-bash mailing list
-Bug-bash@gnu.org
-http://lists.gnu.org/mailman/listinfo/bug-bash
diff --git a/app-shells/bash/files/bash-3.0-histtimeformat.patch b/app-shells/bash/files/bash-3.0-histtimeformat.patch
deleted file mode 100644
index b910600fd896..000000000000
--- a/app-shells/bash/files/bash-3.0-histtimeformat.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Ripped from Debian
-
-http://lists.gnu.org/archive/html/bug-bash/2004-08/msg00008.html
-
-From: Enrique Perez-Terron <enrio@online.no>
-To: bug-bash@gnu.org
-Subject: When using HISTTIMEFORMAT, the date and the command are run
-	together.
-Date: Sun, 01 Aug 2004 18:36:45 +0200
-
-Configuration Information [Automatically generated, do not change]:
-Machine: i586
-OS: linux-gnu
-Compiler: gcc
-Compilation CFLAGS:  -DPROGRAM='bash' -DCONF_HOSTTYPE='i586'
--DCONF_OSTYPE='linux-gnu' -DCONF_MACHTYPE='i586-pc-linux-gnu'
--DCONF_VENDOR='pc' -DLOCALEDIR='/usr/local/share/locale'
--DPACKAGE='bash' -DSHELL -DHAVE_CONFIG_H  -I.  -I. -I./include -I./lib  
--g -O2
-uname output: Linux arabia.home.lan 2.6.6-1.435.2.3 #1 Thu Jul 1
-09:11:28 EDT 2004 i586 i586 i386 GNU/Linux
-Machine Type: i586-pc-linux-gnu
-
-# DP: Add space separating the time and the command in the
-# DP: output from the history builtin command.
-
-Bash Version: 3.0
-Patch Level: 0
-Release Status: release
-
-Description:
-	There is no space separating the time and the command in the 
-	output from the history builtin command.
-
-Repeat-By:
-	$ export HISTTIMEFORMAT=_A_format_string_
-	$ history 3
-	  997  _A_format_string_echo $BASH_VERSION
-	  998  _A_format_string_export HISTTIMEFORMAT=_A_format_string_
-	  999  _A_format_string_history 3
-
-Fix:
---- ./builtins/history.def.orig	2003-12-20 00:02:09.000000000 +0100
-+++ ./builtins/history.def	2004-08-01 18:18:02.652720102 +0200
-@@ -287,9 +287,10 @@
- 	  QUIT;
- 
- 	  timestr = (histtimefmt && *histtimefmt) ? histtime (hlist[i], histtimefmt) : (char *)NULL;
--	  printf ("%5d%c %s%s\n", i + history_base,
-+	  printf ("%5d%c %s%s%s\n", i + history_base,
- 		  histdata(i) ? '*' : ' ',
- 		  ((timestr && *timestr) ? timestr : ""),
-+		  ((timestr && *timestr) ? " " : ""),
- 		  histline(i));
- 	  i++;
- 	}
diff --git a/app-shells/bash/files/bash-3.0-jobs.patch b/app-shells/bash/files/bash-3.0-jobs.patch
deleted file mode 100644
index 72c149c71cf5..000000000000
--- a/app-shells/bash/files/bash-3.0-jobs.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Ripped from Fedora
-
-* Wed Sep  8 2004 Tim Waugh <twaugh@redhat.com> 3.0-13
-- Check for EINVAL from waitpid() and avoid WCONTINUED in that case.
-- Fixed jobs4 test.
-
-From: 	Tim Waugh
-Subject: 	[patch] bash-3.0: avoid WCONTINUED if invalid
-Date: 	Wed, 8 Sep 2004 16:52:38 +0100
-User-agent: 	Mutt/1.4.1i
-
-Hi,
-
-GNU libc defines WCONTINUED, but (at least on Linux 2.4.x kernels)
-waitpid() returns -1 with errno set to EINVAL if WCONTINUED is
-supplied in options.
-
-Here is a patch to retry without WCONTINUED set in that case.
-
-Tim.
-
---- bash-3.0/tests/jobs4.sub
-+++ bash-3.0/tests/jobs4.sub
-@@ -18,5 +18,5 @@
- 
- wait
- 
--cat &
-+sleep 100 &
- kill -1 %% && echo i killed it || echo could not kill it
---- bash-3.0/jobs.c
-+++ bash-3.0/jobs.c
-@@ -2475,6 +2475,7 @@
-   PROCESS *child;
-   pid_t pid;
-   int call_set_current, last_stopped_job, job, children_exited, waitpid_flags;
-+  static int wcontinued_not_supported = 0;
- 
-   call_set_current = children_exited = 0;
-   last_stopped_job = NO_JOB;
-@@ -2488,7 +2489,15 @@
- 			: 0;
-       if (sigchld || block == 0)
- 	waitpid_flags |= WNOHANG;
-+    retry:
-+      if (wcontinued_not_supported)
-+	waitpid_flags &= ~WCONTINUED;
-       pid = WAITPID (-1, &status, waitpid_flags);
-+      if (pid == -1 && errno == EINVAL)
-+	{
-+	  wcontinued_not_supported = 1;
-+	  goto retry;
-+	}
- 
-       /* The check for WNOHANG is to make sure we decrement sigchld only
- 	 if it was non-zero before we called waitpid. */
diff --git a/app-shells/bash/files/bash-3.0-locale.patch b/app-shells/bash/files/bash-3.0-locale.patch
deleted file mode 100644
index ea1ef3deae36..000000000000
--- a/app-shells/bash/files/bash-3.0-locale.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-Ripped from SuSe
-
-http://lists.gnu.org/archive/html/bug-bash/2004-08/msg00005.html
-
-From: schwab@suse.de
-To: bug-bash@gnu.org
-Subject: HISTTIMEFORMAT doesn't track locale changes
-Date: Sun,  1 Aug 2004 11:14:00 +0200 (CEST)
-
-Configuration Information [Automatically generated, do not change]:
-Machine: ia64
-OS: linux-gnu
-Compiler: gcc
-Compilation CFLAGS:  -DPROGRAM='bash' -DCONF_HOSTTYPE='ia64' -DCONF_OSTYPE='linux-gnu' -DCONF_MACHTYPE='ia64-unknown-linux-gnu' -DCONF_VENDOR='unknown' -DLOCALEDIR='/usr/local/share/locale' -DPACKAGE='bash' -DSHELL -DHAVE_CONFIG_H  -I.  -I../bash-3.0 -I../bash-3.0/include -I../bash-3.0/lib   -O2 -g
-uname output: Linux sykes 2.6.5-22-default #1 SMP Fri Jul 2 13:43:23 UTC 2004 ia64 ia64 ia64 GNU/Linux
-Machine Type: ia64-unknown-linux-gnu
-
-Bash Version: 3.0
-Patch Level: 0
-Release Status: release
-
-Description:
-Bash doesn't use the current locale when formatting HISTTIMEFORMAT.
-
-Repeat-By:
-sykes:/tmp/bash/Build/:[0]$ locale
-LANG=de_DE.UTF-8
-LC_CTYPE="de_DE.UTF-8"
-LC_NUMERIC=POSIX
-LC_TIME=POSIX
-LC_COLLATE=POSIX
-LC_MONETARY="de_DE.UTF-8"
-LC_MESSAGES=en_US.UTF-8
-LC_PAPER="de_DE.UTF-8"
-LC_NAME="de_DE.UTF-8"
-LC_ADDRESS="de_DE.UTF-8"
-LC_TELEPHONE="de_DE.UTF-8"
-LC_MEASUREMENT="de_DE.UTF-8"
-LC_IDENTIFICATION="de_DE.UTF-8"
-LC_ALL=
-sykes:/tmp/bash/Build/:[0]$ history 1
- 1502  history 1
-sykes:/tmp/bash/Build/:[0]$ HISTTIMEFORMAT=%c
-sykes:/tmp/bash/Build/:[0]$ history 1
- 1504  Sun Aug  1 10:56:59 2004history 1
-sykes:/tmp/bash/Build/:[0]$ export LC_TIME=$LANG
-sykes:/tmp/bash/Build/:[0]$ history 1
- 1506  Sun Aug  1 10:57:24 2004history 1
-
---- bash-3.0/locale.c
-+++ bash-3.0/locale.c
-@@ -71,9 +71,10 @@ set_default_locale ()
-   textdomain (PACKAGE);
- }
- 
--/* Set default values for LC_CTYPE, LC_COLLATE, LC_MESSAGES and LC_NUMERIC
--   if they are not specified in the environment, but LC_ALL is.  This
--   should be called from main() after parsing the environment. */
-+/* Set default values for LC_CTYPE, LC_COLLATE, LC_MESSAGES, LC_NUMERIC
-+   and LC_TIME if they are not specified in the environment, but LC_ALL
-+   is.  This should be called from main() after parsing the
-+   environment. */
- void
- set_default_locale_vars ()
- {
-@@ -109,6 +110,12 @@ set_default_locale_vars ()
-     setlocale (LC_NUMERIC, lc_all);
- #  endif /* LC_NUMERIC */
- 
-+#  if defined (LC_TIME)
-+  val = get_string_value ("LC_TIME");
-+  if (val == 0 && lc_all && *lc_all)
-+    setlocale (LC_TIME, lc_all);
-+#  endif /* LC_TIME */
-+
- #endif /* HAVE_SETLOCALE */
- 
-   val = get_string_value ("TEXTDOMAIN");
-@@ -213,6 +220,13 @@ set_locale_var (var, value)
- 	return (setlocale (LC_NUMERIC, get_locale_var ("LC_NUMERIC")) != 0);
- #  endif /* LC_NUMERIC */
-     }
-+  else if (var[3] == 'T' && var[4] == 'I')	/* LC_TIME */
-+    {
-+#  if defined (LC_TIME)
-+      if (lc_all == 0 || *lc_all == '\0')
-+	return (setlocale (LC_TIME, get_locale_var ("LC_TIME")) != 0);
-+#  endif /* LC_TIME */
-+    }
- #endif /* HAVE_SETLOCALE */
- 
-   return (0);
-@@ -285,6 +299,9 @@ reset_locale_vars ()
- #  if defined (LC_NUMERIC)
-   setlocale (LC_NUMERIC, get_locale_var ("LC_NUMERIC"));
- #  endif
-+#  if defined (LC_TIME)
-+  setlocale (LC_TIME, get_locale_var ("LC_TIME"));
-+#  endif
- 
-   locale_setblanks ();  
- 
---- bash-3.0/variables.c
-+++ bash-3.0/variables.c
-@@ -3646,6 +3646,7 @@ static struct name_and_function special_
-   { "LC_CTYPE", sv_locale },
-   { "LC_MESSAGES", sv_locale },
-   { "LC_NUMERIC", sv_locale },
-+  { "LC_TIME", sv_locale },
- 
-   { "MAIL", sv_mail },
-   { "MAILCHECK", sv_mail },
diff --git a/app-shells/bash/files/bash-3.0-manpage.patch b/app-shells/bash/files/bash-3.0-manpage.patch
deleted file mode 100644
index 08e3143e5422..000000000000
--- a/app-shells/bash/files/bash-3.0-manpage.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Ripped from Fedora
-
-fix obvious display bug
-
---- bash-3.0/doc/bash.1
-+++ bash-3.0/doc/bash.1
-@@ -3929,7 +3929,7 @@
- .B SIGHUP
- to all jobs when an interactive login shell exits.
- .PP
--If \Bbash\fP is waiting for a command to complete and receives a signal
-+If \fBbash\fP is waiting for a command to complete and receives a signal
- for which a trap has been set, the trap will not be executed until
- the command completes. 
- When \fBbash\fP is waiting for an asynchronous command via the \fBwait\fP
diff --git a/app-shells/bash/files/bash-3.0-multibyteifs.patch b/app-shells/bash/files/bash-3.0-multibyteifs.patch
deleted file mode 100644
index 1e74832b638a..000000000000
--- a/app-shells/bash/files/bash-3.0-multibyteifs.patch
+++ /dev/null
@@ -1,281 +0,0 @@
-From: Tim Waugh <twaugh@redhat.com>
-To: bug-bash@gnu.org
-Subject: [patch] multibyte IFS values
-Date: Tue, 24 Aug 2004 13:34:59 +0100
-
-Hi,
-
-Here is a patch to address these problems:
-
-http://lists.gnu.org/archive/html/bug-bash/2004-07/msg00294.html
-http://lists.gnu.org/archive/html/bug-bash/2004-07/msg00296.html
-
-It works well for me at least.
-
-Tim.
-
---- bash-3.0/subst.c.multibyteifs	2004-08-20 15:22:48.366497771 +0100
-+++ bash-3.0/subst.c	2004-08-20 18:13:30.833624616 +0100
-@@ -124,7 +124,12 @@
- SHELL_VAR *ifs_var;
- char *ifs_value;
- unsigned char ifs_cmap[UCHAR_MAX + 1];
-+#if defined (HANDLE_MULTIBYTE)
-+unsigned char ifs_firstc[MB_LEN_MAX];
-+size_t ifs_firstc_len;
-+#else
- unsigned char ifs_firstc;
-+#endif
- 
- /* Extern functions and variables from different files. */
- extern int last_command_exit_value, last_command_exit_signal;
-@@ -862,8 +867,14 @@
-      char *charlist;
- {
-   register int i = *sindex;
-+  size_t slen;
-+#if defined (HANDLE_MULTIBYTE)
-+  size_t clen;
-+  wchar_t *wcharlist = NULL;
-+#endif
-   int c;
-   char *temp;
-+  DECLARE_MBSTATE;
- 
-   if (charlist[0] == '\'' && charlist[1] == '\0')
-     {
-@@ -872,18 +883,65 @@
-       return temp;
-     }
- 
--  for (i = *sindex; c = string[i]; i++)
-+  slen = strlen (string + *sindex) + *sindex;
-+  i = *sindex;
-+#if defined (HANDLE_MULTIBYTE)
-+  clen = strlen (charlist);
-+#endif
-+  while ((c = string[i]))
-     {
-+#if defined (HANDLE_MULTIBYTE)
-+      size_t mblength;
-+#endif
-+
-       if (c == CTLESC)
- 	{
--	  i++;
-+	  i += 2;
- 	  continue;
- 	}
- 
-+#if defined (HANDLE_MULTIBYTE)
-+      mblength = mblen (string + i, slen - i);
-+      if (mblength > 1)
-+	{
-+	  wchar_t wc;
-+	  size_t mblength = mbtowc (&wc, string + i, slen - i);
-+	  if (MB_INVALIDCH (mblength))
-+	    {
-+	      if (MEMBER (c, charlist))
-+		break;
-+	    }
-+	  else
-+	    {
-+	      if (!wcharlist)
-+		{
-+		  size_t len = mbstowcs (wcharlist, charlist, 0);
-+		  if (len == -1)
-+		    len = 0;
-+		  wcharlist = xmalloc (sizeof (wchar_t) * (len + 1));
-+		  mbstowcs (wcharlist, charlist, 1 + len);
-+		}
-+
-+	      if (wcschr (wcharlist, wc))
-+		{
-+		  break;
-+		}
-+	    }
-+	}
-+      else
-+#endif
-+
-       if (MEMBER (c, charlist))
- 	break;
-+
-+      ADVANCE_CHAR (string, slen, i);
-     }
- 
-+#if defined (HANDLE_MULTIBYTE)
-+  if (wcharlist)
-+    free (wcharlist);
-+#endif
-+
-   temp = substring (string, *sindex, i);
-   *sindex = i;
- 
-@@ -1456,11 +1514,36 @@
-   d2 = 0;
-   if (delims)
-     {
--      d2 = (char *)xmalloc (strlen (delims) + 1);
--      for (i = ts = 0; delims[i]; i++)
-+      size_t slength = strlen (delims);
-+#if defined (HANDLE_MULTIBYTE)
-+      size_t mblength = 1;
-+      DECLARE_MBSTATE;
-+#endif
-+
-+      d2 = (char *)xmalloc (slength + 1);
-+      i = ts = 0;
-+      while (delims[i])
- 	{
-+#if defined (HANDLE_MULTIBYTE)
-+	  mbstate_t state_bak = state;
-+	  mblength = mbrlen (delims + i, slength, &state);
-+
-+	  if (MB_INVALIDCH (mblength))
-+	    state = state_bak;
-+	  else if (mblength != 1)
-+	    {
-+	      memcpy (d2 + ts, delims + i, mblength);
-+	      ts += mblength;
-+	      i += mblength;
-+	      slength -= mblength;
-+	      continue;
-+	    }
-+#endif
-+
- 	  if (whitespace(delims[i]) == 0)
- 	    d2[ts++] = delims[i];
-+	  i++;
-+	  slength--;
- 	}
-       d2[ts] = '\0';
-     }
-@@ -1654,10 +1737,19 @@
- string_list_dollar_star (list)
-      WORD_LIST *list;
- {
-+#if defined (HANDLE_MULTIBYTE)
-+  char sep[MB_CUR_MAX + 1];
-+#else
-   char sep[2];
-+#endif
- 
-+#if defined (HANDLE_MULTIBYTE)
-+  memcpy (sep, ifs_firstc, ifs_firstc_len);
-+  sep[ifs_firstc_len] = '\0';
-+#else
-   sep[0] = ifs_firstc;
-   sep[1] = '\0';
-+#endif
- 
-   return (string_list_internal (list, sep));
- }
-@@ -1676,14 +1768,41 @@
-      WORD_LIST *list;
-      int quoted;
- {
--  char *ifs, sep[2];
-+  char *ifs;
-+#if defined (HANDLE_MULTIBYTE)
-+  char sep[MB_CUR_MAX + 1];
-+#else
-+  char sep[2];
-+#endif
-   WORD_LIST *tlist;
- 
-   /* XXX this could just be ifs = ifs_value; */
-   ifs = ifs_var ? value_cell (ifs_var) : (char *)0;
- 
-+#if defined (HANDLE_MULTIBYTE)
-+  if (ifs && *ifs)
-+    {
-+      size_t mblength = mblen (ifs, strnlen (ifs, MB_CUR_MAX));
-+      if (MB_INVALIDCH (mblength))
-+	{
-+	  sep[0] = *ifs;
-+	  sep[1] = '\0';
-+	}
-+      else
-+	{
-+	  memcpy (sep, ifs, mblength);
-+	  sep[mblength] = '\0';
-+	}
-+    }
-+  else
-+    {
-+      sep[0] = ' ';
-+      sep[1] = '\0';
-+    }
-+#else
-   sep[0] = (ifs == 0 || *ifs == 0) ? ' ' : *ifs;
-   sep[1] = '\0';
-+#endif
- 
-   tlist = ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) || (ifs && *ifs == 0))
- 		? quote_list (list)
-@@ -1732,6 +1851,7 @@
-   WORD_DESC *t;
-   char *current_word, *s;
-   int sindex, sh_style_split, whitesep;
-+  size_t slen = 0;
- 
-   if (!string || !*string)
-     return ((WORD_LIST *)NULL);
-@@ -1805,7 +1925,12 @@
- 
-       /* Move past the current separator character. */
-       if (string[sindex])
--	sindex++;
-+	{
-+	  DECLARE_MBSTATE;
-+	  if (!slen)
-+	    slen = strlen (string);
-+	  ADVANCE_CHAR (string, slen, sindex);
-+	}
- 
-       /* Now skip sequences of space, tab, or newline characters if they are
- 	 in the list of separators. */
-@@ -6796,7 +6921,27 @@
-       ifs_cmap[uc] = 1;
-     }
- 
-+#if defined (HANDLE_MULTIBYTE)
-+  if (!ifs_value)
-+    {
-+      ifs_firstc[0] = '\0';
-+      ifs_firstc_len = 1;
-+    }
-+  else
-+    {
-+      size_t ifs_len = strnlen (ifs_value, MB_CUR_MAX);
-+      ifs_firstc_len = mblen (ifs_value, ifs_len);
-+      if (MB_INVALIDCH (ifs_firstc_len))
-+        {
-+          ifs_firstc[0] = '\0';
-+          ifs_firstc_len = 1;
-+        }
-+      else
-+        memcpy (ifs_firstc, ifs_value, ifs_firstc_len);
-+    }
-+#else
-   ifs_firstc = ifs_value ? *ifs_value : 0;
-+#endif
- }
- 
- char *
---- bash-3.0/subst.h.multibyteifs	2004-08-20 15:51:08.301074583 +0100
-+++ bash-3.0/subst.h	2004-08-20 15:51:39.070206473 +0100
-@@ -231,7 +231,12 @@
- extern SHELL_VAR *ifs_var;
- extern char *ifs_value;
- extern unsigned char ifs_cmap[];
-+#if defined (HANDLE_MULTIBYTE)
-+extern unsigned char ifs_firstc[];
-+extern size_t ifs_firstc_len;
-+#else
- extern unsigned char ifs_firstc;
-+#endif
- 
- /* Evaluates to 1 if C is a character in $IFS. */
- #define isifs(c)	(ifs_cmap[(unsigned char)(c)] != 0)
diff --git a/app-shells/bash/files/bash-3.0-pwd.patch b/app-shells/bash/files/bash-3.0-pwd.patch
deleted file mode 100644
index 77f0918fb4d8..000000000000
--- a/app-shells/bash/files/bash-3.0-pwd.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Ripped from Fedora
-
-* Tue Mar 15 2005 Tim Waugh <twaugh@redhat.com> 3.0-30
-- Fix PS1 expansion crash when PWD is unset (bg #151116).
-
---- bash-3.0/parse.y.pwd	2005-03-15 14:22:36.000000000 +0000
-+++ bash-3.0/parse.y	2005-03-15 14:22:37.000000000 +0000
-@@ -4103,7 +4103,7 @@
- #define ROOT_PATH(x)	((x)[0] == '/' && (x)[1] == 0)
- #define DOUBLE_SLASH_ROOT(x)	((x)[0] == '/' && (x)[1] == '/' && (x)[2] == 0)
- 		/* Abbreviate \W as ~ if $PWD == $HOME */
--		if (c == 'W' && (((t = get_string_value ("HOME")) == 0) || STREQ (t, temp) == 0))
-+		if (c == 'W' && (((t = get_string_value ("HOME")) == 0) || STREQ (t, t_string) == 0))
- 		  {
- 		    if (ROOT_PATH (t_string) == 0 && DOUBLE_SLASH_ROOT (t_string) == 0)
- 		      {
diff --git a/app-shells/bash/files/bash-3.0-subshell.patch b/app-shells/bash/files/bash-3.0-subshell.patch
deleted file mode 100644
index a1d7dfe7d342..000000000000
--- a/app-shells/bash/files/bash-3.0-subshell.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Ripped from Fedora which took this from upstream
-
-* Tue Nov 22 2005 Tim Waugh <twaugh@redhat.com>  3.0-37
-- Applied patch from upstream to fix parsing problem (bug #146638).
-
-http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=146638
-
---- bash-3.0/parse.y.subshell	2005-11-22 13:19:11.000000000 +0000
-+++ bash-3.0/parse.y	2005-11-22 13:19:24.000000000 +0000
-@@ -2055,14 +2055,6 @@
-   if (uc)
-     shell_input_line_index++;
- 
--  if MBTEST(uc == '\\' && remove_quoted_newline && shell_input_line[shell_input_line_index] == '\n')
--    {
--	if (SHOULD_PROMPT ())
--	  prompt_again ();
--	line_number++;
--	goto restart_read;
--    }
--
- #if defined (ALIAS) || defined (DPAREN_ARITHMETIC)
-   /* If UC is NULL, we have reached the end of the current input string.  If
-      pushed_string_list is non-empty, it's time to pop to the previous string
-@@ -2078,6 +2070,14 @@
-     }
- #endif /* ALIAS || DPAREN_ARITHMETIC */
- 
-+  if MBTEST(uc == '\\' && remove_quoted_newline && shell_input_line[shell_input_line_index] == '\n')
-+    {
-+	if (SHOULD_PROMPT ())
-+	  prompt_again ();
-+	line_number++;
-+	goto restart_read;
-+    }
-+
-   if (!uc && shell_input_line_terminator == EOF)
-     return ((shell_input_line_index != 0) ? '\n' : EOF);
- 
diff --git a/app-shells/bash/files/bash-3.0-ulimit.patch b/app-shells/bash/files/bash-3.0-ulimit.patch
deleted file mode 100644
index 8202b95d2769..000000000000
--- a/app-shells/bash/files/bash-3.0-ulimit.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-Ripped from Fedora
-
---- bash-3.0/builtins/ulimit.def
-+++ bash-3.0/builtins/ulimit.def
-@@ -34,15 +34,20 @@
-     -a	all current limits are reported
-     -c	the maximum size of core files created
-     -d	the maximum size of a process's data segment
-+    -e	the maximum scheduling priority (`nice')
-     -f	the maximum size of files created by the shell
-+    -i	the maximum number of pending signals
-     -l	the maximum size a process may lock into memory
-     -m	the maximum resident set size
-     -n	the maximum number of open file descriptors
-     -p	the pipe buffer size
-+    -q	the maximum number of bytes in POSIX message queues
-+    -r	the maximum rt priority
-     -s	the maximum stack size
-     -t	the maximum amount of cpu time in seconds
-     -u	the maximum number of user processes
-     -v	the size of virtual memory 
-+    -x	the maximum number of file locks
- 
- If LIMIT is given, it is the new value of the specified resource;
- the special LIMIT values `soft', `hard', and `unlimited' stand for
-@@ -199,7 +204,13 @@
- #ifdef RLIMIT_DATA
-   { 'd',	RLIMIT_DATA,  1024,	"data seg size",	"kbytes" },
- #endif
-+#ifdef RLIMIT_NICE
-+  { 'e',	RLIMIT_NICE, 1,		"max nice",		(char *)NULL},
-+#endif /* RLIMIT_NICE */
-   { 'f',	RLIMIT_FILESIZE, 1024,	"file size",		"blocks" },
-+#ifdef RLIMIT_SIGPENDING
-+  { 'i',	RLIMIT_SIGPENDING, 1,	"pending signals",	(char *)NULL},
-+#endif
- #ifdef RLIMIT_MEMLOCK
-   { 'l',	RLIMIT_MEMLOCK, 1024,	"max locked memory",	"kbytes" },
- #endif
-@@ -208,6 +219,12 @@
- #endif /* RLIMIT_RSS */
-   { 'n',	RLIMIT_OPENFILES, 1,	"open files",		(char *)NULL},
-   { 'p',	RLIMIT_PIPESIZE, 512,	"pipe size", 		"512 bytes" },
-+#ifdef RLIMIT_MSGQUEUE
-+  { 'q',	RLIMIT_MSGQUEUE, 1,	"POSIX message queues",	"bytes" },
-+#endif
-+#ifdef RLIMIT_RTPRIO
-+  { 'r',	RLIMIT_RTPRIO, 1,	"max rt priority",	(char *)NULL},
-+#endif /* RLIMIT_RTPRIO */
- #ifdef RLIMIT_STACK
-   { 's',	RLIMIT_STACK, 1024,	"stack size",		"kbytes" },
- #endif
-@@ -221,6 +238,9 @@
- #ifdef RLIMIT_SWAP
-   { 'w',	RLIMIT_SWAP,	1024,	"swap size",		"kbytes" },
- #endif
-+#ifdef RLIMIT_LOCKS
-+  { 'x',	RLIMIT_LOCKS, 1,	"file locks",		(char *)NULL},
-+#endif
-   { -1, -1, -1, (char *)NULL, (char *)NULL }
- };
- #define NCMDS	(sizeof(limits) / sizeof(limits[0]))
-@@ -647,11 +667,11 @@
- 
-   for (i = 0; limits[i].option > 0; i++)
-     {
--      if (get_limit (i, &softlim, &hardlim) < 0)
-+      if (get_limit (i, &softlim, &hardlim) == 0)
-+	printone (i, (mode & LIMIT_SOFT) ? softlim : hardlim, 1);
-+      else if (errno != EINVAL)
- 	builtin_error ("%s: cannot get limit: %s", limits[i].description,
- 						   strerror (errno));
--      else
--	printone (i, (mode & LIMIT_SOFT) ? softlim : hardlim, 1);
-     }
- }
- 
-@@ -670,7 +690,7 @@
-       else
-         sprintf (unitstr, "(-%c) ", limits[limind].option);
- 
--      printf ("%-18s %16s", limits[limind].description, unitstr);
-+      printf ("%-20s %16s", limits[limind].description, unitstr);
-     }
-   if (curlim == RLIM_INFINITY)
-     puts ("unlimited");
---- bash-3.0/doc/bashref.texi
-+++ bash-3.0/doc/bashref.texi
-@@ -3793,7 +3793,7 @@
- @item ulimit
- @btindex ulimit
- @example
--ulimit [-acdflmnpstuvSH] [@var{limit}]
-+ulimit [-acdeflmnpqrstuvxSH] [@var{limit}]
- @end example
- @code{ulimit} provides control over the resources available to processes
- started by the shell, on systems that allow such control.  If an
-@@ -3814,9 +3814,15 @@
- @item -d
- The maximum size of a process's data segment.
- 
-+@item -e
-+The maximum scheduling priority.
-+
- @item -f
- The maximum size of files created by the shell.
- 
-+@item -i
-+The maximum number of pending signals.
-+
- @item -l
- The maximum size that may be locked into memory.
- 
-@@ -3829,6 +3835,12 @@
- @item -p
- The pipe buffer size.
- 
-+@item -q
-+The maximum number of bytes in POSIX message queues.
-+
-+@item -r
-+The maximum RT priority.
-+
- @item -s
- The maximum stack size.
- 
-@@ -3841,6 +3853,9 @@
- @item -v
- The maximum amount of virtual memory available to the process.
- 
-+@item -x
-+The maximum amount of file locks.
-+
- @end table
- 
- If @var{limit} is given, it is the new value of the specified resource;
---- bash-3.0/doc/bash.1
-+++ bash-3.0/doc/bash.1
-@@ -8362,7 +8362,7 @@
- returns true if any of the arguments are found, false if
- none are found.
- .TP
--\fBulimit\fP [\fB\-SHacdflmnpstuv\fP [\fIlimit\fP]]
-+\fBulimit\fP [\fB\-SHacdefilmnpqrstuvx\fP [\fIlimit\fP]]
- Provides control over the resources available to the shell and to
- processes started by it, on systems that allow such control.
- The \fB\-H\fP and \fB\-S\fP options specify that the hard or soft limit is
-@@ -8398,9 +8398,15 @@
- .B \-d
- The maximum size of a process's data segment
- .TP
-+.B \-e
-+The maximum scheduling priority (`nice')
-+.TP
- .B \-f
- The maximum size of files created by the shell
- .TP
-+.B \-i
-+The maximum number of pending signals
-+.TP
- .B \-l
- The maximum size that may be locked into memory
- .TP
-@@ -8414,6 +8420,12 @@
- .B \-p
- The pipe size in 512-byte blocks (this may not be set)
- .TP
-+.B \-q
-+The maximum number of bytes in POSIX message queues
-+.TP
-+.B \-r
-+The maximum rt priority
-+.TP
- .B \-s
- The maximum stack size
- .TP
-@@ -8425,6 +8437,9 @@
- .TP
- .B \-v
- The maximum amount of virtual memory available to the shell
-+.TP
-+.B \-x
-+The maximum number of file locks
- .PD
- .PP
- If
diff --git a/app-shells/bash/files/bash-3.0-volatile-command.patch b/app-shells/bash/files/bash-3.0-volatile-command.patch
deleted file mode 100644
index 8b89b35914b1..000000000000
--- a/app-shells/bash/files/bash-3.0-volatile-command.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Ripped from Debian
-
-# DP: current_command must be declared volatile to prevent assignments from
-#     being optimized away as dead code.  In reality, the use of setjmp/longjmp
-#     makes it not dead code at all.
-
---- eval.old	2003-12-18 23:44:15.000000000 -0500
-+++ eval.c	2005-10-03 01:59:31.000000000 -0400
-@@ -63,7 +63,7 @@
- reader_loop ()
- {
-   int our_indirection_level;
--  COMMAND *current_command = (COMMAND *)NULL;
-+  COMMAND * volatile current_command = (COMMAND *)NULL;
- 
-   USE_VAR(current_command);
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index d02bfa92478e..bc1863eafe67 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -1,6 +1,5 @@
 AUX dash-0.5.8.1-dumb-echo.patch 2669 SHA256 7f024dac7ac6dedd54121308834f6ec2c83464abcc2ab553a2af217d2f8f3461 SHA512 5e849eae3022463832c247ac85f085893b068df1043d5a4df4c09c4f7eeb541c659f90b8f516eea09fc8a92828c723a156e08743b6405f0e21badc547823f3aa WHIRLPOOL f21fcd414b568e2dd17f3927844019be5342476beb69789197053cc29bc10c998cf96c0b2c02274a39f80b368b343aa160e5703c2b7d4d9253684711d891ebf7
 AUX dash-0.5.8.1-eval-warnx.patch 241 SHA256 13840812b0e03039c4061fac9bfd01106e53ce51e9bfb794c8c4015e6f3033e9 SHA512 fc44b181f236927e3e15f79c8304f212a55d332acfe981a526e957ff27b8ee56f128e1a5c805045218918f7f6d32945ea2d5b099e988f34cf2f56ad061d654ce WHIRLPOOL 6687f231588d3a47f236b1a4ccbba38f5fccf53e441789e789176c4f73dcabe11298c0ae3da6a09a8e51d23766607ee80a88c239223ba4d7372403a7b1159ad9
-AUX dash-0.5.9-dumb-echo.patch 2534 SHA256 8839fca662ec0456ab55f7f86db28de38f5576bb65bc18592ccf1eb85540be40 SHA512 984341da04a0c925ec976c0074e36d36cfdb83904f23dd4c3bb5efe577dacae12a36821daa184c6f2624a8b32f551a1cbb244ddca4e1846bb6aab2cc13ef145e WHIRLPOOL c71824f71a23e993da3b0da18b47873016e5c378e42a9dc8c12c6c330f5252865bab652deb16031d0b89a4cd1c652d7a313f4b2c37654ec376467c018e8201eb
 AUX dash-0.5.9.1-dumb-echo.patch 2592 SHA256 656875cf5906cc9bcb8e50aa3e374ed4b9b0fb85859367ec649775bc3390de5d SHA512 8dcbee6a53b46b78986c17860f84f47c94b3137b84cf46cd521ec9e4f0b5b4f5a2afbc9e7faa8130b591b3a0f9d2c9dc7853803c8b092c4ec1b5c5b7411fecbf WHIRLPOOL e375e380cae982bdbc928a63c3c44f2fde6a0bd758f76e832d92d70b93dea9c8003f3b7246dcf668ba3347fc04591348082b266bcdb3006331b22894a263e2db
 AUX dash-0.5.9.1-format-security.patch 374 SHA256 0ce7a1417b4e780f184588e761b4bea5d068c2312b23d954183076edf2f9432d SHA512 4726d96ad1a86e47374c129f1cbd13bf5f2b6c77faa4e3e85be65978222cc040175313218fe29da176af2bbc2546c432d84247ea342d261a284b64b42ce138c6 WHIRLPOOL 6584caf7d4cb57c0b7324bb8b54b72b110c57c211f6d8813507dee4b92c86fc0665edb11d83b637d19554bb61459f317f5daf24fc54a0a1be29416395ec26f00
 DIST dash-0.5.8.tar.gz 223028 SHA256 c6db3a237747b02d20382a761397563d813b306c020ae28ce25a1c3915fac60f SHA512 3dc42d3503b33c50b62c0f9104c0e41c4e8fa7490ba72bc09213fcc894d6fd92b9688c58389acf8b538b08f8e9cc179f0bf5572e22175d1960f04554594237b8 WHIRLPOOL df79b1cf81cdbba0d7556175510d1f4d7294185c91a10cc0a8d4a9f940e2c26c681e377103b5f4e5291211b4555340433eae10144cb778d2d4e65e6ab54c98a3
diff --git a/app-shells/dash/files/dash-0.5.9-dumb-echo.patch b/app-shells/dash/files/dash-0.5.9-dumb-echo.patch
deleted file mode 100644
index 9bcf6e65a8a2..000000000000
--- a/app-shells/dash/files/dash-0.5.9-dumb-echo.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-http://bugs.gentoo.org/337329
-http://bugs.gentoo.org/527848
-
-there's no requirement for `echo` to support escape sequences. bash, by default,
-does not, while dash always does.  POSIX permits either behavior:
-http://pubs.opengroup.org/onlinepubs/9699919799/utilities/echo.html
-
-however, since the behavior is not portable, no one should be relying on echo
-having any specific behavior.  they should use `printf` when they want an escape
-sequence.  it also makes dash smaller & faster to disable this logic entirely.
-
---- a/src/bltin/printf.c
-+++ b/src/bltin/printf.c
-@@ -442,21 +442,12 @@
- int
- echocmd(int argc, char **argv)
- {
--	int nonl;
--
--	nonl = *++argv ? equal(*argv, "-n") : 0;
--	argv += nonl;
--
--	do {
--		int c;
--
--		if (likely(*argv))
--			nonl += print_escape_str("%s", NULL, NULL, *argv++);
--		if (nonl > 0)
--			break;
--
--		c = *argv ? ' ' : '\n';
--		out1c(c);
--	} while (*argv);
-+	int i;
-+	for (i = 1; i < argc; ++i) {
-+		outstr(argv[i], out1);
-+		if (i < argc - 1)
-+			outc(' ', out1);
-+	}
-+	outc('\n', out1);
- 	return 0;
- }
---- a/src/dash.1
-+++ b/src/dash.1
-@@ -1182,43 +1182,15 @@
- option turns off the effect of any preceding
- .Fl P
- options.
--.It Xo echo Op Fl n
-+.It Xo echo
- .Ar args... 
- .Xc
- Print the arguments on the standard output, separated by spaces.
--Unless the
--.Fl n
--option is present, a newline is output following the arguments.
--.Pp
--If any of the following sequences of characters is encountered during
--output, the sequence is not output.  Instead, the specified action is
--performed:
--.Bl -tag -width indent
--.It Li \eb
--A backspace character is output.
--.It Li \ec
--Subsequent output is suppressed.  This is normally used at the end of the
--last argument to suppress the trailing newline that
--.Ic echo
--would otherwise output.
--.It Li \ef
--Output a form feed.
--.It Li \en
--Output a newline character.
--.It Li \er
--Output a carriage return.
--.It Li \et
--Output a (horizontal) tab character.
--.It Li \ev
--Output a vertical tab.
--.It Li \e0 Ns Ar digits
--Output the character whose value is given by zero to three octal digits.
--If there are zero digits, a nul character is output.
--.It Li \e\e
--Output a backslash.
--.El
- .Pp
--All other backslash sequences elicit undefined behaviour.
-+No arguments or backslash sequences are supported as they are not portable.
-+They will be printed out exactly as passed in.
-+.Pp
-+You can replace `echo -n ...` with the portable `printf %s ...` construct.
- .It eval Ar string ...
- Concatenate all the arguments with spaces.
- Then re-parse and execute the command.
diff --git a/app-shells/zsh-completions/Manifest b/app-shells/zsh-completions/Manifest
index 9effb26cfa56..f8bebf8ca5d2 100644
--- a/app-shells/zsh-completions/Manifest
+++ b/app-shells/zsh-completions/Manifest
@@ -1,5 +1,7 @@
 DIST zsh-completions-0.26.0.tar.gz 218057 SHA256 783768c8308cc0ff37bce346c66386308550ede05121e352b1a284ff6bf88540 SHA512 78ba96e0c6a30271181270244488b7f2c783047714dcf1eb39918d4b258fbaf1f54b718407418ffcc62f5bf552192aca3841497c0ffb8d3e9c6ea4fb85bc1754 WHIRLPOOL 27a6273f2ae35c4413283a30c506a40c19034af89fe22cba12ec0167f5caa9e8b9e29f057fe4be609c0f54cba8f6f9c610bfe481dccc78f91c653d78b81a5849
+DIST zsh-completions-0.27.0.tar.gz 218869 SHA256 9b817b73e709aca0e7e5a41471b5b63467d1e7aa69ef755b6ce39b99e61cd47a SHA512 1c25fce14117d6eb652e2d3bfb49e68baa9f7c5832031582ec8c3066b91f07491067ff887647177048b51146beda1bcac7080abf140ea5ef846fcdd8ac388b8c WHIRLPOOL 5438c9d2cfb222179598a623f35cb7e3d61db98be0e9b204ec1c99a3475c192fa858c6a2ca7a3b78c8df617acc5471c3c032636f933f4e9800849aa1ee21b551
 EBUILD zsh-completions-0.26.0.ebuild 789 SHA256 6cd69d5a23381b08dc73ad33ceb0a0a955b946982d568f971d839e0a75477889 SHA512 d06bdd7166b0c5eae441a28c7c88e765c33661afd678a52409a83468c3526f48d6d90530fa430d063f3b07fba7a17fed829f7db1957b3f9cc4a6725915641db1 WHIRLPOOL 0de19f52359a3b7f1bd003c811a30a1776a58395b70df19dfd05bed5964a1d37b2e490a5113722f6070a2eec5c15a09e8edffd297d5b0ea3aea0eb6aa601bfcb
+EBUILD zsh-completions-0.27.0.ebuild 790 SHA256 1f87f9c4d22289f9873ee19f24111c3d18eee9455d4dc62ddce58785ff0aeb04 SHA512 c80ced08025d6a5bf2bd0873763432390737d3e10648c9586bf8899797802d40a47573a72d5bf114f11f13f00f683f52e0d1d6b7d2c35592ea8f8786d2605d13 WHIRLPOOL 3763409eca9f9490cce2b7ffcc2d1184866ebaddb7266b1e5d8fd8d75140be36ef6f255c325639bd3d5c28bfcf3cee2f2017d6d3d4a896ca97ea986f0b691e55
 EBUILD zsh-completions-9999.ebuild 785 SHA256 e5178dc86641ab2e9cf7e5cd011bcb631f86b903b3e0a8462093296362d87b21 SHA512 6801846ac6ca49cded07839324e97ac8d32fbb46454b60e56dd0a5644d918bff08b316ebfd9e5cb4c5d96cd4d12d3f1644abfc3893062e9267964386b4f5a8e7 WHIRLPOOL 4826bcf4fd77c8eedbe246247472b644d2d5f212e30e42fd5a9f0f4f072861f1696517794b95736c9daa1efbbc0148f473bea079a3b5ac59906df09ade3ff220
 MISC ChangeLog 5344 SHA256 8891da6bd7e94c4ffdaf38c8f148e63f7a7785419004ca7190ebc34506df696b SHA512 35e3016980ff898af6364f147253f58f2948bd0139fc71f5bd5d416421007ed5f69c7670847643e6648cd2eea4a841f9e73a43d0d33550fbae945834f085b9f3 WHIRLPOOL 0e2d856513b388c429b1472eb96285b54930d3fc0f8e307d1b5d5dd16de74afa9bb68abfc38f752ce36958987cc5648ac8e63d76fdb601e59a54a4c7d7f447dc
 MISC ChangeLog-2015 1128 SHA256 caed04468cca9cd99e0c96847a8c835649af86ac5b5f38c25072af940405ce71 SHA512 9908a0fd89eda8a33dc7c91f4b054fdfc3b7de126d96cac125ea30fb25ceb15a5ee215d4169375bd8a32390ec7869229842069c85954a220fbc7b8d8f44c77bb WHIRLPOOL 2610ffda5366d5f3d8059e6c838c570aaf3ddfecc87863d6433e324e00ecdc77a8672f05c96bd4e7d3a442c751a00a390513b065c9ee8ae71d2dbf1a0fe01506
diff --git a/app-shells/zsh-completions/zsh-completions-0.27.0.ebuild b/app-shells/zsh-completions/zsh-completions-0.27.0.ebuild
new file mode 100644
index 000000000000..74e18cd0dbf0
--- /dev/null
+++ b/app-shells/zsh-completions/zsh-completions-0.27.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/zsh-users/zsh-completions.git"
+else
+	SRC_URI="https://github.com/zsh-users/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Additional completion definitions for Zsh"
+HOMEPAGE="https://github.com/zsh-users/zsh-completions"
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="app-shells/zsh"
+
+src_install() {
+	insinto /usr/share/zsh/site-functions
+	doins src/_*
+}
+
+pkg_postinst() {
+	elog
+	elog "If you happen to compile your functions, you may need to delete"
+	elog "~/.zcompdump{,.zwc} and recompile to make the new completions available"
+	elog "to your shell."
+	elog
+}
diff --git a/app-text/fbreader/Manifest b/app-text/fbreader/Manifest
index 99d782c8d632..1e9fb0c4f068 100644
--- a/app-text/fbreader/Manifest
+++ b/app-text/fbreader/Manifest
@@ -2,9 +2,11 @@ AUX fbreader-0.99.4-gcc6.patch 512 SHA256 bc67b538c51a5b77468469df6b5e96ce918ee1
 AUX fbreader-0.99.4-ld-bfd.patch 532 SHA256 c583f1bf48349f69972e83955265799ea218c2b359a3eb0eb11211ae7c9d5802 SHA512 77c6a0454706f68f5065333c1bbf8456aaf405ae8532019f1d557d5f66d7d0b633d409b320c8ffba50a78d04f4d64c7d655c3b0ee6f87fdf146aa5f04332167d WHIRLPOOL 7be2d6bf4bb4f8d473cb804dee90ae26608f57ec65e1f8bf14d10dbf1eb17d5693fd0b1d767be24ee35fdcae4ad73e9883b7df962d6d4b757983cc98ac1b890a
 AUX fbreader-0.99.4-mimetypes.patch 505 SHA256 8f7f6c793ed08ef305031d402e996911942fabead97e69f87e7cc556572647f1 SHA512 03fd64a802be53bf33c9582d5c2804e0c67809a43db02a2bfbc3e5a15592346cae9ba44333f2f547bcc623bc1d9785ca7a10c77d58a23152a1d3f59328e75d7b WHIRLPOOL 3f4847c2c02cd9f6dedd1df4fc33ca007ee8fd3dac6d0ba170bb2f188a1fad4f393ae1865dd705f78b4666e0af48684c2bae3ce5f7c55a3a83baadb8d580dd66
 AUX fbreader-0.99.4-qreal-cast.patch 950 SHA256 0f3e585292c0dbefa4db33c2b69e90871400be0f92f18fa6ed32daae1227f848 SHA512 260e1966eb5f0bfd42fc3c28fdcdd92d37314d93b31f44e1ec0f94e81ad0084caeaadb69cbd16eb4e8f8b9359534449604845e1b79e63b0dd2eff96b342286d1 WHIRLPOOL aafe31212c1111e43d504f4b84119cdd766c656c86ea454a2fbee541fa5f6bf3649c33aa4874b578d5f0b8ad0541b417a9c69bca11c06c63263f52b62dd3a12d
+AUX fbreader-0.99.4-qt5.patch 18697 SHA256 d47410910cae77622f31db26cd91350998bd725070ca70da1cdd1873d7655b65 SHA512 9eb8319308a36cada28d6036ee0537433cea03cb59e648c6ad1dd8f4d10a1b05fb879ebd38b1f9b1e149e6a6544aaafb93c52d6a97f4c9fd8905e89b8cf7ae86 WHIRLPOOL 23ec6fd884e27b933ea0b0b44fddcce4796396b2c25f9c1e78c7427d331da01fd53cbf36b507da5c3553679677eaea745a8412b49d48ab68ea73007d471b2e75
 AUX fbreader-0.99.4.patch 472 SHA256 cb3aa6795c8f7c694ba296f6f6e6a7939648578a289bc84c10f8302c7e72df86 SHA512 486dc74e3cfc6f94f1bf95269e35e866465095efee0cd31b586592fbd780613d4d5d243b809e494da14a69da8e0c5e47e6dd2ca35619616c4497eb0a053ba09d WHIRLPOOL c9bed0e846e90e9d31240d24ae536092a00819676fa9588b3125182bb242a597a69947eaa4b19ab5f7b2aba5fc4cf5e700c945f5174d2e8a384677ac6c256c42
 DIST fbreader-sources-0.99.4.tgz 2345664 SHA256 3d7c31d5ea314589d2a963290ad16f4d3d631a41e802b8b39f8be0c9f71eb8e9 SHA512 d4b11d7ab03df002ad4212db805b10b80a24ea4384e92122b12c25a3f817a0eb343509ae30e31d68417fd4ce27f77e043235436f0081ff2c785a2830d6211dc7 WHIRLPOOL 1d25ff39bcd93d3b0445abc76d3bbaf5e376385303fd71c98e3844123c85b9edd413f18c8d89a95807391ee2fb9c044d4dfc4b5898484548a011ecc22993e3d9
 EBUILD fbreader-0.99.4-r2.ebuild 2144 SHA256 87b49ae4e525a1c9d285a9ed49bf36ea2bc9f6a5b2e13ac73e28cac9807632e7 SHA512 4219403d355e7b38a04944cb589090a412fcbf1fdf2c21a5f04984f41c6175096bcc9436dd0179e19687f08d5b6326290baadb8b4e641254f627c679b50d09ee WHIRLPOOL 4f029512f2400269915e8c27bb718d157d98a325921c3e1c8ff6d66a1f8f9d4b31994d5aeaa4fa253f74410bc27d81e4b67248347059e7b4295d94dfcaef9718
+EBUILD fbreader-0.99.4-r3.ebuild 2281 SHA256 12691a927fa20dbca693bad35f30c12f62eee718f563a501478709007c5664df SHA512 6f16084876a1a9c412f2c347582f93d4ffbb130fcf5acc62a9ec5eb21b920fcad1aef215d5ee0377bb4a8ccacd084beabbdb449034ba159f83ef2ae0353d066f WHIRLPOOL e31478edb64c05dc80ef65bcfcee4a6397ddebc41ad87428d4660a2f7e4365de0ea09e8be1f6c89d901e4e8184f396bac1180b2618d27b50853dc1e2ab2714d8
 MISC ChangeLog 2862 SHA256 d71979bfe4b7db5a250a69508147d5b041345332d79da2aef5674f3e225a6461 SHA512 7119be4d7ab6af8835a81ea616b15febdc480987669e60e88ac6e401e46eebea51b9abd1a3f22e797f7a644e14a481a184df2302bcb3b2c8712dc6e71646d489 WHIRLPOOL f756ded8013beb14a2a574d5414cc5cb9aef19a12ff5ec75ec30a0c56eec9f5fd20b5c468dade79f0196e7a16f5a4993dfb7dccdbb1f4bd515a1feca37818bca
 MISC ChangeLog-2015 6698 SHA256 1df0df24d5560e8398111e053087e8153ee5f9da9dbd8cd2868db3c58449929d SHA512 31b67c3fb8c0b3854d750f0bf2840cbc82d99e7b67c599898c3f5a6f6ae4b2a94e1afc6b4cd1f9bfba0e24f3dacb80abcabe610b0e90626822843464d471ef93 WHIRLPOOL 8c9e35fadbd828160efdec9673f2fc3e26b1c7f10c551fd2097558cb397af939600eb2e07eedc896ecf129f9c1dfd4291ff78ca40f60c86d3ee99c330f3acf03
 MISC metadata.xml 332 SHA256 e5dde6d2eaf01486025c10a8ddea13c5db04504de76002de9beaf0042f73760b SHA512 f8ea42df45ef57c3a81098a86e13ab124ebfb4f6a8ae34153a03977e122448358d2cb852dd1f9b95a50e293f33a159940132b35b9444e5553eed6017bdeb5e98 WHIRLPOOL 2fa86bf91438ae5df35038019aa2e2d27eb79bd5510830bbdc3e7d0c9ba9e2217fe8c7d160d0874a5d10dbb630c962d24b8625f3b6eda915c77fd47940853372
diff --git a/app-text/fbreader/fbreader-0.99.4-r3.ebuild b/app-text/fbreader/fbreader-0.99.4-r3.ebuild
new file mode 100644
index 000000000000..ea2f14e6849b
--- /dev/null
+++ b/app-text/fbreader/fbreader-0.99.4-r3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib flag-o-matic
+
+DESCRIPTION="E-Book Reader. Supports many e-book formats"
+HOMEPAGE="http://www.fbreader.org/"
+SRC_URI="http://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="debug"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/expat
+	dev-libs/liblinebreak
+	dev-libs/fribidi
+	dev-db/sqlite
+	net-misc/curl
+	sys-libs/zlib
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtnetwork:5[ssl]
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Still use linebreak instead of new unibreak
+	sed -e "s:-lunibreak:-llinebreak:" \
+		-i makefiles/config.mk zlibrary/text/Makefile || die "fixing libunibreak failed"
+
+	# Let portage decide about the compiler
+	sed -e "/^CC = /d" \
+		-i makefiles/arch/desktop.mk || die "removing CC line failed"
+
+	# let portage strip the binary
+	sed -e '/@strip/d' \
+		-i fbreader/desktop/Makefile || die
+
+	# Respect *FLAGS
+	sed -e "s/^CFLAGS = -pipe/CFLAGS +=/" \
+		-i makefiles/arch/desktop.mk || die "CFLAGS sed failed"
+	sed -e "/^	CFLAGS +=/ d" \
+		-i makefiles/config.mk || die "CFLAGS sed failed"
+	sed -e "/^	LDFLAGS += -s$/ d" \
+		-i makefiles/config.mk || die "sed failed"
+	sed -e "/^LDFLAGS =$/ d" \
+		-i makefiles/arch/desktop.mk || die "sed failed"
+
+	echo "TARGET_ARCH = desktop" > makefiles/target.mk
+	echo "LIBDIR = /usr/$(get_libdir)" >> makefiles/target.mk
+
+	echo "UI_TYPE = qt4" >> makefiles/target.mk
+	sed -e 's:MOC = moc-qt4:MOC = /usr/bin/moc:' \
+		-i makefiles/arch/desktop.mk || die "updating desktop.mk failed"
+
+	if use debug; then
+		echo "TARGET_STATUS = debug" >> makefiles/target.mk
+	else
+		echo "TARGET_STATUS = release" >> makefiles/target.mk
+	fi
+
+	# bug #452636
+	eapply "${FILESDIR}"/${P}.patch
+	# bug #515698
+	eapply "${FILESDIR}"/${P}-qreal-cast.patch
+	# bug #516794
+	eapply "${FILESDIR}"/${P}-mimetypes.patch
+	# bug #437262
+	eapply "${FILESDIR}"/${P}-ld-bfd.patch
+	# bug #592588
+	eapply -p0 "${FILESDIR}"/${P}-gcc6.patch
+
+	eapply "${FILESDIR}"/${P}-qt5.patch
+	append-cflags -std=c++11
+
+	eapply_user
+}
+
+src_compile() {
+	# bug #484516
+	emake -j1
+}
+
+src_install() {
+	default
+	dosym FBReader /usr/bin/fbreader
+}
diff --git a/app-text/fbreader/files/fbreader-0.99.4-qt5.patch b/app-text/fbreader/files/fbreader-0.99.4-qt5.patch
new file mode 100644
index 000000000000..c88e6db79d3d
--- /dev/null
+++ b/app-text/fbreader/files/fbreader-0.99.4-qt5.patch
@@ -0,0 +1,573 @@
+diff --git a/makefiles/arch/desktop.mk b/makefiles/arch/desktop.mk
+index 4267113..3b46102 100644
+--- a/makefiles/arch/desktop.mk
++++ b/makefiles/arch/desktop.mk
+@@ -12,29 +12,11 @@ AR = ar rsu
+ LD = g++
+
+ CFLAGS += -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG
+-EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi) 
++EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi)
+
+-ifeq "$(UI_TYPE)" "qt"
+-  MOC = moc-qt3
+-  QTINCLUDE = -I /usr/include/qt3
+-else
+-  MOC = $(shell pkg-config QtCore --variable=moc_location)
+-  QTINCLUDE = -I $(shell pkg-config --cflags QtCore)
+-endif
+-
+-GTKINCLUDE = $(shell pkg-config --cflags gtk+-2.0 libpng xft)
+-
+-ifeq "$(UI_TYPE)" "qt"
+-  UILIBS = -lqt-mt
+-endif
+-
+-ifeq "$(UI_TYPE)" "qt4"
+-  UILIBS = $(shell pkg-config --libs QtCore QtGui QtNetwork)
+-endif
+-
+-ifeq "$(UI_TYPE)" "gtk"
+-  UILIBS = $(shell pkg-config --libs gtk+-2.0 gio-2.0) -lpng -ljpeg
+-endif
++MOC = /usr/lib/qt5/bin/moc
++QTINCLUDE = $(shell pkg-config --cflags Qt5Gui Qt5Widgets Qt5Network)
++UILIBS = $(shell pkg-config --libs Qt5Gui Qt5Widgets Qt5Network)
+
+ RM = rm -rvf
+ RM_QUIET = rm -rf
+diff --git a/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp b/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp
+index 47067d3..119a5ee 100644
+--- a/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp
++++ b/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp
+@@ -24,7 +24,9 @@
+ #include <QtCore/QDir>
+ #include <QtCore/QList>
+ #include <QtCore/QTimer>
++#include <QtCore/QUrlQuery>
+
++#include <QtNetwork/QNetworkCookie>
+ #include <QtNetwork/QNetworkRequest>
+ #include <QtNetwork/QNetworkReply>
+ #include <QtNetwork/QNetworkProxy>
+@@ -149,12 +151,12 @@ void ZLQtNetworkManager::prepareReply(ZLQtNetworkReplyScope &scope, QNetworkRequ
+ 	QNetworkReply *reply = NULL;
+ 	if (!scope.request->postParameters().empty()) {
+ 		QByteArray data;
+-		QUrl tmp;
++		QUrlQuery tmp;
+ 		typedef std::pair<std::string, std::string> string_pair;
+ 		foreach (const string_pair &pair, scope.request->postParameters()) {
+ 			tmp.addQueryItem(QString::fromStdString(pair.first), QString::fromStdString(pair.second));
+ 		}
+-		data = tmp.encodedQuery();
++		data = tmp.query(QUrl::FullyEncoded).toUtf8(); //encodedQuery();
+ 		reply = const_cast<QNetworkAccessManager&>(myManager).post(networkRequest, data);
+ 	} else {
+ 		reply = const_cast<QNetworkAccessManager&>(myManager).get(networkRequest);
+diff --git a/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp b/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
+index a3e5b35..ab41684 100644
+--- a/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
++++ b/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
+@@ -17,14 +17,14 @@
+  * 02110-1301, USA.
+  */
+
+-#include <QtGui/QVBoxLayout>
+-#include <QtGui/QHBoxLayout>
+ #include <QtGui/QPixmap>
+ #include <QtGui/QPalette>
+ #include <QtGui/QPainter>
+ #include <QtGui/QPaintEvent>
+-#include <QtGui/QScrollBar>
+ #include <QtCore/QTimer>
++#include <QtWidgets/QVBoxLayout>
++#include <QtWidgets/QHBoxLayout>
++#include <QtWidgets/QScrollBar>
+
+ #include <QtCore/QDebug>
+
+diff --git a/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp b/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp
+index 472f05f..b9809c8 100644
+--- a/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp
++++ b/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp
+@@ -17,10 +17,10 @@
+  * 02110-1301, USA.
+  */
+
+-#include <QtGui/QVBoxLayout>
+-#include <QtGui/QHBoxLayout>
+-#include <QtGui/QScrollBar>
+-#include <QtGui/QGraphicsDropShadowEffect>
++#include <QtWidgets/QVBoxLayout>
++#include <QtWidgets/QHBoxLayout>
++#include <QtWidgets/QScrollBar>
++#include <QtWidgets/QGraphicsDropShadowEffect>
+
+ #include <QtCore/QDebug>
+
+diff --git a/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp b/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
+index 1cddaf9..2b65cc1 100644
+--- a/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
++++ b/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
+@@ -18,9 +18,9 @@
+  */
+
+ #include <QtCore/QDebug>
+-#include <QtGui/QStyle>
+-#include <QtGui/QCompleter>
+-#include <QtGui/QStringListModel>
++#include <QtCore/QStringListModel>
++#include <QtWidgets/QStyle>
++#include <QtWidgets/QCompleter>
+
+ #include <ZLibrary.h>
+ #include <ZLFile.h>
+diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
+index 6de2c72..d942d47 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
+@@ -19,12 +19,12 @@
+ 
+ #include <algorithm>
+ 
+-#include <QtGui/QSplitter>
+-#include <QtGui/QVBoxLayout>
+-#include <QtGui/QHBoxLayout>
+-#include <QtGui/QScrollBar>
+ #include <QtGui/QResizeEvent>
+ #include <QtCore/QDebug>
++#include <QtWidgets/QSplitter>
++#include <QtWidgets/QVBoxLayout>
++#include <QtWidgets/QHBoxLayout>
++#include <QtWidgets/QScrollBar>
+ 
+ #include <ZLFile.h>
+ #include <ZLibrary.h>
+diff --git a/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h b/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h
+index 4f09cfc..51f1545 100644
+--- a/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h
++++ b/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h
+@@ -20,12 +20,12 @@
+ #ifndef __ZLQTITEMSLISTWIDGET_H__
+ #define __ZLQTITEMSLISTWIDGET_H__
+ 
+-#include <QtGui/QWidget>
+-#include <QtGui/QFrame>
+-#include <QtGui/QPushButton>
+-#include <QtGui/QLabel>
+-#include <QtGui/QVBoxLayout>
+-#include <QtGui/QScrollArea>
++#include <QtWidgets/QWidget>
++#include <QtWidgets/QFrame>
++#include <QtWidgets/QPushButton>
++#include <QtWidgets/QLabel>
++#include <QtWidgets/QVBoxLayout>
++#include <QtWidgets/QScrollArea>
+ 
+ #include <ZLTreeTitledNode.h>
+ 
+diff --git a/zlibrary/ui/src/qt4/application/LineEditParameter.cpp b/zlibrary/ui/src/qt4/application/LineEditParameter.cpp
+index dfcbc0b..bd2689e 100644
+--- a/zlibrary/ui/src/qt4/application/LineEditParameter.cpp
++++ b/zlibrary/ui/src/qt4/application/LineEditParameter.cpp
+@@ -17,9 +17,9 @@
+  * 02110-1301, USA.
+  */
+ 
+-#include <QtGui/QBoxLayout>
+-#include <QtGui/QLineEdit>
+-#include <QtGui/QToolBar>
++#include <QtWidgets/QBoxLayout>
++#include <QtWidgets/QLineEdit>
++#include <QtWidgets/QToolBar>
+ #include <QtGui/QKeyEvent>
+ 
+ #include "ZLQtApplicationWindow.h"
+diff --git a/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp b/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
+index 6241514..e0b143b 100644
+--- a/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
++++ b/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
+@@ -17,17 +17,17 @@
+  * 02110-1301, USA.
+  */
+ 
+-#include <QtGui/QApplication>
++#include <QtWidgets/QApplication>
+ #include <QtGui/QPixmap>
+ #include <QtGui/QImage>
+ #include <QtGui/QIcon>
+-#include <QtGui/QToolBar>
+-#include <QtGui/QMenuBar>
+-#include <QtGui/QMenu>
+-#include <QtGui/QToolButton>
+-#include <QtGui/QLayout>
++#include <QtWidgets/QToolBar>
++#include <QtWidgets/QMenuBar>
++#include <QtWidgets/QMenu>
++#include <QtWidgets/QToolButton>
++#include <QtWidgets/QLayout>
+ #include <QtGui/QWheelEvent>
+-#include <QtGui/QDockWidget>
++#include <QtWidgets/QDockWidget>
+ #include <QtCore/QObjectList>
+ 
+ #include <ZLibrary.h>
+diff --git a/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h b/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
+index 3b4fd3a..42ff2c8 100644
+--- a/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
++++ b/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
+@@ -22,8 +22,8 @@
+ 
+ #include <map>
+ 
+-#include <QtGui/QMainWindow>
+-#include <QtGui/QAction>
++#include <QtWidgets/QMainWindow>
++#include <QtWidgets/QAction>
+ #include <QtGui/QCursor>
+ 
+ class QDockWidget;
+diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
+index 24eb897..c17e86c 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
+@@ -17,8 +17,8 @@
+  * 02110-1301, USA.
+  */
+ 
+-#include <QtGui/QApplication>
+-#include <QtGui/QPushButton>
++#include <QtWidgets/QApplication>
++#include <QtWidgets/QPushButton>
+ 
+ #include <ZLDialogManager.h>
+ 
+diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h b/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
+index 068039d..811cec8 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
+@@ -20,8 +20,8 @@
+ #ifndef __ZLQTDIALOG_H__
+ #define __ZLQTDIALOG_H__
+ 
+-#include <QtGui/QDialog>
+-#include <QtGui/QLayout>
++#include <QtWidgets/QDialog>
++#include <QtWidgets/QLayout>
+ 
+ #include <ZLDialog.h>
+ 
+diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
+index e8ff422..352c350 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
+@@ -17,10 +17,10 @@
+  * 02110-1301, USA.
+  */
+ 
+-#include <QtGui/QApplication>
+-#include <QtGui/QDesktopWidget>
+-#include <QtGui/QWidget>
+-#include <QtGui/QLayout>
++#include <QtWidgets/QApplication>
++#include <QtWidgets/QDesktopWidget>
++#include <QtWidgets/QWidget>
++#include <QtWidgets/QLayout>
+ 
+ #include "ZLQtDialogContent.h"
+ #include "ZLQtOptionView.h"
+diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
+index d5eb4d4..2fc769b 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
+@@ -17,11 +17,11 @@
+  * 02110-1301, USA.
+  */
+ 
+-#include <QtGui/QApplication>
+-#include <QtGui/QMessageBox>
+-#include <QtGui/QFileDialog>
++#include <QtWidgets/QApplication>
++#include <QtWidgets/QMessageBox>
++#include <QtWidgets/QFileDialog>
+ #include <QtGui/QClipboard>
+-#include <QtGui/QDesktopWidget>
++#include <QtWidgets/QDesktopWidget>
+ 
+ #include "ZLQtDialogManager.h"
+ #include "ZLQtDialog.h"
+diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
+index ec9e73c..a50a40d 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
+@@ -17,7 +17,7 @@
+  * 02110-1301, USA.
+  */
+ 
+-#include <QtGui/QFileDialog>
++#include <QtWidgets/QFileDialog>
+ 
+ #include "ZLQtOpenFileDialog.h"
+ 
+diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
+index 48a1b8f..90d50fb 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
+@@ -19,16 +19,16 @@
+ 
+ #include <cctype>
+ 
+-#include <QtGui/QCheckBox>
+-#include <QtGui/QComboBox>
+-#include <QtGui/QLabel>
+-#include <QtGui/QGroupBox>
+-#include <QtGui/QRadioButton>
+-#include <QtGui/QPushButton>
+-#include <QtGui/QSpinBox>
+-#include <QtGui/QLineEdit>
+-#include <QtGui/QSlider>
+-#include <QtGui/QLayout>
++#include <QtWidgets/QCheckBox>
++#include <QtWidgets/QComboBox>
++#include <QtWidgets/QLabel>
++#include <QtWidgets/QGroupBox>
++#include <QtWidgets/QRadioButton>
++#include <QtWidgets/QPushButton>
++#include <QtWidgets/QSpinBox>
++#include <QtWidgets/QLineEdit>
++#include <QtWidgets/QSlider>
++#include <QtWidgets/QLayout>
+ 
+ #include <ZLStringUtil.h>
+ #include <ZLDialogManager.h>
+diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
+index f6c36fb..7fe855a 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
+@@ -17,11 +17,11 @@
+  * 02110-1301, USA.
+  */
+ 
+-#include <QtGui/QApplication>
+-#include <QtGui/QDesktopWidget>
+-#include <QtGui/QLayout>
+-#include <QtGui/QPushButton>
+-#include <QtGui/QButtonGroup>
++#include <QtWidgets/QApplication>
++#include <QtWidgets/QDesktopWidget>
++#include <QtWidgets/QLayout>
++#include <QtWidgets/QPushButton>
++#include <QtWidgets/QButtonGroup>
+ #include <QtGui/QResizeEvent>
+ 
+ #include <ZLDialogManager.h>
+diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
+index e38b62a..ad26fba 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
+@@ -20,9 +20,9 @@
+ #ifndef __ZLQTOPTIONSDIALOG_H__
+ #define __ZLQTOPTIONSDIALOG_H__
+ 
+-#include <QtGui/QWidget>
+-#include <QtGui/QTabWidget>
+-#include <QtGui/QDialog>
++#include <QtWidgets/QWidget>
++#include <QtWidgets/QTabWidget>
++#include <QtWidgets/QDialog>
+ 
+ #include "../../../../core/src/desktop/dialogs/ZLDesktopOptionsDialog.h"
+ 
+diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
+index 98e469e..5a1d574 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
+@@ -19,11 +19,11 @@
+ 
+ #include <unistd.h>
+ 
+-#include <QtGui/QApplication>
+-#include <QtGui/QDesktopWidget>
+-#include <QtGui/QWidget>
+-#include <QtGui/QLabel>
+-#include <QtGui/QLayout>
++#include <QtWidgets/QApplication>
++#include <QtWidgets/QDesktopWidget>
++#include <QtWidgets/QWidget>
++#include <QtWidgets/QLabel>
++#include <QtWidgets/QLayout>
+ #include <QtCore/QThreadPool>
+ 
+ #include "../dialogs/ZLQtDialogManager.h"
+diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h b/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
+index df6c73b..837bce5 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
+@@ -22,11 +22,11 @@
+ 
+ #include <string>
+ 
+-#include <QtGui/QWidget>
++#include <QtWidgets/QWidget>
+ #include <QtGui/QCursor>
+-#include <QtGui/QDialog>
+-#include <QtGui/QProgressBar>
+-#include <QtGui/QLabel>
++#include <QtWidgets/QDialog>
++#include <QtWidgets/QProgressBar>
++#include <QtWidgets/QLabel>
+ #include <QtCore/QRunnable>
+ 
+ #include <ZLProgressDialog.h>
+diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h b/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
+index 9cf7c47..03f1223 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
+@@ -24,12 +24,12 @@
+ #include <QtCore/QSet>
+ #include <QtCore/QMap>
+ 
+-#include <QtGui/QDialog>
+-#include <QtGui/QScrollArea>
+-#include <QtGui/QPushButton>
+-#include <QtGui/QLabel>
+-#include <QtGui/QLineEdit>
+-#include <QtGui/QWidget>
++#include <QtWidgets/QDialog>
++#include <QtWidgets/QScrollArea>
++#include <QtWidgets/QPushButton>
++#include <QtWidgets/QLabel>
++#include <QtWidgets/QLineEdit>
++#include <QtWidgets/QWidget>
+ 
+ #include <ZLTreeDialog.h>
+ 
+diff --git a/zlibrary/ui/src/qt4/library/ZLQApplication.h b/zlibrary/ui/src/qt4/library/ZLQApplication.h
+index c08c536..a714fa9 100644
+--- a/zlibrary/ui/src/qt4/library/ZLQApplication.h
++++ b/zlibrary/ui/src/qt4/library/ZLQApplication.h
+@@ -20,7 +20,7 @@
+ #ifndef __ZLQAPPLICATION_H__
+ #define __ZLQAPPLICATION_H__
+ 
+-#include <QtGui/QApplication>
++#include <QtWidgets/QApplication>
+ 
+ class ZLQApplication : public QApplication {
+ 
+diff --git a/zlibrary/ui/src/qt4/library/ZLibrary.cpp b/zlibrary/ui/src/qt4/library/ZLibrary.cpp
+index 9648e95..a544031 100644
+--- a/zlibrary/ui/src/qt4/library/ZLibrary.cpp
++++ b/zlibrary/ui/src/qt4/library/ZLibrary.cpp
+@@ -19,7 +19,7 @@
+ 
+ #include <QtCore/QTextCodec>
+ #include <QtCore/QFile>
+-#include <QtGui/QApplication>
++#include <QtWidgets/QApplication>
+ #include <QtGui/QFileOpenEvent>
+ 
+ #include <ZLApplication.h>
+@@ -72,7 +72,7 @@ bool ZLQApplication::event(QEvent *e) {
+ void ZLQtLibraryImplementation::init(int &argc, char **&argv) {
+ 	new ZLQApplication(argc, argv);
+ 
+-	QTextCodec::setCodecForCStrings(QTextCodec::codecForName("utf-8"));
++	QTextCodec::setCodecForLocale(QTextCodec::codecForName("utf-8"));
+ 
+ 	ZLibrary::parseArguments(argc, argv);
+ 
+diff --git a/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h b/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h
+index cdaef01..a259c65 100644
+--- a/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h
++++ b/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h
+@@ -3,7 +3,7 @@
+ 
+ #include <QtCore/QTimer>
+ 
+-#include <QtGui/QWidget>
++#include <QtWidgets/QWidget>
+ #include <QtGui/QColor>
+ 
+ class QtWaitingSpinner : public QWidget {
+diff --git a/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h b/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h
+index 1b8ebcc..6f3b4e3 100644
+--- a/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h
++++ b/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h
+@@ -20,11 +20,11 @@
+ #ifndef __ZLQTPREVIEWWIDGET_H__
+ #define __ZLQTPREVIEWWIDGET_H__
+ 
+-#include <QtGui/QWidget>
+-#include <QtGui/QPushButton>
+-#include <QtGui/QLabel>
+-#include <QtGui/QScrollArea>
+-#include <QtGui/QVBoxLayout>
++#include <QtWidgets/QWidget>
++#include <QtWidgets/QPushButton>
++#include <QtWidgets/QLabel>
++#include <QtWidgets/QScrollArea>
++#include <QtWidgets/QVBoxLayout>
+ #include <QtCore/QSet>
+ 
+ #include <ZLTreePageNode.h>
+diff --git a/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h b/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h
+index f6e174c..c360965 100644
+--- a/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h
++++ b/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h
+@@ -21,8 +21,8 @@
+ #define __ZLQTSEARCHFIELD_H__
+ 
+ #include <QtCore/QSet>
+-#include <QtGui/QLabel>
+-#include <QtGui/QLineEdit>
++#include <QtWidgets/QLabel>
++#include <QtWidgets/QLineEdit>
+ 
+ #include "QtWaitingSpinner.h"
+ #include "ZLQtItemsListWidget.h"
+diff --git a/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp b/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
+index 4f5d196..615050c 100644
+--- a/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
++++ b/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
+@@ -19,8 +19,8 @@
+ 
+ #include <algorithm>
+ 
+-#include <QtGui/QLayout>
+-#include <QtGui/QScrollBar>
++#include <QtWidgets/QLayout>
++#include <QtWidgets/QScrollBar>
+ #include <QtGui/QPainter>
+ #include <QtGui/QPixmap>
+ #include <QtGui/QMouseEvent>
+@@ -185,11 +185,11 @@ void ZLQtViewWidget::repaint()	{
+ 
+ void ZLQtViewWidget::setScrollbarEnabled(ZLView::Direction direction, bool enabled) {
+ 	if (direction == ZLView::VERTICAL) {
+-		myRightScrollBar->setShown(enabled && myShowScrollBarAtRight);
+-		myLeftScrollBar->setShown(enabled && !myShowScrollBarAtRight);
++		myRightScrollBar->setVisible(enabled && myShowScrollBarAtRight);
++		myLeftScrollBar->setVisible(enabled && !myShowScrollBarAtRight);
+ 	} else {
+-		myBottomScrollBar->setShown(enabled && myShowScrollBarAtBottom);
+-		myTopScrollBar->setShown(enabled && !myShowScrollBarAtBottom);
++		myBottomScrollBar->setVisible(enabled && myShowScrollBarAtBottom);
++		myTopScrollBar->setVisible(enabled && !myShowScrollBarAtBottom);
+ 	}
+ }
+ 
+diff --git a/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h b/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
+index 6fabf00..ccec1e3 100644
+--- a/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
++++ b/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
+@@ -20,7 +20,7 @@
+ #ifndef __ZLQTVIEWWIDGET_H__
+ #define __ZLQTVIEWWIDGET_H__
+ 
+-#include <QtGui/QWidget>
++#include <QtWidgets/QWidget>
+ 
+ #include "../../../../core/src/view/ZLViewWidget.h"
+ #include <ZLApplication.h>
diff --git a/app-text/wgetpaste/Manifest b/app-text/wgetpaste/Manifest
index b79256002735..e40cd2200c4c 100644
--- a/app-text/wgetpaste/Manifest
+++ b/app-text/wgetpaste/Manifest
@@ -9,4 +9,4 @@ EBUILD wgetpaste-2.28-r1.ebuild 734 SHA256 0429048ada1a1fac3c8cb121dddf8ef4b5f96
 EBUILD wgetpaste-2.28.ebuild 706 SHA256 c3d51ad298d385f0947eb4313549f0f5c90b3809e9f1e76a19ef1708ca18263f SHA512 8eebb90528664d16898c6161ec38a5b10e09e81b4531693fc50b5af5265014fe8917f13b96f9b39eb3eaee2bac45337dc8af6536ec740840a6168a27a127fb41 WHIRLPOOL 3cb04d8aa052053c5bf78e538918df5c30a3644f213c9dc1f60459e48fc35644cce8dbf3358b25c28d96662faae6eb2aec16af701f3069f696b162b85d06d7fb
 MISC ChangeLog 4584 SHA256 9e71c00575a735d24759556a4752d82b03306e4158c08ba7793223f6e8c5f7d8 SHA512 9aad9304ae6da20fc616041dd19a3fcbc2dd3b46916a59657a50eda4db21d8fe1d9f3a10f642dc0c742c14b0079c54473f20fec71c59bc41bf7934a25249e124 WHIRLPOOL 00f6c9e503a33cf01563faba50a02c88029247821b906f656f97c83786c28a2167c9cac912657346512ec97645a3cea27138ff1dc31b4a78d8f0fef13260b3dc
 MISC ChangeLog-2015 19159 SHA256 94577d675df0cfc0fa981e1f87eab558e5255863293b22cf93159811aca0b190 SHA512 b77c44a91af92c90af2bbd9ae92bc243dd4055884bd0e4f3538fd82a8ccd8c0ae9ac544ee07dde3bdb5d111a8f7d8bbb7a42614d6fb2fb9301dda8217828ee45 WHIRLPOOL b886d74788ebd0b6b665dc3c409ef499272967c36148dbcb049fa878bea906f8fed54f1a5a15d2277e4c1c1a2d20f06a54cbb7236a3016c8b44d73b49780f1ac
-MISC metadata.xml 366 SHA256 1876597a18e569a80efc188e6c0ab825b6bc1abb5f3f4a75fc62c52001a038de SHA512 61ecb49c3e667468976584fcd4fbebdf7b48f053a992abe3e61b324571708ed7da2e69f48c43b7d0c9fc8cca6835486e594e202d206003811df06fffd6e8c80f WHIRLPOOL edbb325a42a97a752333d24d0efcbdbb9a449744f83c36003d628a6238e8c928d7bc4c323c26d163a1ffb199917e67a0d32c76ed4cb53c017ca2f2a896b4bf79
+MISC metadata.xml 249 SHA256 6a7a935465d2bcd2b2eb7db8821fdb718f5585aa3385dbc3cfe91a67343dd11b SHA512 c13d64a0d3034eeb4c9567f5e1236ecd6f3c3cbdec69b805627298cdb7050ae01a19a3cb075ec905de9497079a3e855bdccef2f37f65540b6ae184439f01cdae WHIRLPOOL 4106054754ff0cea93503e1b478447bfb853e8a33ba5b5aea25590239973d2b268ca8570696760feff44fe693b7bce246295d7129789d54343d77c0dfb15b082
diff --git a/app-text/wgetpaste/metadata.xml b/app-text/wgetpaste/metadata.xml
index a40a0b2e5038..ceeed1534bdd 100644
--- a/app-text/wgetpaste/metadata.xml
+++ b/app-text/wgetpaste/metadata.xml
@@ -5,8 +5,4 @@
 		<email>maksbotan@gentoo.org</email>
 		<name>Maxim Koltsov</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/vim-spell-cs/Manifest b/app-vim/vim-spell-cs/Manifest
index 529eea257922..d82c8345c3b3 100644
--- a/app-vim/vim-spell-cs/Manifest
+++ b/app-vim/vim-spell-cs/Manifest
@@ -3,4 +3,4 @@ EBUILD vim-spell-cs-20061021-r1.ebuild 261 SHA256 8aeac64aa638085818f24b176b33df
 EBUILD vim-spell-cs-20061021.ebuild 206 SHA256 1c17972929a83ed502426791cb8276737cb74fee14589aa16b0f622880221bb3 SHA512 71312071d9a1bce0e9ef5c00f2bedb1e28991f5462715f08a00ae84a1e96506101ddb69b0db786bd8ef61b3a27cd59fbcacc8d260990c83fe895bb5a5e6cbefb WHIRLPOOL 7dd72a471000e673f90aae075b285265a5aa0ceff15a6c5bad219cffe6fa5dfe437a556a7a72a2a1acda03f9aa2f1e440428442fe01f273e5a7f2ebebc84c9c3
 MISC ChangeLog 2840 SHA256 ddcf7758384ecefdf0d8455399f0eafa264a76e67844b34052c400821220a743 SHA512 c4540339c2fe435b6d19a2f01454ba2baa170c58b14db162cc711e0e5bfcea0b3718ab0d6b360f524276d4357b205d744577bde5c70ab2e72d72bd855704a30b WHIRLPOOL 13d6dd7ba0189057e722fa53f8068a3788fd4576a601d9f5af827c4171fe6f4ed2a9d6704513f780b142df358e07563dc13eb751f265664eec7eabbbf2424d68
 MISC ChangeLog-2015 1156 SHA256 ac1b08cee8cf7091fecc4fb03bcbb313a01358561662618ecfd910fd4a40c62e SHA512 415e6dc4b07eecfccde05f8b1c2b67cef7dd4283dc6122cb76808823170c4c7d51a3527312b11e176e1e60130828a6fb73bac09232fde533c11894f40df466bb WHIRLPOOL b1f861448def5ad7e27438014896cb45f3d9fd202069e458acf854392a0c4fc9b620eaca764c5dd190cb3ea958b539a2f94819e92f436a21d37a6b1aa4e2b750
-MISC metadata.xml 820 SHA256 6877abe234200589b8709a073baf92dd2f0b917533141bddec20a4a0f5c5fd9a SHA512 24f7e0c4c85d4813b21c9f284f046b615225899b4e4f70c9cab9694648ef05e6df3de1d3ec222803c35713b0f5e9908111d2390e7aafcbf397626af217f0861a WHIRLPOOL c2cc91bb8edeb285f142a07638e6fabfce898ea719717f9d16628da4f880f155786660c22f31e7a21fac6911b3156270ff2ca3b9466d5ec03470e992248db91a
+MISC metadata.xml 638 SHA256 794eef84b27af2951b9e0d2c4347a85d1a2c4c700572c2265c2dcc50af1b2edf SHA512 b07bf9a6384798f8904962ce53cb864bc5f9670e9ce23d4d1e9c8374b98987243cd0a6416e3aaf513ec1d8adeb18b0e4d8123aac792dbcc1f9c2cc309c7ddcbf WHIRLPOOL d7e132de5d6785df0efe623af39011a5ff4cacabf318c029297871aba84c852f9e3ef86f1f1844ed7c14adcc9846072bf4faa7aaca472f77c806fa64ba818b26
diff --git a/app-vim/vim-spell-cs/metadata.xml b/app-vim/vim-spell-cs/metadata.xml
index e1cecaf5846b..4bbdb4a9fc3a 100644
--- a/app-vim/vim-spell-cs/metadata.xml
+++ b/app-vim/vim-spell-cs/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- Proxy maintainer. Be sure to also CC vim@ on any bugs. -->
 	<maintainer type="person">
 		<email>jkt@gentoo.org</email>
 		<name>Jan Kundrát</name>
@@ -10,10 +9,6 @@
 		<email>vim@gentoo.org</email>
 		<name>Gentoo Vim Project</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription lang="en">
 		Vim spell files for Czech (cs). Supported character sets are cp1250,
 		iso-8859-2, and UTF-8.
diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest
index feb859b6a903..748ecb236fb6 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -12,4 +12,4 @@ EBUILD mysql-connector-c++-1.1.8.ebuild 1569 SHA256 ed7b496e16325fd12c39e6e66395
 EBUILD mysql-connector-c++-1.1.9.ebuild 1576 SHA256 9ce229bb3cd8b5265472d4951c7978637d6f8c88f25186b23618fa671ec5c6ef SHA512 ed01ef8f9b63c63e4ef148cb9945d75df4da111e2689a0d04b20eed62af0395868b9fb2429d6f4b692811c7358830f0ca224c16837ba18d4e0091f14d269171e WHIRLPOOL 181b7a3d03639cc620980436efe0e5499334a2fff3c9d0a089c14e106ccd23461e5a33f0bd498d01bafef6afbc0004db31bb0e61bfb4af8edd06113f7981e228
 MISC ChangeLog 5664 SHA256 85801285594a20bfacf97ca7705669cd9fa9580baf35a22a32f83d9fce2b1519 SHA512 d2ad7494c8bc6483a6aa7336581f08b9211eaeded7fda487e82a9695ab22c0fe76cf6df0f41f1c54ae1e6949748972a00932cdf79e3bbfa10dc2fdb1a45c5834 WHIRLPOOL e237f1d45431ed6a628c85c99b384587528033b49bef2426130c2b7605a23ce5e884abd2e67d4aaf65732a55532436e77c4de3149f5155b9522eaf129651119a
 MISC ChangeLog-2015 4494 SHA256 254376d667054085d8ab01dbe3c239eb3a4ec7981a1864d9e42c43788629f07e SHA512 9a49703b510adf3eb7560e450ad08224a71f34335bcb84a37b333b3723bdad9f66d97d980f818115af1f6c2c01a80cca10dd04ae7c008627a489af66ad1954d0 WHIRLPOOL 34ae8cf5ae51d7c3e3c352229789b11214bf7d8558105967c86d7da37e0c7a56c9cab0b4bb07175048157f3e108d9cfb651ecb47731e43da65d8670b16241e56
-MISC metadata.xml 419 SHA256 95b8e5045d7498670ca90c681356e0ad4b991319c6327cac46f7b404516dc86d SHA512 81bb84bb08c240b6bb8aa9d6f749eb3a2b0e433da4cc61fec7c261d68b2239f2ca374d3a273fbcc5be786fe33d42330835d1877fbbbe2ce3c3374a49e4a4f35c WHIRLPOOL 1a878d5ac0791a787acdd1af0243df076dc305eeb09cc32206289ce16bb5c1eae87308b4ba636b821b5abf746a1a1595db85f3b6c0a6cd82581ca35ebaf94ea3
+MISC metadata.xml 301 SHA256 6c5830264e27c597da6e7a06e72046982b125544d0bb11307ce9d538b907ad15 SHA512 b3ec0dd4a13953bdc58d50e51c35160bc4645f52cc20dd171eaee67c076e217245ef95308484bb9f0d46746041f39b2f556f14f820b2a771ab546ae37e4004a4 WHIRLPOOL 3ad95f94a1b83c13caf4bc11b3cca1616a173432690e4fde4535837e55c1bce271cb15e25c4794bf513951a4857ba2844b53d3850ddd916ddfaec115b5487429
diff --git a/dev-db/mysql-connector-c++/metadata.xml b/dev-db/mysql-connector-c++/metadata.xml
index ded2dec8ab9d..4a8503781eb7 100644
--- a/dev-db/mysql-connector-c++/metadata.xml
+++ b/dev-db/mysql-connector-c++/metadata.xml
@@ -2,14 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <use>
-<flag name="gcov">Build coverage support</flag>
+	<flag name="gcov">Build coverage support</flag>
 </use>
 <maintainer type="project">
-		<email>mysql-bugs@gentoo.org</email>
-		<name>MySQL</name>
-	</maintainer>
-<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<email>mysql-bugs@gentoo.org</email>
+	<name>MySQL</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index 08750d80860f..64c7c800e155 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -4,11 +4,13 @@ DIST simgear-2016.4.4.tar.bz2 1200320 SHA256 5514fd0006bbfcdbdc0e2dab7da41eae491
 DIST simgear-2017.1.2.tar.bz2 1235662 SHA256 69c8223051b039b00038aabbb8660cecce1866e3f854dadd9543db824d232f6b SHA512 5746262873f9ca9183bf5bcfbff1493637faa68c8d070a5683f991b414b69b0e432f181394db0c39c939b3d6e433288a143eb3489a407c38f3d26c9033027404 WHIRLPOOL a6b18db36078e1e26c8915ef72a5bb890bcef7433c6c641f314533c637cbcd3a626e4146ddbf7551fc179b9b07989baba04559a0f1684c4b00e94760ddace2cb
 DIST simgear-2017.1.3.tar.bz2 1235062 SHA256 85304d985b4fc0dc00d9f7603b02d096e3c24ca4c98adc18dc9af1e2d0e3c310 SHA512 600f883ad92d37bf76d5e6beb066da340c7af927b0f2d51ce290cccaf23d1f3289b1aa31d3aa6cc17a4b9bc57c7180f03e234e08601e4169f26624678bf551aa WHIRLPOOL 377caa9327be22f10e0c45a64db7747d66dc7498b425ae5cf330544e727248b84f907b9eebb7c6b8e6a3272d1929a2b2ae1eaf8a4a542469d1e3615e9a2b7966
 DIST simgear-2017.2.1.tar.bz2 1290780 SHA256 9924592c01cb41ad66a0ff1dc43b7678ceec69fb573d3f4e4637e26c247c7a9e SHA512 168f5e3eab7cdd44643a62e1970c6329ac1121ca98e36c4134d963237e70304a20b7c8df3b438e24c204d51569d6863ef8b16098462d850f72a5f11a10ccbfd5 WHIRLPOOL dc57cb2b87ec0111b0c555b6b87bcba7ec80c34c2277978c3aac7e71a3df260b4ac32f79698b2ea6d84a3bd6a942dc163aabd80c5f5004c409a189456f812d4a
+DIST simgear-2017.3.1.tar.bz2 1302704 SHA256 0ee08550b737b249dcc91590ec0cb9c5dc9080998f6ba66a7d7209cdfce6e1f4 SHA512 339c9af78e8c0490caec69be34b54f947751a9677cbb1163e73917f6aaa8f3d965ccf8058222c48ca4249cba4bb509205143f846de84595e92abdcd93e64c901 WHIRLPOOL f26535449fd04c18e3a0f31817411f634be669c14d84b112f9d5662e56aeb800b7c801fab9113acb111c4823ed1fc25d2fc92822479d7e87ce93d6b3beaf2b8c
 EBUILD simgear-2016.4.4.ebuild 1061 SHA256 bc532b97a66e160f1728c3e984e08df008fefefbf38f1e3563f7a5caf303801a SHA512 132606587c2820bf150fe67b5a60018bc49af52ea2ae320c327301f5becd1f402b081e8985457b72c6bc7c2b13936362aef026c7337beacc8fc6592599a7c5d7 WHIRLPOOL c2e8b73fa3e3fa945aeb0a704db525cc3fe0de95ee4944fae9c511f304b66ebc6305d420e6df30b33bdce5dab78fd6588f11f7035b6df3d72147a884105f44c3
 EBUILD simgear-2017.1.2.ebuild 1062 SHA256 981a5d1aeda0c9c7282b649d9803b4ec050a9bbfcc4071b1d55a1c14a8ae463a SHA512 855947e49e07af915a63ec897ffaa504668812d4697b65a7a3431d591c25682ddbaba029c28748d67d2098e9876dee2cb45d126f9a92e4c006a0e078986cfc36 WHIRLPOOL 7e67c807f6ce9851853218ad45b8ad7d9c4ebb365644e4dcb6d1e0ed648b3b4b8edb3c0eda774ca75ca6c9f2a0792ca590c3137956bbfc053282d43349337761
 EBUILD simgear-2017.1.3.ebuild 1062 SHA256 981a5d1aeda0c9c7282b649d9803b4ec050a9bbfcc4071b1d55a1c14a8ae463a SHA512 855947e49e07af915a63ec897ffaa504668812d4697b65a7a3431d591c25682ddbaba029c28748d67d2098e9876dee2cb45d126f9a92e4c006a0e078986cfc36 WHIRLPOOL 7e67c807f6ce9851853218ad45b8ad7d9c4ebb365644e4dcb6d1e0ed648b3b4b8edb3c0eda774ca75ca6c9f2a0792ca590c3137956bbfc053282d43349337761
 EBUILD simgear-2017.2.1.ebuild 1415 SHA256 fab688c40c79ca132485c88621338d12cc4492cc02d57b300ee2da3131a2a57c SHA512 ac5c3ff2dba76fe9f071355a1347a2805b97c6b0c2f6987123d4c394ae012d4915fa8bfaae1f749cc8c69e1d6a92506faebedc97b16ee617c0a9aedb8f691cd1 WHIRLPOOL d9d33bace0c9c0c84ce9a473f96294836ded39accbbab78f7f32c76610e380e2d463e992d7012cb9af8b6838fe165d13d1132da5b90be3effbb1e9775cde2f5c
-EBUILD simgear-9999.ebuild 1350 SHA256 77ae95bb34402e2caf3b31067dfeea20d2d0e80750bacaa1d49c038da97b2902 SHA512 f2554944961cb5bb7d93088e520d6d2ef10bf3f818e1ead536bad1e2e496263f10a47c2d5324764a4e4d0a5b02bd8df2b917223c35c98aa2836bb8ab9bf2f2be WHIRLPOOL 88eedbf104b5deedb38600140901cc9d7ef35f74e8719014db15b27683f8c96a22dd7409a7f08bf63511937a0b7bd11911447dff0c4d4b633c8583e8d8e18b33
+EBUILD simgear-2017.3.1.ebuild 1289 SHA256 8bdc68c765f9f69c42ee89535cfc175e0801d3fd1afb506a33b7d289b343c872 SHA512 4deaa97b485983475f5c9a72dbe7e3b1ac4c5a0166d3c5a541ac38cc0504211289dbfa8721139fbc8da01cd6171ed99414aec13d924a5ff0c37f379c6a1cf7ed WHIRLPOOL e81bffdc7faec48115cde9cf926b0a3a84d68fe055d72d5d57057db17099406a6bf0983a80a572cc46534f13fc2c42e48bee77e5bd44ab62eedbfbbdb3ef7f8a
+EBUILD simgear-9999.ebuild 1351 SHA256 25d83b642139f559f070c13fc30162e9937f08d8d164021f7fb636cf9daa6ce4 SHA512 3735c556acf625e06391dd2c51b329cc8367449ed67d72dd0e4345a102b98b334595634ac1de1e61c05094075616a48887785f3b3f368d06181413add49a2f91 WHIRLPOOL c0cee81b0a4a32b31dc8aed9b70cf346a5287fe5f46bd11d3bfac9c4a7fe986c2232bb86bd9604f3c062dc43a84e0ac45e0ad4d187e8efef4d2b43c4a846cd2f
 MISC ChangeLog 3863 SHA256 0e3f4cffaee7dca075735c98d102a8af72b4078df93c5419fb4891f031f019bc SHA512 44d2c31a72201607d228025745618c7e793ff35683e51c086929e18df67b5ad5033c3ed8ffba58a550e611b97d512a548d325e9b7e04fc6a851045617d1e0552 WHIRLPOOL eb84bfece0d5c07f0c2fe97e994bae577bf739a6418d538b7bc1608dcf1ddf474da568218513c9c5744343ea9e7c4e47f60391281270ef6d1cfbe897fee10c92
 MISC ChangeLog-2015 11386 SHA256 e0f137c2d4af1399f5a82596819c8747c2b8a6f169f2e1aec448661c82a19f3b SHA512 3b9f8eced1e5c6d43df1bd2130a8237f706dd9a8bfa895896685f99eb44913022b3f61093951daa8c006bc3dd4ec8c1e2b5ea138c52405c68e93a6ef7aac8e17 WHIRLPOOL 26632a83550817a77ae4c23251741a7f94e47af66aa0b98235d84c5516b9b232504e19641e092a5f72043c0a8ab67c71949ecd1c9071deea3e2baab418e0c5f2
 MISC metadata.xml 911 SHA256 dc9b9526a5e3b3563022fec68811ee4dd55598d9dba1e4184bb9191541a04227 SHA512 59839dd8b60cbf26b548157edf6f30255c2ca81545df77d39d47cebbf2eec561014c698ac15028765921fb9a7a570f5032f699f71fc135c5bbad211ce6b0a5a8 WHIRLPOOL 7b3a61b3c8f9d594eca223c0048fda38698138ae2bd35807c1e4219aa336192764986a02d64a002bbc0f36eb8bde718122eec39086ac31495ac59eb07c0800a5
diff --git a/dev-games/simgear/simgear-2017.3.1.ebuild b/dev-games/simgear/simgear-2017.3.1.ebuild
new file mode 100644
index 000000000000..cca44548c832
--- /dev/null
+++ b/dev-games/simgear/simgear-2017.3.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils toolchain-funcs
+
+DESCRIPTION="Development library for simulation games"
+HOMEPAGE="http://www.simgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+dns debug gdal openmp subversion test"
+
+COMMON_DEPEND="
+	dev-libs/expat
+	>=dev-games/openscenegraph-3.2.0
+	media-libs/openal
+	net-misc/curl
+	sys-libs/zlib
+	virtual/opengl
+	dns? ( net-libs/udns )
+	gdal? ( sci-libs/gdal )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.44
+"
+RDEPEND="${COMMON_DEPEND}
+	subversion? ( dev-vcs/subversion )
+"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DNS=$(usex dns)
+		-DENABLE_GDAL=$(usex gdal)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PKGUTIL=ON
+		-DENABLE_RTI=OFF
+		-DENABLE_SIMD=ON
+		-DENABLE_SOUND=ON
+		-DENABLE_TESTS=$(usex test)
+		-DSIMGEAR_HEADLESS=OFF
+		-DSIMGEAR_SHARED=ON
+		-DSYSTEM_EXPAT=ON
+		-DSYSTEM_UDNS=ON
+		-DUSE_AEONWAVE=OFF
+		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-games/simgear/simgear-9999.ebuild b/dev-games/simgear/simgear-9999.ebuild
index 00072326c7c9..6ee236bee6f8 100644
--- a/dev-games/simgear/simgear-9999.ebuild
+++ b/dev-games/simgear/simgear-9999.ebuild
@@ -33,12 +33,12 @@ RDEPEND="${COMMON_DEPEND}
 	subversion? ( dev-vcs/subversion )
 "
 
-PATCHES=( "${FILESDIR}/simgear-2017.2.1-gdal-underlinking.patch" )
-
-DOCS=(AUTHORS ChangeLog NEWS README Thanks)
-
 pkg_pretend() {
-	use openmp && tc-check-openmp
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_configure() {
diff --git a/dev-haskell/async/Manifest b/dev-haskell/async/Manifest
index 02146002bce8..7dfbd9eceba2 100644
--- a/dev-haskell/async/Manifest
+++ b/dev-haskell/async/Manifest
@@ -6,4 +6,4 @@ EBUILD async-2.0.2.ebuild 755 SHA256 f33a7682d7874ce5f30b55bca9830827044b14d7ddd
 EBUILD async-2.1.1.ebuild 756 SHA256 1a251ad99858f1e6c6d0829759fb20749e6443bf11b32cc38c3d17e7f389d922 SHA512 e9a8e214d78534f3b56fdf6b72f34240b60acfe779a1e34160f0523bd00be1bb526b5eb093f8acda2a36bb2ea162e87676434c22e20474dce8d8a387e9e500b9 WHIRLPOOL 7499ee6cfa95f33c7d1f9f88e2b0752727846a5a6ef29e40db2398432df61dfb0efa86d0e3e067540c08d831aea8ae0929ac7aebb275b4a2c9a07fd301054de9
 MISC ChangeLog 2731 SHA256 afb750ae7223a3535cf13e0aaff33cd53f52f62b99934df4533e2c1b35fe16cb SHA512 e80776b6bdc864207c68c57a5546fc753d57a199d6a40298f3f573ba1f03ee2741dee7c41d33741bca70c5a9288c48fe4c0e039cd83fec7dfdd7294cb1c05bae WHIRLPOOL 7784fd903d9bb46fa5fd3b2071494daa5730a4e19d2b1472a3ecd13bdbf0337766e576db9c9ebeab3991c8d77f5051e543021dbc5d8cb6baace474f0877dae00
 MISC ChangeLog-2015 1386 SHA256 2a6fbd679a39e5a16f29e08c699dfb686955a908c2a1a876d4c76cd3bea9cc5c SHA512 91859749df41e907dc0985502fe201b2bc06c317a2fa4c2884e9b0a6e5a49138dfbf00da9cfa8d95076cf01f6e2c9a2419daaafe10675474fbe3efc0063cf1fe WHIRLPOOL 7e3fef8f2e5c7e50d75c9fb882b266270811eafe7a93859038fb74c180961fd41c345787653abb30a5d0efd1df908cac1584b0b2edb27b4a36d1a27dfadd426b
-MISC metadata.xml 1708 SHA256 5332aee972203250aff9a0f4abbe03fb19c11d4459489d92e2818d05ded82fa1 SHA512 391a43bef8006dd5980a9fe11fa8078ee0def6d372de6c8f41f3376e6c19de2135dd5d0037bf4cf0ecbe004e2ccb14508f0db547e34bc67d4cceaa150be57ab5 WHIRLPOOL 3dd103d7a6c9a4d7608c11b6166b9a7195a3d3c739321ac65f2af947665ebc6fc37777d0716c75b7ae60b1ede8f0552a9a2e9700b9cd405dc7c3c89425df18ab
+MISC metadata.xml 1591 SHA256 9b4b455e0f5ebe57932b30dcec87a9d8da00194a4ab25a3add0ec7206b76c5d8 SHA512 9fb7bd1b705dc30c1e8bfeedf6cb4f3ce0391b60dc0eb362536615e7e693cfff0917fa74c1fc725811db1017d186782994b3aeb106059fca5852c1232f48080e WHIRLPOOL fcec08a0470ffed10d63997a941b8ddf4633f45fcbbb849a35a4830a62e434af455300a0d8d16025aeedb608cc1f41a41f67aefe8700bf169d8ea37721ed299b
diff --git a/dev-haskell/async/metadata.xml b/dev-haskell/async/metadata.xml
index 8d5161f064d6..85a5a5773f03 100644
--- a/dev-haskell/async/metadata.xml
+++ b/dev-haskell/async/metadata.xml
@@ -4,10 +4,6 @@
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		This package provides a higher-level interface over
 		threads, in which an @Async a@ is a concurrent
diff --git a/dev-haskell/base-unicode-symbols/Manifest b/dev-haskell/base-unicode-symbols/Manifest
index 32a8f2420baa..0fa3ec21e8e5 100644
--- a/dev-haskell/base-unicode-symbols/Manifest
+++ b/dev-haskell/base-unicode-symbols/Manifest
@@ -2,4 +2,4 @@ DIST base-unicode-symbols-0.2.2.4.tar.gz 5562 SHA256 a2f841430fec32edba778b74bde
 EBUILD base-unicode-symbols-0.2.2.4.ebuild 582 SHA256 336db56dda148a5ec93e71972ae020ba8c566f40e44163d0aa4ace5e01a26ac5 SHA512 10934f5941477c67d82662171100209a5a93029b8ce272073e9124ec5b3c7a609785fa28185c1935d72650679b468d90209f854a9defc22651caf478a195a0bc WHIRLPOOL 5fbcd7b942ef4e60f6ed047862bc776b9350a10b9c2c5eb12b3b44a9374ed3194c16ecfb4d019fe85ca91dab40dad85048df6cffe846d60b2cde4b8bdd0f0e82
 MISC ChangeLog 2936 SHA256 e6131104760fef6b55cfff3f5bfe9b74eca428880057bcad8d4ccc48fa8b3515 SHA512 630d40354bffa9a9228b4d359b162ce7813f8fcf4704981d8d04d03fd1304e7e2dc5a28b2d43708a5adb8e5302c4dbe45009b79603ebd29b786195a0d1605a12 WHIRLPOOL 6a73dc04d023ce4181a8414473c0c9f28ad430b869d45d0160a0700ae25eaeba0158057ceaff1c2fbbf85831f81002f9a9b9bf2edc414e1dba9d3661d1ab2cd4
 MISC ChangeLog-2015 2139 SHA256 960b6a73f8f531eb0fdbb3e646b9d0d5d71049803a84a5a6c4e437cef2639e77 SHA512 3affb78c898d3a4eb332c00d90ba4f62d79d469f03d9c04653773a3b07b2e7fc48d9908ccef2bbd5936f3c118090b7e9570f825576183e441ddcfc4fa96c2cb9 WHIRLPOOL ecf4eb2b99f8fa4859f3d500af9288c81c4f744e83e85839dec492d76cd0a533381028aae1dcdf8577b036fe31d987c5463534f67836bc84af95e4e694f019de
-MISC metadata.xml 1121 SHA256 421d35125ebf461467e256ea5da701f6ffa4d0ba25bb8832d14731a77298b6f3 SHA512 da63a096e7bcb88630c999eabcd796851bee7406247d5b5ccd14e2cc4ded7f03bfad92f3f12c2fc333adc6ba71c5f8daa4e0da8d351097748fb7168951d93498 WHIRLPOOL c1619ec7053facc13246fce06dec98c59e789595f22792b744e6137a0178000cbbfcf28c85022b177a8aa3ffbcc48e2174578e043848b84595e65c07d3309051
+MISC metadata.xml 1004 SHA256 4512f68e32a9729412e64677728da81b0599e65614586d3f615bbe9e3322659d SHA512 3dc724d28f44cf1fb90f8324cc2df0398a726d21b54a78d08a57c75a832aa14d8f5ce01dcd5c4310ddbf28e5fb15d2a5a265ce616c9d5a477450985448df3b5d WHIRLPOOL b47f60e1b2454169a584f49635b491157f5a3c79e402bb4ee23686ddb4f9d52e5e0e3784ac8863ff247994c24e52aadd96b7bd6e1371feb5a204dd6cdec89f71
diff --git a/dev-haskell/base-unicode-symbols/metadata.xml b/dev-haskell/base-unicode-symbols/metadata.xml
index 9d7733e5fee7..ca23dac36027 100644
--- a/dev-haskell/base-unicode-symbols/metadata.xml
+++ b/dev-haskell/base-unicode-symbols/metadata.xml
@@ -4,10 +4,6 @@
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		This package defines new symbols for a number of functions,
 		operators and types in the base package.
diff --git a/dev-haskell/hashtables/Manifest b/dev-haskell/hashtables/Manifest
index a60e7f65bcd8..f504505a6a7c 100644
--- a/dev-haskell/hashtables/Manifest
+++ b/dev-haskell/hashtables/Manifest
@@ -4,4 +4,4 @@ EBUILD hashtables-1.1.2.1.ebuild 1054 SHA256 7c7d17a39b722c9858889e0a8483df5d870
 EBUILD hashtables-1.2.1.0.ebuild 1103 SHA256 c0234506ad6f34c794550679889923114cb9c3aa1b6586386a88a9a82f4a3865 SHA512 5e92d70af6adcf221f166e4644ea54287494e882b2699aacc297b835f880a3faf22a52b21285fb61ed4a99e7390ea2e64678e19bf5a19cecddf12f8976bbad7f WHIRLPOOL e44c6953fa4071ee8dc657d118905ee4fc4d72a65af6e08dde241d4d66c8f0c9b3da5c3810e068253686f8083aad154865a4f1cf3fb7db2d94646670332e3024
 MISC ChangeLog 3540 SHA256 cd881df17b8e4efc09744aeb73531859fe4438f44329dccc62d1dd0a5d055a6b SHA512 74aee815200aea4a6f32c0796dcb0286caba12663a3d32764417357bd80cd6b960410df342d1426bbfb707d3fb9c6a0d0edf419290578a509f51ae8b8515d632 WHIRLPOOL c16c9d82a66b1c47596c4df1e55336ef2f523be990942cb0dca4a408cf9c51b6282c66e52531cca3d89250b31a0cb0b4acf024dcd5c653cd45038c0979425366
 MISC ChangeLog-2015 3714 SHA256 089220d0dcb6d400d667532536d222b40a20716e62f6a064f8646a7e26edea96 SHA512 567024c7a213d2613412af6d7e686d85d42fa99fea162d539b7bfbef568110f08e5a303ab93ca8f05de6e4231fe0da020a6d4b73de93e3d76395223c8edc005a WHIRLPOOL add2a43a08cf1c05667721111d37b428772759a5891ec7afd0874f73c76f45ea622185ab841889b6a5464e7a8858c0339262fdfe4f74994553691b95f4031944
-MISC metadata.xml 4993 SHA256 bca99deb55a713172f5ee82e04468409c385f92ea78bbb5f547a5af46c148b8c SHA512 e044a681e12ffc5e454d24aa72cc2917970fec6bcc603b559a4205f55143b1dc77920de0f9e6456b612397654c7bbf5cb76fc6464f556e76e4ebc79484d88e13 WHIRLPOOL 50b5f5ff88cb8850b9fec51ac3d9bae3cd90b9a2bf8ea32a0bd5d5ccfbd25dd546f79397f42276498ed7779ad959df29be7e33bf2a7c03ef4a2e1872b2aa45bd
+MISC metadata.xml 4876 SHA256 3eac717f65a3e24ad8934c6335d01f74d985c04510a3e79ec2ae8576408079c1 SHA512 d175f516d895b4fa0453185a03741c33e3f01b461b1f2717208ebdeac9d9abd4bb0896c923c30698d9e66672844a58866cd4eb2eb36ab4f9b1e0c60e70facef2 WHIRLPOOL 864cb0c0147ef62e218c72e4b7e88c0bd98e5926c59ae8c0808bf1d322c1f2e1a83c8d7341b0f2a6c46cae87dbc27add5caf031adcb06c083b5e1279bfa936db
diff --git a/dev-haskell/hashtables/metadata.xml b/dev-haskell/hashtables/metadata.xml
index 537275d86282..9e68dbf75d7c 100644
--- a/dev-haskell/hashtables/metadata.xml
+++ b/dev-haskell/hashtables/metadata.xml
@@ -4,10 +4,6 @@
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		This package provides a couple of different implementations of mutable hash
 		tables in the ST monad, as well as a typeclass abstracting their common
diff --git a/dev-haskell/hdbc-mysql/Manifest b/dev-haskell/hdbc-mysql/Manifest
index 67bfb76d7852..1c3722b39620 100644
--- a/dev-haskell/hdbc-mysql/Manifest
+++ b/dev-haskell/hdbc-mysql/Manifest
@@ -6,4 +6,4 @@ EBUILD hdbc-mysql-0.6.6.1-r3.ebuild 849 SHA256 4f33433c650f9f989a01816bc52435ef0
 EBUILD hdbc-mysql-0.7.1.0.ebuild 826 SHA256 7cff16c3d3138cec6c41f6bb82e3de52fd3366586091e845db61fb0a4cd72221 SHA512 ea1f16c467689697be3b263eeaae14cc8b15455c33cfe81e4838d53b90cb8082c4fde82ee0919029d8cdf2fc3b5444a7c83dddacca09e13d0b0d773cade77e1d WHIRLPOOL 8e876eada03a7e61433cb64efe772947775065aaddfae3b147f52856df3e84c757ff68ef96a2eb1bec8fc015c7d2978cd0809257ea5fdf4467a29bae2a75a8b2
 MISC ChangeLog 3317 SHA256 a5856a7655f6c2e390d801e6b021431cc7df7354a790e2eb02f18dcc2dacfb01 SHA512 888813ae9d9e3eeb16e827c17c0eeec13d85243b2d726c7f2a3c7b6442a911abac9f109c6ade1841d9b93edb60cd5df3119ce5558d6e7ded02633f98458fdd5f WHIRLPOOL 138c8936f1f4bec8b7b3a70b5504e4c567ea989e0e1d6fb76eb5647f277351e7623a1d28a932ffd28cb216a37c26846c0876c6f9500811140199a0e52bb66e82
 MISC ChangeLog-2015 1389 SHA256 43a90c569e69aea69e361c0fb7fafb7410ec92d83c05026213aaa2490220cd1e SHA512 deb829a2c3ec1415a09c5e016178b2297ed628c0ebc03ddccb6fa4cc500ff4d771b0c9cec06fcb77c16a81e34ac700d482329e96551eab4cfc4ddb378d48a535 WHIRLPOOL d836c2ea115d3493b620d3acc61673e8e23c12e8997c5f91452c0c6bc81917e71b377899be44ef2f7f68fd81d542d07dd573f6fcfe1314117a18e1cef96b22c2
-MISC metadata.xml 592 SHA256 254a3cfffbc4e714fcc7e0e17a812610f15207cdde7e1fa499ef92a34d72d7ab SHA512 aa93543e2bb7a4dd1141b3ec81bc75fad2b848f962c13b74903d2aaedaaa0369f3d7bed6faefe15b5ec7204e69d5341dace3250f9fd5d06ca474f4bd4c8df4a6 WHIRLPOOL a4e291d1f48a592eb620203876f1d3d197c83e62853e349afc51ed9c01315d33af31e428dce4ebb7be472ee146bce72966d35d2aa2532214ff405a7ba131c847
+MISC metadata.xml 475 SHA256 462e11e46d03ec492cb3d7a507ee0f903cbc73547e5f59bdc2ff039fbb34e048 SHA512 da1098ad2d5808af1dce10679f4e0146f9cab003e5a68fff7b7d389fadcb6a28cc0c67abca16571a6b76bef1c9d838882496cac5fb7febddb4da71b5d9baa4a2 WHIRLPOOL fb8a167dc6fecd6a9a44450d75d785564b5c1f9ad62d258c27c964667c7af6c312fa7549e41ba7228a06f8bb9c0d72094fb6c50f6bb1d87747a822c521d66ceb
diff --git a/dev-haskell/hdbc-mysql/metadata.xml b/dev-haskell/hdbc-mysql/metadata.xml
index 7fca400db6e5..8aa39248b6d6 100644
--- a/dev-haskell/hdbc-mysql/metadata.xml
+++ b/dev-haskell/hdbc-mysql/metadata.xml
@@ -5,10 +5,6 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		This package provides a MySQL driver for HDBC, implemented via
 		bindings to the C @mysqlclient@ library.
diff --git a/dev-haskell/hexpat/Manifest b/dev-haskell/hexpat/Manifest
index ab3b57121105..73bd9517dd7f 100644
--- a/dev-haskell/hexpat/Manifest
+++ b/dev-haskell/hexpat/Manifest
@@ -8,4 +8,4 @@ EBUILD hexpat-0.20.13.ebuild 961 SHA256 6c765e4de2817d18106da02b6dce8d4670699e4a
 EBUILD hexpat-0.20.9.ebuild 815 SHA256 34335390e5dec9a9554e4219169da083ee519abc767dbf328a9c9326ae86f976 SHA512 6395e521c4aa7dfc55d0b63e4693fc39be71fff2652de7d74bcd57dfb6b91acdcf27d3a2a4492ae722a6fe32c01c1783b59e4505fddf6d0ba5135b808bed9e2b WHIRLPOOL 4cfc51216810bde94e0d8ce1d84ecf68d7dbf6f76a8d889def358086a323d2363508b6980242a00eaff67fb4066258675f18f92b7be1c66fec0ff3ee83bbde79
 MISC ChangeLog 2963 SHA256 52bf0d95efed08b92669810162eb2dbc3713c591297df86d0a836274b593e608 SHA512 09cb4fc208df6447b3502275cdeef7bf8d7906beaea7f8c24ffaba2bbbf57c69513400e42cb9de08f8efbbc56946814b78f981380c4007f624fd0892eb86aa27 WHIRLPOOL 739bd8dcb6c50b6a2a743421d16bde143947c3b5daa113d5271e9f1fac953d8e49d67eac80e59e9539d8fc449096410809714629661fa354721d2e4481c44354
 MISC ChangeLog-2015 1062 SHA256 01ea2077d750581149d272b9104f9055af13f9840e466d2bf62b3aa96fa794a4 SHA512 f469efdf34671feb5dd3668501ae2a4d20779485896fea0abe1474db27b4757e28844e7dfc996a7d5fff907343935a22d080a5c14093857327a01aa84c573895 WHIRLPOOL 37e03969c28f86023d87779be6e377d8cf2adbe224fd0b9b4e330c21317b4d1a691451ff583d587639ed80f7dca7425f8c2426736738cc9f48a414242c434fff
-MISC metadata.xml 3671 SHA256 8756853f2113968ab051e77a609fc2b0e41b71f8ed51af0787e59aed38281c8b SHA512 d8dead7c6359aeb1466f3d810880ef87304bd4bcba760c919b6e555691925762e534b02da24ec8ff98304e209ab538ff2607622137b2ef831356cf9842838d9f WHIRLPOOL 85ee3a08fce7c37c2a43ad02ceb93d2bd1ec54690ea7b572eb7032c0e8e8ebc6a45bfe60fd20bb8b4a7da45dbe8b3c497057bcc28ec43339b453a1d814f75340
+MISC metadata.xml 3554 SHA256 f9e9cc6f2022605a024123ec13f97a2fadf845e2beead024465e8a671bdd12a0 SHA512 d096692b1c981f774cc784ebe97163d5f021e8e979e265b86dbe143cb332ffe234c20a986eb210f440da996f26e22d9901c9048f078c26ab30182f986901dea8 WHIRLPOOL f2f7e8a886ab6bcfc3b84efcbb496585b7a5a51afa8c80c1b93401831d88db552a8bec01e33b769c0fce41390b2ce9f722ec69eae1eebe51b7aebea594fa9c36
diff --git a/dev-haskell/hexpat/metadata.xml b/dev-haskell/hexpat/metadata.xml
index f816e0717e8e..686f514d51ef 100644
--- a/dev-haskell/hexpat/metadata.xml
+++ b/dev-haskell/hexpat/metadata.xml
@@ -4,10 +4,6 @@
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<use>
 		<flag name='bundled-expat'> Use bundled expat instead of <pkg>dev-libs/expat</pkg></flag>
 	</use>
diff --git a/dev-haskell/monadcatchio-mtl/Manifest b/dev-haskell/monadcatchio-mtl/Manifest
index 964f92e76057..93324061582c 100644
--- a/dev-haskell/monadcatchio-mtl/Manifest
+++ b/dev-haskell/monadcatchio-mtl/Manifest
@@ -2,4 +2,4 @@ DIST MonadCatchIO-mtl-0.3.1.0.tar.gz 1730 SHA256 18c24e23bcb14ccfe3d46012b7935a0
 EBUILD monadcatchio-mtl-0.3.1.0-r1.ebuild 892 SHA256 d10b42e417f2df45fbe15b8cc10570cec172b5da8440799ed2748a112893f889 SHA512 a25d6aacd9b69c6eeb73d7581f6516dd7bf8ccfc31fa9c3fa154d61a86d6262a19f857428fba53cf2caa7978834fa114bb0ae365dde58e86cd590bb0819a953a WHIRLPOOL f4bd97b3100931f736c5ec5ac3f47d26e298c5853ddb0ca37ae7d93a3b3c7e3abe03a0eb72114005d30017f08c69203c0b8f55a908e8c46438ff5910b30d9a4d
 MISC ChangeLog 3357 SHA256 02f2cd412df226022f0c5e0778f81deb968c576def0b385dd62f881bb9844b69 SHA512 040a91637b6d5ddf6fdfc09d4a57ffb571ee4ce839f78838005bb6ad270a8c970b3508358f9be8d75e47653ab01156882b5794090709e7579e861c139c175fe6 WHIRLPOOL acd70f3f8a549a95e6d7711140aa417b3eb7c13848d5ba0d157b28ae2c1bfbb16ff1d1e031704878e9f53c07a04cf3228d36c7ae2d8b5136803c39a641f856ce
 MISC ChangeLog-2015 1846 SHA256 b075814281a9875fc145a02b300254ea11bc6d979157c89ad172d05e2afef3c1 SHA512 9a58df8d4293bebd0bb976b1a242c4e275e1360c939bff78cdb19ae7058945cc4a84642fc4e0ccf8cd2365fde8d2f450fc01d6a581f408ba0994cf1157f1d156 WHIRLPOOL 1d7ea60dba672f6b3a0ec78cb21544a3c8676673c544a4710bf305fdf0a688fe248d665c6cb75b19526996a852e1c9e4f4619258ac0c6fd8b9ccd7195954e989
-MISC metadata.xml 611 SHA256 f27f444dd5e3a68fb9a8b2e22d415bd9b9258725bdc6848baef5ea96e3a0678a SHA512 32107715f3944946dbe484038633a22331c411bef8447f1be329413db73257555d2647200d410f5b20fa724bd755138efed30194a7bdd591bfc99bd1791711ff WHIRLPOOL 1b1dd28b09aa71d2b369db8119ec22f3281883202bed54004230db26f5e0b68614997a149d1ac4515e26edde7188f5e8cc76b2ecbe71300ce0cb63c9ae1bb3eb
+MISC metadata.xml 494 SHA256 03395ee81c435f17bca08cde89590e41436a9ebe038c1ce7e7a961ba75cb87d2 SHA512 eb38fba13590afdc7d2c96e54b05286d6652ab9d0a7c31461758dd99c4d2602de690a913bea0173b9533617847e019d410938bd583d9e7d6b242230a46d8ce8c WHIRLPOOL d0bf4682d9e60ce9cab9d2c9d272b892d713dd2e09b5e42355acd442d7328c4501146d9fb07f4e9e138e925ff22950528514b22849abdc78548bdd582e077487
diff --git a/dev-haskell/monadcatchio-mtl/metadata.xml b/dev-haskell/monadcatchio-mtl/metadata.xml
index 490175231312..6428af9ccf7a 100644
--- a/dev-haskell/monadcatchio-mtl/metadata.xml
+++ b/dev-haskell/monadcatchio-mtl/metadata.xml
@@ -4,10 +4,6 @@
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		Provides a monad-transformer version of the @Control.Exception.catch@
 		function. For this, it defines the @MonadCatchIO@ class, a subset of
diff --git a/dev-haskell/primitive/Manifest b/dev-haskell/primitive/Manifest
index bacf1a55f1e0..16c7fc0713bc 100644
--- a/dev-haskell/primitive/Manifest
+++ b/dev-haskell/primitive/Manifest
@@ -10,4 +10,4 @@ EBUILD primitive-0.5.4.0.ebuild 747 SHA256 1ab084bb7507e3dc98c2e5afe426c55358119
 EBUILD primitive-0.6.1.0-r1.ebuild 880 SHA256 9ec50dbb60f50e73df0dfd7e068915cbcf69ea4f0c5e95a6df1ce8fa93bd4a20 SHA512 51ea690ffc4b82ae1a314339e3de25160ef07bac8fbcf75a4cebe8f5c63e4c1dd04d717378508646efe4dd25e32fa9c53156a0b8680d925faf4ccfb63f7c9b3e WHIRLPOOL 08228a24ff15194f16559a29f13a5ef48ffeb7c3b8457d213f2df95f4d58505a59b04d3b775391ce4f3250dcb2480dd547055e7ebc04540fdf29ee45fd0453f9
 MISC ChangeLog 2810 SHA256 ef5a48bf7555bee2b47e33acbdb9596b10b4c24744af3793afb9cf4b58832c4c SHA512 5063ab465f3aac40088809fbd3ff85fff5a57ed821d5ca11a84cde41eecc82ffe9b135689365966a6a7893610be8e8546ac076219f6a2d6c75e744d5cdc8bf82 WHIRLPOOL 96e66c91a4784700334133a48fe556828d9b72f81eb991ecfaf7cad1195401b1cb2e45bb5eeac54ce25e1b6804936d9acb4652a750a77f9967ff38636973f074
 MISC ChangeLog-2015 3653 SHA256 e8918d04a1e9c5ea5cb8c72e5cd075c8f9a4e982f43e44f920ecc8718665ffbf SHA512 e4121d7db8b8b9f2fcfb51e9f9119f866f091c1f356780d27fcbb4cb2d91e3c74e7b87f9f036ae935bcd13b51bb7b82d1a5082ae628b0937a0b23cd446113d4c WHIRLPOOL b2799f9117ea772df31fa43f6651cd032a3a1f088679e4691df4c958c8dcd68597b4d64f57498cf060fe0d2ff8480d618d31410cd02c8faa8cdc4d0c0a6469e6
-MISC metadata.xml 1136 SHA256 df2c6a2db2bc80e40f45707d27d58bbbe3da1a259d8291b17ab297b9dbd83b14 SHA512 b57c72f1e66df9ec4083b73e88e248b8b928481ce71f209a107b58e387e99e65ef95567e2850179a43f656ac0369062c127dea23630d2c0f279345c926bc9040 WHIRLPOOL cc5afe1963be678be4ada8a7ad39e115b6a155b81e8a823dba6132d1e8bbf164d1b2bd4f29d38153485aec4853d774d204260a3a4745cc64286c78fa349e21be
+MISC metadata.xml 1013 SHA256 5a7eb5efa34baaa094aeada221b075f3a6959bc671fca1c710a06bed49d0ed44 SHA512 a0d6b463a62899f7f58a197787d85bd60b3179c2fe3f1a91b17cc521a4d688623680f9cf0a78f1a0baf53093ef52ebf889bdc5642489b0073ae768992b4acea8 WHIRLPOOL a2b2d5e790d2dc920036abdd5adb6d032a922aabea350d890dc0bb8ec9d4dfef2cb4026d08b36e21833a91f0de3fe087cc1c2881d6e35aacfd5c064a9fe73d00
diff --git a/dev-haskell/primitive/metadata.xml b/dev-haskell/primitive/metadata.xml
index f3115cb5a7c7..cbe5aeac52b8 100644
--- a/dev-haskell/primitive/metadata.xml
+++ b/dev-haskell/primitive/metadata.xml
@@ -4,12 +4,7 @@
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
-		
 		This package provides wrappers for primitive array operations from
 		GHC.Prim.
 		
@@ -32,7 +27,6 @@
 		* New in "Data.Primitive.Addr": @copyAddr@, @moveAddr@
 		
 		* Deprecated in "Data.Primitive.Addr": @memcpyAddr@
-		
 	</longdescription>
 	<upstream>
 		<remote-id type="github">haskell/primitive</remote-id>
diff --git a/dev-haskell/tar/Manifest b/dev-haskell/tar/Manifest
index bdbe8c60b2d6..68c6abe2ac0d 100644
--- a/dev-haskell/tar/Manifest
+++ b/dev-haskell/tar/Manifest
@@ -6,4 +6,4 @@ EBUILD tar-0.4.2.1.ebuild 798 SHA256 0ab97c597bc92558bff992afe20e70d942de57ba330
 EBUILD tar-0.5.0.3.ebuild 880 SHA256 3a58a491a6e3d287810df754123de495a715c5181ebb60c287229e38517d1ce8 SHA512 2a251e2434d0475501b58269a26c7d39350a2680a80aa562e9145b18eac2c25d2c0e1cf7a225578f232f544c4a1993aff7400bdeb734aefde4768888613f3188 WHIRLPOOL 33ca4fe4fcceade21ca7348877613f3744881e3e12fbadf9ad3527f03f3d0c6bb0beefa5d267d4e01f4e5b65f81e8dadc9b661c16185e4aaf15cc638cc3d4ce1
 MISC ChangeLog 3302 SHA256 0697d556d4898c4a7a22ed7d0a4c66a9afa50e98ec90ef571c33755c27ed6119 SHA512 e56bffa3481a362a6ab0a0a305d5efcf8603dac8d284a40604a4d64b13c950edc7584dd07759e28ff41366f6ac8f2d8b583045d2075c8ffd81032e41c3788b87 WHIRLPOOL d3b3930606039ff868616e9cef247e12ea11a883dfee51eb1bc6a5a7528f0976d089ae562a685c256e4a9ce2d238c56cb95d0bc6b102ba5e1e5269881fec10ad
 MISC ChangeLog-2015 3332 SHA256 82f87643202dc5a04389a15fa99fd241a6e49eb8f23dfba43ee7c4f533a9813a SHA512 e91c58383f549505c82dc6effc1847409e6c24ebf1bcf849a060f40019963bf0b24f40f54873878d880f40e215d0293b74952242eb66e209720c34e3d6118e68 WHIRLPOOL 8b9efeac6e23b8ba2c21d71bf7f895972fa99c2ae728a58fc15fe9f510391f9eee09f46145c5198082a4be52f4582b97b2520d9837a912c324b6b0ed5c12176f
-MISC metadata.xml 753 SHA256 1b876770b0d5829b2ddd1218f9bed8cd79eafdd482829af4b0fbb3843231b155 SHA512 29d5c988054aa1e219041b0971ecaa19378c131996e0f7c150711d9b9d52c04a9539fd6d74264226984f23fd6c25abaa38f53dcc7a70875adf478bf19ed419c8 WHIRLPOOL 1d2798ada84907a2446831736e6d019dd5917bf964a2ab77aeedaf851c132966aaebe5cab977b888e11045b9bd8f06e606d85fbac8906db561d75a3d416b169a
+MISC metadata.xml 636 SHA256 a46bf9c60d19437867dc2be01a0e0e4b9d9bc6c14ec954e6f583397408b78d43 SHA512 2088e0e13c3cd3539be718360a10145e17083bd135749b8ed3374cb51523f53bc0bbf4a441c879f95982ef235f18243bfb49ec822ae70ea4fa8e684e96fdde20 WHIRLPOOL bb10f42ed404afadd396cc9ad74a40df908cb98d5ee1b152bcaae3e634199879bc06749d9bd545e10555cf7a1fe323c60ed3826c697a799c8c652b823abc8db7
diff --git a/dev-haskell/tar/metadata.xml b/dev-haskell/tar/metadata.xml
index 4d362db0fe51..b45e7c641aae 100644
--- a/dev-haskell/tar/metadata.xml
+++ b/dev-haskell/tar/metadata.xml
@@ -4,10 +4,6 @@
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		This library is for working with .tar@ archive files. It
 		can read and write a range of common variations of archive
diff --git a/dev-java/qdox/Manifest b/dev-java/qdox/Manifest
index cdcbdd02f1a7..f5a5f8ca44d4 100644
--- a/dev-java/qdox/Manifest
+++ b/dev-java/qdox/Manifest
@@ -5,4 +5,4 @@ EBUILD qdox-1.12.1-r1.ebuild 2202 SHA256 060c64921072303cc9d753c6dc2bdc1bf7f9f9c
 EBUILD qdox-1.6.3.ebuild 1319 SHA256 d59f8edfa0322b0d1024b9578d97fa8bec7921206c8b896a2b891d8ffc0d0964 SHA512 d3ae1db0c4ccf4df92c3e4bd1fa3175ef8b4a7f0b71dc3e93c5caa604a4dc63d9e1ce40ecbfa008bcf0ffac99a84e21fe7ff02dfc2f33e67490fe7a089fbd8bf WHIRLPOOL 3318a88eaf5ece31ea64ccc1d9b41e789547e09103cbe1e01679ed9f75109929907a41aac99ab8ac66b97686b14a70d57b4653fd5cb302cd1a11dfc182ed3c82
 MISC ChangeLog 4260 SHA256 11dc3dff6207c1498e93ad961d8019e720d7c85327bfc005f556d233e6ca238e SHA512 f184f876676c9fcfb215f923777f461a1c10a055d15a0e93fcdcf22e756fe2e82f81541d25db7b06b5f8ec6707dbbaaaee3ed9603691d0c7051a49a7f5008ea9 WHIRLPOOL 214474cbff0c084591c735e8f43bb29f3eeccf7af0445e2fe701a19abbd905ac9835ff49704e210ab3905e322e04d19d86c170cbe02a21d890223add8e6b1174
 MISC ChangeLog-2015 6331 SHA256 390c056a0f01ce2c54f9a5c5e6077ba703e264c087d82d41c1baf0504a3140d8 SHA512 660417894cd04acd0c38f692ad056fbb01961ae704c79cda9636cce0acb278ab49d1438dfd48eb9bb75ee4bd46958fa84a4e20956566e33aa3f50dc09cde3714 WHIRLPOOL 8f92c9371e5086afae13b7788020857d92c7dcfec3a933c00d4617e2faea78fa1f276256c97c65cbce6ea773bf5bef1b2e29d4f7f5f38f69c24d6e53faf0190f
-MISC metadata.xml 606 SHA256 bfce02d4abed2381720afc4ba72fdac177393e3767581f9f9ced7958fc586a12 SHA512 2c6bbf38e605e7a4f854bed151230d6a61d470238dfa54f8b09334ad66090807f72e371aae55286ec75b6cacf6a7ebac60438c4134a22ef090fb2fb8aead0ee5 WHIRLPOOL 51d45c37b4020aa7b2303597ad773a02e848f54fa41a4525657623ab112df3b149f35213fe3f631ff8f7d763e622dde0526eaf9b9310f045da6cea7df4a62172
+MISC metadata.xml 489 SHA256 a9bcd3644d0151e7d71c83963bc4162191c68c249b6ee994b87355d7c60b44da SHA512 709f38b7f8bb7fabd77d9c17a15e537b7c5b46d6c3e203f24847377980ad6afe55adede125b703215b3ab00ad6cb02b8994b75a3db2a4b1b556775bb9f00ee8d WHIRLPOOL d72c2ce046a0a46fbfdf854087123b40b5b42197d1f672dc48887ac3d31b341295175dbee871bb06ee96d7f52ad6c060bb7469ce3d80721fbc0b456ae9b06e5b
diff --git a/dev-java/qdox/metadata.xml b/dev-java/qdox/metadata.xml
index 60d5c915d495..5b3cc7523d73 100644
--- a/dev-java/qdox/metadata.xml
+++ b/dev-java/qdox/metadata.xml
@@ -5,10 +5,6 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		High speed, small footprint parser for extracting class/interface/method
 		definitions from source files complete with JavaDoc @tags.
diff --git a/dev-libs/ffcall/Manifest b/dev-libs/ffcall/Manifest
index aba5239d81c3..87cf6e391c15 100644
--- a/dev-libs/ffcall/Manifest
+++ b/dev-libs/ffcall/Manifest
@@ -7,7 +7,7 @@ EBUILD ffcall-1.10-r2.ebuild 1260 SHA256 3e26e8f50b34f0915cc1e045a4f5441c581cd38
 EBUILD ffcall-1.10-r5.ebuild 2007 SHA256 8f4b4650322c6724197c57c811e1674324c4f16bcbe91e6ea9091ff3b9d7e87f SHA512 f71390ff4d83dc72139c53b998316bf614ac6587c182e3ea51d7fbed26f8a468d00e0211623c68a9b0e636bcbf5321e0e1c02b46bda8a1f7a684133f5e357ba3 WHIRLPOOL 7dc9416aa1618b2f3f55c8ac475ab3c1db132d1e6ae36b4bfd50655a5a3eb6872e08da9cba9b7aedaa5b83a1953e4f6f2d6472c0cfd6d88dd06b2aac36b6ec10
 EBUILD ffcall-1.10.ebuild 1622 SHA256 5d50fd5fbbccbf05a90bf710eb73bfa8acf3f32af586ec0e96ddf81ce52f2fe1 SHA512 2ef41a0ec232346b4ebb118f953da2f8de54cbf0d8495e2897261cc56450aaf366e806707c95649429bb9e575c697e3b3c55c6c63746c27abbaeddfc77ec1a8b WHIRLPOOL dcc1822f32f779b90e7914bfd6a8c6f8bd6c42d317b50529cd3e5fb882e0a165633f386d1472c2a9add4eb3a2090c3c650c24445c00d3e87d2a5bc27168ddc90
 EBUILD ffcall-1.13.ebuild 1485 SHA256 38067cc39a4488cb70431b874c0aa448e3555e756504f7721b36d766a129729b SHA512 cd06188825a8ceaa04adca8bb532b429faf7d2c25a66c09e51a1ebbe5f9b204bbb9fa470363044e795fb9aed9c135b31e05456fe613da181b41618dfa828c69d WHIRLPOOL cd66bb1d64078ad1db8f2945f007026756fe03b00a5c64fe34025ce2313b995834678acbc713de8e8fc146ed203129e9b6158bff9913d540457b4c45fff4328b
-EBUILD ffcall-2.0.ebuild 1490 SHA256 429ee7ae686dc645a18d5933ee3bba02a6176d461ad11ed2f3757eab1696ee51 SHA512 15be93575c3979f094bfdf3c1aa8deb809e196e2ccc011dd3b93903ae209f1ad366817839230a09fad8e8374375140936928250a078158f3c82194380d464a95 WHIRLPOOL baa60809ae8e43e9398d158ed2af0ee2dd2cdc73ddc6b887255d83398dd33594dd7ae6b8426d9bf5cdd98f1ffdf55a340e7436acf4a9669eccc1de9d2e450b73
+EBUILD ffcall-2.0.ebuild 1489 SHA256 ce384de92a78e6fa7bad87c2fecf4086f76019073e049bd7258917cd9a0b3775 SHA512 4b1409ffc9a41b3f3639125d34bdd4006a29349f095d2f0fbf90d5191196d98129ee49163cbbe2ea4173aeb24176e17adfb06d6e8d781f77e6b70d3b9f37b785 WHIRLPOOL 580cecc0cace265c9f9e417c8f3756a502e371d73bd0b393b740b5221433792e72662c7565b1db18468aff438073a7f50b84b56caaa866ea874a7d0e8df0bcd1
 MISC ChangeLog 2656 SHA256 5add85d025118d2a7fdad19b45ae0e0f3f52622f74780d7b83aa1069291a4388 SHA512 25e7fd119335582f426e31b67a892e031730f944d6848faa7967bfa9ba1dab6296418893819c420df226ade32f32832154e4326fe8ff5b3b31d82279a52b8c44 WHIRLPOOL 60b83d1e7b058b700eda9f99c36d56c233035aa99724be09b72bd403498317c552783519cdee8d3b1c9385b74ff94a2edf2cf269b7bc88c18df196ed6d52549c
 MISC ChangeLog-2015 5393 SHA256 ebd69c93d3f0ac7e75b68cfb3ae079cddb3bc43fb96f4a61cdf58d1c3c5b37b9 SHA512 9a45eb0c33d64e6dcc51672bcdd2416b077b1cf1b78a146d8dd8f66f55bfbfeee1abace360ab06df70083c41f95c5d3b107ad69e51179587cd18103bad347ae0 WHIRLPOOL b50648963d06c1466f4bf892e285068044cbd70d86e15835c239c884c99d7f73e536f42f4a85a220ff7f43a9e0ea9040d0c572b9c9683f672427b90a429a2f44
 MISC metadata.xml 858 SHA256 1c048c75ac311016b9c59909a71a48571e31371284007ad4244802c59e36f001 SHA512 e64e471f2fdcc289c678bfc4fe3d2f652062907f9ff18d0350c0907b3d9bfa4e92c76bf04d1b2f0fb3f820f917ec4e3bd7d997a0d5e2eb270ac10516cb58f971 WHIRLPOOL 910dcd051c99f33a78d8b981c6989b340e582df4df6661b575c9c29ab2303ca96037b7e192ad6563f5ab793ad4212d300bc60c25f0cb5b039052acf51ef6a171
diff --git a/dev-libs/ffcall/ffcall-2.0.ebuild b/dev-libs/ffcall/ffcall-2.0.ebuild
index 4a174c02208c..199a208a913b 100644
--- a/dev-libs/ffcall/ffcall-2.0.ebuild
+++ b/dev-libs/ffcall/ffcall-2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/libffcall/${MY_PV}.tar.gz"
 # under GNU LGPL." -ffcall author
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ia64 ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 S=${WORKDIR}/${MY_PV}
diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest
index 1f3cc0a17de0..9cb1128216d1 100644
--- a/dev-libs/libmspack/Manifest
+++ b/dev-libs/libmspack/Manifest
@@ -1,5 +1,7 @@
 AUX libmspack-0.5_alpha-CVE-2017-6419.patch 1483 SHA256 4b3ba5b72796af2a442bb0a01a09d6f19a4cc1544c84f505b9c50d974262e9b4 SHA512 b6aafe82630d3bb1254fcce9a8bc528b0f375a2e7eec5f729e04c2d9816feb23ba12a0275efcf5ced6578789c4ef83b4364104b4cc35c2c146f4fb527c8dbf4a WHIRLPOOL f34e90557d6c01827c032ad9067b7d1d0072f9cd4b49d99c3d6968e30e0d2d64c5a4e405fa5ff93d483268a1ee2dd912ef4e8091ef4265ef90eed0447416646d
 DIST libmspack-0.5alpha.tar.gz 654193 SHA256 8967f275525f5067b364cee43b73e44d0433668c39f9376dfff19f653d1c8110 SHA512 6d4efa0f43c43185ef91c97c1518aa70f09109d7332cda7e12019e146ec9cb0f2065fb1b57683b48bae9a7eaf8e82eb94096644c6d25c56d45878f630b719231 WHIRLPOOL fcbbbdee1ce4c75222767ad7ce3e16d18c3fbf1c7cb60170a9cad51647e3500e11c458f7a65e8c2e0dccfb8a8e3981f13252ac26fd9edce6f633381b77410faf
+DIST libmspack-0.6alpha.tar.gz 476992 SHA256 1edbee82accb28e679ab538f803aab7a5a569e4102ccf1715b462b1bd915f921 SHA512 7ba4a584d335c2d703628a3c179bc0d323574632357cdfe04622f960dcc4ef970b5739799397b6802d44a312f7ed9d589b4be223facf044bbfdbfd76d9c7405d WHIRLPOOL 5c8fb600af798cb7902c8a7233515004ffc2cc440a152d4296f6827910530259648f73f6e29fd75b5190057b9cf66ad1d180c58255450dbb6b23fce548ad5c73
 EBUILD libmspack-0.5_alpha-r1.ebuild 1056 SHA256 8a72b6596b49c1983142923a489d396737bf24f8fd8ec103311aa681889d7ded SHA512 df255a8f2895b667e46acb21586f7101cbb59d9dff1575a537ce31bbaac7c1d5316ca37ea58c953c1c7854929cea6e5314d5287b915b19cbd8bc943d3f1c2182 WHIRLPOOL c0ce9ca8a6e62e50574c14ae4b2cf4d56fe405d448ae9e6fcdb82bbb3df008aea0aa0763f23b2bdc9d0ae236b8995e26e3c964508956694c84b727134137765f
 EBUILD libmspack-0.5_alpha.ebuild 1001 SHA256 e3ba99982cb2b9704552a2805b912d6c6be5bb1a74c33770609bcd0bdaf30a73 SHA512 04e51296ad4a50665ad8df5d020337c75667f7525412b08356aede88c5b79bfd102613ba5f7a7fd26adbb918a4d78e280f4977949dfcc59a492613ceba1114ed WHIRLPOOL 55f3edd5aea6e803a8c3c70c310d905a8a76e314ad2ecbfce453d8438435512e2b5cdb04d9dcbdff54b9d59915b77e0018d46cc1a9e3fdd4a49f3ef902a8c9f0
+EBUILD libmspack-0.6_alpha.ebuild 1003 SHA256 4a53ba265e2918686067c7c40fd95d0110db4857428834be82399789e3e0ece4 SHA512 8e5c7dd3ac04fdd0dbe84f68d39e531d7427e9ceec23e70b4273041134d665e781809ee6fbd6da215297edda693903684c297b3ea7c7be8ea7bdbcd288a64ce9 WHIRLPOOL 0aee7c1389f2ed9542eb7d88dbaae4d39e873f5b4cc47e4d64a9b6fa83416ac0ec32650266e467d5cb189402894797eae970fac8bc44b5232dfdc3ae34ee0db1
 MISC metadata.xml 269 SHA256 b0e50e7006e04a696bc946ae45550e2bb2d59f449f22ca6a2eade72adb0a927f SHA512 753992cc0fe22a630515becd9f12d80c9929c104521232d87da5fb369c1e3d2a86080d1d54ed1483b54f368882a7a3854a151c7779c5a3ce2aabb06b6a840c2a WHIRLPOOL e9ced1f41b584ec2f6653cbc62c86391fd9306e5f79347bc9d6e82956a7d069177ff5c2e5fc471a4097984889b22fdad936210b3bcd0682327c6aaafb11877b3
diff --git a/dev-libs/libmspack/libmspack-0.6_alpha.ebuild b/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
new file mode 100644
index 000000000000..b8c96e78ed03
--- /dev/null
+++ b/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib-minimal
+
+MY_PV="${PV/_alpha/alpha}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="A library for Microsoft compression formats"
+HOMEPAGE="https://www.cabextract.org.uk/libmspack/"
+SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc static-libs"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable debug) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		default
+		cd "${S}"/test && "${BUILD_DIR}"/test/cabd_test || die
+	fi
+}
+
+multilib_src_install_all() {
+	DOCS=(AUTHORS ChangeLog NEWS README TODO)
+	prune_libtool_files --all
+	use doc && HTML_DOCS=(doc/*)
+	default_src_install
+	if use doc; then
+		rm "${ED}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
+	fi
+}
diff --git a/dev-libs/ossp-uuid/Manifest b/dev-libs/ossp-uuid/Manifest
index 1c615900adf6..59a7802029ee 100644
--- a/dev-libs/ossp-uuid/Manifest
+++ b/dev-libs/ossp-uuid/Manifest
@@ -10,9 +10,7 @@ AUX ossp-uuid-1.6.2-php70.patch 11172 SHA256 c891083d4ebb379711c575f95beefbb284a
 AUX ossp-uuid-1.6.2-uuid-preserve-m-option-status-in-v-option-handling.patch 2535 SHA256 2acc907a73579fb6bb2639f5ca87534a0654b0b7a554ee48c4c2cba8661efa58 SHA512 64634327b2095bac0f8f9778b5c6e09edbaf3f6993aea344e3d8ff0bb661d0e0afae9806a364a33c3be6ca7dd7a23b9b8a501c742e99ad88fbefb88d0c4cfe8c WHIRLPOOL bf904548ba0130b70f513b3759e76b1f7d9f1e00aaa935223ec1871b1f322d152e787d41adadd8e7135f4be50cd376345f12a5b2e42b29722ee504c4666c44f3
 AUX uuid-1.6.2-php54.patch 6096 SHA256 699053118a958fd4ded677edc92e527f06d6f46b736aa66a35465b7c2fb14a04 SHA512 6e3919ffa87e2bb16487761e1b33c0096c8db51bf49e6ba82c3c8f7275d2585c7a7196651a679827c547d8d73ce3739b9f44e44d3f3866aca10ded520547c527 WHIRLPOOL f7d178000bfefea3c352f47550dd1c6b089496d9e659ca895263e503a2cd9a2950ecaad18636b35ea1c7aec2ba595d6485116826767d90a9ad186d3c61e04cf0
 DIST uuid-1.6.2.tar.gz 397048 SHA256 11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0 SHA512 16c7e016ce08d7679cc6ee7dec43a886a8c351960acdde99f8f9b590c7232d521bc6e66e4766d969d22c3f835dcc2814fdecc44eef1cd11e7b9b0f9c41b5c03e WHIRLPOOL 424a7e7e40e51aa7a516c129312548c315ab6581a567bab5ca7ea9289aa9b75ef58db12b947aa58e76d9d6bb151b2cad8709be11f068c43ab986a3396c3b2c4c
-EBUILD ossp-uuid-1.6.2-r2.ebuild 2243 SHA256 da47ed109ca43a00dc99a1c926dc733626a6f824ff4a3f18d6185fb2e1962b25 SHA512 9024ecf04c25a6585118f83b6a4cc230e32f31da0cf267c04bcca76fbd3e8a4be16cb3a0e84ea84851b2b661a54c4fbc3ef58f4cc90c34836147f4c707ee9ccf WHIRLPOOL 61117bd5dfb045a2ba42b03e9842d6f0bcad76709f7689a20827ecaeeeccaefc9419c48d8fbcde0867599240910a91c5acab7067248ed338e729bae4cffea6c7
 EBUILD ossp-uuid-1.6.2-r4.ebuild 2792 SHA256 c48eb58d9fd632dcca3ab0b736d7a82eef57eb1949d96bda17084a79d1d990d5 SHA512 0f3321e226826c8f15b52d498999a9bb6382800ae0452955c7067b4c5db558886d461505f48030d55c83e469d02b6b500e61d84fb28f7b933bf581820f4be341 WHIRLPOOL 66bd40d8fe2cda7d30a2fc9498a69408146fdc31eaf42a3a4d9ea44742d0ac51a614e81f4a490ff5dc42069431debcb8e79f682fb2a242a9af4a5686c9aa8b4c
-EBUILD ossp-uuid-1.6.2-r5.ebuild 2801 SHA256 00b9670a18c361815fb8b8812799c4997d1e1c7f25eaa23476f6ca6632f988ac SHA512 373375aee54e9176729a11260da7b7b63c3379838d94a6dbfd0730236cad4ebbdf508226c329c07cc87a47edd68a2a8b481af1f1586ff97db927078d9eb9821d WHIRLPOOL 285e0c6e2ce72af15c5cb72050e01a2c352de20c0079fcaa3247067b5848f0bb33c9d7e6ad22210cb862c3e4d0284564f2ce63d227b038d8ef7ac7329794d603
 EBUILD ossp-uuid-1.6.2-r6.ebuild 3048 SHA256 904e60857f6a016a4f23b1e7a4e97d99842c7b776bbcc9c01253d5f54de9aabc SHA512 9bcfa77de8523dbf67c58747a083ba3f86615b4aa981ebbcc7db0f48bdc2ae8d9404ae7c6b5f88e12687353b797b60e61d17b5b2434fb23a48ec2218f54c0ad2 WHIRLPOOL 3d95734c7bbe52427e0831233d237ef2159de97561ef28fcd6135ef6f3867a77b76199a593fb99741af13defce5bf566182a0380375af5a96ec98e2d0910233b
 MISC ChangeLog 2870 SHA256 55a875224e7983a212bc4bf0c38fa3f4e3aab60f62ea97a565be8fb3282f6943 SHA512 ad5a4a5f9233b174a845fcaba47378642b09bbb07050568581a5d552e880401fdba9156f2c0bbddfe3e93eec0e4c354a68a7ceaa20f374b351c8dd65a0f39812 WHIRLPOOL ca83fe11babb31f2a06948434627939ad5cac4f7d9dc9e4b135b18e44fd65a4c1fd2aaaf0aac36f95621e522951a2572eb5c67cf3a3a3d9270a0eca8ed2dc6d6
 MISC ChangeLog-2015 7910 SHA256 08ef57ebfcd6bfec3d03270237bba1c3815761610b9709d45560d67583ebbbd9 SHA512 35fc7a7b3a7882e125f4323fa023fd78fa5476aefac809723d91599afc52d3ff76656876849b49e9b93c3f75e8063a7f4659cea479c8f763664c463f85f6d8ea WHIRLPOOL 515d8eed9b172830cf80d740ac7ffdd99f319380a1678c9d163a935db3774b3f32cee4d2c6ac75821dc4d700a6b92544580b5b5bd1788badac09d1f711196e9d
diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r2.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r2.ebuild
deleted file mode 100644
index a09822334738..000000000000
--- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-PHP_EXT_NAME="uuid"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-USE_PHP="php5-4"
-
-MY_P="uuid-${PV}"
-PHP_EXT_S="${WORKDIR}/${MY_P}/php"
-PHP_EXT_OPTIONAL_USE="php"
-
-inherit eutils multilib php-ext-source-r2
-
-DESCRIPTION="An ISO-C:1999 API and corresponding CLI for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant UUID"
-HOMEPAGE="http://www.ossp.org/pkg/lib/uuid/"
-SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="+cxx perl php static-libs"
-
-DEPEND="perl? ( dev-lang/perl )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-
-	epatch \
-		"${FILESDIR}/${P}-gentoo-r1.patch" \
-		"${FILESDIR}/${P}-gentoo-perl.patch"
-
-	if use php; then
-		local slot
-		for slot in $(php_get_slots); do
-			php_init_slot_env ${slot}
-			epatch \
-				"${FILESDIR}/${P}-gentoo-php.patch" \
-				"${FILESDIR}/${P}-php.patch"
-		done
-
-		php-ext-source-r2_src_prepare
-	fi
-}
-
-src_configure() {
-	# Notes:
-	# * collides with e2fstools libs and includes if not moved around
-	# * pgsql-bindings need PostgreSQL-sources and are included since PostgreSQL 8.3
-	econf \
-		--includedir="${EPREFIX}"/usr/include/ossp \
-		--with-dce \
-		--without-pgsql \
-		--without-php \
-		$(use_with cxx) \
-		$(use_with perl) \
-		$(use_enable static-libs static)
-
-	if use php; then
-		php-ext-source-r2_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	if use php; then
-		php-ext-source-r2_src_compile
-	fi
-}
-
-src_install() {
-	DOCS="AUTHORS BINDINGS ChangeLog HISTORY NEWS OVERVIEW PORTING README SEEALSO THANKS TODO USERS"
-	default
-
-	if use php ; then
-		php-ext-source-r2_src_install
-		cd "${S}/php"
-		insinto /usr/share/php
-		newins uuid.php5 uuid.php
-	fi
-
-	use static-libs || rm -rf "${ED}"/usr/lib*/*.la
-
-	mv "${ED}/usr/$(get_libdir)/pkgconfig"/{,ossp-}uuid.pc
-	mv "${ED}/usr/share/man/man3"/uuid.3{,ossp}
-	mv "${ED}/usr/share/man/man3"/uuid++.3{,ossp}
-}
-
-src_test() {
-	export LD_LIBRARY_PATH="${S}/.libs" # required for the perl-bindings to load the (correct) library
-	default
-}
diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r5.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r5.ebuild
deleted file mode 100644
index a0da82f64f84..000000000000
--- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r5.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_P="uuid-${PV}"
-
-PHP_EXT_NAME="uuid"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_S="${WORKDIR}/${MY_P}/php"
-PHP_EXT_OPTIONAL_USE="php"
-USE_PHP="php5-6 php5-5"
-
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit eutils multilib perl-module php-ext-source-r2
-
-DESCRIPTION="An ISO-C:1999 API and corresponding CLI for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant UUID"
-HOMEPAGE="http://www.ossp.org/pkg/lib/uuid/"
-SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="+cxx perl php static-libs"
-
-DEPEND="perl? ( dev-lang/perl:= )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-
-	epatch \
-		"${FILESDIR}/${P}-gentoo-r1.patch" \
-		"${FILESDIR}/${P}-gentoo-perl.patch" \
-		"${FILESDIR}/${P}-hwaddr.patch" \
-		"${FILESDIR}/${P}-manfix.patch" \
-		"${FILESDIR}/${P}-uuid-preserve-m-option-status-in-v-option-handling.patch" \
-		"${FILESDIR}/${P}-fix-whatis-entries.patch" \
-		"${FILESDIR}/${P}-fix-data-uuid-from-string.patch"
-
-	if use php; then
-		local slot
-		for slot in $(php_get_slots); do
-			php_init_slot_env ${slot}
-			epatch \
-				"${FILESDIR}/${P}-gentoo-php.patch" \
-				"${FILESDIR}/${P}-php.patch"
-		done
-
-		php-ext-source-r2_src_prepare
-	fi
-}
-
-src_configure() {
-	# Notes:
-	# * collides with e2fstools libs and includes if not moved around
-	# * pgsql-bindings need PostgreSQL-sources and are included since PostgreSQL 8.3
-	econf \
-		--includedir="${EPREFIX}"/usr/include/ossp \
-		--with-dce \
-		--without-pgsql \
-		--without-perl \
-		--without-php \
-		$(use_with cxx) \
-		$(use_enable static-libs static)
-
-	if use php; then
-		php-ext-source-r2_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	if use perl; then
-		cd perl
-		# configure needs the ossp-uuid.la generated by `make` in $S
-		perl-module_src_configure
-		perl-module_src_compile
-	fi
-
-	if use php; then
-		php-ext-source-r2_src_compile
-	fi
-}
-
-src_install() {
-	DOCS="AUTHORS BINDINGS ChangeLog HISTORY NEWS OVERVIEW PORTING README SEEALSO THANKS TODO USERS"
-	default
-
-	if use perl ; then
-		cd perl
-		perl-module_src_install
-	fi
-
-	if use php ; then
-		php-ext-source-r2_src_install
-		cd "${S}/php"
-		insinto /usr/share/php
-		newins uuid.php5 uuid.php
-	fi
-
-	use static-libs || rm -rf "${ED}"/usr/lib*/*.la
-
-	mv "${ED}/usr/$(get_libdir)/pkgconfig"/{,ossp-}uuid.pc
-	mv "${ED}/usr/share/man/man3"/uuid.3{,ossp}
-	mv "${ED}/usr/share/man/man3"/uuid++.3{,ossp}
-}
-
-src_test() {
-	export LD_LIBRARY_PATH="${S}/.libs" # required for the perl-bindings to load the (correct) library
-	default
-
-	use perl && emake -C perl test
-}
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.41.0-r1.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.41.0-r2.ebuild
index dd0e5c3e5dc2..34f18b06e628 100644
--- a/dev-perl/DBD-mysql/DBD-mysql-4.41.0-r1.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.41.0-r2.ebuild
@@ -33,6 +33,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}/${DIST_VERSION}-no-dot-inc.patch"
 	"${FILESDIR}/${DIST_VERSION}-amvis-type-conversions.patch"
+	"${FILESDIR}/${DIST_VERSION}-mariadb-10.2.patch"
 )
 src_configure() {
 	if use test; then
diff --git a/dev-perl/DBD-mysql/Manifest b/dev-perl/DBD-mysql/Manifest
index 90283d7f8962..fb5caa8ce71a 100644
--- a/dev-perl/DBD-mysql/Manifest
+++ b/dev-perl/DBD-mysql/Manifest
@@ -1,4 +1,5 @@
 AUX 4.041-amvis-type-conversions.patch 1503 SHA256 c7d3d058d72799dccd5225e1ae3025a0a540d373e55c7814564203d2eb45561f SHA512 e30e7d04fac5e19d710af7f116c82455bed5ab1a080bd4e8777e4a08915243f5059c687c936da82d92bbb53496c9a6848cb2fb36bc8e63140e6b230b78d3daae WHIRLPOOL 1919c1b2f99f071cbb667c62cf389809cbdfcff7fb3ee8463f98796e628df1e1587a07298000fecdc2dc3199893059e73d8f3f296f41934ff8a0f600895246cb
+AUX 4.041-mariadb-10.2.patch 1276 SHA256 0ecc3c1378a19f7322bf0706a7be50069cc4dfeb8767cf7c1d4dbebe4673d159 SHA512 1e2b4b98d285c7a0b0cfada98e7e65896b322dcf26985cb1f3bc0ceb1e72e71650b23a8b0600e887df33ed316545f8adc22c4cfd9318485f04195d3825d8ceee WHIRLPOOL 4b8fc48ecde789aeb3c5aa4ddbb46c5dd8135022e013e8594a2b5d40c6ad983b27b2b8260f946c0ab4b130300bef22c02151c066b634be621c0cc511e88a4e46
 AUX 4.041-no-dot-inc.patch 3470 SHA256 4a75b2eae0cca4b4bc9d122d12a6c96ad8f6ed823b70c85ff8bf91c740de4beb SHA512 b7a075b9e63bf80bf78a91fc732fccf2059638961d941b7be0dd73b3669a0a0df7bed3a8e5c12d8d88a9da7c28fb872669de5f3d6b6ac60da5510599a173cb26 WHIRLPOOL 085ad9532f6977ca5ebab4487e035caaf1cf30d4f07bf97e4d2edb244743c0c21a018fb361708ae7342d81c6eb2805820248d7b16e5e535e37c12fdb4fe345f5
 AUX 4.042-no-dot-inc.patch 5717 SHA256 a156c12ed5461a7e51fdd1a9fdd1613620a39ca1d90b3f1f04adccac465ac2a6 SHA512 8b8707cffc9ff711ea0effe9c2eb0ef56fd4b97729e76f3bffe52e780764a4f0d812e1ec00249752363475650dc803b2311c82cc645016d0449be296b8b1bf0b WHIRLPOOL 4b437edd2bbce3438e709a7f66fb56d990f6f20ce427f6884a40f176fd23be3de9160bf9110fc8c8d3b6965d71c2b5621749e79988c96f7e9073d296eee178ae
 AUX DBD-mysql-print_embedded_options.patch 616 SHA256 b1aeee3f0d34a909509b30b0713c1e9385061e2d5518f5210fd90c6d15d07348 SHA512 da7bbc1b65e58128af4c19673827c342de94e811b6ab20ff6844646eb7d6afdff79b61aaa6033ae2ac3d8dce8140f78505961e3da49306b5034a6c3eb5ba8157 WHIRLPOOL e7c755168a0d1c2cf6eeaf6c6fb68ad0ab16c20425adb1375cc40165b08606c309b88e22c320f4c5ceb0adcdf6aca009038ac8a99cd3fdf3907bbba1fbe087f2
@@ -8,7 +9,7 @@ DIST DBD-mysql-4.041.tar.gz 150508 SHA256 4777de11c464b515db9da95c08c225900d0594
 DIST DBD-mysql-4.042.tar.gz 160028 SHA256 dadb6884788dc3fdf40b13b72d8c60d5a83680cc2aeec7515c3e5999e064b455 SHA512 fe3c9e1e325f7056da783e0ea33f9a7810f25f3d9cd2c9a4bf4037b20a2148f2291b2f90d44730e63c7902b45e26993a7f9fcf1b3bf8d1bc5d3fca99893a019e WHIRLPOOL e8fe5c142028df4b10982f71e4aede68f01e0ecef6040fb6d4cf0d8006ab34f80fa8d20fd06794c2668dc8cb0a0459a8c97038f3abe280a6f6bd94e4d04f216f
 EBUILD DBD-mysql-4.32.0-r2.ebuild 1319 SHA256 4311abd6df474f5df7b2de8c8ca427048e93f840364126bbd5ee723c67c57d21 SHA512 e654b62fefeb79914ba77691a9b28777c594fc69f8ff91f77d190f831a79a7b5bd7caaf62d6cc9d6cc3d48a9ae43b96815d3bf87aa62cf9a1a2b3ef6189db776 WHIRLPOOL 3347586ae44a84463889dd804d17728f46bb3125455e65a92527f391197e1491a575595f1ef67ec785cdce71c8bb8eb4305fcaa5e3727beff830dde181ae2f98
 EBUILD DBD-mysql-4.37.0.ebuild 1973 SHA256 9f2a1dfe233565034158c407de65c1ce20e83125ca1c26291d103eb1b78e42ae SHA512 1b6e44cfff11f8f28e29721fd0c47b3b2b1c6a5bd638a9b219e94dd76ae23814bf86116006b1bebae49266e255cfe9b529b79e54076664a502013a6d057f1696 WHIRLPOOL 0dd10efdd7d76d46662f30dac1c96ccf4f56fee1e5630a2b2e36aa64c692e737fb27d091bb3bca572c5a4f43083841a8d37376fc6406fbf1558d03c4ff796063
-EBUILD DBD-mysql-4.41.0-r1.ebuild 2043 SHA256 dbd70d8134be8a9d3af71c5e217eeb358eb23db6eca3c5feb984f33fb48e9a37 SHA512 eb03419925b3b4018b5d9c0bce4561c925a381f1c66c99874bdc9b40e6641a607411362b9468fb01c0d7f628cfbf721c2727d2a7801b23fc21eae106929b339a WHIRLPOOL f6205ebfe8051a0f6cab27e57d49bf8096290b2f19055f562ad320493e7a3e2f725e0b20baf3d1944f91702c97ea930e6027a27a46da882fd4c9c47f94edc5c2
+EBUILD DBD-mysql-4.41.0-r2.ebuild 2093 SHA256 c5f2b75108c38b0717cc48a0d15a5c806c28312e5dc0dd715c14b3993afa7710 SHA512 72f9938a6e98a0a1631eb75d97af59c0ddcb8b7e5436572ab3049967452aac9d6d0339fb7c07e2e7fea58038c2d14f7cd5635767baa43967b480e3e3189fbdbe WHIRLPOOL 76fec5470969437131290fa8504f4e2d33e711657482df02319bd4612f8091943c52506ff3ffbdee1f7370ccc102396478f4fa794d3fc0a99d17f077fbca729c
 EBUILD DBD-mysql-4.41.0.ebuild 1966 SHA256 de13dfad6ab4a235869466d22ec5bad77e69ed566afac3a9a93f499bf7297521 SHA512 88e2669b1feb2b6bdeec630a9fa2fc4dfd62b907d0af3ac0b97a90608a4113593f704ce92d14fd542c8b9760d3a4a345dfdec251359d30075da1a500526182e0 WHIRLPOOL c559885c164743b6641a85fa9b9272e90681b66c7d3983ba8c2ba896e0779de634d1f2cde751f40e90f50bd97db537ce3ed1eba4407f9a72827298e5a4c5dd2b
 EBUILD DBD-mysql-4.42.0.ebuild 1977 SHA256 849f55ca8976cba4672bc823fc12271b3a8f6871480293a7c701bbee8df10680 SHA512 ee15ba80bc64c0073a81f9883ceb0366e21aed63d3543eb75427166f01ffe0125087d4ea0aa196eed1c5c8596581664038bc9f41c2486c2ea5b8c4f68cf9c201 WHIRLPOOL f9743ed08677ccbc9ba486168edfca587b11cf371438311166ae7c40d1ac53b438def464484934fc2122185029064208c6359cb4d2532c719720ec6ba4a9ee0c
 MISC ChangeLog 12301 SHA256 5542cd6880e4f05520c0bb77252bd7ba8e49a825f3330af412fcaaa11769f9a7 SHA512 f6df4409bb13951d3b2d8b4df4d05ace5c828c567e0b4b07e53dcb3a7f141e27028539b66c0ba30b5eb9d3704d79e8191607542f2893f94904cc88fd33c6f896 WHIRLPOOL 7670b320d6f9c3e2898fe922de8c6099350fe26900b4641fe2c244afa6333876766cf8867d7946fc02b37846280ad47d4b9dfd12a4af1fd05fd79302a92b4c92
diff --git a/dev-perl/DBD-mysql/files/4.041-mariadb-10.2.patch b/dev-perl/DBD-mysql/files/4.041-mariadb-10.2.patch
new file mode 100644
index 000000000000..13fa2775a3c4
--- /dev/null
+++ b/dev-perl/DBD-mysql/files/4.041-mariadb-10.2.patch
@@ -0,0 +1,35 @@
+From 509fd6a054de9408ce9032e93fff61f6bdbc568a Mon Sep 17 00:00:00 2001
+From: Brian Evans <grknight@gentoo.org>
+Date: Fri, 13 Oct 2017 15:03:50 -0400
+Subject: Fix building/linking against MariaDB 10.2
+
+Bug: https://bugs.gentoo.org/634192
+---
+ mysql.xs | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mysql.xs b/mysql.xs
+index 13c6a57..6de3c8e 100644
+--- a/mysql.xs
++++ b/mysql.xs
+@@ -790,7 +790,7 @@ dbd_mysql_get_info(dbh, sql_info_type)
+     D_imp_dbh(dbh);
+     IV type = 0;
+     SV* retsv=NULL;
+-#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709
++#if ( !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709 ) || MYSQL_VERSION_ID >= 100202
+ /* MariaDB 10 is not MySQL source level compatible so this only applies to MySQL*/
+     IV buffer_len;
+ #endif 
+@@ -822,7 +822,7 @@ dbd_mysql_get_info(dbh, sql_info_type)
+ 	    retsv = newSVpvn("`", 1);
+ 	    break;
+ 	case SQL_MAXIMUM_STATEMENT_LENGTH:
+-#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709
++#if ( !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709 ) || MYSQL_VERSION_ID >= 100202
+         /* MariaDB 10 is not MySQL source level compatible so this
+            only applies to MySQL*/
+ 	    /* mysql_get_option() was added in mysql 5.7.3 */
+-- 
+2.14.2
+
diff --git a/dev-perl/DBIx-Class-InflateColumn-IP/DBIx-Class-InflateColumn-IP-0.20.30-r1.ebuild b/dev-perl/DBIx-Class-InflateColumn-IP/DBIx-Class-InflateColumn-IP-0.20.30-r1.ebuild
new file mode 100644
index 000000000000..ef520397ac63
--- /dev/null
+++ b/dev-perl/DBIx-Class-InflateColumn-IP/DBIx-Class-InflateColumn-IP-0.20.30-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=ILMARI
+DIST_VERSION=0.02003
+inherit perl-module
+
+DESCRIPTION="Auto-create NetAddr::IP objects from columns"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/NetAddr-IP
+	>=dev-perl/DBIx-Class-0.81.70
+"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/DBD-SQLite )
+"
+
+src_prepare() {
+	sed -i -e 's/use inc::Module::Install /use lib q[.];\nuse inc::Module::Install /' Makefile.PL ||
+		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
+	perl-module_src_prepare
+}
+
+src_test() {
+	perl_rm_files t/pod-coverage.t t/pod.t t/style-notabs.t
+	perl-module_src_test
+}
diff --git a/dev-perl/DBIx-Class-InflateColumn-IP/Manifest b/dev-perl/DBIx-Class-InflateColumn-IP/Manifest
index ba766666fd08..e9e821745bd3 100644
--- a/dev-perl/DBIx-Class-InflateColumn-IP/Manifest
+++ b/dev-perl/DBIx-Class-InflateColumn-IP/Manifest
@@ -1,4 +1,5 @@
 DIST DBIx-Class-InflateColumn-IP-0.02003.tar.gz 24096 SHA256 250bbcfdd3c6863556fbafdd31e6245dbc3f6d4157ba1c1d6aeb87a427c4acb8 SHA512 07a5f97f4e8fe148ca69ebbdf82276774e3ff68ad3956a6fc6523158ddf0a645b6a149d56a316fb5b23a52889f7dbd924e3ded6a940c9ca5d25d774cffc488d8 WHIRLPOOL bbafbbd49d31ef333a627b8b9c0d2eefd157e84ebf344cb592af40b5c899848b8a1e0a1193fa7173badc271448bda5308573722d3905dabe941252e09897ef8a
+EBUILD DBIx-Class-InflateColumn-IP-0.20.30-r1.ebuild 687 SHA256 3af1107fd5f60df75a552c4fcbfbd77f6437e1c0e1f1408ebb4a47d15975ef74 SHA512 edc1e1c2b1ea711f2cc592d16adab5c3ad2885e82f6a0f6720991e00af3fd496ed32a16e3e148b09c3ecca4956435a16e6f8691d336f6a007b9485dbe5aac3ac WHIRLPOOL 9d4081f8e5d60c29b3337f3814c3c3117b36548368fe476a371055c0d081982a5a62d7e75dd9dbce7bffd3eb636e6ab09db59db1680d8ac6b69b9791eac7046b
 EBUILD DBIx-Class-InflateColumn-IP-0.20.30.ebuild 560 SHA256 cc6c8f6daae4f828f816e68caf8f123533f9e6ffa19a312f6499ab27f2c83df0 SHA512 9c20a6a3502e7c088a5b1041c60935c107b2dc9126aa6db56947ce92a14e6ebbd0c3c157dd2c1d0e45b09f3d7374979cd212b0230a373a3b39f7fa38177e4ff5 WHIRLPOOL 92b88610da32d56ea80b891bae5df462c1f5760b4ee5465cf8b1e98cffeafddf1352f6d96fa5fa3da5a62800750eaee66a1926e780f8170b591984068afb49d8
 MISC ChangeLog 2491 SHA256 2d11e13a7bdec93d3365bb0c665e9b07152ee2c1120df0577583482a73696253 SHA512 281ca8b6a16999270050c6ceaaf1c3d3f185745911d30a21ff11419c92439aa599444fb2be04d58be389178b221ef8648cfbe11c2b2edb0e102d3bb01738952a WHIRLPOOL 4bc14a5dbc9bae242b808b5dc6d7466f5227b04eca4a82d8ee99070b50fc49a853e6b34cc874c0309c4730bf6d91dcfc5da0ea0675a658ff2fabaeebebfcc577
 MISC ChangeLog-2015 1677 SHA256 22d916ecbfcfd964a8102d817daef1a72180cb911abdb2648d068df646209acc SHA512 a3f17a2cd27d24fbe657681d63d76b7efff68121d9dedf9b114dbab33d6fad2a46f595c46de82d34047723b24af235634e87120aef605e618cca878894d9e211 WHIRLPOOL 88510f39f48d05e4dffac16b8b9f27a20056350ea393bf412289c7a0a3773a59a3c85658d6638cbe708dba26d60ea9096afd619729fa3e511009645ffb3d0a4f
diff --git a/dev-perl/DBIx-Class-UserStamp/DBIx-Class-UserStamp-0.110.0-r1.ebuild b/dev-perl/DBIx-Class-UserStamp/DBIx-Class-UserStamp-0.110.0-r1.ebuild
new file mode 100644
index 000000000000..ccd6d0d44a2d
--- /dev/null
+++ b/dev-perl/DBIx-Class-UserStamp/DBIx-Class-UserStamp-0.110.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=JGOULAH
+DIST_VERSION=0.11
+inherit perl-module
+
+DESCRIPTION="Automatically set update and create user id fields"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-perl/Class-Accessor-Grouped
+	dev-perl/DBIx-Class-DynamicDefault
+	dev-perl/DBIx-Class"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/DBD-SQLite )
+"
+
+src_prepare() {
+	sed -i -e 's/use inc::Module::Install;/use lib q[.];\nuse inc::Module::Install;/' Makefile.PL ||
+		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
+	perl-module_src_prepare
+}
+# Parallel tests fail sometimes due to sharing a sqlite db path
+# and recreating the same table
+DIST_TEST="do"
+src_test() {
+	perl_rm_files t/02pod.t t/03podcoverage.t
+	perl-module_src_test
+}
diff --git a/dev-perl/DBIx-Class-UserStamp/Manifest b/dev-perl/DBIx-Class-UserStamp/Manifest
index 968de1900d8c..b7a79cc13291 100644
--- a/dev-perl/DBIx-Class-UserStamp/Manifest
+++ b/dev-perl/DBIx-Class-UserStamp/Manifest
@@ -1,4 +1,5 @@
 DIST DBIx-Class-UserStamp-0.11.tar.gz 21714 SHA256 73e091694f583da269754cd19cc3981f88974256a89fe771b5264a698a4db251 SHA512 66411a73d8c27d0ac1cc8f1e61d092c22fd11637a528726553935a3aa4522699b7c48c1cb26ca92ed38c3747c4dcdba0f2b024d737dc5c3281d15bfa7cc0a830 WHIRLPOOL 2453985220ed4a50a3e49fa6fcd0c9a908713397a79b6455e76da85d4e671d5d8f770bf4865d52913c8650fd5d8c53b6d1eada70a27b7fd823ea9147e84a5b7f
+EBUILD DBIx-Class-UserStamp-0.110.0-r1.ebuild 822 SHA256 c97a74503b0f4e91b26bb4e95596a167de0339d710e0c77c74d964fefbc26c2e SHA512 a9071e2b8f0c0b43cf947edb7754187cbe047283d05c179be717da66c310c28f96eb8f692fbdcde2db3bcd7fac65b86ce2d2ab465e81f163a49cf1b8861f7a6b WHIRLPOOL 95c79d2a7eee8a392afb4e5e4586231cfc8a104649130e4f702257e6b78aee00d420b137f75955e184f1533f379ca4f114e5fada915afff5ecd24e613375ef45
 EBUILD DBIx-Class-UserStamp-0.110.0.ebuild 598 SHA256 bd2c7af81312ff697d25f7832e38630df6fa6f1789f57d3cc844425ff22b807e SHA512 06af5a94b35e4f9c129bc2359effb0bf4d688a43f3fc3aa6718c66ae1d257398d5be19e5f155c1adf2e4d93bba17ac4b3091dd96aafef8bcede92977de1383c6 WHIRLPOOL 08db394f90258628e02286b920ebc5e38692035b59d20e28b27eb61d3c3b8e35ea7a18b04845a5d6c16796e80850b85806723af7f6fa262aeb6e4f4526f87c1d
 MISC ChangeLog 2470 SHA256 36ab5644b7ea3b91e588c120ce4cade529c08cb49a17fc0886e3c709201ba861 SHA512 8072f3ced7439ba7539b4822ceec5d795490c2c33974f53b96ee48bb4c7ba98869c88b77403c5482697af1b525ca35343bc6eaa5fe3ca4846cc2b8ce054b9a76 WHIRLPOOL 5e5efbc96e33eb0fb063486f5b754e7228a3865372437a33fc3f40a8e7f3379cfb53c0f8066565b46bd12a474ef165e7a8d1315ce0d2b22d067efe91b5b16f08
 MISC ChangeLog-2015 1034 SHA256 312300d778da679a405ac336e7492adc191af1b52d5df7fb70180cf6d952e448 SHA512 9004379ff209b82ada038aed8d3646750be4165cac605d66f8281eb51b7d27e28fb648d3a26582d040749cb17b0d8beb0f7860abc7117c5a43f4b185e725e2bc WHIRLPOOL d37611fe98e5c83bc1f9a1384a534a5adc65d479f2e34ecae071e4550427a0a55881fae56e60a11b42a53f7ff268a75ae749acec72102333ccdf2a56b6fbc993
diff --git a/dev-perl/DBIx-Safe/DBIx-Safe-1.2.5-r1.ebuild b/dev-perl/DBIx-Safe/DBIx-Safe-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..dd738e566fe5
--- /dev/null
+++ b/dev-perl/DBIx-Safe/DBIx-Safe-1.2.5-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=TURNSTEP
+DIST_VERSION=1.2.5
+inherit perl-module eutils
+
+DESCRIPTION="Safer access to your database through a DBI database handle"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+LICENSE="BSD-2"
+
+RDEPEND="dev-perl/DBI
+	dev-perl/DBD-Pg"
+DEPEND="${RDEPEND}"
+
+src_test() {
+	perl_rm_files t/02perlcritic.t
+	if [[ -z "${DBI_DSN}" ]]; then
+		ewarn "Comprehensive testing of this package requires some manual configuration."
+		ewarn "For details, see:"
+		ewarn "https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/dev-perl/DBIx-Safe"
+	fi
+	perl-module_src_test
+}
diff --git a/dev-perl/DBIx-Safe/Manifest b/dev-perl/DBIx-Safe/Manifest
index fa906b365d60..9ef0e9f4c13c 100644
--- a/dev-perl/DBIx-Safe/Manifest
+++ b/dev-perl/DBIx-Safe/Manifest
@@ -1,5 +1,6 @@
 DIST DBIx-Safe-1.2.5.tar.gz 16958 SHA256 73279fd98b20034d3735dee67e2b89ac63d55449c3c64dd1a7ba0df10fbe0acf SHA512 ce694bd9f6078e7ec7ac04fe57da96ddecebdbe312c87047ee71384c8233ae160078518b876819c6f12ad29d6d27c30ba2975a48db34b7cb5d79ff71f6a79712 WHIRLPOOL c04d2fb1163e49bb62a37ee78de5c195eeb19d58924b22ca93f6701ebb2291aef3373f8f666e0d5328e8cfb556bade2c1d8b0dbdaadcdb045131add1bf3f3895
+EBUILD DBIx-Safe-1.2.5-r1.ebuild 677 SHA256 a12e30c4899d5dd67419b9019ccc33f8292a3f61e16773b6cc99f3de75eb4f87 SHA512 729aea03083eabb71b53f940b6283e12bc38d712521a6f38d3ec85bbe020b20580bb29444b5fce9db09682b53b5a1ed7fa6bedf74ed0a34edf3538cde55025c9 WHIRLPOOL 8541fa32b218b544cd264ddd069f570b20a0a4bb93efddf4070c9ac805ca3be1465cfe9650bc0629424600f31f9792776a55863351a2307f2dcf68ecd6207dc0
 EBUILD DBIx-Safe-1.2.5.ebuild 380 SHA256 78b3fb9c434973486330c37603c881550ec787bc988779a2f8b2d4032091dea8 SHA512 1931fcb3a27eed7abc8cb0e2205eb27232e235f6ed836ae89b4fd4dd48a14d8db73fc0087171c25c380614c260de1d824e399f769908d096c00eeba09c0d8f25 WHIRLPOOL 34ed0dda3797c2db74bd219a918c5bce26a35e46fc54ca44cb2844b8e8d5c0a067c2f7041abfddcfbd8a2d9d7e0d45a7feea655a07a6dbb270f71e14290907a5
 MISC ChangeLog 2433 SHA256 44c6592c5b6a1d52ddd637ad3dc4eac0c14419dc24d4ff2376a3a4201b2cdff4 SHA512 a2e3df961f75c38ec50457bd36f506426705b06f36b90374b552894a4cdd41a51cc5ff4f81a38a49f4c4d7f79ecb2640f9c77842f7e4a7fe95dca38232e6a9a8 WHIRLPOOL 52573b3de35c3a62696153a59c715220a7b1c0154c3e6b730a82a41fa87fd2cc8c5a74a133a9df140bc09de298b8e945581a802fc47e15a5739341a3663e9613
 MISC ChangeLog-2015 689 SHA256 76c8408b564a8b95e0e6120878ec41fe832fe5dda05c7a0c38cec5f26e76ecdc SHA512 f0903760c1678ab8f114936e7aad620dc683a816f6125919e6438dadc0ba7cdc421d1384c4b28b70ab6255c1e47525fd0fb0239982d858babb5e39d78e15b4b4 WHIRLPOOL d05615d52704a8b557792a100510aca96918d28ca52940da9477b43fcf9edd3a869c9782fb2f6621b9c94f717e0b765aa063ed72f6e329f7c6c4fb0153e0ac85
-MISC metadata.xml 257 SHA256 4d43e70b770d0898a99af64a8454a6116e4a86500c23290655c8371265010427 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e WHIRLPOOL 87039765046556cdc2f7d76ce4192945117bfd5bb684220ea8fb72be310673a5b729ea428666ff1ceb1e6c21fb585a3a7dd72bd94dab89cf076a895e6a7677f0
+MISC metadata.xml 390 SHA256 82e1b22c19028b9796885c9829e9c50d14dc6d6182d5a1194d839d024f23d50b SHA512 c50cb9f4aa347d2364fa1a8bb4100e2edf68f2ce5a2f4f15b20ac37a15a202db984f38fe7fe76560ab559742d3e4084c20ad28d758f88405fb89cb9eaae33452 WHIRLPOOL ea146b8534d4ac6a21ae788a79c95ba7a374c6f7e02500fb48555bedad302c4a2d6c5216c891def3919b20116722e157b6964f269142a80f23d00257f4c45a08
diff --git a/dev-perl/DBIx-Safe/metadata.xml b/dev-perl/DBIx-Safe/metadata.xml
index 2b9a936fc0a1..924a4f01a129 100644
--- a/dev-perl/DBIx-Safe/metadata.xml
+++ b/dev-perl/DBIx-Safe/metadata.xml
@@ -5,4 +5,8 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="cpan">DBIx-Safe</remote-id>
+    <remote-id type="cpan-module">DBIx::Safe</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Data-HexDump/Manifest b/dev-perl/Data-HexDump/Manifest
index 9dd5f31bd8f1..05f87d5c46be 100644
--- a/dev-perl/Data-HexDump/Manifest
+++ b/dev-perl/Data-HexDump/Manifest
@@ -6,4 +6,4 @@ EBUILD Data-HexDump-0.02-r1.ebuild 540 SHA256 520280952740a07c52c2b769fc814cb3ef
 EBUILD Data-HexDump-0.20.0.ebuild 388 SHA256 27298822e4aadd7556653d1dbc713819f5578ef60ea817221c9df2b421c8e852 SHA512 2ce4537d8497922e358fe3f2b74407805c17147fe7abcf70b03a7a3edde937442ac6d5dae360627ea554fd3ed334a1e49489d2ed866418f99ad2d0d8923d25a4 WHIRLPOOL 1099c5e96ffbc284a52c3019bcbb13188e50c9a726cae7cf89ae9b3b5a5eba9de986e9c7040429b896bf6eb740fe44a04eb5e413c7f18d2abe3bf9f3bfe2ad85
 MISC ChangeLog 2446 SHA256 1c8c8bf6e2153ed39344364c4c31b1f9648cd6ea6b8d06c497f30a88d42efcb1 SHA512 41670ab6e495bd1db0a18e5cbe5e8e4b958f6ca5d6a28bbad4d3c15bbe4a9b349e7f5e506f16e3fc77db5edaab9d59da789e5c36dec402c5d3b3316c7ffdfd59 WHIRLPOOL 125a06c4b4985bcf702b3e4155e8674025c29fc19dbaa96e670d5455f7846a5d95a4cbbed4e16f89b3fd79d1352b6da483c02c180d8a0872709a857e808c1336
 MISC ChangeLog-2015 1061 SHA256 f4a539b7dc60e0234ba36c3031d4b6c0306a568c2818b29993d1db6ec98dc5b9 SHA512 123bc7a963eac5f6f1aec3a827857eadf864df491f24bd32d0fbfe9857ff330be4d6e265d91772a9caa693e92d736e5a4a1ea5ebc9c15d22c61f5a9c0e0308a6 WHIRLPOOL 5ae94917673333b8939364086d7ad755969d914e924847e5e59ef80ff8859ef150ccff36455a86dcdba517f6e5a0382ad85f3d231ff91d207d38f14c6364e09d
-MISC metadata.xml 336 SHA256 7e8fee943851c3906f1aab1b7e13eb5b916db40b737f4f9e36ef2e8416aec675 SHA512 c096f1eec35305a49e0a2c12906be89209dd5133421170090783211c94d00ce76d7c74727bccd66165328f987e5026458f7f094a9e5eeaba1faaaf6f5097d833 WHIRLPOOL 39413c62e3bc1f02567b0ef5981a008c1fa2310b86625b255065fa45184e335eb0ed9060cbcd48bda28a27739b60af32bc62d5d0ef7528fb567e8560e8dd34b4
+MISC metadata.xml 396 SHA256 3963c0b1f71ccad4c1a07191d90d847277b8880dbf8d651d6f64a8fe0566e774 SHA512 5126f9c11f1edb366844f8ecc7f09a05fb6f759c08aaea90e2f108440c8472701e491d79e0fed5724254599229bcd9b3ae465841d12466241e601b9540a88c65 WHIRLPOOL f06eabacf3dd1e93e6684429d9f7adb3adb0f5e0cb07571b2b505ebf1da9a4e3ce91a99b8303c7d4c0f36b44e98ead673d0f5b1291e782ace796e6e14e90ef05
diff --git a/dev-perl/Data-HexDump/metadata.xml b/dev-perl/Data-HexDump/metadata.xml
index cf65f73d36a5..0534d0cc31a5 100644
--- a/dev-perl/Data-HexDump/metadata.xml
+++ b/dev-perl/Data-HexDump/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Data-HexDump</remote-id>
+    <remote-id type="cpan-module">Data::HexDump</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Data-Perl/Data-Perl-0.2.9-r1.ebuild b/dev-perl/Data-Perl/Data-Perl-0.2.9-r1.ebuild
new file mode 100644
index 000000000000..565b8db84e83
--- /dev/null
+++ b/dev-perl/Data-Perl/Data-Perl-0.2.9-r1.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=MATTP
+DIST_VERSION=0.002009
+inherit perl-module
+
+DESCRIPTION="Base classes wrapping fundamental Perl data types"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~ppc-macos"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/Class-Method-Modifiers
+	dev-perl/List-MoreUtils
+	virtual/perl-Scalar-List-Utils
+	dev-perl/Module-Runtime
+	dev-perl/Role-Tiny
+	virtual/perl-parent
+	dev-perl/strictures
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/Test-Deep
+		dev-perl/Test-Fatal
+		dev-perl/Test-Output
+	)
+"
diff --git a/dev-perl/Data-Perl/Manifest b/dev-perl/Data-Perl/Manifest
index f6a860a52db2..8f824fe74b5f 100644
--- a/dev-perl/Data-Perl/Manifest
+++ b/dev-perl/Data-Perl/Manifest
@@ -1,5 +1,6 @@
 DIST Data-Perl-0.002009.tar.gz 23155 SHA256 b62b2225870c2c3b16fb78c429f8729ddb8ed0e342f4209ec3c261b764c36f8b SHA512 872eae53641b7ac19a8bcd4a6522475bf042463fbb8380a45481289c6792fa17cf4d52d146228acf089b9cff091413684fa5b39f67bc28f362a5d2eb85d1d01a WHIRLPOOL 91c8bfb339bc05d1a2165ab8c6c734371919a758844b5d0cb16806958beca01024e4b0e652d3b20748f52ac505214e4353f223c597573428d9dcce71d6d7a83c
+EBUILD Data-Perl-0.2.9-r1.ebuild 630 SHA256 84521639c369a275fd354bab353092726c1f68f4ff6c7121c3e97408ee2d68a9 SHA512 d8ffa52d71f25ba05aeb95c3333e50712601561c285f3d4925322970f034637b4676443a821c1b9117dc702f5e49d73e3fae1da40e78693a1583b5cdd7ced141 WHIRLPOOL 3a7497e3706cc9d4d51c8f0a0c9c37a33c742f800ab8816eb3cb10a829def12709c2064454410a3fc3e6a3e5d33a205284b763dc5fb98761031c0f0f15860160
 EBUILD Data-Perl-0.2.9.ebuild 645 SHA256 4f8881c9ffff96cf9d41c76d70bf66da7b08b4c61b82390cc9ae3644a4ef11e7 SHA512 ed93c6f9fd153aa79bf7b9156f2f6b476df4e9829f07fd2bc82410a0bf0ff972cba9f5288b12e288a21136916e152916009be629013bddf599663ea0d5b7d5be WHIRLPOOL d4677e16074aecf7ffe7728a7074216b2d9c7690ab1c57efe399134fc677402758c3c5cfc389cbe413ff6bec5e7af9a3cb35ea8e8c5cb2bedfdca6e007901e2b
 MISC ChangeLog 3304 SHA256 66d185b1f4cb665f71c0ce55d04728acff1fc0497bcee7b51345ffcaa2b03d11 SHA512 7107a7f654cb3ebeb8418380dd3bb99dff9d3145f45a9026d171fca40909c8aa2ada542524fa8fb5784d50d72bcbf47be807d63334e4c915c442c3a79bf62ea9 WHIRLPOOL da65b46523acdc4009afe41ac0a3785bc3d40e68894e6e609ad6b322f10913c639a6c4f3d63d7402e7b21c787a20c001b4022a29221a2ae96e307d1e953f29d2
 MISC ChangeLog-2015 715 SHA256 a51677947075276c736a18e600333696804967f5fb98a8fdbc00f7aac4975f1f SHA512 8c57d1cd16d075cec4365f0cc59ad6a102c4eed68ef67059feeeb642b31c3b75f78a760d5f2841208fbe14c2e997957e891a87fcd4a9ecb3449a8a965356c26e WHIRLPOOL 13b8bca76898e7e925bd265b2841f4b1f7335f648cc068ee11a9114762371ec39c8474233b904e5209b65ee2c783583946c3725096ed77a6d81128a8cb257b25
-MISC metadata.xml 257 SHA256 4d43e70b770d0898a99af64a8454a6116e4a86500c23290655c8371265010427 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e WHIRLPOOL 87039765046556cdc2f7d76ce4192945117bfd5bb684220ea8fb72be310673a5b729ea428666ff1ceb1e6c21fb585a3a7dd72bd94dab89cf076a895e6a7677f0
+MISC metadata.xml 1378 SHA256 42ba8223feaf19866f9f16fde4c13d4b3370f03fe96b7eec274368bb289fdb88 SHA512 6166dd5902561f4f12158203b8affff35835c15b9d843b1924eea23a0af70832045cbb33fc534cad128ec06cc096abeb539f4fa6f670f78f173bb8ac164e16a6 WHIRLPOOL 3de0fd1083a85a092b1e9e2a2d7b8e0c502ee666ca4633b6fd909b167d2526aa0377462a5285911ca533b1ff0f5a75a1308b6dcf32e10f6545e2e05050648849
diff --git a/dev-perl/Data-Perl/metadata.xml b/dev-perl/Data-Perl/metadata.xml
index 2b9a936fc0a1..87e8fd1d2c09 100644
--- a/dev-perl/Data-Perl/metadata.xml
+++ b/dev-perl/Data-Perl/metadata.xml
@@ -5,4 +5,22 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="cpan">Data-Perl</remote-id>
+    <remote-id type="cpan-module">Data::Perl</remote-id>
+    <remote-id type="cpan-module">Data::Perl::Bool</remote-id>
+    <remote-id type="cpan-module">Data::Perl::Code</remote-id>
+    <remote-id type="cpan-module">Data::Perl::Collection::Array</remote-id>
+    <remote-id type="cpan-module">Data::Perl::Collection::Hash</remote-id>
+    <remote-id type="cpan-module">Data::Perl::Counter</remote-id>
+    <remote-id type="cpan-module">Data::Perl::Number</remote-id>
+    <remote-id type="cpan-module">Data::Perl::Role::Bool</remote-id>
+    <remote-id type="cpan-module">Data::Perl::Role::Code</remote-id>
+    <remote-id type="cpan-module">Data::Perl::Role::Collection::Array</remote-id>
+    <remote-id type="cpan-module">Data::Perl::Role::Collection::Hash</remote-id>
+    <remote-id type="cpan-module">Data::Perl::Role::Counter</remote-id>
+    <remote-id type="cpan-module">Data::Perl::Role::Number</remote-id>
+    <remote-id type="cpan-module">Data::Perl::Role::String</remote-id>
+    <remote-id type="cpan-module">Data::Perl::String</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Data-Serializer/Data-Serializer-0.600.0-r1.ebuild b/dev-perl/Data-Serializer/Data-Serializer-0.600.0-r1.ebuild
new file mode 100644
index 000000000000..8d662cac0a2c
--- /dev/null
+++ b/dev-perl/Data-Serializer/Data-Serializer-0.600.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=NEELY
+DIST_VERSION=0.60
+inherit perl-module
+
+DESCRIPTION="Modules that serialize data structures"
+LICENSE="|| ( Artistic GPL-2 )"
+
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-AutoLoader
+	virtual/perl-Data-Dumper
+	virtual/perl-Digest-SHA
+	virtual/perl-Exporter
+"
+DEPEND="${RDEPEND}
+	virtual/perl-File-Spec
+	dev-perl/Module-Build
+	test? ( virtual/perl-Test-Simple )
+"
+# Parallelism broken: https://rt.cpan.org/Ticket/Display.html?id=123331
+DIST_TEST="do"
+
+src_test() {
+	ewarn "Additional dependencies may need installation for comprehensive tests."
+	ewarn "For details, see:"
+	ewarn "https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/dev-perl/Data-Serializer"
+	perl-module_src_test
+}
diff --git a/dev-perl/Data-Serializer/Manifest b/dev-perl/Data-Serializer/Manifest
index cc1f15e1746e..5ad49f5fee2e 100644
--- a/dev-perl/Data-Serializer/Manifest
+++ b/dev-perl/Data-Serializer/Manifest
@@ -1,5 +1,6 @@
 DIST Data-Serializer-0.60.tar.gz 43291 SHA256 b3493017840bccb19cde57bc84d4d4183872efeadeeed3275ec21d1a02d24431 SHA512 85211d2ca5db19219f89da5300b93835866baa5e12237efa61ea82d2b841f6b5a05bca889d98878151d1f7517b2af5d9a1535e7bbcd64245936b270a82be21bb WHIRLPOOL 20679be6cdb2e5f1878306162313d7647e80c36514b00cab1a150568d85fbc279084960a2d76b07edb04383ac8de07e03d22a7ceb72c48a77762db2130f35e66
+EBUILD Data-Serializer-0.600.0-r1.ebuild 839 SHA256 c160c1a683aa0b616d78742421847db7d8d33ec1c286798a075706cbc6746950 SHA512 39cfa2479a8c9b9b5e0040437b40500252a47ba318f842de23b949d10b623a52169a7bb0cdf30c200fa4f8b3760794b5c1223293865a35dee016d0b0a52697d1 WHIRLPOOL 3de32e142e47115878e52cf9aae870d9cd8999681e1e49a6fda70e14f0a62f5058e32e866abb38072c6e0d0695ed8a8b03b0b47ae81037217b8bc203d160467a
 EBUILD Data-Serializer-0.600.0.ebuild 523 SHA256 3f4cad723035d30b0c4e660a802a2d6848114caa41a9bdf73249248905cd56a0 SHA512 18d61e0f4390fcd780509e651d84508f6c1df3993d8374a01d08db12bfbb391e3b3eddcdb139021456a8597fc98b5ee1259bef2270a5013f8880c5a1f2f31983 WHIRLPOOL 5103c2da93726ac9b3f870144493542dd444274e65c78ddaa57566c6758bc7c812641ce4a6a9812ba5196a62f64e361e0012d1cab5e210f304d4275e64531052
 MISC ChangeLog 2455 SHA256 2ee6173e16fc997dd92480cdd72470611012d6ed1d9e9157817729a31dfead31 SHA512 c387567542436b0045783a78f9ec700c9e2b7229dbdaa435639f2538e57b9cc92c87d59fae341cdcf514e0e1bd5590d8cd0f63266242d412f033b24e657df915 WHIRLPOOL fae1272dafcfe4e97b865b7ec15d047513289a8fd3b659179a7bb899a4ad35b161223c62eab1c74487b813ec15e0e33748abd10a05fc0b512d1afcf815a0300a
 MISC ChangeLog-2015 555 SHA256 75b7f1c5b974a51cca36724a95d59828959f19e804f204338a032b1cd51dd8d2 SHA512 c31d2298b258dabd61416f05a53fdb8f46f569d6185a68a3114f98fcc7e88364a2ea1a13b9f5d4e358691c6078528c30a6ccba2f107af9c57dadd4467e22bfbc WHIRLPOOL c89e8298e2011ad0246f2e9446a03e6cf6e34c0f066de863c0a5826aac1d072cff5efccd7c6ee98efe1bb92270017bff06c4ba646e1ca57dd381bf1900ea63ca
-MISC metadata.xml 251 SHA256 38969a343659e88a894d06828458ee55b28e9acd7aca5a59ed98621146aab844 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695 WHIRLPOOL f05271953c2c5c80651322f48dbe5824812a413518fbf78b44ecf77c3e57d53507b42cb3d0b0a9c0ba77c31cb6278bd3af3bae204f86dc428ef1125fc155b30c
+MISC metadata.xml 1785 SHA256 612ed23b6e0ca7487a9bba83d7d1ce6bfdb2cdde8c6178f6af3360d17758e824 SHA512 f94b1ef75c7cfc02d87c446f6c3dd03b2004d49b122311479bbcf03b36836cc27f639ec77b7f9838a4f588bd58780bb852a7134551bdfb1cab3574073b668cb9 WHIRLPOOL caee65f98252bd2ea2713fc798c72033a00b17128979340628079e3615cbe60d2c7be369fbd8a453c9b3ff41c79ace25223a3a1221c96c64962b7135f7a8cb8f
diff --git a/dev-perl/Data-Serializer/metadata.xml b/dev-perl/Data-Serializer/metadata.xml
index 51930499ab60..3cbc2852662d 100644
--- a/dev-perl/Data-Serializer/metadata.xml
+++ b/dev-perl/Data-Serializer/metadata.xml
@@ -5,4 +5,27 @@
 		<email>perl@gentoo.org</email>
 		<name>Gentoo Perl Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpan">Data-Serializer</remote-id>
+		<remote-id type="cpan-module">Data::Serializer</remote-id>
+		<remote-id type="cpan-module">Data::Serializer::Bencode</remote-id>
+		<remote-id type="cpan-module">Data::Serializer::Config::General</remote-id>
+		<remote-id type="cpan-module">Data::Serializer::Convert::Bencode</remote-id>
+		<remote-id type="cpan-module">Data::Serializer::Convert::Bencode_XS</remote-id>
+		<remote-id type="cpan-module">Data::Serializer::Cookbook</remote-id>
+		<remote-id type="cpan-module">Data::Serializer::Data::Denter</remote-id>
+		<remote-id type="cpan-module">Data::Serializer::Data::Dumper</remote-id>
+		<remote-id type="cpan-module">Data::Serializer::Data::Taxi</remote-id>
+		<remote-id type="cpan-module">Data::Serializer::FreezeThaw</remote-id>
+		<remote-id type="cpan-module">Data::Serializer::JSON</remote-id>
+		<remote-id type="cpan-module">Data::Serializer::JSON::Syck</remote-id>
+		<remote-id type="cpan-module">Data::Serializer::PHP::Serialization</remote-id>
+		<remote-id type="cpan-module">Data::Serializer::Persistent</remote-id>
+		<remote-id type="cpan-module">Data::Serializer::Raw</remote-id>
+		<remote-id type="cpan-module">Data::Serializer::Storable</remote-id>
+		<remote-id type="cpan-module">Data::Serializer::XML::Dumper</remote-id>
+		<remote-id type="cpan-module">Data::Serializer::XML::Simple</remote-id>
+		<remote-id type="cpan-module">Data::Serializer::YAML</remote-id>
+		<remote-id type="cpan-module">Data::Serializer::YAML::Syck</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/DateTime-HiRes/DateTime-HiRes-0.10.0-r1.ebuild b/dev-perl/DateTime-HiRes/DateTime-HiRes-0.10.0-r1.ebuild
new file mode 100644
index 000000000000..8663f56e040a
--- /dev/null
+++ b/dev-perl/DateTime-HiRes/DateTime-HiRes-0.10.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=JHOBLITT
+DIST_VERSION=0.01
+inherit perl-module
+
+DESCRIPTION="Create DateTime objects with sub-second current time resolution"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-perl/DateTime"
+DEPEND="${RDEPEND}
+	dev-perl/Module-Build"
+PATCHES=("${FILESDIR}/${P}-datetimelocale.patch" )
diff --git a/dev-perl/DateTime-HiRes/Manifest b/dev-perl/DateTime-HiRes/Manifest
index d1eb1dfb43bd..ae65e1616bc5 100644
--- a/dev-perl/DateTime-HiRes/Manifest
+++ b/dev-perl/DateTime-HiRes/Manifest
@@ -1,4 +1,6 @@
+AUX DateTime-HiRes-0.10.0-datetimelocale.patch 1233 SHA256 50ccab11475aecdd1f414d36e0f2461b24978e59731cff7e3295f793ebaa84df SHA512 765e619037e0aeadeee2bb4db685b4bcd9b622d4ec53c7e58f7f6c1af4ca46323cc533e8b64b44377f264ca0936450c678dd5dd75702c62acea1bdd37c4e5376 WHIRLPOOL 8c53af3fd3b55aafabde953406d6011db73252973de57f3c2db8394eb510b48b2e498eb1cd276acd4ea698cfcee58b462c0bc11da6e228e27fa6111135044b97
 DIST DateTime-HiRes-0.01.tar.gz 9982 SHA256 d04cff95aa94266102f25095d1161e32b65fb103f4bb45d7b8a52e10aadb5d17 SHA512 c84f0a415a28eb58158150373e577fa2cc852ea1f998b118822de328d2adab8800a0ed283beabb0c32abc36b1de90ad929f6c68096a8a27c50f08d9381468611 WHIRLPOOL 9f16ef76308d8af74d8881bf5cc1a415d294ed312958f525136507d6b76af9eb6cdac957f855c384723cf920accca1f547792af9511d77445620a576f756da7f
+EBUILD DateTime-HiRes-0.10.0-r1.ebuild 418 SHA256 e2acaf0f9ca657742a6eccd0ca33bff646f788aba22546ffc2b5ef1f06982b10 SHA512 a20402c0a844c82b8a57746b8db1da8b1a3eff7ba76037fb5d1fbbb8a66fccd7543797f4689f7d9304741c9026a421cef947a042c9db774532767203a6246c6d WHIRLPOOL 3dd662919c23f22c8c8d501956768c416402eb0f5d0c654c48b90991c0cb6c0efd45f4e9f7bbf80e913deeb9a41f5caea09270fa662e6203a47412a09af11b8b
 EBUILD DateTime-HiRes-0.10.0.ebuild 371 SHA256 a9f4b3f1dc4947ed8a0c226d842824bfbeb8c44d26174ee9cfaea4d4c845c6c4 SHA512 8e2b1fee1b1402541a98cad7dc2ed5ecf658ead903d077f80c34c21b8c02e82bfb94b9a67ac463ed3db07155b78fd553737508b6c27d74ab7c4d940e1719422e WHIRLPOOL 901dbc14f4eaba2e75013a568217a2b9ec05809024da48b73a3784d27426432ab3326a93703dbaa10f0c84688f4d62fc2982e8d1f41e2ea82e059bc3f5085b91
 MISC ChangeLog 2450 SHA256 2158827725be98589b92d89c5f6eea597db7088f5b4cfa2eb8e60c6278399883 SHA512 5f8d1934ca4ea2114efb177d2f69ae1d469a739fd623e7571961801e62442920b1f8e2fdf06fa2a30ae60264597f886ae3f9355a65c70f09c5f44c3522ecbfcd WHIRLPOOL 48c2424ef179f7c007cc85db15a8e13cf8ffa51a72023b93b329145524df995a278b2c80c81c1a431d8f51f6813ef6a9c0a1b6f1faf61cb5739e332c175221e2
 MISC ChangeLog-2015 1265 SHA256 36c0dc7063cbe2c4834828fa7cf5344a2328456b5663980aa6eb26010d08ace7 SHA512 47308724bfdc88e96ef9d40f74ded882007fc105fff4264e26ed9efb3d4ff141c8123eb20df429fe02ec5f8d6a1a58f300d2413ba4d23f60d7a22d5a455daa0c WHIRLPOOL 6a948a47f5ac3976120c74f98fcd7959cbe3a5515778c3b4b8b75dcbe92c2a2735f1faa02058e18cb880d1cb4f5cac1e42724777af8a2f0d3876ed3bade06232
diff --git a/dev-perl/DateTime-HiRes/files/DateTime-HiRes-0.10.0-datetimelocale.patch b/dev-perl/DateTime-HiRes/files/DateTime-HiRes-0.10.0-datetimelocale.patch
new file mode 100644
index 000000000000..37847c4d5568
--- /dev/null
+++ b/dev-perl/DateTime-HiRes/files/DateTime-HiRes-0.10.0-datetimelocale.patch
@@ -0,0 +1,39 @@
+From 39dca8357ffbc562d1a4138586795a32e2a0c8ea Mon Sep 17 00:00:00 2001
+From: Roy Ivy III <rivy.dev@gmail.com>
+Date: Mon, 6 Jun 2016 14:03:59 -0500
+Subject: fix locale testing bug, accepting both old and new canonical locale
+ forms
+
+* fixes #1
+* fixes [rt-bug#109088]
+
+.# Discussion
+
+In v1.00, DateTime::Locale changed the canonical form of locale to use dashes instead of
+underscrores (see [1]). This causes a failure within the "t/02_now.t" test, blocking
+unforced installs.
+
+refs
+[1] https://github.com/autarch/DateTime-Locale/blob/v1.00/Changes#L44
+[rt-bug#109088] https://rt.cpan.org/Public/Bug/Display.html?id=109088 @@ https://archive.is/3RccB
+
+Bug: https://rt.cpan.org/Public/Bug/Display.html?id=109088
+Bug: https://github.com/jhoblitt/DateTime-HiRes/pull/2
+---
+ t/02_now.t | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/t/02_now.t b/t/02_now.t
+index 4eb1f74..fc55184 100644
+--- a/t/02_now.t
++++ b/t/02_now.t
+@@ -32,5 +32,5 @@ use DateTime::HiRes;
+             );
+ 
+     is( $dt->time_zone_long_name, 'Africa/Cairo', "accepted time_zone parameter" );
+-    is( $dt->locale->id, 'ar_EG', "accepted locale parameter" );
++    like( $dt->locale->id, qr'ar[_-]EG', "accepted locale parameter" );
+ }
+-- 
+2.14.2
+
diff --git a/dev-perl/Devel-Leak/Manifest b/dev-perl/Devel-Leak/Manifest
index 62ad2e3a485b..9d29d75d97f6 100644
--- a/dev-perl/Devel-Leak/Manifest
+++ b/dev-perl/Devel-Leak/Manifest
@@ -1,4 +1,4 @@
 DIST Devel-Leak-0.03.tar.gz 3233 SHA256 6f42c34f11e2b4e3ea2e0e6b9416a88a685add447910caf4d91dd2c178177252 SHA512 177f64b87fa6ab08b93f7c5bfcbaf4421e8431bf795976a0a7efa0120828984fed29a2bc12918e5bea9ea3edccf6316ba8daf704f349aece84b45bdd11f57707 WHIRLPOOL 49031a2a4e8de22208730354f9bc917980280048efa8bdbbba180021c8d13e91e28126aca9bd0b28e180fc2ff3548a97690dba51e7f00a79a581dc326edf4dc3
 EBUILD Devel-Leak-0.30.0.ebuild 358 SHA256 e1747e47953de2a6280a8d8e294fed3edd3047b6922b12d7f41e1e3e1e83d72e SHA512 3f60fb37bd94fc2f71aa52dd81fec3f505eb53ebf67e0de65d142e668a43fd1f8fe2d1b701827e022ce39bfd0744d16a0e502be16739c48979fef67edc78920c WHIRLPOOL e348d4b6489ba9dcbba26b757168dd2732d45b911c5d3bc5afd7f4d99f37f4a9ca59353d7d03046878640208aba42a2cc82762cbfb3adb4b8a8ee9da4924fe6b
 MISC ChangeLog 642 SHA256 0b44faedfa0c6b5026ce833ce2ff88e7d93ace554933e5cc3d1a5631d57c1411 SHA512 dcdc7d70c47b0e8cef4c6e3262a5f39c9fc09fd2edaa5a5c494f4c171b7fa35e6b3e227de5e607a93516092cf4d0e3c1414234b98e9f9e61fa0dc46d7e77bde1 WHIRLPOOL 0dd288e9f2b0866c218f6a033d3038b2675a5b2e6cfe1375738e889f9ca0b4874886515c2b94a19dcace63a0376b8093dfce14d706a53a4273870f163df02528
-MISC metadata.xml 269 SHA256 84b65c1e72c439b7f5175ff684ae78fc7fc7a226eea4a884c91e73e90b1662f7 SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84 WHIRLPOOL 3da4987d361ac8c36e2c8fc914594d87b657765153dcf177a1dccffa9b088c0bbea71f6a9848bac35a92659455cba03f88f21fae9ffc6735b60512fb1a35982a
+MISC metadata.xml 416 SHA256 72c1c54e4ba4aeaad28ddbdb059a7745c1c12cba7b28a16a3d481b962348245c SHA512 a9c12172786cc42b085236ba4f3305bf321284ba53a39b396e31dd76e12be6c687c57f17ad3e3a8171d935b6d4bc6802225b3314309c9748ab365003116133d3 WHIRLPOOL 677cc63544eef79b53eac5f1d9d8b5caac12992b82ed7ef33a8173b38017dd07da7efdc24c5b43c8074daba593714eaca90e5b384d1c1c0493eebb0427c136b9
diff --git a/dev-perl/Devel-Leak/metadata.xml b/dev-perl/Devel-Leak/metadata.xml
index f53c778e0d38..34f4300b856b 100644
--- a/dev-perl/Devel-Leak/metadata.xml
+++ b/dev-perl/Devel-Leak/metadata.xml
@@ -5,4 +5,8 @@
         <email>perl@gentoo.org</email>
         <name>Gentoo Perl Project</name>
     </maintainer>
+    <upstream>
+        <remote-id type="cpan">Devel-Leak</remote-id>
+        <remote-id type="cpan-module">Devel::Leak</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Devel-OverloadInfo/Manifest b/dev-perl/Devel-OverloadInfo/Manifest
index 4afbc6f34645..988acb45f092 100644
--- a/dev-perl/Devel-OverloadInfo/Manifest
+++ b/dev-perl/Devel-OverloadInfo/Manifest
@@ -2,4 +2,4 @@ DIST Devel-OverloadInfo-0.004.tar.gz 12013 SHA256 83e88450064b0b0bbfd520cc9d7997
 EBUILD Devel-OverloadInfo-0.4.0.ebuild 623 SHA256 9028ef0946f5b2ee5beeb19ed8582d5441f3a6030e59fd47732eea8848c378da SHA512 5bc99a3e0228fd28d7a2b8d0be3f2cf35d06879c283f55684e5f53e2d223b89849d887d949c8535434a0cb1bf74eb54cfdc6cc57acd686c01f4aea439baaa478 WHIRLPOOL ddb6554eef02b9e729d385309289a3ef834f75871b7f92bb151c69523264da518a2d44ba6571a86577e01d25608158e162ec86a154140099f78b84a7ddb09d0d
 MISC ChangeLog 3865 SHA256 c189b799463111cdb8a10093e1107a3b65f5fdc6de6434e97e55ccde0899e41c SHA512 9aabd55ae12d968d4d8e1ece3f58750b7a32ef37bac081052025d112488d6e5faef27b9fa8c45b73612372207749f85b01a236e8a1be6a54d3e0b0eb13e8d467 WHIRLPOOL a20f4e80f415cd4b1023c5289beb6ca2f1c52157d5ed488f821823bb261908f89dde17d5a8b0068292b209af084ec4f532f08c070e9df0c4920a2e06ae1f936e
 MISC ChangeLog-2015 456 SHA256 8bd1712d7358d0fc79b97caf08615245f2121e0dcc5ad82ecf3c6456713192a3 SHA512 e5a55ab2a0d6e70a40d63ef746c80a69fd10f538936ace68e2946ec8c802a43b9d14eff2f0d4ed0d1e9bf0d24c38381ffa44d4b11e28b37b6e2864dd1edbf4dc WHIRLPOOL 34efa3f385dcbc7bad941217dd4aab9245552263a1f555071a81996e1cbdaf6544218587b66d7b267d8c6611af77602ef42d8e449a80b298536e12939dce2cd8
-MISC metadata.xml 257 SHA256 4d43e70b770d0898a99af64a8454a6116e4a86500c23290655c8371265010427 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e WHIRLPOOL 87039765046556cdc2f7d76ce4192945117bfd5bb684220ea8fb72be310673a5b729ea428666ff1ceb1e6c21fb585a3a7dd72bd94dab89cf076a895e6a7677f0
+MISC metadata.xml 408 SHA256 2a9fb5c64542408745f0d22696e1bf969dd6a6dab14cfdf33abfdff3b3d215a3 SHA512 e562e8c4bb0e9d7bc286d2c65ae2a485ca13ffed205240ed396a3bd612a95ce922521ac64ee9c8e4da0352d434766103218e3225c58b461dd8c4c161f572edfe WHIRLPOOL 9345fb3b0696e7c69cc59c742b26606819512e482afb4181789fe785f5a6a31833708fbb3f75f75038bb5d4b834f7f8a9bc6ad049516299d494bbdd861fb444e
diff --git a/dev-perl/Devel-OverloadInfo/metadata.xml b/dev-perl/Devel-OverloadInfo/metadata.xml
index 2b9a936fc0a1..42395bec4812 100644
--- a/dev-perl/Devel-OverloadInfo/metadata.xml
+++ b/dev-perl/Devel-OverloadInfo/metadata.xml
@@ -5,4 +5,8 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="cpan">Devel-OverloadInfo</remote-id>
+    <remote-id type="cpan-module">Devel::OverloadInfo</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Devel-SimpleTrace/Manifest b/dev-perl/Devel-SimpleTrace/Manifest
index cebf2c39b900..f1cb99eb35c2 100644
--- a/dev-perl/Devel-SimpleTrace/Manifest
+++ b/dev-perl/Devel-SimpleTrace/Manifest
@@ -1,3 +1,3 @@
 DIST Devel-SimpleTrace-0.08.tar.gz 17826 SHA256 d318a85bb29ee3c770e6b888585692a6f1a0173faf001be995e97481212536bf SHA512 347eb59aa6e6a3231cd0fd2d3f987c6650276a2826275f679673d46e4d0a5daca489fb687dbbcfd842fdd50b104308596139eaca2ec782109983cc20c6822c22 WHIRLPOOL 451d8681e925f5f84ca7442a47b5023dc492d8f24b71a3e265b0cb5335ee41dc4f83240b8dbf793b04302e36ad18a925f4ac211d2f27ff91b3e94a93b6406117
 EBUILD Devel-SimpleTrace-0.80.0.ebuild 417 SHA256 4fc204db421ace81a5fd98d2c312134636bd52d709c5715d825bafbcc8d52edd SHA512 973acd83cc3237d7aa5bf5fcbd99c30530eec5f2bdea1b57fd56ef275122dba1d6f0883e4eaf59c7e7f3e52c9f3d96ebfdf6376aa5fd257553cb1f291e441900 WHIRLPOOL eb9a192445dd6b4c33e1121ace200fd62e213b84b09576d2f274cef1e7e7dd738c7aebe47cdd268249748cf425e0d335a7b283dedbfc9a0895f5b67548849b4b
-MISC metadata.xml 257 SHA256 4d43e70b770d0898a99af64a8454a6116e4a86500c23290655c8371265010427 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e WHIRLPOOL 87039765046556cdc2f7d76ce4192945117bfd5bb684220ea8fb72be310673a5b729ea428666ff1ceb1e6c21fb585a3a7dd72bd94dab89cf076a895e6a7677f0
+MISC metadata.xml 406 SHA256 64e161c2bcdfd43ffaf5370b702fb204b986642daebd1918d06509c5a9fb60f6 SHA512 03702fa4a8a1a608f9139c7e3e0f252f1239f97c81fce0bab015f8833610ff12246e74b1988265d19210db3c73001a1636d793dea8b2a69988eaea03e9f4a16b WHIRLPOOL 8e5244f0717143339dca22c174b62306bc28ff9819ecf282e903457ccde4a1ac1b034f73d501e0fb005ef7cb33076db92770881fa77ff4d8943696830ad6a1cc
diff --git a/dev-perl/Devel-SimpleTrace/metadata.xml b/dev-perl/Devel-SimpleTrace/metadata.xml
index 2b9a936fc0a1..d6b7a3bdfef7 100644
--- a/dev-perl/Devel-SimpleTrace/metadata.xml
+++ b/dev-perl/Devel-SimpleTrace/metadata.xml
@@ -5,4 +5,8 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="cpan">Devel-SimpleTrace</remote-id>
+    <remote-id type="cpan-module">Devel::SimpleTrace</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Devel-StackTrace/Devel-StackTrace-2.20.0.ebuild b/dev-perl/Devel-StackTrace/Devel-StackTrace-2.20.0.ebuild
new file mode 100644
index 000000000000..effc2eaa6f41
--- /dev/null
+++ b/dev-perl/Devel-StackTrace/Devel-StackTrace-2.20.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=DROLSKY
+DIST_VERSION=2.02
+inherit perl-module
+
+DESCRIPTION="An object representing a stack trace"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-File-Spec
+	virtual/perl-Scalar-List-Utils
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
+
+src_test() {
+	perl_rm_files t/author-* t/release-*
+	perl-module_src_test
+}
diff --git a/dev-perl/Devel-StackTrace/Manifest b/dev-perl/Devel-StackTrace/Manifest
index c91933797cad..ca21d32c7332 100644
--- a/dev-perl/Devel-StackTrace/Manifest
+++ b/dev-perl/Devel-StackTrace/Manifest
@@ -1,7 +1,9 @@
 DIST Devel-StackTrace-2.00.tar.gz 30012 SHA256 1debe7273099a60e1386e0da5edbed7334db3cf3ed8e3b4106b087100b8ec5e4 SHA512 3a91249dd6c6da34ceeb66d947c269e360503f193b57acbed76671b030de4d2f7e9bf2c0cc4104777fbfd1dc610c06cf3c1e21b914334bb068b66875cc4e2af7 WHIRLPOOL ef97a2d5eaf2fdee6d6748bf9c32fbe795c3e8a7d475344279f65ed04ee7476b3eeb32d3ee6ec54355de663694dd8892d07ebbb22fd30242e290099584fd5499
 DIST Devel-StackTrace-2.01.tar.gz 33728 SHA256 055d35b5dbe62b88af7a15b347f7759cacb376dda345e0bd092a549384c30c13 SHA512 12f7192973f6eb4833140e0c1fbb76c1b0851803b39c805ae4012fc51506ce6e651edec9046322ac2b105412222d227a792a69cc257e316cff4a557bc90cdced WHIRLPOOL 0417a89da61e040066aee9a11a4d164e45ae9575a702b8d11bc78b6fdecc0f134e71ab6681313612388ddfb5ad0d4073dfa8d05b14a21aa6d97e1ef0f04ba9fe
+DIST Devel-StackTrace-2.02.tar.gz 38221 SHA256 cbbd96db0ecf194ed140198090eaea0e327d9a378a4aa15f9a34b3138a91931f SHA512 1744597ea86e0631a2f0b730f0448af21639f2360a95baecd47542bcd9be96163904ec438a34f70e794695046bac9751ece0e4705af95e717a5143295fce31db WHIRLPOOL 8c340bc3e849db178de0e2d8375ddcc97009d96576c3667eea4cb6d298cd9683403daaebbb07b1ca4743a5539622a09d52cab7438266a54c7a6a88d86c2fb3f3
 EBUILD Devel-StackTrace-2.0.0.ebuild 592 SHA256 6bf5f1303071c4f7fa786c89f53e1a5d15673f7e79acf0b45edafd2cecff2067 SHA512 ee8f8d5d6a7434fa3a468ac674520f31089b920b4149033169eb23bf9d106761f68a8f814427285df3e76d6c7a0b91f47bd3a135dabee40c4aec00aa87b32e4c WHIRLPOOL 41f625dd104fcd83e5434b5d7f92c1fbd08ce9b2cb2e00b6d8c8a249e916224d130f005ea7c80e85427729af514e46069d8d95ba274bf2e6cc7a0d51b36cfa13
 EBUILD Devel-StackTrace-2.10.0.ebuild 646 SHA256 b2dc27103cb569c91f5caa118c971bbe9877f8f6f85251fa64e8522e397790e6 SHA512 06851bf3e5cad3f1ea7efa853553a3a08a615373f81e3d3ae33b9ac96ebbd9f877a3d7e266a24e44ec9aac20f90fd9e288e0133e24ee5e4bd32b367b0b9a857f WHIRLPOOL 9d981cd55b986a6623edc46c4728d366a381a770ce40f0f6a80d19889726b90ce0b687bf6a71285eba8789923ea7c16c406ce2d2b7498675466f7c6cce70f274
+EBUILD Devel-StackTrace-2.20.0.ebuild 646 SHA256 45a1d65c465b9bc0b7682da4a3ad542a36fc832e375b79c89ea4519b6ad4a61f SHA512 208bc179971f4de99d830df2152ea1792b8fbec3017a130187350d7882ebb399cade9918a97ec0a8cfb97bc356457d638437cf22e5e8e6f52f6dcdeb93fc2094 WHIRLPOOL f3aa386ff7afe08b85592b2a6b2eae6a34ead13693fc87a9dffe1d57b8a88294359535ebef2c90578e7368371dbe1cb0485ea00ee24904684c46ba559050fd2a
 MISC ChangeLog 3241 SHA256 1a245a04f883edeea17e726d8c83b19977ba5ef60277af61ab701e1856e3201c SHA512 ee0460129b1bb9916f12314f046f2d1620892610266a72ac7eef5f05915308958c9578c418eed7eec8ca763e6fa34610a23d8106e482ab2663c3b900e94d48f9 WHIRLPOOL 2a831f0761300e9229066dca1ed6e72ba96db87209e3178e0c88efecd6de9bed85f2c99a42d5d46dab71bfc965468a06e06f8ff2b6ec86b4bf6fc7094297de37
 MISC ChangeLog-2015 11789 SHA256 8a9a60a0575b6df14dbf5ba54e63f8677080677cc9cd3a86f3bcfe29f87808cf SHA512 2248f2f442c5da866cb92c1e8d66578a382ebe0558471164cb618fc87bcc4b38b6cc9146b45fbab143c15be917eb1b882ad3b27004fd1b2231621cfc6fd8eb0a WHIRLPOOL 560fb645e4eea80a59430745053d0410a71c9ada3c422af3520740e00c7c1006615c9fdc07ab2469fe8432d8696df1de5aa29e2597e78bbc322076786171ec7f
 MISC metadata.xml 475 SHA256 7bc6aa7011ce1e3db4e5531c84815c60e4020f15de6edd2245f976207b092d41 SHA512 9100f9b2f46c30dcd594d6d05674deff141509fa89af6414e9ad0f928b5e589b2ae9dea9772874ab34f78c01db5067bb05e2a7aa4469216a241bbbadff4ca121 WHIRLPOOL 3d2a0682d1120b2b17f76e667a53e74be4b44b50badc228aef32c22d3be5778826cb04f788b0f29933c393c940eb0094134d28838d8cb726f8a98b828c8296e8
diff --git a/dev-perl/Device-SerialPort/Device-SerialPort-1.40.0-r2.ebuild b/dev-perl/Device-SerialPort/Device-SerialPort-1.40.0-r2.ebuild
new file mode 100644
index 000000000000..175ab8c6cee3
--- /dev/null
+++ b/dev-perl/Device-SerialPort/Device-SerialPort-1.40.0-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=COOK
+DIST_VERSION=1.04
+DIST_EXAMPLES=("eg/*")
+inherit perl-module
+
+DESCRIPTION="A Serial port Perl Module"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+IUSE=""
+
+#From the module:
+# If you run 'make test', you must make sure that nothing is plugged
+# into '/dev/ttyS1'!
+# Doesn't sound wise to enable SRC_TEST="do" - mcummings
+
+src_configure() {
+	myconf=()
+	[[ -n "${DEVICE_SERIALPORT_PORT}" ]] && myconf+=( "TESTPORT=${DEVICE_SERIALPORT_PORT}" )
+	perl-module_src_configure
+}
+src_test() {
+	local MODULES=(
+		"Device::SerialPort ${DIST_VERSION}"
+	)
+	local failed=()
+	for dep in "${MODULES[@]}"; do
+		ebegin "Compile testing ${dep}"
+			perl -Mblib="${S}" -M"${dep} ()" -e1
+		eend $? || failed+=( "$dep" )
+	done
+	if [[ ${failed[@]} ]]; then
+		echo
+		eerror "One or more modules failed compile:";
+		for dep in "${failed[@]}"; do
+			eerror "  ${dep}"
+		done
+		die "Failing due to module compilation errors";
+	fi
+	if [[ -n "${DEVICE_SERIALPORT_PORT}" ]]; then
+		DIST_TEST="do"; # Parallel testing a serial port sounds unsmart.
+		perl-module_src_test;
+	else
+		ewarn "Functional tests are disabled without manual intervention."
+		ewarn "For details, read:"
+		ewarn "https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/dev-perl/Device-SerialPort"
+	fi
+}
diff --git a/dev-perl/Device-SerialPort/Manifest b/dev-perl/Device-SerialPort/Manifest
index 33db5947cb3d..833065cdf985 100644
--- a/dev-perl/Device-SerialPort/Manifest
+++ b/dev-perl/Device-SerialPort/Manifest
@@ -1,5 +1,6 @@
 DIST Device-SerialPort-1.04.tar.gz 98706 SHA256 d392567cb39b4ea606c0e0acafd8ed72320311b995336ece5fcefcf9b150e9d7 SHA512 4b25a7d29091322d516e0aa20693caabe95a8521b3fdc425d1c03e3312fb59a6883268db7eaf79b32586569502fb656c875dd2b6b1d7a4341d9bd6916e04ee44 WHIRLPOOL d824392faf10a9f1f1e3656b957e7ed0124271e787fe2b6abbb995e367a53a6c306bdc675097841848d418a9d49aa0604b7da5ddcdf65e4d6b85b3b60fbce504
 EBUILD Device-SerialPort-1.40.0-r1.ebuild 458 SHA256 897e55229cb085546e9516b2943be371c0f43c299c50455ec674bef3fb93e916 SHA512 b4a455eb9926131ad25d43b806a76fe0fd7754b7a4a1e391c8dccca1d4113fff6f5408060b2c49f98cdd27f0a197168649c87c026f3c6b22d6d35ca82d17cd0c WHIRLPOOL b4fda0bd56af0663c43ca2f37ccf5cf1a90054eba1eaf088bf72d6226478ecaa637d7f66b1c6f585227f41990aeaaccf7382a401f8b5fa0c629a93e51a18761e
+EBUILD Device-SerialPort-1.40.0-r2.ebuild 1403 SHA256 2192e36eb3cda9a1beeb93a68d99d2efe433e4436ecf45a4d229c3141201c351 SHA512 1ab6fdf39f919adfe233c56670387b08ff8969f151467d523c08adcede009ced346319e2de27be57a50f12e5a6663821ca87a96624c6e76f974308a51f59ac0a WHIRLPOOL b07c30be92847f208f41837eb43766b04eb42e2aee9c2ab4326ed473f9be2e3814ac632f493837c18d7e36e41d5d7d985751d529bed7fe3cefd2c7f78bcd32b3
 MISC ChangeLog 2465 SHA256 907f292f5912616fbe86160fb21be671bcd08932c24d20a894ec386ec9d6ff2a SHA512 488e7bb91b2014e461f4f5d89455a2feb66f482af5707610b5bc29761043842f416590f428d0643bed99d98492d968b702daad915705ae7f1fce51735266131d WHIRLPOOL bc7d18b87245ebf27aead0ba8158dc2a1811bc57132d9db89e1da1ec73ab25c09198fb1a16cb7d87a655fc6ed197a7f0e9046443e754cfd412dde962143dd265
 MISC ChangeLog-2015 4534 SHA256 b529fea3842e68964780439da62ac9a8d45ef39bdbbc54ddfab47f8be2a5e6a1 SHA512 7e109a6ad90e49d785dee47306cdefca680d84e01c57f22f8cc42614be6749381e1bb48f3fafe0850a55c204fb120b53bbd07986beb024be03c2cd0965f258c1 WHIRLPOOL 6ffe8f6c8916e011b9c82503cc43d1959156aa405ba6730a5c84350dd51145e71c46d9b76508de2d6e4b5d4abfc26898aaa876fca05d1733c92e1cf05d179f34
 MISC metadata.xml 406 SHA256 c487d00bb0a1091722f2f4385c739ef866c1b2cfc153e9a8a28c32d87ab20ab7 SHA512 4033d17808f503aa81fb607db7f8dfd27bebad8b3c62527b63ef8d841d3b5176ed2359767689168731d6f25d6e511ba4f6f4828e3d37bcc53468c01117e5c032 WHIRLPOOL f34ac670eb216b842308ed2b965c471c4e22b5a235918dbb8b88fb565b30d02ebdf3ca4721e022647d83be759351d4b802783b27be3df052a92623bffbe96eaa
diff --git a/dev-perl/Digest-MD2/Digest-MD2-2.40.0.ebuild b/dev-perl/Digest-MD2/Digest-MD2-2.40.0.ebuild
new file mode 100644
index 000000000000..d6c7b3de0989
--- /dev/null
+++ b/dev-perl/Digest-MD2/Digest-MD2-2.40.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=GAAS
+DIST_VERSION=2.04
+inherit perl-module
+
+DESCRIPTION="Perl interface to the MD2 Algorithm"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
diff --git a/dev-perl/Digest-MD2/Manifest b/dev-perl/Digest-MD2/Manifest
index 1ab2ec4a3671..04413256b165 100644
--- a/dev-perl/Digest-MD2/Manifest
+++ b/dev-perl/Digest-MD2/Manifest
@@ -1,4 +1,6 @@
 DIST Digest-MD2-2.03.tar.gz 17054 SHA256 c7e2b63596f99f2723b25256c8dc780228381c6d6a53dcb99844a6f06c6ee245 SHA512 78109efc43d7c3a58cb94fe100f31064988b581aa1c4726f679d13f09d7c89655f858b8fafb72f61005f955df75cd526e8532b02621ccc1f135fabaca31b292a WHIRLPOOL 2a193baadf8a615154f8a82b01a7467f5e140f37025bfb8a793c7fd21f539bbce1e9fe8817e4c9f811dd3cfed6a906b9683c959d22dfc55d194525e0e2dad1ea
+DIST Digest-MD2-2.04.tar.gz 17379 SHA256 d0aabf4834c20ac411bea427c4a308b59a5fcaa327679ef5294c1d68ab71eed3 SHA512 780ee79830fe8fcb3a844f67517c90d49a1e5e869dc8efd208d3eb73ccf6e56d3d112fcbd1effa083c4d77e5bddaab096b8aff9528707b235287761622b80433 WHIRLPOOL acb942ce0e6958f73df7a0001b83e638418fe33415e528b8d34b8af9e6b8a53473822091f6812a1718bc9a16e6200347bf56f74e7a9e9335d752dfa1221b8266
 EBUILD Digest-MD2-2.30.0-r1.ebuild 370 SHA256 c4f94cf70f1515797cd5c553f4a4a95670b424233c4f9c4e24004a15fadee295 SHA512 587bed365532db271a4061e7637a7419463d94e441bc3b329b140e28471d7a9a359e54b2e239e3366e9c43e0a0145cfda4aa1f9cfc022f527aa586d4862432d6 WHIRLPOOL a0f227f6edae309d57a6f258f5af30fad09a786896e4b84aab7ee20f23ac9e9a36ca5b7acf109df7baf7261b56f5d1b04bcc621a91a266407cbf6d09d2e9bbe9
+EBUILD Digest-MD2-2.40.0.ebuild 359 SHA256 5f120e5fcc7820074e294699edd07827e0a858402b64a3839fcfb96a862975e2 SHA512 c4b761a31bed87c78adcb4b4b05a24b077108e99a1b9b07a2254a72308ba96ad028c922f3b55f9384fe91500294c929d636bb5c64cc68e697a1a0e6085601d27 WHIRLPOOL ea787c90a16ebf3fdf38b7b334e477916495afe9f57de2a88a08c7f3fe606f363df5c392ffcd05c2723c5a3ce5e5150773b0143d262f33a5b399da11c8447916
 MISC ChangeLog 366 SHA256 5d272c78d0a20b9cc09c622e1e383678250e35ccbc749bb4b6c8b378c8c07a3e SHA512 de5ddff89604628c4714c5c3fda07d2aee9dd7ae06830d0ef59cea66ef10a2e51637bcced3043d17be159b9a89d76fd5965b896a19abcee137a4ccb4e3471af4 WHIRLPOOL 2043cc6aa9ccb9b4f5f58acf0e80e5f1e35fcbb599a29671da375bd9f7879272f2c29b074ca504b787078eb14359f382ad36c4b562d6d90c13ab51871ad4d306
 MISC metadata.xml 392 SHA256 30886b26a102566c7ad1e33901e791533c1d82f66cc9d458ee44be7ed68b0d85 SHA512 57c242eaa0b0acea17abf67ca8c1daa0e9ed34eae737292a175f15592aefd1d52f4bda8f97c4f95834feaaece1580d86e4e5935cf25a3a4db7a0f4f9e20f28a4 WHIRLPOOL bc8c5591060e199685154a49004db572230c6cf107f7f947be609423016a1e986d2e9a88be7e22e0b1941b11a53b3096109f395ffb3d1f2a835b4c3e36feb026
diff --git a/dev-perl/Digest-Nilsimsa/Digest-Nilsimsa-0.60.0-r2.ebuild b/dev-perl/Digest-Nilsimsa/Digest-Nilsimsa-0.60.0-r2.ebuild
new file mode 100644
index 000000000000..7ab5ad2d8e49
--- /dev/null
+++ b/dev-perl/Digest-Nilsimsa/Digest-Nilsimsa-0.60.0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=VIPUL
+DIST_VERSION=0.06
+inherit perl-module
+
+DESCRIPTION="Perl version of Nilsimsa code"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
diff --git a/dev-perl/Digest-Nilsimsa/Manifest b/dev-perl/Digest-Nilsimsa/Manifest
index 92084d116e05..96e15fcf7377 100644
--- a/dev-perl/Digest-Nilsimsa/Manifest
+++ b/dev-perl/Digest-Nilsimsa/Manifest
@@ -1,5 +1,6 @@
 DIST Digest-Nilsimsa-0.06.tar.gz 79065 SHA256 cd3762cd76803729fd42022d382bc93b26f9b14aed9732eef85b44a9576d2d1e SHA512 c91a4587e61306e22680575d26e17d4c255c3830f833debf9ef9e7fdcf709dc07584e028d0e3d4e81761c05da3a47ef58652dae2b36e48fa55341825eb891bc6 WHIRLPOOL 82acc3dd40f7fbcb6661045afe674942bc14f65a197ff158c37a7c918bcc7188fbeed9938423298896f947954f1d8bfb8b63d83eb8e274cd2842488fd8566133
 EBUILD Digest-Nilsimsa-0.60.0-r1.ebuild 380 SHA256 5f2fc87c9bc6da02a99d7db8447834bf2e438ba0f138352317b5e5e6ae5c63bc SHA512 dcabc5bb189f0e241cc3227bc65d3f83d7326cb4ceba871551afdf0dddbc83b38001bf15154732a30bd3208c2b4b4f3c2df9894da1fbdf194643f565b927845e WHIRLPOOL 341338716d79941ed8c20f09fdde89c7fc3024dbb4fa3fd5d5191cff5ab23b6efa708034b8316d7868ea9302fc89f62a9cc774392c53904d1e8acdbae371a04a
+EBUILD Digest-Nilsimsa-0.60.0-r2.ebuild 365 SHA256 b66032b776d1566ac54103dc8e0b535d8d6b2315174bdbec04e2b605b9df2fba SHA512 7ec0de2a33e90559674d39eaa09bd79eaa203222f6fe791a1e478f1ea7893745c44c957c9d21f7c88d7081825ab84bd5ad4649247db5b935468c7fcdead393f9 WHIRLPOOL dc4bd5eb04d252fbb7547e376231a3a42565f07dfb6eb8406cf27868dab90fb50b45670c3876ac91790bdc9c6402e2b4527de6b944aecf7776e3518d1195283e
 MISC ChangeLog 2459 SHA256 c11446878df20a91a0ce480c5fc82d4d99fbd391254e25ac0210885a7d604c45 SHA512 b21f0e9d5ff37bbfb0645de38d3f2d8abf6975797bb4dcf84afcd575ece53562105c4226718b8bbf5e9d1ef6402496cec366e50aa3de48cfbbbd0f6abf21eebd WHIRLPOOL df7ba8bbbd64ae5d74e9200f88341b01bec30b6c7fb7251ee57da702b5c6889286c5db4f9ce865e58d80bedf0e1dbd949888022b895169ec3ca00e69e976c1cd
 MISC ChangeLog-2015 2876 SHA256 041a65ba8031bcdbcb067435d059e4d91338449b8ed514072808aec98c9609c0 SHA512 ca806a9489df54be9fbc4544b3b38a39ae3f989ed4e87d2f7f30a5a4fc4fc77c8e9053ae8529af4521b97a7219cc29ebbcc0fdf51a281f952eeac050b1ef2c03 WHIRLPOOL 49df31e77755db530a7253af806135cc583fbec4b995a052a6bb4afacc84d05417ca68219c5bdee8f7bbcb4c184c2bdce49ca8e48aef610e2eb735213b656846
 MISC metadata.xml 402 SHA256 12685f431ab9b0bd6db5f1aa215326a3564b8386205c4b8c9a1975d5380afa01 SHA512 5ae0bf4183cfe4dccf43bda88e47c6b1eeec77106f7756c9513f52eca1679e920fc2776b9e5bfc3887a85ec76340fdc2379bd85e59891a9845ad8b8286d4568b WHIRLPOOL f26862b1498286888cc7c0090ad279540a357627c2fdd5e39fc524605da4b53772e40adb556767572e6d69a0be8ca4b0187629cc920c67dcb69da9e81427ab6f
diff --git a/dev-perl/Dist-Zilla-Plugin-AuthorsFromGit/Manifest b/dev-perl/Dist-Zilla-Plugin-AuthorsFromGit/Manifest
index a377c056bc19..9dbc2415ccc6 100644
--- a/dev-perl/Dist-Zilla-Plugin-AuthorsFromGit/Manifest
+++ b/dev-perl/Dist-Zilla-Plugin-AuthorsFromGit/Manifest
@@ -2,4 +2,4 @@ DIST Dist-Zilla-Plugin-AuthorsFromGit-0.005.tar.gz 5236 SHA256 1db47dcd68a763f45
 DIST Dist-Zilla-Plugin-AuthorsFromGit-0.006.tar.gz 5308 SHA256 c5cbf1f002a581dd2b56ce6b9df0a7b01a428f5aa1ef0738bde34f5e440f5c75 SHA512 e140102881905d722bc8d9e2aa82807271020ee43f771c2bd1350549b782eb21050a4c9721cbe8d5c27798f106f69f9317a026b274b4023a27aa8a1fe81e572b WHIRLPOOL 4265f7681dc0e63a7313e9b4b04c784901bd6c67865140e3c5b5f0cf944e2db874c97345c87b48b5138bb8b93bafa9959779880c4653b797175f1b82d399b1b6
 EBUILD Dist-Zilla-Plugin-AuthorsFromGit-0.5.0.ebuild 550 SHA256 ab43f8108e60c41f3603f3b423e423c43b9a970b4182da10164e6a40eebb0855 SHA512 904177a632a7a58c5c006fa33933f0e78ee7ebff175b197bc30f092887bb707cd1ea82a3f109d0dc1c0b317ac344379aa7a2c6df93f776f496b349198852c139 WHIRLPOOL 53d216eb2472c9c05e798be5a5a0d0c450482e1f67b42b01ba17aeadd999c10c16ef4aa309ee104e1aa4b16d5a494047f62a9906141228b97745313b8af84737
 EBUILD Dist-Zilla-Plugin-AuthorsFromGit-0.6.0.ebuild 550 SHA256 95e8a2c928ebbf949fba217c8ce81bdd68d42d7851f5705721330855cd9e06c7 SHA512 d206a11fda95e79ce290affa3b214c4c0d5435861cb7bf6df710c10703b3dafd9e7358d03cf516d3d1be4b98998aec7f475e79778a4fb9d3c085832250a6f6fa WHIRLPOOL 4a068ac08e62ce1d0dc5eeaeda3edf410c8916798afe9b5653ecd8efc604b45e2f912570dcd051e8910086df55965ffa081708e8c7723d75ca9e596824192196
-MISC metadata.xml 257 SHA256 4d43e70b770d0898a99af64a8454a6116e4a86500c23290655c8371265010427 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e WHIRLPOOL 87039765046556cdc2f7d76ce4192945117bfd5bb684220ea8fb72be310673a5b729ea428666ff1ceb1e6c21fb585a3a7dd72bd94dab89cf076a895e6a7677f0
+MISC metadata.xml 438 SHA256 9087964a87600a8c9291900b6316aebb06b324463afb07995cf864d8a9d2e57e SHA512 aa0bfe612a21e9a01688b15cf7c80a833ec79ea1de835d411bd78c5b9023a843224b1a313be32d62b99184b10390b04d217cdaf9ff1d2babd6dda8e18030de27 WHIRLPOOL 84778f049019b24bf5a5d55d374b4c182a39f55d307250fe41f2c392a5d0f072553c5aefc9f92d713efcf47ccee5db08b3e714c93340f383c62198375cde5605
diff --git a/dev-perl/Dist-Zilla-Plugin-AuthorsFromGit/metadata.xml b/dev-perl/Dist-Zilla-Plugin-AuthorsFromGit/metadata.xml
index 2b9a936fc0a1..bdc5edee98ef 100644
--- a/dev-perl/Dist-Zilla-Plugin-AuthorsFromGit/metadata.xml
+++ b/dev-perl/Dist-Zilla-Plugin-AuthorsFromGit/metadata.xml
@@ -5,4 +5,8 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="cpan">Dist-Zilla-Plugin-AuthorsFromGit</remote-id>
+    <remote-id type="cpan-module">Dist::Zilla::Plugin::AuthorsFromGit</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Dist-Zilla-Plugin-Config-Git/Manifest b/dev-perl/Dist-Zilla-Plugin-Config-Git/Manifest
index ef82c46a9b65..b73fef370e5c 100644
--- a/dev-perl/Dist-Zilla-Plugin-Config-Git/Manifest
+++ b/dev-perl/Dist-Zilla-Plugin-Config-Git/Manifest
@@ -1,3 +1,3 @@
 DIST Dist-Zilla-Plugin-Config-Git-0.92.tar.gz 17755 SHA256 502f35869dd0841cb985e707d025ec65d14dd4f389c624870026874f9bdf82a5 SHA512 f319cbebe197a1c3c6f1ce19435f4e7a93378f211051b94b8bb0d3ce94da209c3d72ff5f3f7084222fd22c785bc75ac2ebcb4c7f0600ee87cec54f3454cc0fe9 WHIRLPOOL 4de254e7778f3bd554eb4f116ecdcafdc12f8edcff9bc6654da21100143ddf002f6a8e189777882430c102876a642470afb9b20116c547714764934a80636bdf
 EBUILD Dist-Zilla-Plugin-Config-Git-0.920.0.ebuild 591 SHA256 b1b2b32587617038cec99042109f24b907e8edadff08396a896685f849d3535a SHA512 6df511107876f05af8050277687370b7f28fc491340f5e0717473aec766b2ccc4b1d630dc1118a5ee82f41ebc58e428607d1579ce2e596dc64f0f29bc64e9b08 WHIRLPOOL c6bffa6dd800e7d9d9a100571dcbff66dce5d951f3fedf6dc0035248c6456ad8532d092d47c1331c199371faa43d7f810b0cb532515adf08719038968e39aa2f
-MISC metadata.xml 257 SHA256 4d43e70b770d0898a99af64a8454a6116e4a86500c23290655c8371265010427 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e WHIRLPOOL 87039765046556cdc2f7d76ce4192945117bfd5bb684220ea8fb72be310673a5b729ea428666ff1ceb1e6c21fb585a3a7dd72bd94dab89cf076a895e6a7677f0
+MISC metadata.xml 506 SHA256 de958eb4b5fc00a40d610efa04fcd11b9e323ec0c5557fa78bacdf4f26a0d9e4 SHA512 fda072ab2adc0a37daf1625b1c48ee1c07eb595a341da0975e3f1083e22bfda43428eae4a705014ac0946cb0348b5e3f20df1da62bce72929ff85eb19d761559 WHIRLPOOL 32a5e872e0bae40fdd03fb0426e29322925efb244b7054a1714b4e67bd4429b3c7ffb782544531aea19e968da013fe89affd377b14b9df224148fc6a0e1245d6
diff --git a/dev-perl/Dist-Zilla-Plugin-Config-Git/metadata.xml b/dev-perl/Dist-Zilla-Plugin-Config-Git/metadata.xml
index 2b9a936fc0a1..7c6e9917bfa1 100644
--- a/dev-perl/Dist-Zilla-Plugin-Config-Git/metadata.xml
+++ b/dev-perl/Dist-Zilla-Plugin-Config-Git/metadata.xml
@@ -5,4 +5,9 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="cpan">Dist-Zilla-Plugin-Config-Git</remote-id>
+    <remote-id type="cpan-module">Dist::Zilla::Plugin::Config::Git</remote-id>
+    <remote-id type="cpan-module">Dist::Zilla::Role::GitConfig</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome/Dist-Zilla-Plugin-MakeMaker-Awesome-0.390.0.ebuild b/dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome/Dist-Zilla-Plugin-MakeMaker-Awesome-0.390.0.ebuild
new file mode 100644
index 000000000000..8867f1fdb59c
--- /dev/null
+++ b/dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome/Dist-Zilla-Plugin-MakeMaker-Awesome-0.390.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=ETHER
+DIST_VERSION=0.39
+inherit perl-module
+
+DESCRIPTION="A more awesome MakeMaker plugin for Dist::Zilla"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+XBLOCKS="
+	!<=dev-perl/Dist-Zilla-Plugin-MakeMaker-Fallback-0.11.0
+"
+RDEPEND="${XBLOCKS}
+	>=virtual/perl-CPAN-Meta-Requirements-2.121.0
+	>=dev-perl/Dist-Zilla-5.1.0
+	dev-perl/Moose
+	dev-perl/MooseX-Types-Stringlike
+	dev-perl/Path-Tiny
+	>=virtual/perl-Scalar-List-Utils-1.290.0
+	dev-perl/namespace-autoclean
+	virtual/perl-version
+"
+DEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-Tiny-0.34.0
+	test? (
+		>=dev-perl/CPAN-Meta-Check-0.11.0
+		virtual/perl-File-Spec
+		dev-perl/File-pushd
+		virtual/perl-Module-Metadata
+		dev-perl/Test-Deep
+		dev-perl/Test-Fatal
+		>=virtual/perl-Test-Simple-0.960.0
+		virtual/perl-if
+	)
+"
diff --git a/dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome/Manifest b/dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome/Manifest
index 76ee4d5a6d01..0cfc95500272 100644
--- a/dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome/Manifest
+++ b/dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome/Manifest
@@ -1,4 +1,6 @@
 DIST Dist-Zilla-Plugin-MakeMaker-Awesome-0.38.tar.gz 41950 SHA256 55200e8db5d72a4273bd146b78c8d9d9459ef580a0ba972f0a5b12182f999691 SHA512 66602030920f4e187eb026227cfcf6375ca4381ba79810e63cec41d44210f60c68ebb12629d6032893ac661c5116890b9121590ddc14b26aceffb33a63ef18ff WHIRLPOOL a32b1398db00058b92901cccbffbace8f180dc2a4e0a60dd48b5111e1b000d7ffdd359fb368cc541c99c5902793ee105657e4d311a706b9573058535f2021e5c
+DIST Dist-Zilla-Plugin-MakeMaker-Awesome-0.39.tar.gz 43621 SHA256 a314b50fb968bcb032871fe7b3ea8c4011ae5628ddcc9df429fbf80057ee5840 SHA512 b0e2f4c83759ff8ef040d507a52b4465b6eb5cd4b43db40169b49890e89e9b98d247dcaaf2be1ae5ea4d5804faa54c25bfc0e4349d38046fc05e1287ad91a42a WHIRLPOOL 3292330cc3a0d85222111e3317adfdde3d452c3d41adc2f59efda79fd212c6af45bfe689a416ec60a87dc9dd92b497950c13134a429fe1b4ad3fbd2db3b13ba8
 EBUILD Dist-Zilla-Plugin-MakeMaker-Awesome-0.380.0.ebuild 893 SHA256 6e0b7ed4821904c815bbbbf0ef1d145d4b582f0cb7a84635696c6d6d6f50a02d SHA512 2b18e8d380e8439ccfe8d369750fbf8ea910c93d7ee479213e5057f4d8d03e4c4017cc9084847e26ac4a1c604ce295dc9aa1c66ff1550e215b20ab0c59088c74 WHIRLPOOL 002934d8c3457764cac9bb5a343c59c2b1ca996f63165041800d2570871b78d491ea0a1bc4a6579814be9fd1d6fe995901ce852040a621c7fc44c17d00c1d575
+EBUILD Dist-Zilla-Plugin-MakeMaker-Awesome-0.390.0.ebuild 893 SHA256 ca8a1deeb2ee687bf1e71917a301e64371b2ae8a3f1a54ba1976d81a7b34eb6c SHA512 8aaf104faced1b8b5d256cf433c15a87bc5faa86ead993b20c0db9a59d07495e8ac4f5e4a3e760708de84370f9a2df2e9695cb920580a24b4f14b0a83fd4ef66 WHIRLPOOL 3267132a13b8fde452af30ad867994f35ef96111ce969590571d74e50072900d723214e4fcb1c725ad83fa0b3be67f3e4dae6fdac72132509521ab0c0be6624c
 MISC ChangeLog 431 SHA256 35448cb3c357c89765eecd57b65662d80539f0414d30efb6473308c625a7f7cb SHA512 8162367a83fc857bf50c549bbe3327eabd6424628d7dbc973b8a0f8d76ffcbccb1a2ef74089e95bf18ba8f97514d97080e66cd095ebf7cdce0aa08d9b44073d3 WHIRLPOOL 4b1c56db202798760f29514195e0ca8d7ffcd5e14920317584b71a5dd280ea7ba81739ed7eeaac283ac3faf77a66e8362ce3fa95b1fcd29f85950550e4d90ed4
 MISC metadata.xml 445 SHA256 51457867b06f92d497ae0f4fef493f112f6f549d95d88714cee85ba37c53da21 SHA512 ac613ac05d79396ad1f658ebe8b2aea6cb276a7f3deb2a40d2a32bc16e3f510e009f4ab4506f048afd5a866c382690d181b0883f5b9311bfa32b66bf37e195de WHIRLPOOL e22dabd4cbb384119a61f299b3db3d1ef1264a9d7fc9f666775493509a7f48eb82fa66d755f82b022e0adbef5775b2c65165a99e0dcbba0e3321d64d0f3e2296
diff --git a/dev-perl/Dist-Zilla-Plugin-OurPkgVersion/Dist-Zilla-Plugin-OurPkgVersion-0.120.0.ebuild b/dev-perl/Dist-Zilla-Plugin-OurPkgVersion/Dist-Zilla-Plugin-OurPkgVersion-0.120.0.ebuild
new file mode 100644
index 000000000000..a3f871cc1550
--- /dev/null
+++ b/dev-perl/Dist-Zilla-Plugin-OurPkgVersion/Dist-Zilla-Plugin-OurPkgVersion-0.120.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=PLICEASE
+DIST_VERSION=0.12
+inherit perl-module
+
+DESCRIPTION="No line insertion and does Package version with our"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	dev-perl/Dist-Zilla
+	dev-perl/Moose
+	dev-perl/MooseX-Types-Perl
+	dev-perl/PPI
+	dev-perl/namespace-autoclean
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-CPAN-Meta-2.120.900
+		virtual/perl-File-Spec
+		virtual/perl-IO
+		dev-perl/Path-Tiny
+		virtual/perl-Test-Simple
+		dev-perl/Test-Version
+	)
+"
+src_test() {
+	perl_rm_files t/author-*.t t/release-*.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Dist-Zilla-Plugin-OurPkgVersion/Manifest b/dev-perl/Dist-Zilla-Plugin-OurPkgVersion/Manifest
index b3a3a805d85b..3217f10e4d61 100644
--- a/dev-perl/Dist-Zilla-Plugin-OurPkgVersion/Manifest
+++ b/dev-perl/Dist-Zilla-Plugin-OurPkgVersion/Manifest
@@ -1,4 +1,6 @@
 DIST Dist-Zilla-Plugin-OurPkgVersion-0.10.tar.gz 16513 SHA256 f9f87d27772a351540b4fb15c59ab2ebbf8cd0e7501fe2a7e151d1626b79be60 SHA512 086d3f12d5724e8d129bcb685428e3a6060eaa0ef00c661225b7f29f260b0aa7ecba6233f142e63d4af630090c5d7de7cc08a85ac13c0ed40e499a0301014ed8 WHIRLPOOL 5e6677c9570d90d5b8018228be7f219a05174bd421c4b20d7327620a1f71322d02e80cbcb2a7c3f1d6ffadb2750d8b2e52f213bcd4458eb98fa431c7afec2f53
+DIST Dist-Zilla-Plugin-OurPkgVersion-0.12.tar.gz 16929 SHA256 e59be5a9ba3b21e3d1b25cab0aa93d42d347d77e837002683592f5b168bdfc5f SHA512 6826c222bc402a747a6f7d05a0373b8c2b53121c10c0e5651fde54f389b51bdf45f808d823120f57f0cc75786c7fb7c5f3a2c80f08b7c0754377e97b2375b4a9 WHIRLPOOL 30328bf16798d79db2cdc96a67200bdfb342ce51adc3e5a736bf54b688a7aac1f16e35408f3e95aefaffe94e211496c900e5f2ad603fcc50517b1ddcf5b4f265
 EBUILD Dist-Zilla-Plugin-OurPkgVersion-0.100.0.ebuild 725 SHA256 0579842bcca9db0e2b4ca8df55132a08d3f7e90cbfe1bac6e22119e1dd0239bf SHA512 bf504a447c4d922c4a3519543e47baf3631e445bffeaa96b49c432b8803333d961f9538a6a9d7eadac8a825521d5ec55b0064c222c591950442ef05ce79f6b09 WHIRLPOOL 48bfa7c3bce8e7d9511e8517edc05fbcb0f791d2d598bfbccc420b0ce0fe1042e751ab1a22a888a533a9243182444da585e8c8be5fbeebc565bb139690b36a75
+EBUILD Dist-Zilla-Plugin-OurPkgVersion-0.120.0.ebuild 725 SHA256 088e8f10f74a6868ead3e787ce7f85d03858c2683c92a46cfe8b09be48a9bf79 SHA512 3a966abe912bee3d1d640ccb980f7127cd489b06583e547ed8de95e15979e4d21948cef23bcf6d46612c257ee9fc8c3a57994786956f947373871375f4a51d6f WHIRLPOOL 757f976f94da2d9b41cb89d4b7bf44329023750a21a72977b41a5186592947a6e0c68b823bcdd68c6d40b54a633216e78c639e9999cf4c44ab544ae71a448293
 MISC ChangeLog 428 SHA256 b045ee6709e8e35ca8c2c23cdc4a115cf624f4dcb0058a86e419daf5d195c7e8 SHA512 5774edbce8743f57af6c9026c31379f8361d5386d318f4fca426e4ebd53553330327183172e1adad6c87cbb7ba249bfc9cdcda1efb451febe2f2710a090d7eaa WHIRLPOOL 01c672a6f728aec5bcdc624b7716323b7233d0c8a80319eb07f8256e0bc584d117d3dc49c0b34ea627ffbf255ace06e662c88ab3613084ecf808bad194ff2f4b
 MISC metadata.xml 436 SHA256 8b1a6a0ed20b9d151b59b04156f21d9306b41412c1a9c3e5d1ca753750027d67 SHA512 e95b665557c05305e78a2e2712102e3e0a8f5f630cf5510492c9b58864bdff73c3fb7ed9ccb6cc83252feb9e9d5ad3f5636c6f38706e5a718d06ff37667ff3d3 WHIRLPOOL f73e42f6914a339afcae73c40763348b608a6d57aab0dec3ff5fd0af2bfae0daf8d8495e8827cbfa76d4db3d60b384a612d5134aa40c80647604104fcfc70642
diff --git a/dev-perl/Dist-Zilla-Plugin-PodWeaver/Manifest b/dev-perl/Dist-Zilla-Plugin-PodWeaver/Manifest
index b609dd2a3d58..eb4805371f4f 100644
--- a/dev-perl/Dist-Zilla-Plugin-PodWeaver/Manifest
+++ b/dev-perl/Dist-Zilla-Plugin-PodWeaver/Manifest
@@ -1,3 +1,3 @@
 DIST Dist-Zilla-Plugin-PodWeaver-4.008.tar.gz 17501 SHA256 1fd9e3833f2a12c4d0490f455e06f6819f3bf81b75238ea448e293a28d88c139 SHA512 e780dc2269b9691d0c334866c278fd2dea2eb68a3d84a5c8dad80b2b9277a7396e523a2b8c45b32d7c8b7b1379b7e3f7d68871b40901d3fa3a2bb0d039e824e5 WHIRLPOOL 3f62adc47f518eff5312922d225ea3311838ba02d90484c14723a2e7ddcd2b04c7dbf47ee13e8924c09eebae9fb96980fe50ec94442dddcd446946eb8f517410
 EBUILD Dist-Zilla-Plugin-PodWeaver-4.8.0.ebuild 613 SHA256 afae69cad6958eef3cbe0bcbf336e189828c85bad4643c55c01026411caadde5 SHA512 c944074d74efb7c9a812d762be2f0b8cccab60cb61f90f0a5b01deb9f6d1de1359a02b7459899ea81c67b4185f0d86a298ddd22c36a455a695d4d4b8aa501513 WHIRLPOOL 601d68a49c30c98d16690fe35e38af7755762ce314409e8b2246356ec169b467600000cc8d435d74435b022421110616ea2e7a22842082fbb54904a0eedf119e
-MISC metadata.xml 257 SHA256 4d43e70b770d0898a99af64a8454a6116e4a86500c23290655c8371265010427 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e WHIRLPOOL 87039765046556cdc2f7d76ce4192945117bfd5bb684220ea8fb72be310673a5b729ea428666ff1ceb1e6c21fb585a3a7dd72bd94dab89cf076a895e6a7677f0
+MISC metadata.xml 428 SHA256 05c5edf5c03877b274f6324dc771e40b36f1811826067e681eedf9571e8f0b46 SHA512 6d9ef75a038510bc44852156ed05db1c16568a19f72e4cf56f566a0bc58ba9168a8964ded4d68030fdbc64b2865b2fdf038adb4fb0f48620f376d715f688d719 WHIRLPOOL 7bf7b4ce922ff6199bdbb9fb27c1850adfe7b24a20a6c6fa94c608ccd93574692830ec8d5c29a32b62b550cdd5b905272a1b2d3802cc120ca757c45db78c01b4
diff --git a/dev-perl/Dist-Zilla-Plugin-PodWeaver/metadata.xml b/dev-perl/Dist-Zilla-Plugin-PodWeaver/metadata.xml
index 2b9a936fc0a1..0254ca78020b 100644
--- a/dev-perl/Dist-Zilla-Plugin-PodWeaver/metadata.xml
+++ b/dev-perl/Dist-Zilla-Plugin-PodWeaver/metadata.xml
@@ -5,4 +5,8 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="cpan">Dist-Zilla-Plugin-PodWeaver</remote-id>
+    <remote-id type="cpan-module">Dist::Zilla::Plugin::PodWeaver</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Dist-Zilla-Plugin-RPM/Manifest b/dev-perl/Dist-Zilla-Plugin-RPM/Manifest
index b383d108b0b0..005656d02cc2 100644
--- a/dev-perl/Dist-Zilla-Plugin-RPM/Manifest
+++ b/dev-perl/Dist-Zilla-Plugin-RPM/Manifest
@@ -1,3 +1,3 @@
 DIST Dist-Zilla-Plugin-RPM-0.015.tar.gz 14550 SHA256 6714979df6848cb7d5f375b665256df930689eb3478474fb508f06ace80bed46 SHA512 e3369ef05d8f6b4ad5e6b2d88646ac64129ef81e9f46a95b537ab539b6540ee9d34e6a63ba719f8bebdf4a2167074e542f1b94671169c779e3163774b0300023 WHIRLPOOL c125ca2b8883f7cd2025806648b1574fd496237da243a628195792a0bc98bd78b42ec510ed7f5f680ce4516759687b5b73c27fe46893f7e70b404b9343e27294
 EBUILD Dist-Zilla-Plugin-RPM-0.15.0.ebuild 677 SHA256 e4c995bfb21bd47e75da73b5a833eba3a114dac0c7e4af09450a37a235ce79d5 SHA512 f7fb0c7659e45cc5498a2a28e7c26260a68c9a7ce19a67d34665b984a673eb591b75288fba14e351f60b968b145ac37182d14f7a52486baee552dee4cae815b8 WHIRLPOOL a9248b7f5fab2cec39eec2f5633a73d9b5fdb387ddbfea63d067f241f33ff7d9157d799b54b17ed968475cbe6cdebe07159fd7670194e54c5e2b84bb21a97638
-MISC metadata.xml 257 SHA256 4d43e70b770d0898a99af64a8454a6116e4a86500c23290655c8371265010427 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e WHIRLPOOL 87039765046556cdc2f7d76ce4192945117bfd5bb684220ea8fb72be310673a5b729ea428666ff1ceb1e6c21fb585a3a7dd72bd94dab89cf076a895e6a7677f0
+MISC metadata.xml 499 SHA256 7d14a0a068dd43f7da9b9e115d0114bb54aa596d9b4beb7c02a676e0f606c8ea SHA512 dd95b532e179033f7192eb5081bf7be5f16549d23c88231337bca99106ce27c9034babed6270766a3ea3499d9b418a7dac4ffd1ae65affc41aed0cafb9a1c150 WHIRLPOOL 9ce541cfb00f96d6d674a5347c8b40d0e2049e0271f4a9c75ed3c94230460ffe9c5cb39af91bcf6214922b76df64b42e309e0b2b433a6aa8e255e1a5fc70ea8b
diff --git a/dev-perl/Dist-Zilla-Plugin-RPM/metadata.xml b/dev-perl/Dist-Zilla-Plugin-RPM/metadata.xml
index 2b9a936fc0a1..35b6388ae1db 100644
--- a/dev-perl/Dist-Zilla-Plugin-RPM/metadata.xml
+++ b/dev-perl/Dist-Zilla-Plugin-RPM/metadata.xml
@@ -5,4 +5,9 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="cpan">Dist-Zilla-Plugin-RPM</remote-id>
+    <remote-id type="cpan-module">Dist::Zilla::App::Command::mkrpmspec</remote-id>
+    <remote-id type="cpan-module">Dist::Zilla::Plugin::RPM</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Dist-Zilla-Plugin-SurgicalPodWeaver/Manifest b/dev-perl/Dist-Zilla-Plugin-SurgicalPodWeaver/Manifest
index ccdadc50c982..4bb128eb716a 100644
--- a/dev-perl/Dist-Zilla-Plugin-SurgicalPodWeaver/Manifest
+++ b/dev-perl/Dist-Zilla-Plugin-SurgicalPodWeaver/Manifest
@@ -1,3 +1,3 @@
 DIST Dist-Zilla-Plugin-SurgicalPodWeaver-0.0023.tar.gz 18350 SHA256 4965966ad524d2b5847d5189cd2473ea07504842384a0981778098cd15891e1f SHA512 3d67ad95b0e77dc2f1adc7adbc9f1d1349dfba926f0d5860948f561fe4e9ff348652513a5ed7bae74a5372c64cd146f90df7f3a9ed475bf7958eb767ca9aea13 WHIRLPOOL 56812204d015dce1c090e986941d1536a06c4d8715d45b121ff5449e1491189c8909abed42bf75f406e9fa4e602f971c46c051c43075c9ccd95afe84068257ac
 EBUILD Dist-Zilla-Plugin-SurgicalPodWeaver-0.2.300.ebuild 479 SHA256 8c49b0259a5569f4f1e7f23d2a332ca18bba0c229a64b195b622dc2c814094b9 SHA512 d606b7a9b72dce1eb648bfa0415702d9b13ead610f9ac0dacfa36fad3cf74d761e3f61346e8f70b8505a633fedd5d569bbe0eb429486fcae9ecbbdf4b6b19655 WHIRLPOOL e3448ada05ee77179fdc1c5aae840cc2d45b48bd4244a688b8bf5c08c2fb2ddcf4b3c6b42fe38098ed110494edc793b0c1f362b49d5370022fb73676f6fe933c
-MISC metadata.xml 257 SHA256 4d43e70b770d0898a99af64a8454a6116e4a86500c23290655c8371265010427 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e WHIRLPOOL 87039765046556cdc2f7d76ce4192945117bfd5bb684220ea8fb72be310673a5b729ea428666ff1ceb1e6c21fb585a3a7dd72bd94dab89cf076a895e6a7677f0
+MISC metadata.xml 444 SHA256 544efe6449aefb148ddeed727ab855024899ac585b501e98ebc30a0389ad892e SHA512 68ae54809b4de7bbfe09c2dd964a8f36dddf5ec1c7f6c9031f540fbb16db43f3145f894666ea70696e49ddff3a93e6e313925b502c6b924692cd357535b33392 WHIRLPOOL ee24dd0d527194bf95c6430bf2b0ff289c83cc2e40b63033c23898445a93c0c8390f7bc1a8fc6173bbcde09a5caf5355d43d5e3fbdcf18287416f25921253df2
diff --git a/dev-perl/Dist-Zilla-Plugin-SurgicalPodWeaver/metadata.xml b/dev-perl/Dist-Zilla-Plugin-SurgicalPodWeaver/metadata.xml
index 2b9a936fc0a1..c6fb7a8844fd 100644
--- a/dev-perl/Dist-Zilla-Plugin-SurgicalPodWeaver/metadata.xml
+++ b/dev-perl/Dist-Zilla-Plugin-SurgicalPodWeaver/metadata.xml
@@ -5,4 +5,8 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="cpan">Dist-Zilla-Plugin-SurgicalPodWeaver</remote-id>
+    <remote-id type="cpan-module">Dist::Zilla::Plugin::SurgicalPodWeaver</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-php/libvirt-php/Manifest b/dev-php/libvirt-php/Manifest
index a6d49136cd9f..849ec57c3756 100644
--- a/dev-php/libvirt-php/Manifest
+++ b/dev-php/libvirt-php/Manifest
@@ -1,7 +1,5 @@
 AUX remove-imagick-check.patch 331 SHA256 c08f4f4f0149771e7c4f17e58ba366d58cf3c2abf9ab0239f4083955b6f12e68 SHA512 1e949f8c704a2e6b541a276b8cb53e9cf09f009dadc01f4f50ad02e92258cfe30130b2d22b811e0b5b07e1bad4023fad05040c6031bd0063999212c2d6483bcf WHIRLPOOL 932b5ed39803b1073d8e2b5adae65ca16744d37e753311fc9f40828206ebb28c5b2d0f519fc663897176a0e99087e445069bf4dbf5d84b03d5c165e42e119923
-DIST libvirt-php-0.5.2.tar.gz 770816 SHA256 f338caab2bebcce60cd62e3982ec4c1a274ecaf49d03cf7080b45f2f16cd516d SHA512 11844fea8507090826acd81fc7c257ecc3ed9cca10fc785e4d54b98ebd1e213310e379e7ca684c6439d9e2c57800a140fdc9953c6bec72da1959f5ed99e9ef31 WHIRLPOOL 19bde6afd0ef824557048d9f00aa1dd34f7138408326653e49c04a25e514575d1c2d92c462a8a9f40048ae2af7b2e46a27b66561cddf21fb8f28c294085700f5
 DIST libvirt-php-0.5.3.tar.gz 778604 SHA256 6cf9a5aa855cf973e4280c890d9da88a2a26a1e5a3c8bb555f885391467f85cf SHA512 b4cbfd8840d8f114fde762b5d6ada155ebdb231b554e28e8526a7af45a802a18f28e90fa52f3d7ca9f616996fe0a8289b70c2d14dca51a52a7bf8a501c3ff44f WHIRLPOOL fc379e7a216e7846dd6711816f19fac8497f67bee69fe66b904b86d40cc7064d941338941d6bb48e13d4fb1e0a8bff6421831c538a66f5b36556fff838d7f598
-EBUILD libvirt-php-0.5.2.ebuild 1082 SHA256 76a658353105b586ee89b8c7b68a8b9f42b952fa668ee91f4f20ad62601fa2a9 SHA512 35b20ecbae30b079e50a3a01c9612ea87607c094a744ed9139ca0ad3645c6281e9fb47d5b863f47c4d6d00f309ef9e8e89b37900ef868a9953d5f27046a98692 WHIRLPOOL 56f7c77cb35a978a5eb6cfbd5dd0346ad1f942a40e704cf8d78235b09b3bed604bfacde2962380a28e223241b57d28a9dd0b8b0c46adf3e87cb3461e5a2e524c
 EBUILD libvirt-php-0.5.3.ebuild 1432 SHA256 f1459d54c16803982240db85a615ae60d36c046f8761c3440ddf398d9c403537 SHA512 9b3615b60eaf3524ede5985e4ccafdaee674862a6869fb2acec6926fd859db39c186c3ae9085f642e82ee5a2ab57b9cb3c0d4ef50c07aeb3d16fcf3864b11c7f WHIRLPOOL 3d560dab1d5f895e69a4a411554faf88f99656c7dd4bd6d7bd701294d5fb59b9ea5ccc42534289568e4abea4d39dac9a4efad3741c667b30a62bc69e6bc88ba2
 EBUILD libvirt-php-9999.ebuild 1432 SHA256 21095d6d8419fdb500405fa6cb34f1a0259e38439c92a855beb18f5026b30f4c SHA512 804d7a2885b642ed15232e2910743ed630d1eef465e5edf792477e8bdc9e670f53975e3c3deeb538203782c740c7046fea00e73854db78a17493d6dc5a6ae82e WHIRLPOOL dd4cef09ae0d7249ab7abeb73dc271867bfe29ba0e988eb255ef9d617e730792f0e9f801b93db2b4618592a25e5ea3b1e463fcde5dbeb332bff15f2aaadc565e
 MISC ChangeLog 3165 SHA256 45e82bb26c60b62ea961959fe8b7f9e2f1c5e3a55ea26752d32b6ffc217ad99e SHA512 9517b3c546065d55bc4e65c59d125df9be4d990860fd1da910d4ff77964b12aab903f7038e3a68146c5d37f5fb4b7c97a677552c205c745fc7aa436f585927a1 WHIRLPOOL 3dbffe7bba6034039c6a775dd4521991a40313e153afe860716538dac071b399f1a5bf1c49e9a2543ecc01e44b170fe7b60ba9acec2b57821177cf5898c3b84f
diff --git a/dev-php/libvirt-php/libvirt-php-0.5.2.ebuild b/dev-php/libvirt-php/libvirt-php-0.5.2.ebuild
deleted file mode 100644
index bc4fa0c889b2..000000000000
--- a/dev-php/libvirt-php/libvirt-php-0.5.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PHP_EXT_NAME="libvirt-php"
-PHP_EXT_SKIP_PHPIZE="yes"
-USE_PHP="php5-6"
-
-inherit php-ext-source-r2 eutils
-
-DESCRIPTION="PHP 5 bindings for libvirt"
-HOMEPAGE="http://libvirt.org/php/"
-SRC_URI="http://libvirt.org/sources/php/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-RDEPEND="app-emulation/libvirt
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	doc? ( app-text/xhtml1 )"
-
-RESTRICT="test"
-
-src_unpack() {
-	default
-
-	# create the default modules directory to be able
-	# to use the php-ext-source-r2 eclass to configure/build
-	ln -s src "${S}/modules"
-
-	for slot in $(php_get_slots); do
-		cp -r "${S}" "${WORKDIR}/${slot}"
-	done
-}
-
-src_install() {
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env ${slot}
-		insinto "${EXT_DIR}"
-		newins "src/.libs/${PHP_EXT_NAME}.so.0.0.0" "${PHP_EXT_NAME}.so"
-	done
-	php-ext-source-r2_createinifiles
-	dodoc AUTHORS ChangeLog NEWS README
-	use doc && dohtml docs/* docs/graphics/*
-}
diff --git a/dev-php/pecl-crack/Manifest b/dev-php/pecl-crack/Manifest
index 3ba9d52caf57..68e7ab7eb6ad 100644
--- a/dev-php/pecl-crack/Manifest
+++ b/dev-php/pecl-crack/Manifest
@@ -2,9 +2,7 @@ AUX 0.4-php7.patch 8435 SHA256 74eb7097cef9e1306b9c0d4ec80149f948bf4696d011c315e
 AUX fix-pecl-bug-5765.patch 375 SHA256 1a4f72c1c51cbc95eaa68776fdc677a740ae2cc04e21000a2260548fb7f85b74 SHA512 21f7d76242c630334e88c8bf1f6e4fe9718943c36c6886f8de6503c9c616beab7007e31127b40b1df66763893d692a65f20483addb1607e0cfc7ec7b92ff4500 WHIRLPOOL 040ae981d77681384f96f4c4713a0668b33e7e3c8551edbc1c80c0372f6387b457920b4695c8b8bffbcad2afaae3fce8ac5c3960992c70af61c1c7bef88b4ab9
 AUX fix-php-5-4-support.patch 674 SHA256 f2fff058733ad7990f4685f70b8988721d6ad8d3302742f1143cffb468bb92f1 SHA512 ca2475557dc1d2f23a1e5745e7f3bac70855d0916a9d37d1a7efcd04e3bb973220b87aa2cc7ba8315473a2fd16dfd142c5c01608e94c595541ff15838c1e1d44 WHIRLPOOL 68e93584a9fa166c8b9555e05150315b30a5c5fe9c1159e61eb7b560b1a20aafd59aa8071509625c1e19dcee3046593c0e76ac7534157d3d9c114766776f59eb
 DIST crack-0.4.tgz 25524 SHA256 00a5250a6c82b39c1aefcb6e1ce0980da5df49c9bfc6ade9a8e867d89e87f560 SHA512 0dec64d1ce859bb3d7e2b834e4bcc4ef8c6f3e88e5b61884e40dddc366a992a7c85bfad4227224d4401aad7f26843678709f29acd2dcc75563658040b8067d7f WHIRLPOOL 2b6d26cf65912f6fac72733711ed48e0c859df28a3c7a2b351e607edcc51f15fea7cfef01419b3fd56267ddf9c57f4a75f93e64015c0db9d14e5799ac1a411c7
-EBUILD pecl-crack-0.4-r4.ebuild 669 SHA256 21ca7bb8d8c19a72238c483abf438cf937aa25e5da8e16018122d106180f5c13 SHA512 86ae5004c6df246fda3c8eab83552c29ba598dce7ba19569ddf1342bf06a96ea9366613dcac29682d2641c5d36dc612e2ae585f2a3455f153798ec4862a4255e WHIRLPOOL cf53eb0b18e9dc84e5617e8f22a7330cdb9bc3d7fd571b29dc7cda28ed9b69ed660c08c49e3f22e6067b4c1c6f44fecb8faf231da75ecac639da6345f4e3c8a3
-EBUILD pecl-crack-0.4-r5.ebuild 540 SHA256 4f264539d87b0e4685b4abb780f9a77fa2809295e8e8a9df5d44eb3961224cbe SHA512 462351a6d267763c368541ca0a70c3f01d908df63694cf8d33a9fa963c8cd7fd776f30d94a2f361c1565f58eba6f083fbf11cb1aaa66de839fb6597a5ed53cbd WHIRLPOOL af51cdea554d1b25d098f76afc584864a1b46ceb9ca9401c0562fab0e756da75730804555e0656c48056dc4c98301d76841b2710f995e8bf8855ccd111bd96a0
-EBUILD pecl-crack-0.4-r6.ebuild 582 SHA256 ac6d3ac7d19a1fe3c3e8624bd829fa2fd73c32262f47c3824986777428cb2f86 SHA512 56c58d0c1c83b7aa90b5ef3661afa07d7819a661c772dd500aa00f6b18d37d24894be3f016367d52aaff1920285d3c92f661aa209f8d9c8ceed02069451b15b0 WHIRLPOOL 219452771fc4cd9017a33cd0299f2e76765c744b27558d3cc1489c9c7ed2dc1aff782280f9c3d80302f745cc16471d9e7541103d254e4898118a8275c58d3f4f
+EBUILD pecl-crack-0.4-r6.ebuild 581 SHA256 4f106b54c3d89245fe8d1123082dddb1c2a27e25d7ad37ccd0c6171c2e2c26e7 SHA512 7d305dc22b4972335d32906f25582b35bedaef94b0b9b53d69683f41f5f9c4011b6c5aa75f23f4f7b1eba5c8f277c77a8fc78b013669a7a96d0922e2bbdc0a27 WHIRLPOOL 90de72c02093b4d5dd0b7de80c028fa8a28a146944c359ccf761f84c3150bb1f124416bad7be986d2793fc5932063d94a4f485be1d6f8ac44199dae374089ea0
 MISC ChangeLog 2895 SHA256 73e34b6cc44100823758b604c414da082a5c597b869175f58d17a9113cd5ea3a SHA512 11fec7699502a87d57ae72efe3d571a79d7207c8499b3d150fa0986e65aeb223861684cabbba65099265b2f415f518a9b44777d5107b51caf1755d033b6b9656 WHIRLPOOL 7b908028ecbf68978e874cb333d83040978138469b7cc796b967bcc403bd6d80869805df624799c23767be316c3cd16eb23f025d70d9bdd9f6a56ce252ac517e
 MISC ChangeLog-2015 5469 SHA256 8e461e2f7fe1293a9c0235ea94610c2a77e0a9f65769b8bf86b6e667cbda2850 SHA512 41a55e94a50da6780ec6a937f8251417ad32c02d68cdcd388ee6bfb84b4358e92b99809c4f387b8304307afca9cdb618d0921ad3b210cc2bd3a0fd48c2c4342d WHIRLPOOL c940536eeea140c572d907413e79d7166af25dd8cb675a15d5be3a7df548f9f4cc331774957e72dbc70d19b85a852de96ff1622b0d9f55403a7943db19488a6b
 MISC metadata.xml 239 SHA256 b54aca642ac424532264a97d14931720ed288cf387dbdef6a10b34ffed6689f1 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0 WHIRLPOOL 80ab9605bb31ce3310bf524de4705c67ca85cf8f2346b7e13274595598b9fe92c9b119beb865ef214ad33ef172b880e318d18ff8c8d2026cb7319f0524d8a7aa
diff --git a/dev-php/pecl-crack/pecl-crack-0.4-r4.ebuild b/dev-php/pecl-crack/pecl-crack-0.4-r4.ebuild
deleted file mode 100644
index df78d006ef24..000000000000
--- a/dev-php/pecl-crack/pecl-crack-0.4-r4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PHP_EXT_NAME="crack"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS="EXPERIMENTAL"
-
-USE_PHP="php5-6 php5-5 php5-4"
-
-inherit php-ext-pecl-r2 epatch
-
-KEYWORDS="amd64 ppc ppc64 x86"
-
-DESCRIPTION="PHP interface to the cracklib libraries"
-LICENSE="PHP-3 CRACKLIB"
-SLOT="0"
-IUSE=""
-
-src_prepare() {
-	local slot
-	for slot in $(php_get_slots) ; do
-		cd "${WORKDIR}/${slot}"
-		epatch "${FILESDIR}/fix-php-5-4-support.patch"
-		# Patch for http://pecl.php.net/bugs/bug.php?id=5765
-		epatch "${FILESDIR}/fix-pecl-bug-5765.patch"
-	done
-	php-ext-source-r2_src_prepare
-}
diff --git a/dev-php/pecl-crack/pecl-crack-0.4-r5.ebuild b/dev-php/pecl-crack/pecl-crack-0.4-r5.ebuild
deleted file mode 100644
index 271e073679d2..000000000000
--- a/dev-php/pecl-crack/pecl-crack-0.4-r5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="crack"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_EXTRA_ECONF=""
-DOCS=( EXPERIMENTAL )
-
-USE_PHP="php5-6"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-DESCRIPTION="PHP interface to the cracklib libraries"
-LICENSE="PHP-3 CRACKLIB"
-SLOT="0"
-IUSE=""
-# Patch for http://pecl.php.net/bugs/bug.php?id=5765
-PATCHES=( "${FILESDIR}/fix-php-5-4-support.patch"
-"${FILESDIR}/fix-pecl-bug-5765.patch" )
diff --git a/dev-php/pecl-crack/pecl-crack-0.4-r6.ebuild b/dev-php/pecl-crack/pecl-crack-0.4-r6.ebuild
index e386542b84d6..dcda4876842a 100644
--- a/dev-php/pecl-crack/pecl-crack-0.4-r6.ebuild
+++ b/dev-php/pecl-crack/pecl-crack-0.4-r6.ebuild
@@ -13,7 +13,7 @@ USE_PHP="php5-6 php7-0 php7-1"
 
 inherit php-ext-pecl-r3
 
-KEYWORDS="~amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 DESCRIPTION="PHP interface to the cracklib libraries"
 LICENSE="PHP-3 CRACKLIB"
diff --git a/dev-php/pecl-ssh2/Manifest b/dev-php/pecl-ssh2/Manifest
index 8dad90e7beef..7fe59eac68b0 100644
--- a/dev-php/pecl-ssh2/Manifest
+++ b/dev-php/pecl-ssh2/Manifest
@@ -1,10 +1,8 @@
 AUX 0.13-parse_url-fix.patch 1777 SHA256 f23f1667b973230318bdb87b6fcdad47b703646eedf632014fe5354ad9e0ee1e SHA512 9628c0cd1d09d64be3824485ec54ad9bb477a18b9178a120b8fc17ca5e5f2055d23019495741d7e85841f9e0b5f7dc991fb14ead04cc60f95127099e3e5fb205 WHIRLPOOL a79f0fe1488e79616ed6b007909ea7104cbe990c7cfc6044c7d2b1e6f3439af2279b65c1e9931a6d73d254d98adc847c90157108b7af14b34cd81129c869b724
-DIST ssh2-0.12.tgz 26223 SHA256 600c82d2393acf3642f19914f06a7afea57ee05cb8c10e8a5510b32188b97f99 SHA512 e48f8051f9234841bb0fc10594dcd90badf2d880d75c4bd59f847e3d4276e9fdd3fe71c1c01c07fb9f552cec470f3dbac6ae1db4d33e5793d3988ea5bac1d5bd WHIRLPOOL ff8e983027281db4fdff6c85d4a98c8987277abe40c82b4306a86459661864e4ca534b48ee22186d01b8166a58980bf5cba374a35d4e477e4dbb41f8c845a601
 DIST ssh2-0.13.tgz 28984 SHA256 cb2cb8ab840b5b36bcd8a8df06ea4a970a61e4cb3980f3c0ac5c913522e6c1be SHA512 c031e22853bf5cf8ee59dc5b99d9e7e60af1507a22e7d0a9e2f54b8f1758a03a6cea91c539e0f667d48ec66185fdc8a28c47e5a1e10a72220c0cb16b3948e1d0 WHIRLPOOL 62c36541bd3d7c579fdd4e3c8114e26dbda7206839db75d77b84fe320a87c1b8033b618da31a8d9038d5fb5874fa05a333e3b391a9e33fc1f723138be8e3ac71
 DIST ssh2-1.1.1.tgz 27551 SHA256 30963a0a4d9f704d594d875665c1ea297730a6efe2af22dff12a78183907ac0c SHA512 92cc40627a6114a4b0e7b8437e5e0b219b49dfbed9668937e7d0d37492a101c9f25381b5a1533f91c0530fdebe66af7bcb68ff4231a7ecd806b99d8a04f74d79 WHIRLPOOL cfbbb940ace42eb41c2852a1fb9514b36f64820cd2e45cd14808614d9b7ca8d347d1c9d5042bb38e215b5c88d113e5cfc2bda531240e2550f9e14798069198ca
-EBUILD pecl-ssh2-0.12-r3.ebuild 393 SHA256 bd06f7e690b8979e30fe59c2f72c9cc54b6fc59cee70e73a4d94b6405b9870e5 SHA512 1287a53a4b208257e17c1708c34c1f3144602e5b2d543ef7e7d9da584efe81a0da81b09ef93b968d6ca26f1cbd0afd0196162d5c0cf9243684c064905d9cdf66 WHIRLPOOL 15c0f4a784a1f763589f1f7953ea20ae94b2f06b73d2bbcd07635365718107c8483baa03e743cd9dad56ec2f258ef153747cb9dc169b0f384219f00c91bb5bb8
-EBUILD pecl-ssh2-0.13-r3.ebuild 708 SHA256 a61d17f59b519ab50b4c615fab363ed64fa9a5057441d18db11174bb26a55a2d SHA512 a3f5afc2c374dcfe6fd6f4b560d091e4fcb327ba4857b83f5bdb91b0bbfd5da4649cd36aeb264fa08857b21a154f26b867e7cf23114888b4751f15566dbd7fa6 WHIRLPOOL a582a8fc0507959e9e3c217eeb528fe95d488e8b5bcd57bc31c3541beacd9bfe62fc23d372d873f2199aa0720550ab0f0501ad14a56345034383b0c579b42b85
-EBUILD pecl-ssh2-1.1.1.ebuild 654 SHA256 0fdaa9ca9118271bd29f91078a0bcc45a664d02afcc5a7ae190062af7931e95c SHA512 7ca99c7f89006b69ee10f62759a897e70b85580743d4beaa5ca0075c246f9b66a7c16ddb17b5ccf94107ccbeb72efbb1f46bba9a6764130436b958cc18679a81 WHIRLPOOL f19665371c8f2820ce0b509725d8dae9670b001a64001b39c4253a7137d858e9b656d416f1c2bc466256e1efd42bda7ed960d4d1de05ac45a2e0538fdf569bd6
+EBUILD pecl-ssh2-0.13-r3.ebuild 707 SHA256 401a3f526cb638dd6f5b6b61613169af164efda198ef5c66aa9c8497cb3d6f5f SHA512 05ee3824bb54b54940f982d4b96bfb9ceb546f40b55067bfb1df24123c662786f87faf12905b58cc24188160f0af4f06e0c150a6c32f5e0b93f1343ea64b179a WHIRLPOOL e221b26482f1c56240df77bf0cb39e2a8c149001646035b76d659977052249aac5781b2818f90a18ce28b9eb059b75c8dd965f8da5423af744c0cdaf661bc746
+EBUILD pecl-ssh2-1.1.1.ebuild 653 SHA256 892f01eb140ecb310177b503455e24f7d151e0cb87a8e140adbe5c741a9c7914 SHA512 4e86a46a4d758326de99069c925e46acebb92ab9867b62623c7b90c5a15763dc3900530a4d2d868bd99edb4c5dc5285b493333bae1ba76a635253cbce61e6bea WHIRLPOOL fbe981b71e4512dd6671d30b5d41abe81489f92c234b5798b04bf7ec290b89717cd2e669d16f6c5eecfea5e1bd44c984cf6713afc0781c7ba38a3924fa42aea6
 EBUILD pecl-ssh2-9999.ebuild 771 SHA256 dce6f453f12379e37055bb2e75085c08979706dc57d8e8ea982d729079c02327 SHA512 30198a7e5a19b9532d16980cde4e3cda856a76936a79a06719ee5dc8ad6498c1a1cad7c52a67d9d90d66a91599cdbd791febb5ab348f1a685a9b37485a341c89 WHIRLPOOL 602a94ec89f56ccd9d2d70518e82eb3a2fdd45c99e78998a5bc9f9ffed31ebfc1aa4ec70bb7854c0df80d2ec538a93b2776145c77e4209c4f38e7338817435d7
 MISC ChangeLog 4357 SHA256 d8c9a3da5d7b925284246aa801549ea4f11afe767302b28e0328ac378ab017ff SHA512 d743d85d4cb8ab383cf8af36efd922e948bb9788945391e8de0999f99ce348426fc49734658e0070e44cd8949d3ee196504dba76a8fef3f436de0d1162309ac1 WHIRLPOOL 56d2b920ab122eb0b21b37466cb0b427449da7f515303d32baff0147c10a29eaab7fcadf9ce6ce2ce39e35fb140050be201fb44aaf6f0f7833196a6a0b0b7747
 MISC ChangeLog-2015 3773 SHA256 fe7c9d46629a3801dad080755e4d6bdd917037647b3f3ff3a5bdd4df876ba243 SHA512 f31968f6a49e8f4c01abd82643a5da03972e73ac2ab4ea0da4150868deec8a9baa0a8a24eb45a57ca54ca9053a66a09db1b49d1e3098615d4bdf9b02ed13fc7f WHIRLPOOL ae05dc9c1c7b6590472a7c1de2fb1c3fdb192ea9dcfdc8a2f81fd01c1a7cedba56b03e871279eb49a81cd40cb4be14eef75978b64ae08f1d9b24794716823fbb
diff --git a/dev-php/pecl-ssh2/pecl-ssh2-0.12-r3.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-0.12-r3.ebuild
deleted file mode 100644
index 0165e12936ee..000000000000
--- a/dev-php/pecl-ssh2/pecl-ssh2-0.12-r3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PHP_EXT_NAME="ssh2"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-USE_PHP="php5-4 php5-5 php5-6"
-
-inherit php-ext-pecl-r2
-
-DESCRIPTION="PHP bindings for the libssh2 library"
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-DEPEND=">=net-libs/libssh2-1.2"
-RDEPEND="${DEPEND}"
diff --git a/dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild
index 2c6edfc3567e..25a9a72ff7ce 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="PHP bindings for the libssh2 library"
 LICENSE="PHP-3.01"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 # Upstream notes say there are errors with gcrypt backend
 DEPEND="net-libs/libssh2[-gcrypt]"
 RDEPEND="${DEPEND}"
diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild
index f44824724191..2c2f92bed940 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="PHP bindings for the libssh2 library"
 LICENSE="PHP-3.01"
 SLOT="7"
 IUSE=""
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 # Upstream notes say there are errors with gcrypt backend
 DEPEND=">=net-libs/libssh2-1.2[-gcrypt]"
 RDEPEND="${DEPEND}
diff --git a/dev-python/ImageHash/ImageHash-3.7.ebuild b/dev-python/ImageHash/ImageHash-3.7.ebuild
new file mode 100644
index 000000000000..56f5b8037e90
--- /dev/null
+++ b/dev-python/ImageHash/ImageHash-3.7.ebuild
@@ -0,0 +1,30 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Image Hashing library"
+HOMEPAGE="https://github.com/JohannesBuchner/imagehash"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pywavelets[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/ImageHash/Manifest b/dev-python/ImageHash/Manifest
index c89dc4c8d2d2..d5c8f7538ef1 100644
--- a/dev-python/ImageHash/Manifest
+++ b/dev-python/ImageHash/Manifest
@@ -1,3 +1,5 @@
 DIST ImageHash-3.4.tar.gz 290881 SHA256 22d5afa8089cfd08807e8133c2f03c81272e959f1dc922a2dc924c612f419841 SHA512 a4ba260988d81135f073bfc9a1b1253a69e8736da61e09ac93f8403ca237bfe85c3f0b4791546af601d62a306dd3346ecccf8ebd00d5cd8f4c6ca717b9d89dba WHIRLPOOL 0f4d837197db6a2407c0901403cb8c0effffb167d2517be0a7264fbec108d6f70739c980c00a648fe94b471273d2c6d52bd4f4e371cf9392e7c1177467077a08
+DIST ImageHash-3.7.tar.gz 294629 SHA256 09346020334afc317f79fe162928418f4b2c7e7e053638033f60339d39788c50 SHA512 e0da65d9d2a42ffce5c8b95017fd79bd002f48a963b956836695118e89bbb2ff936629a743248b4189439de155a0ec5f54a34d7cf7b803ae581b45f7bc02b500 WHIRLPOOL e3bb554a885c95669e1a2e02ccb8985d491d55b9b6e4df63a174f6cda71516c6c3e39b544574a620504017f7b9aa6b9683da66a6dfb1faf6852e72faf67e8d04
 EBUILD ImageHash-3.4.ebuild 681 SHA256 c2427af0ccf5e075c3c0a6720c35422c4e1d3aab620bac372d36b7f59486c97d SHA512 0212aae2cd9aa0c45bbcd0993acd4a90101a51f4392ef7f1cbc36bf99f98db11f069a6cd41dddcd5cf01e36eaa0cbf7caa3797ec07404cf22ab7feaa8f8a67a4 WHIRLPOOL 608585eacd0d0b481ebad34d33eaccce190b4ad886ba311cc3abed378d635ef3d39a9de13db92d7e14c22ec5ba270db51aa733562154eb1814f78e41cb5ac70e
+EBUILD ImageHash-3.7.ebuild 681 SHA256 c2427af0ccf5e075c3c0a6720c35422c4e1d3aab620bac372d36b7f59486c97d SHA512 0212aae2cd9aa0c45bbcd0993acd4a90101a51f4392ef7f1cbc36bf99f98db11f069a6cd41dddcd5cf01e36eaa0cbf7caa3797ec07404cf22ab7feaa8f8a67a4 WHIRLPOOL 608585eacd0d0b481ebad34d33eaccce190b4ad886ba311cc3abed378d635ef3d39a9de13db92d7e14c22ec5ba270db51aa733562154eb1814f78e41cb5ac70e
 MISC metadata.xml 706 SHA256 226536fc73812ab3886142ee1df1956db1db43dd1bb1a572be338738d38638fc SHA512 289175e72c831818e13e1011c2a4908b6bb60ae5f2cdb91b81765f4386215283648694a7ef1f293dd91f11f9b5177156de9617cb081f1e31d42e6c1ff3f5ddf5 WHIRLPOOL c3901388cb9930fcbd6aeac26b1c4afbe07e2d75fb743e36baf341033d5f2edfd59a0df39f5249af99eaba72bbe11630ede535ba2eefe789f0d9519957bfd72d
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 85640cdaffd0..7527802cfc79 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,7 +1,9 @@
 DIST PyQt5_gpl-5.7.1.tar.gz 3733746 SHA256 be849f212a074049b9ebc10b6c07dddefb86e6d30e8df8a5c715cbb2cf7fad14 SHA512 7498713f73807522e58ae38ff58548cf80c2f2c418d6c55e20ce613cdc997e4ee7139076f1f152c7c3edb970bde14febc3496009f934e31ff71f01a1605f558f WHIRLPOOL 9322ccaaebf78a9e177703bae26f002cdfe9ad3ba45a9c7b9ccdd3b73cca96550e479b243b302d59eefdc1520a6e5b5f18ac5fabc1f8eff36f7f76d71b7dea11
 DIST PyQt5_gpl-5.8.2.tar.gz 3744907 SHA256 ebd70515b30bbd6098fee29e6271a6696b1183c5530ee30e6ba9aaab195536e8 SHA512 8b765b9ae6210b7312a2dc6ed94d2664ae569625fe8a27443bae4230d9d9c00e0cf3b4be6904c66ebceff5cd5bbd19a5a9794a0b3222c8098a55f0b94fc8d89b WHIRLPOOL a2cf7d65f73b0cba7d37339e22b4bb8d3a4a924dbbd4d093943e299cf4d96dfd66e81ecfc4a5bf570f37f33eaad458849d7ef93ea22b115eece88866067f2e22
+DIST PyQt5_gpl-5.9.tar.gz 3097557 SHA256 ab0e7999cf202cc72962c78aefe461d16497b3c1a8282ab966ad90b6cb271096 SHA512 6e925dee751d6b2ab97b3614b0150f305798b89920e11db7a2cbef579e4c21839a38f4ad7eee5828a0c28942999955715a265e043004ee7838d376025d32e4aa WHIRLPOOL b92833ecc97638c8dac5e35de155ddb9d5783925aa8ab50bdd823b793675354b37edc29e17396241de87b25ae142c37a9cd1c215ad57c25b928ec0af3deac8aa
 EBUILD PyQt5-5.7.1.ebuild 5612 SHA256 9cc63dfe3053a665263019919056c4ff654e97483fac58f7b4ce6bd9cdb12c45 SHA512 1bf9de7a46d07740e91d5497767b226435d20bc98eca0cce901e5b7f2e7de3f41a4e34b073f4d3280e0184387d8d07d06f7e0a002196659c1a9da8e3745dd366 WHIRLPOOL 36494a100fb28ba04e7de4dc80dc53f48efdb05eb0fd3aa645d82ffb90369a577580d7397cee2edd36cb245aaabb5b5d42d5de86ea05c5b8d76893fe4bd83823
 EBUILD PyQt5-5.8.2.ebuild 5636 SHA256 5d636464a9dbcaebfbab6e0b1032400f92b85882dbe2e9a7a7dee21a589c16d1 SHA512 71c23f5ce7c44be2252cba0efd8687591ac6e4980626d9d880a5a54a31d8b721697ca9a80990ac38481d54ab12036457e020cc7afca7e01a265472a05e106f5b WHIRLPOOL 65e2a1c3988004e80b8a308f2463629a323a6ef3cb056a3cf9b7bbce23ba452220da3fd7fcc5f0b13aed029d1dc09b91ffe334821e0a1e1d656ba2b1aa6f8dbe
+EBUILD PyQt5-5.9.ebuild 5666 SHA256 230e1343e300a481f3d3c132337a05ed6db9878b0f7b2a167f7b05363b1ea31c SHA512 eb8eb4bcd242d8f69ae4215c9f56f95edb6bb93024ed98805544bb16a5a792b2de3b9ac5b1d899cf82fdcff402cf11ccae0679da21edae5b21863d18cbe8d1f1 WHIRLPOOL d1d73074b13a8720ba8e25b2d5c24d3c145d429cf5b53cbb48b2e8dd9c3244081f440efe3bddc2dec7b0f24fdf978b2e7aa739082cd2a0918e43fcfd186a6ac8
 MISC ChangeLog 5945 SHA256 bc33b54e774fca6c280fea23679a5e301d9b0e579000bc279fefa1e6cd4e22ae SHA512 36ca5033cba177eaac511fb501a9dc7db91ea8ed00ba412b93611261546c1b1c73d06e9fc65e20d76f1043c3ef73c776d9674f57ffc4b465efc979ef09ee6714 WHIRLPOOL 6261d3e758bb7fdc5e61df408f408794036b05116d4895492d5e1d5e59346996d788b49fa6da5a3e8453f87df8d1f04fa388bf1b1e9b0b0822354268b544afaa
 MISC ChangeLog-2015 2530 SHA256 c0f5fb7e518d57246a272e1850019d5c6b17295aeb6be532c3ea0531993066ce SHA512 e84858c3d2dfc44e35eca767822dbdf42396f0df1c2b6676bfcd624be232ec4ead7daadc71dcadf204ac10bd91dddf0c37decea272f3e6130ae2b36aad6cb18f WHIRLPOOL 67f2ecb4cd02db99f6ffc1e0e1bb404c5067015cb85846704e285122c5074b286103ecaf9ef17e9874afad4784d18492808f192e60e363438f375408c1af45cd
 MISC metadata.xml 2458 SHA256 76c968147d7a2e8135e38306261729f31498e340584f4442b119b0a46b5f3bd0 SHA512 8554c97aeb873a2a7e1d50b8aacc3638a87fdc0fdc367d61123b63bd506b1376873d88a967773e8f1050f0e8c35ae180d61c7eb2c213c345e5b17a3c0e4c7df8 WHIRLPOOL 2731d8a5af652bc6b372b12ed8ee714487abc542a2a1673a80b97110f800f453fcbd648124742a17463da6abb586359601016b70b2006bd8d68604e031b4bf5d
diff --git a/dev-python/PyQt5/PyQt5-5.9.ebuild b/dev-python/PyQt5/PyQt5-5.9.ebuild
new file mode 100644
index 000000000000..de9e668e6d1f
--- /dev/null
+++ b/dev-python/PyQt5/PyQt5-5.9.ebuild
@@ -0,0 +1,198 @@
+# 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 multibuild python-r1 qmake-utils
+
+DESCRIPTION="Python bindings for the Qt framework"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
+
+MY_P=${PN}_gpl-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
+else
+	SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# TODO: QtNfc
+IUSE="bluetooth dbus debug declarative designer examples gles2 gui help location
+	multimedia network opengl positioning printsupport sensors serialport sql svg
+	testlib webchannel webengine webkit websockets widgets x11extras xmlpatterns"
+
+# The requirements below were extracted from configure.py
+# and from the output of 'grep -r "%Import " "${S}"/sip'
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	bluetooth? ( gui )
+	declarative? ( gui network )
+	designer? ( widgets )
+	help? ( gui widgets )
+	location? ( positioning )
+	multimedia? ( gui network )
+	opengl? ( gui widgets )
+	positioning? ( gui )
+	printsupport? ( gui widgets )
+	sensors? ( gui )
+	serialport? ( gui )
+	sql? ( widgets )
+	svg? ( gui widgets )
+	testlib? ( gui widgets )
+	webchannel? ( network )
+	webengine? ( network widgets? ( webchannel ) )
+	webkit? ( gui network printsupport widgets )
+	websockets? ( network )
+	widgets? ( gui )
+	xmlpatterns? ( network )
+"
+
+# Minimal supported version of Qt.
+QT_PV="5.6.0:5"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/sip-4.19.3:=[${PYTHON_USEDEP}]
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtxml-${QT_PV}
+	bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
+	dbus? (
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		>=dev-qt/qtdbus-${QT_PV}
+	)
+	declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	gui? ( >=dev-qt/qtgui-${QT_PV}[gles2=] )
+	help? ( >=dev-qt/qthelp-${QT_PV} )
+	location? ( >=dev-qt/qtlocation-${QT_PV} )
+	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
+	network? ( >=dev-qt/qtnetwork-${QT_PV} )
+	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
+	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
+	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
+	sensors? ( >=dev-qt/qtsensors-${QT_PV} )
+	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
+	sql? ( >=dev-qt/qtsql-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	testlib? ( >=dev-qt/qttest-${QT_PV} )
+	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
+	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets?] )
+	webkit? ( >=dev-qt/qtwebkit-${QT_PV}[printsupport] )
+	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
+	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
+	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
+	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+	dbus? ( virtual/pkgconfig )
+"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( "${S}"/{ChangeLog,NEWS} )
+
+pyqt_use_enable() {
+	use "$1" || return
+
+	if [[ $# -eq 1 ]]; then
+		echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}
+	else
+		shift
+		echo ${@/#/--enable=}
+	fi
+}
+
+src_configure() {
+	configuration() {
+		# Fix out-of-source build
+		ln -s "${S}"/config-tests || die
+
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			$(usex debug '--debug --qml-debug --trace' '')
+			--verbose
+			--confirm-license
+			--qmake="$(qt5_get_bindir)"/qmake
+			--bindir="${EPREFIX}/usr/bin"
+			--destdir="$(python_get_sitedir)"
+			--sip-incdir="$(python_get_includedir)"
+			--qsci-api
+			--enable=QtCore
+			--enable=QtXml
+			$(pyqt_use_enable bluetooth)
+			$(pyqt_use_enable dbus QtDBus)
+			$(usex dbus '' --no-python-dbus)
+			$(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets ''))
+			$(usex declarative '' --no-qml-plugin)
+			$(pyqt_use_enable designer)
+			$(usex designer '' --no-designer-plugin)
+			$(pyqt_use_enable gui)
+			$(pyqt_use_enable gui $(use gles2 && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
+			$(pyqt_use_enable help)
+			$(pyqt_use_enable location)
+			$(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))
+			$(pyqt_use_enable network)
+			$(pyqt_use_enable opengl QtOpenGL)
+			$(pyqt_use_enable positioning)
+			$(pyqt_use_enable printsupport QtPrintSupport)
+			$(pyqt_use_enable sensors)
+			$(pyqt_use_enable serialport QtSerialPort)
+			$(pyqt_use_enable sql)
+			$(pyqt_use_enable svg)
+			$(pyqt_use_enable testlib QtTest)
+			$(pyqt_use_enable webchannel QtWebChannel)
+			$(pyqt_use_enable webengine QtWebEngineCore $(usex widgets QtWebEngineWidgets ''))
+			$(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
+			$(pyqt_use_enable websockets QtWebSockets)
+			$(pyqt_use_enable widgets)
+			$(pyqt_use_enable x11extras QtX11Extras)
+			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		eqmake5 -recursive ${PN}.pro
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		local tmp_root=${D%/}/tmp
+		emake INSTALL_ROOT="${tmp_root}" install
+
+		local bin_dir=${tmp_root}${EPREFIX}/usr/bin
+		local exe
+		for exe in pylupdate5 pyrcc5 pyuic5; do
+			python_doexe "${bin_dir}/${exe}"
+			rm "${bin_dir}/${exe}" || die
+		done
+
+		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
+		if python_is_python3; then
+			rm -r "${uic_dir}"/port_v2 || die
+		else
+			rm -r "${uic_dir}"/port_v3 || die
+		fi
+
+		multibuild_merge_root "${tmp_root}" "${D}"
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	einstalldocs
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 8c7166454fac..47aad7cb1ca2 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -9,6 +9,7 @@ EBUILD cryptography-1.7.1.ebuild 1666 SHA256 07c512a796db87de7a6e3ee3fdd6425dd95
 EBUILD cryptography-1.7.2.ebuild 1748 SHA256 d186c9abdd5f89e682598e1c2f6166fbc4041be7d71402f2d88317835c241036 SHA512 f6d6768259d982e8c2f933bd61fd103384110258bb7133184f54ec48a6c91593a6261cef15b4208330192a7678be45e53170ecb16ef3f64b761ae9d258ef7ae9 WHIRLPOOL ef1899c94574e4011964b1bbd6f3a70fe0c1a80273b63b818c8fa9cd36d365c94a92d6c28e398fa9212fe01fcfee8863dd34ae8dc4209a0801aaccd9eed6ac15
 EBUILD cryptography-1.8.1.ebuild 1675 SHA256 653083b45ac8b5e11eff9a8b5742d67fe5b55f45282ea462699d9db62f30291e SHA512 dc74e12777b873ebad3a97d7f8b205e0d200fac1479bc0d8c7e5b13aa8714d3d8866f42380540b6c81e48d83640abbe87582694097f8145e4c88ad0da314ca4b WHIRLPOOL be672028ab6564197e73d618879ea9c5d7015152ddc8d6d67ca5abec972498b2061af21f9216d2a5b8868d5831d46d67b6e197ed86dc72341245ecb2b574d1ee
 EBUILD cryptography-1.9.ebuild 1646 SHA256 2535199d50fafda5a6e5e87c540a253292cee6179fe769e183fbc24c9f7886fa SHA512 a239da1f7e7397cf9153d9ecc5edd49e8a1c18eeaa884a73fe2f592408bf514f19af738202aa81905f55997e5e70b5643a71856db7ff4ea4be63151eda3bfeb0 WHIRLPOOL 53ccfbf3cc57cc2e7b96f45e170f01457aab8080d81b9eec03868df84d0356a9d565c3a1b66d289a600c9e9a7a7c16121d7b6090838ba88b72d96ebf0d125db8
+EBUILD cryptography-2.0.2-r1.ebuild 1624 SHA256 45e6fd16917c624c317bdab445dedaef029cecfbef987feafb54d1bd309c186b SHA512 ab34101a8b2556703dfd1d4947aa9c42b85489c3556e558ce0e78b0ed685c00d836f4a349c623b78c5e1d54f92156d982bcaa9f54b04c8f960f447b5be390bdd WHIRLPOOL bedd4fcab97551131372c3f85ca333e7b6f56d7841be9122322c5053475c6a5d5cd7a6bb75a9d33f5a579745d8a27dfe87a446591884a6f1194e16631306431d
 EBUILD cryptography-2.0.2.ebuild 1542 SHA256 07db5ba031dece262de146cc6a3d4f6e8bf17f2c4458e09def15a86326916374 SHA512 51a737cf880345dc75a7973870dba1971e8f35fba61b744bc4c352a643feedd9f342729e483383dbe4c0dd2b729d3564274bf57c77a35343143b70bffafdca1b WHIRLPOOL ebda0e16cf84820e8317f114277dcddc2edd3822100aa62646083c6fd0c7a725805c90f9b239dbda24a7f168a8b679dd43657be2e469cd252f96b7128741a674
 EBUILD cryptography-2.0.3.ebuild 1646 SHA256 948a31ec4b78bc9d00a228eadb1ecaa06161704586292f310e70cbf23b711907 SHA512 7d11e6ddae039e21eb205d5b4f71e56bd0bbf57670166afb57bcea711adb360653e4337a83a826ea11d1a964153b767fe05c7a8b00f16798f581e9c2de7ae966 WHIRLPOOL d0d674f90374d32f515895ebc09e3db92c58b07e9ca8a083f90b0e624ac204a45cbcddb8dc673bfdfb0c9233d7aeaca5f2b942a1d9efb916ac50a9051a4b4cad
 MISC ChangeLog 18416 SHA256 1c2c81e70a455fcf401bb7c0d61cf38f3de9e7a2cc5ba5c18865038dfd43cea2 SHA512 b327d91034d2141d3c39cc406a0d74ff019994a92dd8f35e8b1715d5f0ba00930a15f42e601013dd7d14a81de0a30fd3b0dbf66a00a2c555f6015b8a6eea9943 WHIRLPOOL 5f09b6aa83487c428ced79af0f2c4d5d85db223f74298a1216b3cc248494f0c7f85ef98aa8461666420006fed1caf61f18679985b75998cfd4dd8ed82be8d1a0
diff --git a/dev-python/cryptography/cryptography-2.0.2-r1.ebuild b/dev-python/cryptography/cryptography-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..1ad0041e1fda
--- /dev/null
+++ b/dev-python/cryptography/cryptography-2.0.2-r1.ebuild
@@ -0,0 +1,51 @@
+# 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} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 hppa ia64 mips ppc ppc64 x86"
+IUSE="libressl test"
+
+RDEPEND="
+	!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
+	libressl? ( dev-libs/libressl )
+	$(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3})
+	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
+	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+	test? (
+		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
+
+python_configure_all() {
+	append-cflags $(test-flags-CC -pthread)
+}
+
+python_test() {
+	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/debtcollector/Manifest b/dev-python/debtcollector/Manifest
index 351e425dabfd..f815a5ea932f 100644
--- a/dev-python/debtcollector/Manifest
+++ b/dev-python/debtcollector/Manifest
@@ -4,7 +4,7 @@ DIST debtcollector-1.17.1.tar.gz 28805 SHA256 1f751d74789baa82684f55bececf754ebf
 DIST debtcollector-1.3.0.tar.gz 21853 SHA256 9a65cf09239eab75b961ef609b3176ed2487bedcfa0a465331661824e1c8db8f SHA512 b53ef131599fb04abb9f11e8abe3dc8447a595695bab505be642c03925e0da625e6a10944ec10863526645080ed3ce43b9a5138a1f7ba91511ade6daf42d018a WHIRLPOOL 04c6ee34a48955a86535c3161005417f5c5dfca9152e092c3856d61a4707f6249245398006d0da0c31ffa7103ab69a566bf84d7321b70362d59f359b5225622f
 EBUILD debtcollector-1.11.0.ebuild 1856 SHA256 e6c18c977f0afcbf2a63b06fbf3536588fac92154ad2d07dfe0d45411af09eaa SHA512 df6e094e314ae712d6ccf9a622f6a8141cb1aa972edc6386ce632f64e0ba368cd6477c66d24444fe71ecde640ecaa9f9fa0a79b0543e8d17e99e2c67fc0c6233 WHIRLPOOL fe85d2e5642a2476b54910892f308ca5285d09e89c46870cd749ec6cf7c0e8a24aff9a21992f54d3e706545112893c0c97414f0b6ee5df739bdff17710c98323
 EBUILD debtcollector-1.17.0.ebuild 1948 SHA256 475a980dd170536db36542c2f6274aa3491f1c6dd487eb532af29e02b0853d24 SHA512 a3db1ed22534066d748c58497b458bc9100198a1db5909b272a86d5b463b0e73393195c3f0ccdaacc53f7ac421c93b0bc0ea50c4e2840c3e0243d5b3e360d9a0 WHIRLPOOL 3d8537accac0f8c29a13687b02d32e9061ef2e990556ec8f7e40f09c392415e0912a9ba5d96f90cdbaaeb27f8e2d2c0014ae759cc24fc2f1af920ce6810130e8
-EBUILD debtcollector-1.17.1.ebuild 1950 SHA256 648f28d42999226a718fa6d909a7a410e9d31cbdf90627c2c8c494810a2e0f82 SHA512 2943a0c6d0b03ce9d871fd5cd2fe5ad085e79e9301d305136b51b2e20ec4a7800e638ed7dff3d2edd1a56aa8a3116aa2e3a59932e00d8c6a3dd3494107fbb6a0 WHIRLPOOL 66663910e2c6030506e7532709a1b239069740f58d9a4980edf2ff8b75013e5ebf08f387dd4eaae30caa85cf9a015e7b57304467f7b121eba9de706a80650b8f
+EBUILD debtcollector-1.17.1.ebuild 1998 SHA256 162eccbd4d6c8111d85e3424f59a320d0665f641dd8c9a6a2ef7816b9efebc76 SHA512 f5a21032d6f1b3aaef4f76274241434342b19854cf9ae0cb66c6e5d8b8e91cabd6f20033030ef0d8aa55e226af6f69b0173c2c987de174d3536930e907a9e8e2 WHIRLPOOL 826af1f6919ebf07b6ec74c09d169748d2ee48d445a126a99ff88c1ca17c65f205772b3245f3bf4836353e7be8c6f2b8856c238f082e9704dbb8843fcb58c6a0
 EBUILD debtcollector-1.3.0.ebuild 1856 SHA256 463e2ad82ee085a2c5e802c038447d90cae7035d72db4f6ee49f2820a5d2443c SHA512 82101ceac61a1b4a6fe7baead86a994666be9c7285e3b43675682b6b021d673735aaac4a66644e9dc2a37c64e38622cbaff996dad2a707610c908a64286ac04a WHIRLPOOL 02e6d69981507ce941d88c1907f7115bb9b2e15aac496f9b89b89b01d25d7139326eea757fad912fd9eaedc984bb99294ece7a19c0ed04921f89f5e3f5aa8deb
 MISC ChangeLog 2232 SHA256 76cbdc547a0ecd1be7908b5729937a7c1bca3d438697ab0fb49599d77a1afa18 SHA512 4b02555727a027f55657d53958c2648b954a9c423ffe83240e0803b3e74851a27b17728d6dcc5b720d1c6401165336806eec08dd67962280a53fa9e6a04230c3 WHIRLPOOL c845c356157a681e9db6a2d08c74f16b6152886b634fb573ccff4d75412a01cdab6a94c7c1c105dca83a5056494152d3e82123317dab0d76fc5521747fe48ccb
 MISC metadata.xml 330 SHA256 9b562bbb206531a7ac136e1cc6f8cb1a749fefca019ade8a0a73ba5f1e97a43e SHA512 b7a055d8cce134695b3443f4c361636ec4b6741080671b65b47cb7823384370caefb825ab3851cd8cb4852a696d2ded714087917cb565e381aac7ce53e537268 WHIRLPOOL 0431687192f657c68e32855868882d95667905e3f59fe1824e761d866a72a34681687f2860cbb458e3536742edf70f35298faeae406d413af3f01cac56b229ec
diff --git a/dev-python/debtcollector/debtcollector-1.17.1.ebuild b/dev-python/debtcollector/debtcollector-1.17.1.ebuild
index a1bac138b939..11809ad2350c 100644
--- a/dev-python/debtcollector/debtcollector-1.17.1.ebuild
+++ b/dev-python/debtcollector/debtcollector-1.17.1.ebuild
@@ -34,6 +34,7 @@ DEPEND="
 		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
 	)
 	doc? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
 		>=dev-python/openstackdocstheme-1.16.0[${PYTHON_USEDEP}]
 		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
diff --git a/dev-python/libnacl/Manifest b/dev-python/libnacl/Manifest
index 91ecc79e6566..9d431ac2ff86 100644
--- a/dev-python/libnacl/Manifest
+++ b/dev-python/libnacl/Manifest
@@ -2,12 +2,12 @@ DIST libnacl-1.4.4.tar.gz 30965 SHA256 f2ee401a78dc693fcbc2051befcee2f76bb13ce75
 DIST libnacl-1.5.0.tar.gz 47386 SHA256 1af2bc9fab80bd264ed224d9c4cacb0514db2f202eca5a4d90da3b06ba2000de SHA512 72c6041e14bf705d6d3b0fd0b77b1b1c7f4a86653113f56fed6b4e20369ff8b79ee1ea23179661299c51f13602dbc3f33e98bab0f6b8080d40ad75253137391f WHIRLPOOL 97795c28cd6437736e94a2e9faaac79a71c21e6b19ec5d652a2fb0616177f25ceab57bc8cdb4bdf7a0a20588f8dbe4d7f6808be4f905628ed1bf39e47ffa7855
 DIST libnacl-1.5.1.tar.gz 49383 SHA256 e44e9436e7245b0d8b7322bef67750cb7757834d7ccdb7eb7b723b4813df84fb SHA512 8bc5e0e15b35814249b69b6c1270fdf2c45af808c3315a6499b25a4861f0b21fe1840630a08cf808c8dc840f417736dee9d020d21d5d1d697b8644bc2645b12e WHIRLPOOL 0b4ec73546e3976a9fbca79db6e5bcbea5f90de202e3f83041c7b271f9f95d23980fe8020eb3505e8339c3b03d1dbc4f11b649f9b61979d5e86a9fdb4dbc6d46
 DIST libnacl-1.5.2.tar.gz 49573 SHA256 c58390b0d191db948fc9ab681f07fdfce2a573cd012356bada47d56795d00ee2 SHA512 f5d0827b621c0ddcb61041c3bb665d2c70f5fa400691128134d519fe454439648e7b2e36ab73b0cc827032461ad611e0834655c2f75e3cb3b53063c33aba8c1d WHIRLPOOL 926b6ced7bff0411ae3a4d060459f255fcc4af0eaa3fb41fc9cf60c7b93a0b8fb8128715ec2eb7160904e9e32267bcb3bd57ad91791229da8d906e0c07a6c92a
-DIST v1.6.0.tar.gz 39711 SHA256 5bee7374bcba132ae312928c3ad8049239e7c54bb745780c82634eb479f3c2ce SHA512 6f5202ca50bf30526bc51e2c528fe86aa412eff4b912d0b09da7f019de2929d2be2a9a8f80340849cf77b3593eae4fa96f2c0920b5201c5786f5009ad5f32c34 WHIRLPOOL 38f4b9dd1478376a48035270cae0480360b59daac24c43b0437103a92093c2edbbc74106155a226d9649deab58875f5a762730f70c8101942d9e030762b3034b
+DIST libnacl-1.6.0.tar.gz 39711 SHA256 5bee7374bcba132ae312928c3ad8049239e7c54bb745780c82634eb479f3c2ce SHA512 6f5202ca50bf30526bc51e2c528fe86aa412eff4b912d0b09da7f019de2929d2be2a9a8f80340849cf77b3593eae4fa96f2c0920b5201c5786f5009ad5f32c34 WHIRLPOOL 38f4b9dd1478376a48035270cae0480360b59daac24c43b0437103a92093c2edbbc74106155a226d9649deab58875f5a762730f70c8101942d9e030762b3034b
 EBUILD libnacl-1.4.4.ebuild 514 SHA256 5014e1f8afefc4923967992f5dcdb2a2797b92a6beff41847dcd9edc45a2d5b0 SHA512 2d1cde34848085f3388246464ef19deb02a92e2de16413fb539e086a6c61f28b553f3b1ccfb1410455618151f48c69bb5062e5adc5ff76efcf39eeb55fbdc318 WHIRLPOOL 9f265f5d41ddc8e58e0515565bacd51f08cdad37427f7a2ee31b971aa7278d5cf134743bd557ac7c648e063dc61e60d71cf91292eb7fc4e8cd21bc5974e69084
 EBUILD libnacl-1.5.0.ebuild 520 SHA256 733aa1dcd118b1eaad3618dc6b1ae964279282b244ce8f28bb322f4e6c1867f4 SHA512 ac3d78c6d234b56213fe46025d56fdac38b4ba2e8cde29dd4e085795c090d70f00409d7444dae13c75116e230269cecd8d3d29e524f70c2d6c129c840c9542bf WHIRLPOOL 668fba0c4a543f6278ffe4b3d4aa2d62d4ee0448fee72c4f4c5edb80b12bc292d06deaa51426953086daeeb90ada34f6fed5dbda9083ee248e8bb94dfeece4ff
 EBUILD libnacl-1.5.1.ebuild 520 SHA256 733aa1dcd118b1eaad3618dc6b1ae964279282b244ce8f28bb322f4e6c1867f4 SHA512 ac3d78c6d234b56213fe46025d56fdac38b4ba2e8cde29dd4e085795c090d70f00409d7444dae13c75116e230269cecd8d3d29e524f70c2d6c129c840c9542bf WHIRLPOOL 668fba0c4a543f6278ffe4b3d4aa2d62d4ee0448fee72c4f4c5edb80b12bc292d06deaa51426953086daeeb90ada34f6fed5dbda9083ee248e8bb94dfeece4ff
 EBUILD libnacl-1.5.2.ebuild 520 SHA256 733aa1dcd118b1eaad3618dc6b1ae964279282b244ce8f28bb322f4e6c1867f4 SHA512 ac3d78c6d234b56213fe46025d56fdac38b4ba2e8cde29dd4e085795c090d70f00409d7444dae13c75116e230269cecd8d3d29e524f70c2d6c129c840c9542bf WHIRLPOOL 668fba0c4a543f6278ffe4b3d4aa2d62d4ee0448fee72c4f4c5edb80b12bc292d06deaa51426953086daeeb90ada34f6fed5dbda9083ee248e8bb94dfeece4ff
-EBUILD libnacl-1.6.0.ebuild 537 SHA256 627d857b95b3dae2940598a08e7e60e2c824436de27580d8e33b975987224f94 SHA512 e67d741deafb3a6d10e0a68531d677e3aae89d349e787e0d33054cf3d2b0611254a8b06397ac87068552b6b528fffb104a546c636a3dfa1ee49a2ae01bd0070f WHIRLPOOL 90fce546d7e3a61299c77fd2fe21ac06be35c3d5c4a006fda3644cb6c12c6087f707fe1b23530a8fb65e595e69d42dd599d3b624c27d09b9835bba06d194ed31
+EBUILD libnacl-1.6.0.ebuild 552 SHA256 fd9c931813e6847c83923824d489a639cd56fb9496e1dfde98d3a8618da9acb8 SHA512 137a499d467aee62aa53f25b23256360c8d2ba871659f0e5be5ec0ecfa60b5c79e32957d6b47ff5530dde84b4bfdad5f8d2623285b2737897bc937c436b72027 WHIRLPOOL 70fcda034a1f38a338ce50e6f7c57b052f8492db67b58321ea54cd4c0481a8eb5ea3781ea253850d948659b01d726baff75ca4a5e7ca443943d011fe63e8999c
 MISC ChangeLog 2917 SHA256 c469c55aa1de9d7839b81986966e75270ed63a2f76a49fa0a405f480d8dd63be SHA512 fb55c0243e457d543bd133e8aa2b267c2cc9db72c00663389a52f567efc085a80e9e2af67804850a61fc442942cac4778cecd1d59d118ed930449fbeb7cef42b WHIRLPOOL 047b92442839784f45935736ddacdb21747d6456106fe52e3c7a0371f8193cb7a797e6877e0ed4df751b00f98d8bd0dda757e0806b5ba243a7b87d70bc8b8325
 MISC ChangeLog-2015 901 SHA256 cd39a114539571cde9c295ac0775d6f820eeb22995cb824a96d4b66640c8c437 SHA512 24afdc8b8e1b440f648dcf87f464b42ddb4afd4110b710dadf7a01b35254619ea4b74071a0b13ac7e38095b4b757f7dbfc670190b53d59c340cf579c855a1d4d WHIRLPOOL 42956de2340506b52d5e33de409b45c9e7fa7d08cc46a364f66d23c360059e0c814f616e22a22885757ed859659972b8301b6efb817156cd9b05a0de2f65bebc
 MISC metadata.xml 436 SHA256 c988eeecd5cc7f58c8c77f16c39a5d0cdccb9e6aa00f67561aba3e6077115a74 SHA512 f8a241e4d71d6d6c682f019d086e4effa58608430a5df8c2f70c29cde07124fec2c37b8c63411b19e50baf2b5486a88ec696e4499e47e64936212f6dce938a2c WHIRLPOOL ce8cfb495e00f54a1b6f9c64fc22029d63c0ddd44e2961bc5629439b0089e9f022a6eed25670cb7f9a2303eebe9c581e63bedea48541c91fcc5adbce30121925
diff --git a/dev-python/libnacl/libnacl-1.6.0.ebuild b/dev-python/libnacl/libnacl-1.6.0.ebuild
index b263cddf7919..19dc1f1821e4 100644
--- a/dev-python/libnacl/libnacl-1.6.0.ebuild
+++ b/dev-python/libnacl/libnacl-1.6.0.ebuild
@@ -7,7 +7,7 @@ inherit distutils-r1
 
 DESCRIPTION="Python ctypes wrapper for libsodium"
 HOMEPAGE="https://libnacl.readthedocs.org/"
-SRC_URI="https://github.com/saltstack/libnacl/archive/v${PV}.tar.gz"
+SRC_URI="https://github.com/saltstack/libnacl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/matplotlib2tikz/Manifest b/dev-python/matplotlib2tikz/Manifest
index 82cf3bb09171..1cd8e6414d5e 100644
--- a/dev-python/matplotlib2tikz/Manifest
+++ b/dev-python/matplotlib2tikz/Manifest
@@ -1,4 +1,3 @@
-AUX matplotlib2tikz-0.6.11-pipdated.patch 639 SHA256 f98244a71104b31d2b03b960f616e4c8079530d526d8fab55faaeb90137ed646 SHA512 f2c8f4e8af2a5deedb1cb1f38f51c7b5cc70aea54a76647664c68531b98b80058622fd948adf56eaf3815df9c27075694ff96d8ddbb60edb4bf67d62f579500e WHIRLPOOL 8e5fa04554671b96f61e6c5670436a00ba9e206103380d585ff97babe5d917e9e080eea89404ff3de2f24823b905087a2f2a6d23c59a01892b283eb04986278b
-DIST matplotlib2tikz-0.6.11.tar.gz 524298 SHA256 79c9f141fd802fe5863d2eaff6c67476d02ca474433e65990c935241a2591994 SHA512 eda5042f1db35436ca56256cb858fa11b48d497f621183475d69381b0b10ac67f9447522e1b78c1a331337e34eb159b5ffeef9655a8c0dc4ccab22b7afcb5e96 WHIRLPOOL b09025b9444e0a0ec122fbb7d6d90e32e043c3a86e8b7454ac3fdc0ba03374f5648491a4564bae7ef622a536f4ec92e762a68816d64621da6df44fea2c404c8c
-EBUILD matplotlib2tikz-0.6.11.ebuild 966 SHA256 0a45b2fb418fb8bd5df6bb5a6177fd1b4edfa487cf89182e9993bee6773bd91b SHA512 a614afe5abf1e043d6f61c033a77b03a0cf4108c0499903fd1aad99e5fef518c7025402822a2c7c412db02ad84e7c5922a3e16a35fed542747b3558fcbea28ab WHIRLPOOL 90158cc980e2e597af7d5566d5dd898a40021dfde385a01f8f1de9d2d238c09b0c067b96a181bde6dc833515d37315c428cd6c074b899a41c12f0c6e26eaab1c
+DIST matplotlib2tikz-0.6.13.tar.gz 524735 SHA256 ce6de9226316d4b5ae3ce0d57c7cf445d219e6842bdc041820c0c39ee9af339c SHA512 f42e96ab60005b96f9327e34ff9df444e9a371334c77b0bad85343beeb20a5c4c2df5539fd0200cf306a4cfed6926f191d547bf2ed69a98c4a9f2e1c2ae0da7b WHIRLPOOL f6ff4d4d8837394e1aacc2c66686cc711b64b6d7aad95620e402b4f1494436b8d2248ce8fbb947ec9d4a93442aba1c1cf03eed9423ff19f31b98060678274785
+EBUILD matplotlib2tikz-0.6.13.ebuild 919 SHA256 997682904a3fa55ab34ee572adebb7b55f84b245e8db70c0cafcc0ca0b270f80 SHA512 d4a49f83027820c8346b3c63506702ba5dcc960f76550e698df5c286b9526b607b92ac738367b382f23b2b7a9115edbf4f6364920a502f8d17d204b3599674d0 WHIRLPOOL 2334a231f2b2de6c1b6bf079e35b8f216a8a66becefcff0544b7623d581b0d35a090316439e38067c131fdc34a9b1f013acf972acde07880f95e5dba9108a02f
 MISC metadata.xml 976 SHA256 bbd0ee639b2f20cf03f6f450fa9e7486cb1bf286b4b58e2f555a489345de6872 SHA512 5ce41d4236c17a50a9a9949974c8c9fbaa5ca0c46cd628b34a8266227982b780c5fa5f2fe5667d51961f64c19c73d377363558f28756d2bbb8a88f1c4ced19b1 WHIRLPOOL 3e3e5a5edb35e07284a4d9447829e66e54b98bf612af5ebd1164044583ef52a5cb08653772e3122825fc73bff166b5103c2345fb664a6da9bfc86d32c38718df
diff --git a/dev-python/matplotlib2tikz/files/matplotlib2tikz-0.6.11-pipdated.patch b/dev-python/matplotlib2tikz/files/matplotlib2tikz-0.6.11-pipdated.patch
deleted file mode 100644
index 3b7cf2ffbe51..000000000000
--- a/dev-python/matplotlib2tikz/files/matplotlib2tikz-0.6.11-pipdated.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Remove version checks using pipdated.
-
-Patch by Marius Brehler <marbre@linux.sungazer.de>
---- a/matplotlib2tikz/__init__.py
-+++ b/matplotlib2tikz/__init__.py
-@@ -16,7 +16,3 @@ from matplotlib2tikz.__about__ import (
-         )
- 
- from matplotlib2tikz.save import get_tikz_code, save
--
--import pipdated
--if pipdated.needs_checking(__name__):
--    print(pipdated.check(__name__, __version__))
-
---- a/setup.py
-+++ b/setup.py
-@@ -34,7 +34,6 @@ setup(
-         'matplotlib >=1.4.0',
-         'numpy',
-         'Pillow >= 3.0.0',
--        'pipdated',
-         'six',
-         ],
-     description='convert matplotlib figures into TikZ/PGFPlots',
diff --git a/dev-python/matplotlib2tikz/matplotlib2tikz-0.6.11.ebuild b/dev-python/matplotlib2tikz/matplotlib2tikz-0.6.13.ebuild
index 437c6ed6f555..28505b0459e4 100644
--- a/dev-python/matplotlib2tikz/matplotlib2tikz-0.6.11.ebuild
+++ b/dev-python/matplotlib2tikz/matplotlib2tikz-0.6.13.ebuild
@@ -16,8 +16,6 @@ LICENSE="MIT"
 SLOT="0"
 IUSE="test"
 
-PATCHES=( "${FILESDIR}/${P}-pipdated.patch" )
-
 RDEPEND="
 	dev-python/matplotlib[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/pysha3/Manifest b/dev-python/pysha3/Manifest
new file mode 100644
index 000000000000..a15b9efaaccf
--- /dev/null
+++ b/dev-python/pysha3/Manifest
@@ -0,0 +1,3 @@
+DIST pysha3-1.0.2.tar.gz 829192 SHA256 fe988e73f2ce6d947220624f04d467faf05f1bbdbc64b0a201296bb3af92739e SHA512 57476d24b9d399471cf56c8c1413f58dbc863c16d4fe9ebd2cf65df8092e139e2505252605e3fccd68978f5ee3fffdfeeedee6788aab38a54c918a452fc19720 WHIRLPOOL 0de14913b4c02b1c8310432f6a71ed986c6f525c7b15bb6e91d3972a84f5599b13d621b04a4007ea276089cd75d965798a84b11d378e02ab50e1b6d243b62bc0
+EBUILD pysha3-1.0.2.ebuild 506 SHA256 e601d4866d605ba991e30cfe5004f443b2173e3860b9e61e5e2a74ec2a67ee03 SHA512 fd76313141ec0ea1f121adfdcfe56a5f1560dbd35f797a63323516d6d4e24702aa0e06dc270f841df607464650d16a32fd36a214db2dc21dd9369956b5608000 WHIRLPOOL 2eed6e1b11a98b5bd69fc6c2ef991906d195cf49d87e15abc19a27551cce1f4a6758c117c2c6e0703499c9abaec5375eca789fc799d79d389b2ddaabaf4ab9cf
+MISC metadata.xml 447 SHA256 20e1d0abd801718c6a7145bbc1f8bfe93ba10ec12c367ce2aa50830655f9f93e SHA512 e29bf7eb65b03e9190be49df6e924da2e8a6d30eb74bad5cd5b3551df5184c720c9666a11c0cf4afe4626a3d433edd0989507583d97aa24cf5b8bb9ffb535b9d WHIRLPOOL 56a1d3524f24596aab3bf5f1fdddbf48a59c33e2532eeda65f14971d5da1ae2c026f3ddc08bd07a39d24c09684ab69c2a8b61d2f5c67d363cbdb6afed39bc199
diff --git a/dev-python/pysha3/metadata.xml b/dev-python/pysha3/metadata.xml
new file mode 100644
index 000000000000..410617d33dce
--- /dev/null
+++ b/dev-python/pysha3/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>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tiran/pysha3</remote-id>
+		<remote-id type="pypi">pysha3</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pysha3/pysha3-1.0.2.ebuild b/dev-python/pysha3/pysha3-1.0.2.ebuild
new file mode 100644
index 000000000000..2f9172ea7855
--- /dev/null
+++ b/dev-python/pysha3/pysha3-1.0.2.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=( python{2_7,3_4,3_5} )
+inherit distutils-r1
+
+DESCRIPTION="SHA-3 (Keccak) for Python 2.7 - 3.5"
+HOMEPAGE="https://github.com/tiran/pysha3 https://pypi.python.org/pypi/pysha3"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="CC0-1.0 PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/python-musicbrainz-ngs/Manifest b/dev-python/python-musicbrainz-ngs/Manifest
index cb1346480212..61147c78567c 100644
--- a/dev-python/python-musicbrainz-ngs/Manifest
+++ b/dev-python/python-musicbrainz-ngs/Manifest
@@ -1,5 +1,5 @@
 DIST python-musicbrainzngs0.6.tar.gz 110948 SHA256 ec447bcab906fe7c4dbd714a1dff1b00adcd20d0011968df1a740e6b1fb09cb5 SHA512 901729f736b207f2f086e3d44a3515d405f6621706ad9c7ca07dd304349e048c5790bb16b054393651808bac4905ceb9493dd66d9fb17a1612692427c0bd3bd4 WHIRLPOOL 210d2dea5c3f4d55ff40cf44ab806afc02ab0093800a92cc1bf7ffcb6833f6317d96e9d2fabc1b8b1f522ac80e9ad924f6d0393766d81e53636042a089141859
-EBUILD python-musicbrainz-ngs-0.6.ebuild 1067 SHA256 66bd6483bfb4370a1d73ae7dcfdd700e93fd5202bda1ff391d6a9f948a3ea1ea SHA512 5ed64085ec863028d231d8fa1b2ef648cee15f6f9798d8632f912c845e2a1b5c310cf08b5427be92a1e01664fe944f91c3ac64ddf6f382581a56fdeab949864f WHIRLPOOL 8f200d93162120bcb7141a203a41cd91f40931eb1862a6eaed4a343d7236f33cd192085d48c64f9d51e8a2fc50a4d70bb25f69ed8139f6179bc9928e1980c391
+EBUILD python-musicbrainz-ngs-0.6.ebuild 1070 SHA256 933655fd1512c8b772564d5847838f0609577a8e0acee995678ffad902b8d951 SHA512 10d3b85d087416675dc62e5de06da7c8778cbd8b91c6772116e635dcff75749fc69e8398299a1870bcc473f3151246fdf8dc8c0cc9412cf23cf23ba457384a0a WHIRLPOOL 6825fc6cc5eeaf151fb1f16cd6aa6de846fefb5b040364b8bfce281e7362360a04432f116d5cbcbea1b2501491a0ba8d72a758139c4f02964a8efb8a0e60ea44
 MISC ChangeLog 3949 SHA256 2fba25b3ad1b2e24a139dc6e3c90046eb117cdb1eb6b3591b072b854f0568f02 SHA512 abf27d5e7f6bdfe0906faf33ec38ce1b36b2ce1f9cd6cb703c40287c7026a196b86adcdad663bd354aff0429236b40985663ce0eff80efe250a2f68a4ff1b85e WHIRLPOOL 41cfcf88c8fd35115ae668cbe5e2b85cf24e7ce99790e7b0dace33e59e490a0e47a9966ce6d1d358fe6794dc7b2e53340cbce0aff6e64d6b39ad52023e6de215
 MISC ChangeLog-2015 2163 SHA256 dce01709e07e9c99ed59f8e8b3633d0be49fbe4a0d1f52ec223008d9b44b4898 SHA512 59e4d563b1333d4b0b60b51f17da046bcdd73e00ea82213311b3537d466de9fae1117eb0934b912d4aa8f1257a2d934f0139793aa5cfa8ddda53f7d23a436f3a WHIRLPOOL 1f66d95e6dc3871523ef5471a0b541beee8be94f25f629739a696dd7844a8e1c08349887f0dad1ad2017665b39c06d173ddd0132e65925fea1b6b4a79060ae4b
-MISC metadata.xml 688 SHA256 709074c1bb6e6c73147bd3f8bf604303ce046ee92f8ceb38cd79c4927713613a SHA512 e4d3dda963dd86ad236866f7dc7d6d55f295fe6ebb8f054ff3cd980b9887789a34027738a4bc61871dd8129bb66945b394f6fef08bad78d80be38e21692c969a WHIRLPOOL a81da25581af53deef962ae06dc5c552bbe88e16dec0253889cee8ddfe834845517ed34a261357ce3a5d98010ee807f391e4db46075052533ae4853366240492
+MISC metadata.xml 685 SHA256 01be692d24ca9e0f6ae3c22d708e106172424656e1cf0d5118e625e96a172231 SHA512 3116e7b8d6ad69989ee0a17d3b6f6f8f9a68f10ce1bbb6338022c13c6ed0b2c8c5bd5ea74c9198e263499ee59395efb78d70f4c6f59b3b205bda405668bcc6c7 WHIRLPOOL 50bf0e6530a3cf34047588a2103227511b1ee934faf0d4a6164212a6be8de56ddbaebc18880e066a6f061f46af35dbff669bd98d247989b3d872b239d2293623
diff --git a/dev-python/python-musicbrainz-ngs/metadata.xml b/dev-python/python-musicbrainz-ngs/metadata.xml
index 3c2fea6062a0..736fcaf54dce 100644
--- a/dev-python/python-musicbrainz-ngs/metadata.xml
+++ b/dev-python/python-musicbrainz-ngs/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>gerion.entrup@t-online.de</email>
+		<email>gerion.entrup@flump.de</email>
 		<name>Gerion Entrup</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
diff --git a/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild b/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild
index ebf8f704489d..9f634440ae11 100644
--- a/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild
+++ b/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1
 
@@ -26,7 +26,7 @@ DEPEND="${RDEPEND}
 
 python_prepare_all() {
 	# Prevent un-needed d'loading
-	sed -e "s/,^ *'sphinx.ext.intersphinx'//" -i docs/conf.py || die
+	sed -e "s/^ *'sphinx.ext.intersphinx'//" -i docs/conf.py || die
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 463ede458203..cd75612396d0 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -6,7 +6,7 @@ AUX init.d-gem_server2 503 SHA256 f2b2aaa83e69482e1dd6b71c0c0c4b82375029d4e23f63
 DIST rubygems-2.6.13.tgz 768906 SHA256 d041502ae77e8d49e0a436483fb91f9ad6cc1489e49e0735e7c4a7cf10e728c9 SHA512 c952b6061a9a0778db304c3aa5bea693e71ae2564abfb19f8b123eef66eb1e3877fc7c36f4f1527da97bb320870cbfd4574ac57ad88e850a44fadd67ebdac152 WHIRLPOOL b03b7fcc9b4e84f1692afcc5d7111e75ade5fe777ec73f6006580e65be1f23101f0c29b9d2e9f9af5d66bb5f46ab3919cd11e37126758e9edd66609a47085739
 DIST rubygems-2.6.14.tgz 769418 SHA256 406a45d258707f52241843e9c7902bbdcf00e7edc3e88cdb79c46659b47851ec SHA512 7743845bc5265df3782f85a23896cbb250d8a2bbc9934a27f274b001afa7aa62f7f00f616296f74747ea612d2cb37dd7f533c931aa72550d84c64d2a73d60daf WHIRLPOOL 61f64c4172d33f63a12ddcb08a331fba55d33cdee2ad75e4307d94979df46e8235b96944217f7d3316abf59b06927d12ea206d14b058f9a4993609cd912eaeb3
 EBUILD rubygems-2.6.13.ebuild 4064 SHA256 8a7338cb8c4b8997eaa754e8adc841ccea1fc015346f9759268cc5f1b20100e4 SHA512 c8671ca33ba19c8629914e0743bef1b5ba3e0d09dd094463586e99659d99419bbb13202a12d2a9c69998102a2a6e314cb7aeabeae4840a89ed315cba4af50fbd WHIRLPOOL b2c77bee1d1dd051cb74e444b46bf6bb021269c7e7d0add53eb101728f8e1695ecb5cc76faa09ae51ef40128000f4dbd2c80b8e290552ee78375dae53a2fdbc4
-EBUILD rubygems-2.6.14.ebuild 4067 SHA256 a54b02d982d9b650e56448881fb790b53c1c12c3103b7cbd9bd26f08f293d74e SHA512 79c288d9652136615e0a426434ee62796ce2b77d4b229eb64756fe2c02a0f59eee99fdb6b5e8e72cd6c25df9dfa2db125da5701fb4a056ab7722dbe1edb64e21 WHIRLPOOL a4a542caab456b7ecc06b5220f4acab919fe42cacc8b5ce27151f168c88dc3fc753bcf93053165598a9b34e5df0b09cb0a08d6ed4c75f61fd29132d851789e08
+EBUILD rubygems-2.6.14.ebuild 4066 SHA256 16f2e2270d6e5cdb515254d6ffcecc97dcf92fc4a202e689083ff57a49cbe269 SHA512 3c03a1f98ad959e7e813b43adde18253a018d3ebff4ba6cf4433ddde5f05e0f6b6f29eb52da4ba19c0f7e4c4a7b41a6ac486f5cc6ff562962cb0afa0b59622d4 WHIRLPOOL f0ffab4480a525eb1347cf44e8643eaf477940221b766f16fa8b34d27f626831a973ff878af46bd0e094fd87a15be48a911f06a20c858febf88f421e21c6fa03
 MISC ChangeLog 7072 SHA256 bd2bc7bccd485cebf61f987e368bd367082f05f4d0de7eef72268a17a37f9ff0 SHA512 a5b6e17113533e24f48757d1c02cd7a9c95c209a01d49c5ccc00b4e51ca90bc33a7c645aef0d43ca92b3db182b91fc823bd2e3068b112fa9744b78937cf72fc0 WHIRLPOOL 2d1853337f923ad73b3e30304013b9a169299cbb4df69863d18adb30fb506b386973d327688b87340f64566f3a468ddd7dbacc25662733c9c758038376c07b9f
 MISC ChangeLog-2015 41896 SHA256 305d77cfe24e0470947e40901d582b1a2973e1f7f37777730f655f4576cec23f SHA512 bc2cdc365c3dc0efac2e30a02e9d9d6333fc2fd023c27ee038e1614c076c10abe2890265a62c93763794971ff9821fdf2cdd1d62bf8514c2bb29118b671cd61b WHIRLPOOL c91c086363e286572b483c5a9612b75a69351cdcaa651612b26341c0c795602e7c8dfbf1df66661f6f410d0b67f0b6eece369742fdc5a80ca837fd9c7c9410ee
 MISC metadata.xml 335 SHA256 bab66dededb00ca646623a09584d00c8639c00aa41c8827b5990358cd023e6e9 SHA512 fd7bf880ad68fe5f1fe8eb79f9662af87831ed499517d5a97e22f18a4ddafc69d53118f020e15c3b8b171fe144bf6cb0ce799beaa6e4e4bdc01c984ab582388e WHIRLPOOL 660543fa0d7e9aea36220a8f98a9e7f39ecd180533cf712c101766adc45bea546431287af302737383337c32d597efe7983db6500453b109ffa51dc13093042b
diff --git a/dev-ruby/rubygems/rubygems-2.6.14.ebuild b/dev-ruby/rubygems/rubygems-2.6.14.ebuild
index 762b4f535df2..3910d2646da9 100644
--- a/dev-ruby/rubygems/rubygems-2.6.14.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.6.14.ebuild
@@ -13,7 +13,7 @@ LICENSE="|| ( Ruby MIT )"
 
 SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
 
-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 ~sparc-solaris ~sparc64-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="server test"
 
diff --git a/dev-tex/dvi2tty/Manifest b/dev-tex/dvi2tty/Manifest
index 274bcc71cb10..eaa109eee07f 100644
--- a/dev-tex/dvi2tty/Manifest
+++ b/dev-tex/dvi2tty/Manifest
@@ -3,4 +3,4 @@ DIST dvi2tty-5.3.4.tgz 59519 SHA256 5272ef88b99ebc0fe58c868fb4752408dfe8b23d7d8b
 EBUILD dvi2tty-5.3.4.ebuild 638 SHA256 7740c998ca7e0d51e4336579dbf3331c8bdcffdaaf049852ce490338ca304877 SHA512 a0f6304577a5d064850768238f026c5c972ba726cdeef693f339344ed81d50c1ed6fdcf96f5aa8e07f4c1d0f3f7f3e8a3107f2ffd642eddae4fbe9bebfe039e5 WHIRLPOOL 1fdb6aacafb09b11358aa64bc8ad58648bb406bd771234671155bb848b0f7d095dbfa419bacd9e749c119677c1ea8047cb8914ed7397f1e08f652c8345c31c0a
 MISC ChangeLog 2838 SHA256 c7c4b477ebb19b61a3881897bcb967afde3188271444e8cdaf66bdf7f37b9ca3 SHA512 141d1309f1124c5bfa80f66858426fde7b20fdb3b6eff900aa18f79118597eb0724734f6dec3ee372f39313ad570be039f1c1fd5892be404572db24985b3bf74 WHIRLPOOL 4dec3bba40afa6af6a808c69ac55914597768c0692395bd947d75b4cf62a86329e40c2b5af6abfca348ee4399514456fcdabc289ab91ba7cf650de1fb7fcfc50
 MISC ChangeLog-2015 4146 SHA256 fc3432d2e79fc698c1929e6fe579d8aea310081f71f908b61b9bc89e81fd2514 SHA512 ee5294d8f73c9d2a405abcf0efcf4d0a73c194b0730eae9e541c55eefdcbf18692ba2570a69b7fe7d2951f38c6ea37614669597592acd1c0ab6532126842ffa2 WHIRLPOOL af8c1f96cc4f704ae5334d5becc29b996ca472601d31ead61adf128fb04ed580b5875cb63b14c8b43b8dd3c305ea23041b6746c2118cf031023cc2d8155515de
-MISC metadata.xml 464 SHA256 346fba3769de10f0a9b7052b03c7ade5426d2e031e0bb632d65e2b587373e842 SHA512 d2b42da0e8a533ff8042b950060b932d8121a9db489f8f683e59eda22e5056d74baaf9eec695c11dceda2b9bfabf41db06bc4e1ef2418dbf75adfc35c00c7be7 WHIRLPOOL ad5fc7a5566e768e7a442fc93e38bf9d71f4e5adc71cf8987147a17de55253fcbd3cef14f0388abcef72cd8b6cdeacec3ec9bf70914b9d68dce6e856cc51363a
+MISC metadata.xml 351 SHA256 f02cf5fde5766b0069a8cdb640214ea0a2e31d1719f0340e142e03600af495c6 SHA512 0101264deff11ad3ac6f600aebb219fd8050ce76392655af100c280f68d1161cd5ef5827ccc395b7fdb74699eb8c30e174c79854e583ac1c0b953c868b70376d WHIRLPOOL 3425cd4d1fbd1f8d627ea4ac0e610aa7c021f14fa9e8602553b19a3ac7ed098fa2fbed815149aaa3119ec760b0038dd6d059490edcea94a7827a97ae89a3adaa
diff --git a/dev-tex/dvi2tty/metadata.xml b/dev-tex/dvi2tty/metadata.xml
index 64c3414de00c..eba585c71c15 100644
--- a/dev-tex/dvi2tty/metadata.xml
+++ b/dev-tex/dvi2tty/metadata.xml
@@ -9,8 +9,4 @@
 	<email>tex@gentoo.org</email>
 	<name>Gentoo TeX Project</name>
 </maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
 </pkgmetadata>
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index bf66e9ae1297..641a715a93a4 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -14,11 +14,11 @@ AUX cmake-3.9.0_rc2-FindImageMagick.patch 2407 SHA256 5cfef1e684b67f3bc464fdbeb7
 AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 SHA256 dd3388f12fcaaed08c752f85ed4f27d795fd97896386a0c1f237e2cc4a65a9f9 SHA512 8adcb75cc035f64521e85229eb8dfa1e627326f8e189f66b707b3a0448ed3ae6acf306643026f7cbc7b924edcef73cad7a107d83162b4ca46bd6bbdc7a58af12 WHIRLPOOL 51a499e6df73e9a68f243979a4fef33eb717e1f60fffc3bfbb9289f7a03c7438e44e4d01a77e87ea24c7bb956199a3f5a7fdd7f3583a625384487366ed0ba6a0
 AUX cmake-3.9.0_rc2-prefix-dirs.patch 4030 SHA256 2f07ffa2eb1129b5bd707b0834be1cf00964710974393a301a8cc9995b2e07cf SHA512 116073dd2d63861cb33b7b92d07adbdfe74e05864f488be8df3a6f5b92bee76c518770ad31972323e0ed5d8c07505c7fe18105573e7f5ebeb79b193297dd2ca0 WHIRLPOOL 5b0f3afbddfb202cb12d7b86823a39ab2de81b6ce261aba25afdaabefd5b4ec87804ea1b6d7891c69f6b7b32a2ef2977937e2dda62c88cd5032e5987b16c40ee
 AUX cmake.vim 217 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf WHIRLPOOL 088ae1f0a4f32ea872deaf1d4e8d21d6853d3cecb903ea8abfb06c85de8c200757c2cfb34ec25cd0d8ef2a3c12b3cc9472e9ef0b5ce3f702502100806e0e73fc
-DIST cmake-3.10.0-rc2.tar.gz 7819550 SHA256 9f0e21c23dec1c6d5af781bdef6def70694eac1b184134af0551a684f4ac8386 SHA512 afad0b2ca4e5ac5945461df02d4bad816900bdb9ec32a70b642cb9dc2cb035ee9298de3eb9bd393dbab4bab94e352dad3af70ee4a8abc9a8ae81be04910e4ea8 WHIRLPOOL 1cf1dfaeaad13978e271f50331d5849c7f8771c336304fb4a10e185754dd87e7c3c68d13be9dd93f111bee9f478976395e43b736f863eb2703c849a0b51c04d6
+DIST cmake-3.10.0-rc3.tar.gz 7820278 SHA256 155431a645a381d2f254058d7c23c9a2063ca37554c8576e5979281b57d80b14 SHA512 28f1435e314697531736ca9dc94cd65dc2d71c3f75b7d197ef200b096ef55f6fd64a2c0706c44692b8ec49cf3861aed879d3c1da0eb2de3b0c2762450466ecb9 WHIRLPOOL 39ace2bcd763f04ec29f7f34184187d265f483aafd35100cf3d15b0bc1a2df6ea73d2170349293f907a408b72ae4ee0901e5b95465ddf07de50560e59335285c
 DIST cmake-3.7.2.tar.gz 7361593 SHA256 dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0 SHA512 b2ed0192e12267de19eb178c2dedc69d06fc33dfadd47efbe0ccf6969ad72d290fa4bff02861c379a8752337d67d2485d7e1ba947cb219f2e4041a53a195e88d WHIRLPOOL 1861fe2887f4483856e1964ff1492e196624d3072ad1e21910fba29d0c0d654e7d5035571648386a77cd6cbe895f8cdfbb1f4cc1ad60d14015a01a22494456f7
 DIST cmake-3.8.2.tar.gz 7504706 SHA256 da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d SHA512 49ea6f74a81dfa8ed8336c94ed50e0a483b796132c260f4bef159f9c389d99cc7b26ecfcccdd8b0a8f5b52fddd277c17c547d2a2e8848da9912c464ada1cbe3f WHIRLPOOL 8768bffb365852414eda0349d71e59517c8047689303d7873a5889cb8b28c72cd636982a18b039f26daae33023f7e0ad91c3a9ab2d30c30e4b3a9b3cc525b78e
 DIST cmake-3.9.4.tar.gz 7705052 SHA256 b5d86f12ae0072db520fdbdad67405f799eb728b610ed66043c20a92b4906ca1 SHA512 d9172f86df7ddefd0ecf1cd271add8b8af2d712a47ded530e9ff2c26e39087bc11a099125f17add6b563d176f27a68f4998bb53ae390b3f12894d658dfc8eee5 WHIRLPOOL c1cc16977ce1c1a4ac58692694a608bb5996c19db677bb6d25db1e017586ad1d676bb1f086af4016b8017cfe845ed7c6795fad7f1e7b5ab0b4d9b414452d661f
-EBUILD cmake-3.10.0_rc2.ebuild 5926 SHA256 58e0d5a44a8328bbb51af633b403729b1ef219b01fa8cc78a6699d4f325346c6 SHA512 85d7e302aed0b5ea85828810f61b762b8d2b4a9e04c58e2feea389b5407210b625e4f01b9e36df336e1d2a4ba2068bceb54f7a2ad562dd7ee4ba4f30ab7802fc WHIRLPOOL 2ae8cc6da42d81f51852bd94306f53d3565eb4ad242ea2656efdeb0a541bd65a0750e111d61dea2c8d58fe71acd8b82849c78f9485a54e073666bac89b728e12
+EBUILD cmake-3.10.0_rc3.ebuild 5926 SHA256 58e0d5a44a8328bbb51af633b403729b1ef219b01fa8cc78a6699d4f325346c6 SHA512 85d7e302aed0b5ea85828810f61b762b8d2b4a9e04c58e2feea389b5407210b625e4f01b9e36df336e1d2a4ba2068bceb54f7a2ad562dd7ee4ba4f30ab7802fc WHIRLPOOL 2ae8cc6da42d81f51852bd94306f53d3565eb4ad242ea2656efdeb0a541bd65a0750e111d61dea2c8d58fe71acd8b82849c78f9485a54e073666bac89b728e12
 EBUILD cmake-3.7.2.ebuild 5503 SHA256 1f8fde3a0b989b81fa89d4149a9422d118b0459925de3c56106bedc9808f5310 SHA512 8c8b96355c6edf0e84e3cf837042922bc5558f8c488e9ef718553c28eef10bf630671b66a6205cf495e22ceb220fb37c2a7ea1926a5271a63f8c402626dffbb5 WHIRLPOOL ccfbe6cc7c39db516d7fb294a5f656a89d9f8ff9cfb256c389a3e20fe9a3b6c8d3c93b277f71ab4928bfaa88b4de48a2e76a4898caf71782dae9387fd30607e6
 EBUILD cmake-3.8.2.ebuild 5717 SHA256 1667ef61409d01ecfd1273c9076af6e92a1603951e75e1cb31ab537f8b6ad155 SHA512 b1975568abe8939d5c18acf64d16268013107b41870c67670cc4c1b31c6d9f71d17138c153ab8bf44022216044dc961e271cac3feb06b20de19490a7c18b9e80 WHIRLPOOL 1f0f45c00c3e029f3b1f15c7ae0cd4cd3ee46d003c34557bc9d37bdbebf44ce22358bd8fb83fec76393db3e62b7e8971049667bc2308ce7a60a5d7c3d6ca891e
 EBUILD cmake-3.9.4.ebuild 5975 SHA256 fc9aa836630ebaeafcdc37a23f9871b354b1dd6037f233020adca3c9ccda745b SHA512 b7f3c9d2f72a708e19359b8a0737aecbaacf09ce7b817c785789008353ad758ff7ce889a10e52bce5ac3cfcda4cc1a518f7a49a553e902e3a53e10dc2177849c WHIRLPOOL f2ff6c773f31032d227c1006e5c7c88857a92824168e13afe9ba84d0d9bff88d3086f8837e0c4f852ec27ba2ccac729e262ef1b66c67cda2fb0c1e9d50312799
diff --git a/dev-util/cmake/cmake-3.10.0_rc2.ebuild b/dev-util/cmake/cmake-3.10.0_rc3.ebuild
index 95dda9d73a6e..95dda9d73a6e 100644
--- a/dev-util/cmake/cmake-3.10.0_rc2.ebuild
+++ b/dev-util/cmake/cmake-3.10.0_rc3.ebuild
diff --git a/dev-util/debugedit/Manifest b/dev-util/debugedit/Manifest
index 074d76bcdcc1..96603a8e5e2f 100644
--- a/dev-util/debugedit/Manifest
+++ b/dev-util/debugedit/Manifest
@@ -1,4 +1,3 @@
-AUX Makefile 143 SHA256 36e9d1c153b6dea6f2b337f0aa2749e207f38e4cf438d144f38b01e1e500719a SHA512 f8b870bda202f170551e3f9c305f2b6c8c47d0df82e257c8164f79af4a25ce8707c3da50b5bc8414283c8a4ac5ecdb5a802df7c2bdd435eebc59382533bc5875 WHIRLPOOL dee7884edc646a57d1b42d194bbcb244ce9d9095111a622a6a5374e79d9822bcdeaf2fafa44f7180df805f65ec944e2998b2d301fe210a0d66ba4885d1e3a381
 AUX debugedit-5.3.5-DWARF-4.patch 3235 SHA256 ab01e2a5fe5e77ba5254858d2cc800d7129cb932498f43866a02d5842675d6bd SHA512 594bed4c2433e15c840316ca132619fc2b65ea5477cfe416ef851414d44932b3f8e75d006025eefbfc9c6cdcea956ff9ffc28dd4ef4fe5858a486ce5d08f43af WHIRLPOOL c1d9052edffb0d8594dc94e0ceb73f47452c54ccc25cbede484abde75bf9342647250b85724d16ebc984615382a6e00b0dafb8474ffa806fa64e3c8c246ffff7
 AUX update.sh 1690 SHA256 dee47083f18459d62857b22aecfba31400200e5ba17eec5a884b413e50e605a8 SHA512 5b271427d6391f717286289c5ec6eb794e99b7f0bd966100d3db03f84507000bc9256526f4ad6cdf809ff1800d53d5ed64d76bb14733507563d7a6123c9fc422 WHIRLPOOL d509050ef7c00c0a88753cfb2a2ea8d7c6fa995c1d16effba64a7c711bb4f3476c7cc8324967a4420fdf0011640ee83e1455563f0e2c2618e7779b0c99c573b8
 DIST debugedit-5.3.5.tar.bz2 27799 SHA256 150461508dfd7791c9408c33248e5271e837167fdfa11d69d6fb51cc16d90663 SHA512 afac800a8f2e035705fcf997500d8fd2c3dc658850f47754863e8811db97859748721c5a252cc90dc81d07bf08763a9507e2272e983ee3f6bf16d8016fe5b8c9 WHIRLPOOL f3ae87994c7b9f3233502b4212b9036eae169b0ed18632c4565cf7f299012c4ef02558f476ebc4d17f3bb82c64eba8b7ed180138b66062c215546747e64c2025
diff --git a/dev-util/debugedit/files/Makefile b/dev-util/debugedit/files/Makefile
deleted file mode 100644
index 946a12865f64..000000000000
--- a/dev-util/debugedit/files/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-CPPFLAGS += -I.
-LDLIBS = -lelf -lpopt -lbeecrypt
-
-all: debugedit
-
-debugedit: debugedit.o hashtab.o
-
-clean:
-	rm -f *.o debugedit
-
-.PHONY: clean
diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
index a76cf564151f..2fe24d78d498 100644
--- a/dev-util/kbuild/Manifest
+++ b/dev-util/kbuild/Manifest
@@ -3,12 +3,14 @@ AUX kbuild-0.1.9998_pre20110817-gcc-4.7.patch 315 SHA256 34a340193b7f6154ab8f5a6
 AUX kbuild-0.1.9998_pre20110817-gold.patch 795 SHA256 2c2de2d1abf4d9d71c8f14c60701a98223e83a86387dcbb3ce892022e2b67080 SHA512 6ea5d896fdd632355985bdaa69e36aa091fdddc925049dfcb7eab37472c88fde954c6b987a0e647e65832cec5c91ccad7ad8270376a112af95df90d4a60687f9 WHIRLPOOL d3f4413b0c6c493095a8d9344ee94fd02afd446421ad3b0713477846dc186da82c0602e232beacaae5ca97a17bf784f1f18cf172e42dc488a17a1977eb8fd973
 AUX kbuild-0.1.9998_pre20110817-kash-link-pthread.patch 296 SHA256 9370231d3ff856b8be43d352e2c6e29e66079467e99169ed234c3b0761666e90 SHA512 178da856a83631ca4d86a9b8c20e74b75b76426c177b87c26d4c4b3df86e72f3b6339e8f61948498ab9c4bf047119588f3df8ce78448160afa0840b2cf3aeabb WHIRLPOOL f1054aa09c6fcea126450441235fa32a3cce815ba7f54280d1a41793bca1572c3023d997d7d210e41f2511f15e0f059dbd4a99636fd3b11a5dd4593ffd6532aa
 AUX kbuild-0.1.9998_pre20120806-qa.patch 292 SHA256 ca14e0327ba1690ad12e37ea80d8fba04891ab0350e1fefcdb67ab64ce30cce7 SHA512 2a311e2e79c1e85c3c2c26b3d187355167c237c334687494a8e532b84232340df44b0d896fe6638bf1a9d4ba1c5f1efb29978de3bac0490fe04f2e57f7fb1874 WHIRLPOOL 50c63c97ac5e7784e4b1540459a1b3ffdfffecb590dd966f8d713a6e5e9f7250f37a8f234f845c326e578b43fd59b9a12f22975794138aba3784f20fdcee1bbc
+AUX kbuild-0.1.9998_pre20171020-gold.patch 619 SHA256 5f309584e339cbe417fe42a18e2cb48031eec10bd804390ffd50c170f36c2ef2 SHA512 a9d084b34d8bcb431748c6c87679db764557fa2f141f4b942cfe44ca05040dc6eb7f923be89db87d6f35f8d141f3725240dff7502fc919716aa081cdb145d521 WHIRLPOOL e296085447391b8ce08fa9a58db4dfa977d98c06d28de57c2a6dce57aad5de60907c3e626f24769421310ce2d36c4ce1c8bdad2727dca21d5b7cfdcfa5aa62cf
 AUX kbuild-glibc-2.10.patch 756 SHA256 d76d27fa7e4082d6a06434ff9006465d4c29a8ff2add8e3c25456c5bf412687d SHA512 dd8a9464c7014205bbed655a42325653618ad902493d7c73d714f7504a539159771d64b7e0d82aaaf76fadf3eb46dd663e62b5960c17077b8c80ac5f414555ce WHIRLPOOL dabea273f7b662195ec366bed94f2e6d06395ff17f4be856a7853857b32f0ff06a9a589877d63547b90b8c46b245c1c70d1cc755681c20a1bf41c820075e7256
 AUX kbuild-unknown-configure-opt.patch 355 SHA256 078c95e432c9774e81a2894096855b422a42f53650462cbdca16b72c78a05ef2 SHA512 26ae63facf7133be4fba606ad0b9488ea4c2ad2290a1e33a0f0c3283e0c8267eaae41bde6efaa52895b444178ec101a800ad580d2d85d0e69c56dc7db32b1105 WHIRLPOOL 700ffe9298bfd5c7f0259851214eb60cd9ce9152d64dbff4838fc9f1c1adbe14f66f4662d602cf6c0aba504a443af61562f0c118b066e00546762caa86ef6e87
 DIST kBuild-0.1.9998-pre20131130-src.tar.xz 1707632 SHA256 def0a44cc0a91b6aa8a80f73ace0cfc315f298ba3e0d3d81fe52834091b68586 SHA512 66f418c0e052389d2b5cfc4d46bc8598ceaeded369151047e455e921bef494ec42099cdc368d24b572eacd809bb7c124d07e0fab54788af01664b72f571fb047 WHIRLPOOL 95caf78eaa6ead0d9a009879a2ba9a01b138760345eb38a6786ceaf0262520e1827b5e4401884cd6d3849bfa5528f45a9a5cdac5ae61e6cbd1753dec0ba0da2f
 DIST kbuild-0.1.9998_pre20131130-tools_and_units_updates.patch.xz 7344 SHA256 0dcfb79274a96f1a67aa466ca468bebf00a39544517ad0d05c09595341d11e1a SHA512 91aac638e9f4cc321f7d06c89be1a4ce4e57aa88165c71a4f68a73ad51f049f631b2d7427178014408b551fac5678f0c0bf806a61f9d749daf5019f1b6a61bb0 WHIRLPOOL bb0a295e93870364ab176eaca3d07e18567148e5ba431a205085220b305b5cd78c210bea8896611bd4b9b47a71a527afc55a9a30a64b707993c576466609ee8a
+DIST kbuild-0.1.9998_pre20171020-src.tar.xz 2190856 SHA256 96b031b183ffb63cbbf77b1c68325868c1064d377c799ffcab0cdfb61d01aea7 SHA512 53c55a520f3711d1141b10eaeb3bec5dc57bb8476c6b658826e05dbb525eda43a0007dd94dcdde31ea39ad0bb29223ef8ad2a72da1404e53919e444039794043 WHIRLPOOL 86ce166505191eca0a83a238d61c6d2935fc43bd6d6a93c0b0dcec529a797d8a9589be4bf9498934bf7b6b80dcbfe5cf4193cd2969bf1fff5bc41209a51e5af0
 EBUILD kbuild-0.1.9998_pre20131130-r1.ebuild 1802 SHA256 f86e383bf28dfc9a4e0d0ff2579c19e60b2d658e5d527e2deec6743412ed9fc6 SHA512 39d21f6ac472c67c3f0aa9e1d160444f89bfdab05bef260eac07aeef9bd464a98f1fa8ce978a47ecd47af350c0484dffbc9c0b057f4d92a9bfdbbe95627fa92b WHIRLPOOL 2a80b07f6e5967f53192f4a7607fd1351841e69c956064703745b05b55a8b7ff36de791ddd8ff4e761d30d4126746b4f6b938abae8b2c6e0765a70cfa5db7c08
-EBUILD kbuild-0.1.9998_pre20131130.ebuild 1616 SHA256 b3402e34197a7a7ac33b2655861221a11404908795aaff1b560cb4607b6a7e26 SHA512 87d4115ee283744c2f6cf9a5f7d497024aea00d5d25c7f43861776ed49db9101dffc9a73e69ab811a7578db48ffd1543571d096dd4c2b2f7675d64095654f873 WHIRLPOOL 4975014c225224aeb2876a902f0bfa8a97294ddf40cfd64d45881955294de843816192e204e8d303efc38d3d99e7f6b102263ff1ad2f7053d5e87a12aa346038
+EBUILD kbuild-0.1.9998_pre20171020.ebuild 1552 SHA256 be1740bf17a0f31b0fc0c6dea10e7aaf10be5e7e265b06afe5fc9365677d49c2 SHA512 738255ee317a81d0d19b9613537381a10d624325291b356d7494748071f4a494f05f6fe0b075bd3cb39d0353110d00d1ea29df83560deaece8fa4d37f817e8bf WHIRLPOOL ea568606be2e25b912d41bb61a5b2dae0b191f7292c73a14aff65292ac0340726ac0953dcdfe606311c3f8614a639b8cebab54b5ba9837e403fcf94e6e1e9b77
 EBUILD kbuild-9999.ebuild 866 SHA256 774ea20b6cd9dd0ab75f1e96c15bc82c7c026ce7a4ed3cef8281f823dba32bd2 SHA512 eed52912df838735e25196dc2b836b7af459dcdd68338c8501c16dd534050c6650f9d973a41d694862d189d0a30ce12ebedf9793f3a5ddde3d9304d7bc78c999 WHIRLPOOL ab097ab4f5639950823b96bef757e7c52f2d34d253ab75b27a2d2bc33cd6d2fa4cfbbf0ed99afb080b311d626acf4bde30884af4fa5ab2991904f981b3a92bff
 MISC ChangeLog 4206 SHA256 3cdc60eb74d96e9c2f92f1d1dbfddd210671a7f620156f199563a358664c8668 SHA512 f0bf84948ff13dd44b9cd5a0a87d4be8d1127a8d92c115bfed38a7cb3e658760906c7321b51a2ad0f932922c408467e6953e8868babe260c27180b1484b754d1 WHIRLPOOL 44aeb415a41f98f4aa15b3fbbeadc8c8099afb5ebfc6aca1eef16b4c494ab60f70fdcb352cbcfcc01b1cf0caaf197c592b94a6dc9dd90e110bdf17df83608a21
 MISC ChangeLog-2015 7510 SHA256 fd408d7e21f962dd5fcfd3714842a8b02ace87d5268be25c84189674908f4d8d SHA512 2a2c57de330a59f60932d039492b22448c34c4c8770922aae0840c48235a8896d99b0e505ad83fa292cdee6d22ebe28c5bc067e07e457bd6aa28f6bc4e27d2ec WHIRLPOOL 06add0bf5d8b5c8fff6ba2ecea9a4a6228ad6f0ff90b95851cc212a4ca687d5fbf38ee5c2e8dcfce416fb1f6356071d2cebdc1d4923d99755ca107ae3b8d1941
diff --git a/dev-util/kbuild/files/kbuild-0.1.9998_pre20171020-gold.patch b/dev-util/kbuild/files/kbuild-0.1.9998_pre20171020-gold.patch
new file mode 100644
index 000000000000..4c98942c0f3a
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.9998_pre20171020-gold.patch
@@ -0,0 +1,11 @@
+--- kbuild-0.1.9998_pre20171020/src/kmk/Makefile.kmk
++++ kbuild-0.1.9998_pre20171020/src/kmk/Makefile.kmk
+@@ -57,7 +57,7 @@
+ ifneq ($(KBUILD_TARGET),os2)
+  TEMPLATE_BIN-KMK_INCS += glob
+ endif
+-TEMPLATE_BIN-KMK_LIBS = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL)
++TEMPLATE_BIN-KMK_LIBS = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL) pthread
+ ifdef ELECTRIC_HEAP # for electric heap (see electric.c) - windows only.
+ ifeq ($(KBUILD_TARGET),win)
+  TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN-THREADED_CFLAGS) /FI$(kmk_DEFPATH)/electric.h -DELECTRIC_HEAP=1
diff --git a/dev-util/kbuild/kbuild-0.1.9998_pre20131130.ebuild b/dev-util/kbuild/kbuild-0.1.9998_pre20171020.ebuild
index b96e4f88d758..612e8ebbab1d 100644
--- a/dev-util/kbuild/kbuild-0.1.9998_pre20131130.ebuild
+++ b/dev-util/kbuild/kbuild-0.1.9998_pre20171020.ebuild
@@ -1,39 +1,43 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
 inherit eutils autotools toolchain-funcs
 
-MY_P=kBuild-${PV/_/-}-src
+MY_P="${P}-src"
 DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks"
 HOMEPAGE="http://svn.netlabs.org/kbuild/wiki"
 #SRC_URI="ftp://ftp.netlabs.org/pub/${PN}/${MY_P}.tar.gz"
 SRC_URI="https://dev.gentoo.org/~polynomial-c/${MY_P}.tar.xz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
-DEPEND="sys-apps/texinfo
+DEPEND="
+	sys-apps/texinfo
 	sys-devel/flex
 	sys-devel/gettext
-	virtual/yacc"
+	virtual/yacc
+"
 RDEPEND=""
 
-S=${WORKDIR}/${MY_P/-src}
+PATCHES=(
+	"${FILESDIR}/${PN}-unknown-configure-opt.patch"
+	"${FILESDIR}/${PN}-0.1.5-gentoo-docdir.patch"
+	"${FILESDIR}/${PN}-0.1.9998_pre20120806-qa.patch"
+	"${FILESDIR}/${PN}-0.1.9998_pre20110817-kash-link-pthread.patch"
+	"${FILESDIR}/${PN}-0.1.9998_pre20171020-gold.patch"
+)
 
 src_prepare() {
 	rm -rf "${S}/kBuild/bin"
 
-	epatch "${FILESDIR}/${PN}-unknown-configure-opt.patch" \
-		"${FILESDIR}/${PN}-glibc-2.10.patch" \
-		"${FILESDIR}/${PN}-0.1.5-gentoo-docdir.patch" \
-		"${FILESDIR}/${PN}-0.1.9998_pre20120806-qa.patch" \
-		"${FILESDIR}/${PN}-0.1.9998_pre20110817-kash-link-pthread.patch" \
-		"${FILESDIR}/${PN}-0.1.9998_pre20110817-gold.patch" \
-		"${FILESDIR}/${PN}-0.1.9998_pre20110817-gcc-4.7.patch"
+	default
+
+	mv src/kmk/configure.{in,ac} || die
 
 	cd "${S}/src/kmk" || die
 	eautoreconf
@@ -42,13 +46,13 @@ src_prepare() {
 	sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.ac || die
 	eautoreconf
 
-	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+	sed -e "s@_LDFLAGS\.$(tc-arch)*.*=@& ${LDFLAGS}@g" \
 		-i "${S}"/Config.kmk || die #332225
 	tc-export CC RANLIB #AR does not work here
 }
 
 src_compile() {
-	kBuild/env.sh --full make -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \
+	kBuild/env.sh --full emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \
 		|| die "bootstrap failed"
 }
 
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index dc52cd8664cc..6899a0019924 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -2,7 +2,7 @@ AUX kdevelop-5.0.2-ninja-optional.patch 426 SHA256 de410283856feaf6e13f5edf88d65
 DIST kdevelop-5.1.1.tar.xz 4685416 SHA256 0a01a4ffb2f01802cf4945521a3149a8f82c21fa8a97935991f1854b7db5d754 SHA512 e2c1a4885bab9815341a53da6a98dd4939b7128eee174e79c616cc020f464362a2730508b3a8d66f00e4ea95f2098b92d6328b43b9f22bd77145bbe6ce096529 WHIRLPOOL 7e4134a89533ec510486f4b65a50cdc4b6f9f3ec3639f38077e568b54ae66d470f8028348eaab875c08ab8de4535902e2572aea99f86baba9359b581747a4366
 DIST kdevelop-5.1.2.tar.xz 4688696 SHA256 af54e807847d145fe5f3eb55962ed0d22e6363c2bc6c32167e51ca4823c00ac7 SHA512 3f359587c7dca3ad4d0db4940cc9557bb61647672432f21c21d6f493e5e5c96e026c7dc155b66a7be4d20b06972fe961d8a3dda28e8aa273d0a4044a6242e39b WHIRLPOOL 0e3229a9b209cc3dd0afed13fdf72053dafaff3ca3d75172ef575590e6a5eb8374a4c0ded6e10adabb305a91f725a26877f91d417bd05d647fec2bb8f169f1fb
 EBUILD kdevelop-5.1.1.ebuild 2562 SHA256 5bed63ece3d27fd5b4aedc2a2d2b0220b6e6e5e8d365367a6c2f04902f23ba20 SHA512 f7d3ad87391cc509ffaefc5d9308ad7cabbd4faabef68acf1ab0e00259526014bcc100a686879e796cbed99090bbf354a7bb5493a8dba356a4b31581c6942e26 WHIRLPOOL 5c45c5dc2f5a5bf16780e50f47c04359956052843c3221a7776c93478d659e2664fc2b34c832d57b2cfbb5b03bf94702b5cdfbe81ef01963bbaa64302987d21d
-EBUILD kdevelop-5.1.2.ebuild 2570 SHA256 06ceabc2d1e8fa8601df41d8f243078e3ea42a413e97ff479a900002a5c4dccf SHA512 413a4b79c2edb489816f18cbeabf3099b64ee2318b6b32a4dc242be8ad287c9557223af151c186d508cfdee873ae7414c114e10685558750dfd0b50f2731c383 WHIRLPOOL 6c4de213735e838da17da608c1316bcc88035ee9e5083cff795cc7991462656e4d595b2cef16ce1b77278eabca99259e99b191bdb9738ba48fc6e8c97d2b2ecb
+EBUILD kdevelop-5.1.2.ebuild 2570 SHA256 3f88a8c48848265c142f0d80da85ad6a3c7723ef3564199442d0b4c268448617 SHA512 f9dd61e5e66c3aa12131c3149070d9067b6918159c7e0c1d7be98408a1af4f34b129943035f36dca97efd84473a646dff38a65dc3cf0058e299c233b43b3e060 WHIRLPOOL 0f27149e2ef48587540a3c995d06ed74c58a3dabccf5bfad42116584cfb65b28d4cd5c71f7d6a02fc7c8835d1b25de79a5252ec5238d99be623ccd94de77bb97
 MISC ChangeLog 7546 SHA256 62a5c648dd50a1c831960579da88ff3aad5f5f198c04afa2e8dca66e2a41b43d SHA512 f7ccdeb52b318a7ac700538508ddc119b3833349705715e41b57aec8707ffc69cbf948abbae08dd6d44971d46b693ac0e55b54344094048cb7c0ae24099433ba WHIRLPOOL bbbc218f69de23736553946b14fe8ff508437526af62dea7d680b76dbc182a3dd4307fae9261de47ba2b8a9003944c2cbdc1938804cd025672bf616df2db59ef
 MISC ChangeLog-2015 39119 SHA256 6ce8c61c7acd1546a9d894cfc7754e7363ab7f0799b82747ffa0615e489366dd SHA512 b78ac3c39b5fa535956066568d56bcd57a54b42614abc5cc28015909b1824878d89cfe81172782d6ee85f24a572304ca9565c88c5c51d191349373a0ba2a9e20 WHIRLPOOL d1d433c52184613a9c6bd1fa17334fb6c67c311a4ddfe2e70e3d5693dbc268d63ff3c416d720167cc59e2d99c50b7baaad41dcca696ba9c2ac95d6d117c17f3d
 MISC metadata.xml 606 SHA256 ae2ded29876f28bf22af2a6ec83ab5f1c73f645b05f95a24e535d945fccc5d39 SHA512 029fc300951af3f0887192a7c51efb51b4107b05433d7b47af2a1346603443c2da4c7849bcc4b06d08445c12893a6abddf89fbe126694aa1809a43579cbe9600 WHIRLPOOL 3368c317e6a8ea906a395eba09a0828d911d02816c59bf4968e5c02f0a88be3b564f4d606c6ef3ebcdeed38fe3a07021979369bfb4cf38720f6c8be050b6e835
diff --git a/dev-util/kdevelop/kdevelop-5.1.2.ebuild b/dev-util/kdevelop/kdevelop-5.1.2.ebuild
index ffbbca5b1bc6..63a561d9e8b8 100644
--- a/dev-util/kdevelop/kdevelop-5.1.2.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.1.2.ebuild
@@ -46,7 +46,7 @@ COMMON_DEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 	>=dev-util/kdevplatform-${PV}:5
-	>=sys-devel/clang-3.5.0:*
+	>=sys-devel/clang-3.5.0:=
 	x11-misc/shared-mime-info
 	gdbui? ( $(add_plasma_dep libksysguard) )
 	okteta? ( $(add_kdeapps_dep okteta) )
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index cf1ce407137d..85e622deea5f 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -14,19 +14,19 @@ AUX git-daemon_at-r1.service 340 SHA256 980b2b2234fc672065286244cd4e690c92865d39
 DIST git-2.13.5.tar.xz 4756436 SHA256 21c9e29caac86d244ac7af78bc3422746dabb903cb3952a1ceefd801020ad1a1 SHA512 4a0b55d19f15cf0ca388d43b650c1ccadbc32964925e5d0a3107ae84c38506af957335ceb0cbb5468ffbe0f5283f8e188aa51c9e915b3249126eb37c304be9ec WHIRLPOOL 7a3c9971f37de366801be6a6d1d28a1d02b2f3fe98a508465c01d600913efd0ae4d241fb690686beb2ae9b0321ba4f7eb5b313ec47fb04eb7d0e0e51170c6750
 DIST git-2.13.6.tar.xz 4756820 SHA256 bce97e403bea34f50378e90ade10c12666b2382cc247551b63dc5604e03b2523 SHA512 ed39784205e1077f886eebdfb34a205fb0433071de29f673a79ea32bca31a2ba9bdabba208c9679ea2f6f295bafad52a7e7852b5bd2ccb1e6c99a1d2e76e8ada WHIRLPOOL aeadb595a3fc9b74b143478436f4511d15735e5e01bbaf84bc60ef6c3bb91d94aa29ea1bd700a08d3aea3341de4cee5c4d5ced0b550a223faaadd37774cd3492
 DIST git-2.14.2.tar.xz 4800208 SHA256 50e9723996114ad1eec4dda89960d9fe34461749ae42031008a261fedd03c7a1 SHA512 fe99486e0aef8d73dace3081bbd62bc6d08bc13868b98c905f7833458fdfc464eea504ae2961f4a2f38892cb0e76b533a50a2cacdf07c9ad9f8106e7ac1c353c WHIRLPOOL af0d166fc00aea8a4a77984e8bf92f6fb3abc854263316961683e5e27c8adbe1d73a3384b4d14c2ce762d75fd95f67da9a95a3fd3eca4d6747eb1850ab7b084e
-DIST git-2.15.0.rc1.tar.xz 4839236 SHA256 50081dca7fc77c4cb93057d4825df6c91b29c74e53a2aaebd8d7be301280fa98 SHA512 5c773be8f94f1c4fa2d4c000c14a6ccc0b560207ac59a9c60dcff0a81decdebff64a00ff045864d0ea527a61b9258c039110422f479df4314bf0164400767ecc WHIRLPOOL 32a34d871a96d2b8fde0461f47d9206ca5bc10af707b2d2d0ef7aacedf019d54f44a90ade64fa5e6f9b075f00f4cdea55bd7796e7640ed7fae1ab2bbf00e8bf5
+DIST git-2.15.0.rc2.tar.xz 4838680 SHA256 df624082e8e26ea94a6794da7a14861ff3724d98f1368ebbf85520741083f895 SHA512 7a9415ecac4a0ee5f7058efaec5e72f857fd4972ebcedfb04924e431a2d093ee146a16e88fe053990367488ed550b8f7d9fa7db03819a2dc39bc0a6b013171a0 WHIRLPOOL 4bc4f74d28306ccb60a3ab60d6f0daa3a1a4897e054589fb7c374f53269ab4b3e62cd386368a91a5736632183a09d69878350aa0f18c76e41b74c7c89aeaf63e
 DIST git-htmldocs-2.13.5.tar.xz 1110236 SHA256 f5f10d821544446547dc91798772f36d7515a824c9a28f22521f0094e1a4dc08 SHA512 0ba006ddc35325052be4d969a3a966ec1be7954dcc1676b9914953720e56f3c9a4522541d964c6ff08a921c35f983213eacd00b99db5d97b97ea8f5c1181ed73 WHIRLPOOL 020963c8544dba6acc4b0e681a844b6a9f332b3b3469c056d678791afacab54f4badd956137b21d3a5d2ea465a83f05d815a2c066f71fade41a58e8f802088bd
 DIST git-htmldocs-2.13.6.tar.xz 1110668 SHA256 cdc39ecc8d1ce09f7b865832ebbc466441beb61d1aad4c7796514520220dabf0 SHA512 9eb26f04836620bf4486d3bb2a170ab2b0af319f7f53e2677f4c1445767f5c3521cfdbb274dcc4df2bfd2fc5bf0ca18c6a4a9ca0b9f957c53f66e530684af6cc WHIRLPOOL 126d8ae25c71dc4e6a6eb20ba611cd2eaf94ea8f4f89fde82b2d05044e93f425d9812559db5599b557a1a8f5832cc41d0651b421d265219c257351fe7fb41f2b
 DIST git-htmldocs-2.14.2.tar.xz 1115940 SHA256 a36661e81e5b21e788cd84e11860bcd0cafa402eff06e6371415a5a0e0b80dfb SHA512 c5dda319713a98b9f655a04fbb4dfcba4cc60fe22586bae73a88111d96cd8da989060b8450549a32a5c5bf5bc8ce735e73055ce72b8bf5d3b4fcec2040fa196b WHIRLPOOL 1b47b798ae00f29e84862b973f4e284076eba84992f52b92903b56d50f0a463aac011fdcb3ea0b4859d2cf8661eb24c5faf4569ed22de952e293df95ca9a0438
-DIST git-htmldocs-2.15.0.rc1.tar.xz 1133728 SHA256 0b062ae4ac8997e13d6beaeb572251d98bbf56c4473119c3e91a0422fcc81514 SHA512 935c21d12b9334aebbcf208131f46e62391111e78b4e3de67f044766301aa28b528d525d80cc9fbd4c889b01e25a0550d7bfe4af419dd13bfa4e789a7fd658a1 WHIRLPOOL f1e1c88cd312961bc289044d0d73ed27baca1b1a808b2254fbb34095c401ab5335aef591f9d896c6966b3ab0bcc2c0d1242074c3d16f0bffefef33c5b6de27ae
+DIST git-htmldocs-2.15.0.rc2.tar.xz 1132916 SHA256 4b5b38eb028356cda303add5d6132b94b744c2b7d4aadd7fe99ee2b6bf24e964 SHA512 5ad647e9db64f3f048560d032ca6bf712b45c64ba87a8443462e392c11bb23d28d094139edac800608202320de0d62944c421b5bedf727aefc78ff3823999626 WHIRLPOOL fb441afed5d1d5bb8432d733febe26d972e334433b35d68c57ce63a773f4b5e189a975ce634a83d7f1405d93d03dfb0e2aaa24b9552dc8ef5c13ec712f930f2d
 DIST git-manpages-2.13.5.tar.xz 407640 SHA256 1dde688dda9162605ae27e4ad1b55c65c056b3e7cd70972b7e1d6bd2b743394d SHA512 42637b264b4a1a73defe22f314cb8ca0bc171fd722252cd926a9fd74a8f89d129da0648ed85b72f44948795c6ae1f33f4f141f11b07688533c8654be0983fbc0 WHIRLPOOL 9b4a3440c4d1da7089d020e146de7401502cdbae0d82a0052f665cfab84d48de5aa5602d78b8d2f29507e280a16ab4bc2ea4a753fc948a7102eef0240ab3ab2d
 DIST git-manpages-2.13.6.tar.xz 407660 SHA256 9c92ed09c3343c770a1afd9dbb1192b00ebb1b3d3e25e21a2dcb1a4e9a494d1d SHA512 b24a96053e348e1d2ebf5c66d968074bc73471f07ac3a680d8b16fd211b69b5fdfad6a087473edf9941ad08493e4d7ff0a916b85ce40ebe19b3e3dad6a4baf5f WHIRLPOOL f25b4b20462806a722067aecb7aa0526f00536630c8f71bd7be1ecc0ff4fec07db2fa79d69d911f3e1a2eaca9fe73ad76e76e7ef7afbb83698db42a540e4cfef
 DIST git-manpages-2.14.2.tar.xz 411160 SHA256 6dd350d1e9d00159a549f0fad08a9f954b1d12576fc8d5865fbed9dee15105fc SHA512 64f9e22ed98cde1dec9afb719c2f7254d5da1eceab2e7d3291d37792fa1b9fc83633ac42a4f47961a6721b325d58818e67ffb14085d5e8f9bed1b691f22d79d7 WHIRLPOOL 902889bed82289773c029ac7c9625f4972559e0365cc04dfb661ae14fd7e1757d3820d75b3591d72dded98107ad7a1e2e31590452699858ca3a94fcc375ac0eb
-DIST git-manpages-2.15.0.rc1.tar.xz 412748 SHA256 deffc4779d5a652591f211daf25dd2b9d815a6e6f4e0696a5930e2067241c7f6 SHA512 a5d3a5a3d77c2278d36a9f2cc38d181177a5ff22488f48d1cdd2b00fe40f3feba236169d65f68ff924f08619af62403895dc85ca858d933f58a3a267ea413f29 WHIRLPOOL e9646c531666e6971cff80d12c4bbefc370659fb1d55a31091d6624204e5781937aaba13a3993b2fdd70414ca5582f51e714103c2c958502aa81344ed8ff5e98
+DIST git-manpages-2.15.0.rc2.tar.xz 412668 SHA256 5fff26704ef20de480a5dbfed1ff102c8e66c6d2dddbcedb62780e1dffdeeafc SHA512 ef0a2ce093789b1c1fd64739ed6206a2c3ae99405dfbaa0c1ea4c15b6236c89a8a13ed92e6ede87749d260f9194b6c5306dbe9fd4a7c70b32a5e10efaf9db35e WHIRLPOOL 2a5d352332f050c127ff9691918737058e8340ab3418a3754025325c3ebe0de0af110ddf5e90bcb3cbce4b76d0dcfb1d65b65345f6a0bc7b383a7429dabda646
 EBUILD git-2.13.5.ebuild 19016 SHA256 60f7549d88e55d94f090293c78c841565b8a11f8db61526abbd2c4de650dbac2 SHA512 4741a465efa6fbdc86775abc4088a9512971658988154a5da2f410e1e243b6f6a1e7c5bece23582f3a47e1ddd587685ebfc32c7b00c8ff325d2e92996e4d840d WHIRLPOOL 1372327523438351e0368978141e4c80d7ab3f0d3f816d9c2b749287caccab69870dd26db28b75f5244b69012fc0951b7894c442d5aae006167435511e5890c9
 EBUILD git-2.13.6.ebuild 19018 SHA256 128e50a563fdadb04bf66fce8f1aa0e3e9e9c37f5493d445459a06a39085a048 SHA512 6e6e3e18ee9c3fb0d6261f3ff827cf0b11a79df439ddcff2cd9a2b5f90d6a4b280324d6e06b42fb1c3f4bdc3fe9269f9b07e7473a03cf0043917cd7d103cfb29 WHIRLPOOL 0b001716179dae7511bced83791ec6a505c205cb7580acbaa854a496c18ac9a81d689849c7dc9895f4c75a29492f703e333ff23fc4dde015d1b14e6cc55c0be5
 EBUILD git-2.14.2.ebuild 19492 SHA256 7ffc88887aa46a21a50af75c177e551ef40ffbb1b12b651a9c0c3111d9f3fc6c SHA512 f0dfd54aad567141b2806c0e2bc8a24699b66456f6fe964071a5da78b201b4f27dd7942e75ae320f6b5b4c0c18a948971ad75a339125cbd5f5709ec0780726a8 WHIRLPOOL 332d2dbb55610ca410fd04e2fc595e1e65fc6edd95d9a412d7dad14b266707d2c0e760b2d5aa54fb7dd7d1f0b2d21d19b561d5060418037f1de24c53b32ad52b
-EBUILD git-2.15.0_rc1.ebuild 19492 SHA256 7ffc88887aa46a21a50af75c177e551ef40ffbb1b12b651a9c0c3111d9f3fc6c SHA512 f0dfd54aad567141b2806c0e2bc8a24699b66456f6fe964071a5da78b201b4f27dd7942e75ae320f6b5b4c0c18a948971ad75a339125cbd5f5709ec0780726a8 WHIRLPOOL 332d2dbb55610ca410fd04e2fc595e1e65fc6edd95d9a412d7dad14b266707d2c0e760b2d5aa54fb7dd7d1f0b2d21d19b561d5060418037f1de24c53b32ad52b
+EBUILD git-2.15.0_rc2.ebuild 19492 SHA256 7ffc88887aa46a21a50af75c177e551ef40ffbb1b12b651a9c0c3111d9f3fc6c SHA512 f0dfd54aad567141b2806c0e2bc8a24699b66456f6fe964071a5da78b201b4f27dd7942e75ae320f6b5b4c0c18a948971ad75a339125cbd5f5709ec0780726a8 WHIRLPOOL 332d2dbb55610ca410fd04e2fc595e1e65fc6edd95d9a412d7dad14b266707d2c0e760b2d5aa54fb7dd7d1f0b2d21d19b561d5060418037f1de24c53b32ad52b
 EBUILD git-9999-r1.ebuild 19492 SHA256 7ffc88887aa46a21a50af75c177e551ef40ffbb1b12b651a9c0c3111d9f3fc6c SHA512 f0dfd54aad567141b2806c0e2bc8a24699b66456f6fe964071a5da78b201b4f27dd7942e75ae320f6b5b4c0c18a948971ad75a339125cbd5f5709ec0780726a8 WHIRLPOOL 332d2dbb55610ca410fd04e2fc595e1e65fc6edd95d9a412d7dad14b266707d2c0e760b2d5aa54fb7dd7d1f0b2d21d19b561d5060418037f1de24c53b32ad52b
 EBUILD git-9999-r2.ebuild 19492 SHA256 7ffc88887aa46a21a50af75c177e551ef40ffbb1b12b651a9c0c3111d9f3fc6c SHA512 f0dfd54aad567141b2806c0e2bc8a24699b66456f6fe964071a5da78b201b4f27dd7942e75ae320f6b5b4c0c18a948971ad75a339125cbd5f5709ec0780726a8 WHIRLPOOL 332d2dbb55610ca410fd04e2fc595e1e65fc6edd95d9a412d7dad14b266707d2c0e760b2d5aa54fb7dd7d1f0b2d21d19b561d5060418037f1de24c53b32ad52b
 EBUILD git-9999-r3.ebuild 19492 SHA256 7ffc88887aa46a21a50af75c177e551ef40ffbb1b12b651a9c0c3111d9f3fc6c SHA512 f0dfd54aad567141b2806c0e2bc8a24699b66456f6fe964071a5da78b201b4f27dd7942e75ae320f6b5b4c0c18a948971ad75a339125cbd5f5709ec0780726a8 WHIRLPOOL 332d2dbb55610ca410fd04e2fc595e1e65fc6edd95d9a412d7dad14b266707d2c0e760b2d5aa54fb7dd7d1f0b2d21d19b561d5060418037f1de24c53b32ad52b
diff --git a/dev-vcs/git/git-2.15.0_rc1.ebuild b/dev-vcs/git/git-2.15.0_rc2.ebuild
index d079a65a75eb..d079a65a75eb 100644
--- a/dev-vcs/git/git-2.15.0_rc1.ebuild
+++ b/dev-vcs/git/git-2.15.0_rc2.ebuild
diff --git a/dev-vcs/stgit/Manifest b/dev-vcs/stgit/Manifest
index 1818d37b5ef3..5635a6017973 100644
--- a/dev-vcs/stgit/Manifest
+++ b/dev-vcs/stgit/Manifest
@@ -10,4 +10,4 @@ EBUILD stgit-0.17.1-r2.ebuild 1942 SHA256 6a3cbe09716b84c0e32e9ad3408447a9ffa4e7
 EBUILD stgit-0.18.ebuild 1950 SHA256 981bb6bd330b521ae6cb95e585eb2669ad580ff76181921ea934ce06731fae6d SHA512 9ac041555d25b6be3dcd730ff4e18388ca2d425eea5a396b93c5109e986f9cbb0621e21c0f2387a86a6a322ffcab8099dc85bf22c87f31e6682f340f9f01e9d3 WHIRLPOOL 707c3c2bb58e7ddab1a05f7e3488dfdc258cfa5addea5d21581c2af9fc9d82b407c2480b978579ef5df1c0ba5a4c407be44108d4c709b7811a8f83d34df46d34
 MISC ChangeLog 2897 SHA256 743f0c43d222fee585d1c3e48f5c7e9a535751f75e8ba0d7191914c936ef273f SHA512 2c86401c114db55c19fe26c3c1459afb3c43f36175e77bedc280a641b564771fd69532f7f68468ad4e9e9a3e495887287fc27582e38de501f7593d2d6a3ae258 WHIRLPOOL 8bad435f911194d3b8481d2e6c215a8222515777aff83b46ee0366e88addd8477055850122d83ba41c73aa9c9e06ceb6a09cff17723647c18fc03230837eb021
 MISC ChangeLog-2015 9103 SHA256 eafed372849816e41a7b359a434cf0223405cb1eab7345c740a6f087d18d7a15 SHA512 7d90f53d0510f3d5c9d5d65450fd38ca1a43f64cc4208a858597b5de3c18f0f75ff6f75e671289e49cb948319c5909358f6d798f9b53132a3b25bf6a161c47c8 WHIRLPOOL 1498950b6c15ee7a43e0f85f6125a1781c1215d628edd5c5108f079f00dab680112dd4ae747be1cad3b9280decdf108a93f6c5ed3038393de50ce9bf16b17137
-MISC metadata.xml 355 SHA256 a3ac539ceb8ea5d139d978130838d3d541ecb6a2bf8af9e1f770258ba5e7291e SHA512 48924de6338d2fa91ca905d341d8e9bf95ee94cbbdc24dc95eb6545066bd28fb5c6b5707cb73cf56b376466d9a975d8e0f86491fe1e38e115d0128eecb294a57 WHIRLPOOL 725ffa50f5dc2fb1fce31a40f6ac43f4256b9f630a5524de2c749192f357ecfbfe950810babcd3ba9953dfc20f998845a1d207bb9fb47b28ca7ca17f3fd69bbc
+MISC metadata.xml 240 SHA256 617d68811d3753c1c435f47fbe63983b453190a8f7ad6cb8577e963793ba7281 SHA512 923a0a24ce7efb7b5c6e6561521def809a20d77a8dca21ca55c1bd8e0e34139c0d5d6ec683180f0b97ddb809ea124765eba82f1135abe08c93f4dfb353d18da8 WHIRLPOOL bad18ca161e86a61cd8cabb13793d9e8830ad820d922adf08c354546e308f402d9e0227b4013935dbefc08810220ba1575454eafeb733cc5515aba28b1857055
diff --git a/dev-vcs/stgit/metadata.xml b/dev-vcs/stgit/metadata.xml
index 564e8c923f57..4f503c94254e 100644
--- a/dev-vcs/stgit/metadata.xml
+++ b/dev-vcs/stgit/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>dlan@gentoo.org</email>
-    <name>Yixun Lan</name>
-</maintainer>
-<maintainer type="project">
-  <email>proxy-maint@gentoo.org</email>
-  <name>Proxy Maintainers</name>
-</maintainer>
+	<maintainer type="person">
+		<email>dlan@gentoo.org</email>
+		<name>Yixun Lan</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/eclass/php-ext-pecl-r2.eclass b/eclass/php-ext-pecl-r2.eclass
index b124813c4727..ca712c800525 100644
--- a/eclass/php-ext-pecl-r2.eclass
+++ b/eclass/php-ext-pecl-r2.eclass
@@ -1,6 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# @DEAD
 # @ECLASS: php-ext-pecl-r2.eclass
 # @MAINTAINER:
 # Gentoo PHP team <php-bugs@gentoo.org>
diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest
index 67613482b245..5a0ee7ab7662 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -2,10 +2,12 @@ DIST FlightGear-2016.4.4-data.tar.bz2 1654119067 SHA256 3dfd4b82c99a8bf4b81dd318
 DIST FlightGear-2017.1.2-data.tar.bz2 1460657435 SHA256 99d38d0478a8c8031f59376112bd54a6f996e1d363807b3bb45786384cfb2753 SHA512 0498b662a26c03dd08a1861d63e982adeded1a01db34ccf09d2acd9420a0b0343242216c58fa2a2ce215806690eb4d1796114f15f3adbd391fa18421629d4f97 WHIRLPOOL 45a1898ed0ca108d501f3bd35153a2107c4e4f682e3b49a7e8f49015fa5a6b6468d5177cc79458e23f5ae9b3ee2744540ab82a48561d9ba994cb147adc898650
 DIST FlightGear-2017.1.3-data.tar.bz2 1460527272 SHA256 bf35d9a15be9e7bd1c286eee879251e0907a3fb5cca4e7d1fdfbe67690345365 SHA512 eb6140612920b190cec7f2879e4789cfb1ab41ab3c2d463948c592347bfd8f042bb62b499abf94d51e550bc472afe334c77ad750930d954067dc1f6bab66efac WHIRLPOOL c2de9906a0d4f88bafd85edb9b217b1ee766f128c0b6e95f82a6c6a98313c63e26113e5798b5be7e8714831db94bb5c95afc0cbdd570b0c2313dcf856e944523
 DIST FlightGear-2017.2.1-data.tar.bz2 1590727949 SHA256 c9350e4500a1d97ebc515e7bb9e74081a8726a8fa244966543c9c67bcdacd1a4 SHA512 a6f6ff55d5ff866626b98fdfd77610fcde567aa53f74ccffb22c0580d1b6cc7c50fbc65b9c8b1f75ccfb07434b830b230c73a165c095f9367b67cd37b60018fc WHIRLPOOL dec850a9c1db5d6dec1682671f12b7d8015b29590100ce43f20724eb3d907da37b114f76f51cca4f1cde9e2c0e365cd913d9a42a2f51f91d8a32eef5e98146bc
+DIST FlightGear-2017.3.1-data.tar.bz2 1560855079 SHA256 df08b06e88a29a9f80f29186afd54d278636a663281a1b68e8f484bbb403d898 SHA512 9a3a68103bbb0f74d7f019b45cca00e686122618c1b5142231ba0c8b83f1283956782d3ea4372b1d96d653ea45f7087c32f39f26fe97695faddad0be12f8d9ff WHIRLPOOL dfa888d2735c25cb44f77812860febb9a983d0f03ff438398352bfca9300550b3b3367c36441323cbb440e75c304a7c69e9893bb9ffd4d4a1d70fa89ba86fab8
 EBUILD flightgear-data-2016.4.4.ebuild 516 SHA256 b44cf60ee084202db360b47ac12e16f32238c40652053a1a62ae589915b21e49 SHA512 ae6c1f4c13d4dd776fabfbafcc3b733a300b2f7e43846309cc96f5632d9d76c84103b3606cf5aee94c7970d8e47c1785f018f7c82747ddaeeb66cac70813cf8c WHIRLPOOL 64d619e38e7334f77a4290e70c6e62a56aa7cb8ba2585604273596bcd5f6462f4c6f58b0eb76c323f0606c29a8374f8f11f70997365c5f6606e729d401ac6535
 EBUILD flightgear-data-2017.1.2.ebuild 518 SHA256 7f44cda315b809e48dd6baa2753a9b2e612dafb8a3ff5700be7b4096d18d82f4 SHA512 02ea5407ec76fadeb0230b3567e9c83445d562a49853681c1b5418dc4ccd7e97e582e4776bef02347fed25270ab2637fb8b530beca6ebfa1d19b805209d4192f WHIRLPOOL c8f1d06fd36a4359c053731c7d78683ba2332033922d1ca93869bb65477d429105b4db5d0fa630366775850a32b338573ae06ffbf8e09639c1f007f969dc1949
 EBUILD flightgear-data-2017.1.3.ebuild 518 SHA256 7f44cda315b809e48dd6baa2753a9b2e612dafb8a3ff5700be7b4096d18d82f4 SHA512 02ea5407ec76fadeb0230b3567e9c83445d562a49853681c1b5418dc4ccd7e97e582e4776bef02347fed25270ab2637fb8b530beca6ebfa1d19b805209d4192f WHIRLPOOL c8f1d06fd36a4359c053731c7d78683ba2332033922d1ca93869bb65477d429105b4db5d0fa630366775850a32b338573ae06ffbf8e09639c1f007f969dc1949
 EBUILD flightgear-data-2017.2.1.ebuild 518 SHA256 7f44cda315b809e48dd6baa2753a9b2e612dafb8a3ff5700be7b4096d18d82f4 SHA512 02ea5407ec76fadeb0230b3567e9c83445d562a49853681c1b5418dc4ccd7e97e582e4776bef02347fed25270ab2637fb8b530beca6ebfa1d19b805209d4192f WHIRLPOOL c8f1d06fd36a4359c053731c7d78683ba2332033922d1ca93869bb65477d429105b4db5d0fa630366775850a32b338573ae06ffbf8e09639c1f007f969dc1949
+EBUILD flightgear-data-2017.3.1.ebuild 518 SHA256 7f44cda315b809e48dd6baa2753a9b2e612dafb8a3ff5700be7b4096d18d82f4 SHA512 02ea5407ec76fadeb0230b3567e9c83445d562a49853681c1b5418dc4ccd7e97e582e4776bef02347fed25270ab2637fb8b530beca6ebfa1d19b805209d4192f WHIRLPOOL c8f1d06fd36a4359c053731c7d78683ba2332033922d1ca93869bb65477d429105b4db5d0fa630366775850a32b338573ae06ffbf8e09639c1f007f969dc1949
 EBUILD flightgear-data-9999.ebuild 546 SHA256 4145f97d16b28243830a29d2a8780a2e0505f1103b22abd8609953e14e0ee3d2 SHA512 92dae00bd54b164590c4c9cd66f3797a8f39211a66773c6cb710ecfff4d47f1d65d03861ec9648a8165a823f038f3d19b54dbd2b9b145147d29696569b4ae508 WHIRLPOOL bee0d1836bfe1cf9bf0c45eef3b2412f8a1cc84f2b4adc41ff7633faca0c7bf6c0b9ab3b580bc3dc0f07b839fae0caa8aaee43b72266bce32f4fe9a86656e23e
 MISC ChangeLog 3414 SHA256 08069d29c580931bcce75597ff354c5254e77a90ada53a16b336f66b1ede42a4 SHA512 119d1ed5392f20abe434ab9ceaad010c0113eac3ad139a2d6db26aa45095951a6001c00e0629e5c54238cdd68fd4599b74ff86e30a3e066df3592e03a2361f31 WHIRLPOOL 0b4faae37385bb9b343ed28d3719863e813929e2ff17aee717af8697fedb9e154708256b8964289ab82fe12c1f27e71f97245d328b31910f5d3245f010667eab
 MISC ChangeLog-2015 2399 SHA256 f6b1553db81a37763a7bff18ce113ad72b74cb7c1cc80d7add73aa47553537db SHA512 f235ad5a943659554f42ddb0aed4298324be936e6d3b80df54f54c152a8dfe52c1f3ae406893a5da220f3e4be2370791e8947808a638c484ae6ecabfeb2eea5a WHIRLPOOL 9de9afd13530bc1d6e0b66a9f19a6385dac980ca26cb821051e24e4d8b5ff91d8971b0c6aa91f26531158fd4950f7a83fb40ad87b196e6c9abc60c477cdc6c49
diff --git a/games-simulation/flightgear-data/flightgear-data-2017.3.1.ebuild b/games-simulation/flightgear-data/flightgear-data-2017.3.1.ebuild
new file mode 100644
index 000000000000..f835ef53253b
--- /dev/null
+++ b/games-simulation/flightgear-data/flightgear-data-2017.3.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="FlightGear data files"
+HOMEPAGE="http://www.flightgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# data files split to separate package since 2.10.0
+RDEPEND="
+	!<games-simulation/flightgear-2.10.0
+"
+
+S=${WORKDIR}/fgdata
+
+src_install() {
+	insinto /usr/share/flightgear
+	rm -fr .git
+	doins -r *
+}
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 11fe8a7c5961..e9cb9632b249 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -4,11 +4,13 @@ DIST flightgear-2016.4.4.tar.bz2 7560911 SHA256 d51992cbe40f1812f9821ab27b838d52
 DIST flightgear-2017.1.2.tar.bz2 8056697 SHA256 41fe2a4ab0c14ed10436026c2edbb83148bf603691487976aaf2a5314f524659 SHA512 26466d6bd567c06cec7744dccba5c4a70d01c5169153c3c660175e9b400b9d1b5cc0d067e4d53d102ba5c20ceffb2217afcc54a0e86bf8aa7b3e7ee5a60aaf07 WHIRLPOOL f7b8a7884d4738a6e803a27b0dd3a5ad7bfc65d25b6c19baca0b0244222b967963ff3663298a8659ff01fd6aa52c4d7ed91f29792c8b77dded36ec6ba687200c
 DIST flightgear-2017.1.3.tar.bz2 8056402 SHA256 3d7cb2b4b1d60b80b0613222b1fc7b6db665eddaf68d7080c07cdedcb544b0ad SHA512 93aa27a976bcdd79c76eb9751ba90a79a6146d8f3961c3bdf1db136a99cb9a0ab644c7409a26267181be0476fa455bf739b78cb7028e3e12d5509f96a1d3f303 WHIRLPOOL 55592116f730eaefb57f1d1eb684629c3cfa4e4167ed4f3a17203b1ce7eacb9885f389cb934a4e3f9d10230ce45410ec09dd2b81220a5077f4c4c545dd8a116c
 DIST flightgear-2017.2.1.tar.bz2 8054033 SHA256 c7d9a63736cafd02236707d0f8e1bb36884a1a989cf49575bad13b4cbb311f5b SHA512 d4063d93d70046532c061cc6e09e0c6514cd8138c3baac1652b098a9196e5b435eee4e5ed19082a9e1994f95738114d13fe043290e7efb1539c70b107bbd33ea WHIRLPOOL 63e0c461551a361a2204f66fb0460d1884b3b078afc86681983ad843fb0a1fb944f26d23926563785211f2cd87b237adc5776c9d1eea4cb30fb0bd6d9907ed27
+DIST flightgear-2017.3.1.tar.bz2 8098283 SHA256 6f2e1d992e2f202b8f9c918c9fb19124ef06824ea0e767e2f4dff6ba43728ccd SHA512 e91268b4fc6a5b04761cf64e003e9962e5a66a91c0f089a1de220ef7cc438250dbd93ed99773c09f19255604c4cc5a0b65b80fe19e663fa0eae8107374527b4b WHIRLPOOL 708653d6c80c7041087bd66091de4f838a57ba3f2305d632a0d48867af7774477f492004750e5d89f4aec7a8cf3136d27bbb214635c7a8264f1ccc1eeb24a2fd
 EBUILD flightgear-2016.4.4.ebuild 3573 SHA256 769e4b50ac69ec1b30628f0626ed996233087cbbed769a83e536854b7cb7d6f2 SHA512 55d5b3c0dfee272cef2e2ee20deee26a230b3b339eecb6555cc79605131714c31ceaa5914960b88da3bcde6bf2f01728958b4190217f3da7efbeb67ec03929dd WHIRLPOOL 32f1439c6c93ca52adcdf11dbb2fb1766822a9540eb80f21876e692aedbc74d8f6e95fb64794f4ff61415bbbc993ad2a9e06247ec7929cb3389b014e1924b81c
 EBUILD flightgear-2017.1.2.ebuild 3691 SHA256 52ca76f6110bd6c1a3018dfe4075f722162fc1c8a0318a16c2521083994192d9 SHA512 e53ab6ac5332c118d7292487d9b4ccd17fb6100ebc5588b87de9df84ea622af797236969bc16a7fee287ac63e4a1cd14b9d49e628b4734a2c3a40df3725d3b0c WHIRLPOOL b09741deb57c32c49a72ff89100b9d2c33e45f9f27d7c072b8b129b2027762c516c3a63d899251d4346736aa30ee5c224bbb6112d78eaa2e8bad386416ee20fa
 EBUILD flightgear-2017.1.3.ebuild 3691 SHA256 52ca76f6110bd6c1a3018dfe4075f722162fc1c8a0318a16c2521083994192d9 SHA512 e53ab6ac5332c118d7292487d9b4ccd17fb6100ebc5588b87de9df84ea622af797236969bc16a7fee287ac63e4a1cd14b9d49e628b4734a2c3a40df3725d3b0c WHIRLPOOL b09741deb57c32c49a72ff89100b9d2c33e45f9f27d7c072b8b129b2027762c516c3a63d899251d4346736aa30ee5c224bbb6112d78eaa2e8bad386416ee20fa
 EBUILD flightgear-2017.2.1.ebuild 4015 SHA256 5ccb0ec422cf891d312717df5991b756e5c361337b1224d4cdaebd0b197df9b2 SHA512 446c5bc1a9ac429d14991387704f9d5d40a94c01a0dad1f9cc4a42a79300a70332ddd23e882cd33bf1cc54e92e854bece7629a50c7bce128ddedde5f7221807c WHIRLPOOL 51347a022e789d846f5c3d9e07a2d9df9d2b1282e2783dbbce2069b744a9feaf2a0d4bdd73d1dc60bea16726abdfcd86c8622a0f4a564e714385c471ef23c79f
-EBUILD flightgear-9999.ebuild 4065 SHA256 36fa6d94baa75ae24fe6d6511ec666ce7e475f3c5062aac907bfbf6238a88dd6 SHA512 f7d24c76900b8c265ab6ddddf52a8f7de9359670f061384f16d1467a8ab86bf0fc45d4eea35b63095ac58f975859563b1bf613bc46936dd1237c8c891f150e96 WHIRLPOOL 468c77c47ea1b7618069f80c127fb6909f48cb2475f86bcab1afb5d4c0031b14e923305cc0eb73d0013df09744b4b1253fbc2289fda2739946797963f1aea223
+EBUILD flightgear-2017.3.1.ebuild 3668 SHA256 106e40fbe301be78624ca9ed250259dcc35935be32f2fecb579c74ccf8ad2d6d SHA512 5c35232ce212fce4fe054d1074ca69f91f477afa1a57fcc22b2a45162cc3f6ea8df54c22aa721be506a3fe512b3ad30485d3905cb6395b5ce6d33bf3b33db6b9 WHIRLPOOL 38b940decc52aa56f07fbdb97f604ea9bd33f1cbec5aacca328f78257ca98c99a4618c43032d5087c5ea676c95046186404540ca4b70fcab68f2eff97ea83084
+EBUILD flightgear-9999.ebuild 3718 SHA256 1730fefa794139b339851b5d71f4206bafab109cb3161a5d97b04a9b34b44895 SHA512 c3eaf6e5003e950fe409fe81c13e588179e438cc08bc7e461c86bb23859e441285edabf9d5ba6dd6295f1c602d22736939634ab92965f0b6387af4d2f99eddd4 WHIRLPOOL e8e0439660ac41d7c2fcbfbce79206ec2a04c51635be904811d222179076b853f0f853fc849cfb5e72706d55a4e5af92237e6637fc82f26942ccc9baa89ef517
 MISC ChangeLog 3416 SHA256 c4c271c041eca9d091125c23918c8aa393f787190d8a79f675cd475661f8c1cc SHA512 d02d259f509359b07c3188542abad3dee052eb5cb57a3e75652f45a1b10b9cd965562a91f2ef27170289d512e07f93ad8490a889d5334087dece5214530df65b WHIRLPOOL caf3cef2cf84cff047ee04b9fbf9b8eb5c3f3160c18e319d876c07a84ccdc22025803c03595dceeb0f3b1d921ae33f51de1472a7b9874610b0c01233f9838ffd
 MISC ChangeLog-2015 13813 SHA256 f4912ce531c377cf9c5d71c08db3e419e63e9783b2f7858fa410a2d5119aaab3 SHA512 b090c22881f5bee0262349f3aa63dc6500fe51c69e08d834d0bf72cd5919dd82f6593e6c2cd62dfa4ea91198b5c75c36e723a602ad89f376fcc174ef5abc69b5 WHIRLPOOL 7ffffda05c252ff7162b334ef441c16cb868d8f587213e67de22eb55e33ab7ab5a56cdd79abbfac6701232e49b4c177946cf4ecdc287eca9e320e2172ec280a3
 MISC metadata.xml 867 SHA256 0454c6cb95bbffc7e40e1a8606e0bdb6a7f6d2fdcbda849fd02b5ad4e9a69452 SHA512 645a952785a101a8400be7a2608e7c71007c093c8f7cdbd0fab36f21b64ea1bbeb67e8f30404ab63841d41e5709a30570223732ebb586c780727ab0cfed0d943 WHIRLPOOL 54f54ea9a9e81d4ff8799d0ec1b45b236042897029fc010a694a99a1227bad57fe36711051db4a5840ad66951b95d955a3eb9d28c3068c367a6505e592e9384d
diff --git a/games-simulation/flightgear/flightgear-2017.3.1.ebuild b/games-simulation/flightgear/flightgear-2017.3.1.ebuild
new file mode 100644
index 000000000000..23182087a6f5
--- /dev/null
+++ b/games-simulation/flightgear/flightgear-2017.3.1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="Open Source Flight Simulator"
+HOMEPAGE="http://www.flightgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="dbus debug examples gdal openmp qt5 test +udev +utils vim-syntax"
+
+# zlib is some strange auto-dep from simgear
+COMMON_DEPEND="
+	dev-db/sqlite:3
+	>=dev-games/openscenegraph-3.2.0[png]
+	~dev-games/simgear-${PV}[gdal=]
+	media-libs/openal
+	>=media-libs/speex-1.2.0:0
+	media-libs/speexdsp:0
+	media-sound/gsm
+	sys-libs/zlib
+	virtual/glu
+	x11-libs/libX11
+	dbus? ( >=sys-apps/dbus-1.6.18-r1 )
+	gdal? ( >=sci-libs/gdal-2.0.0:0 )
+	qt5? (
+		>=dev-qt/qtcore-5.4.1:5
+		>=dev-qt/qtdeclarative-5.4.1:5
+		>=dev-qt/qtgui-5.4.1:5
+		>=dev-qt/qtnetwork-5.4.1:5
+		>=dev-qt/qtwidgets-5.4.1:5
+	)
+	udev? ( virtual/udev )
+	utils? (
+		media-libs/freeglut
+		media-libs/freetype:2
+		media-libs/glew:0
+		media-libs/libpng:0
+		virtual/opengl
+		qt5? ( >=dev-qt/qtwebsockets-5.4.1:5 )
+	)
+"
+# libXi and libXmu are build-only-deps according to FindGLUT.cmake
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.44
+	>=media-libs/plib-1.8.5
+	utils? (
+		x11-libs/libXi
+		x11-libs/libXmu
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	~games-simulation/${PN}-data-${PV}
+"
+
+DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+
+pkg_pretend() {
+	use openmp && tc-check-openmp
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DEMCONVERT=$(usex gdal && usex utils)
+		-DENABLE_FGCOM=$(usex utils)
+		-DENABLE_FGELEV=$(usex utils)
+		-DENABLE_FGJS=$(usex utils)
+		-DENABLE_FGQCANVAS=$(usex qt5 && usex utils)
+		-DENABLE_FGVIEWER=$(usex utils)
+		-DENABLE_FLITE=OFF
+		-DENABLE_GDAL=$(usex gdal)
+		-DENABLE_GPSSMOOTH=$(usex utils)
+		-DENABLE_JS_DEMO=$(usex utils)
+		-DENABLE_JSBSIM=ON
+		-DENABLE_LARCSIM=ON
+		-DENABLE_LOGGING=$(usex test)
+		-DENABLE_METAR=$(usex utils)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PROFILE=OFF
+		-DENABLE_QT=$(usex qt5)
+		-DENABLE_RTI=OFF
+		-DENABLE_TERRASYNC=$(usex utils)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_TRAFFIC=$(usex utils)
+		-DENABLE_UIUC_MODEL=ON
+		-DENABLE_YASIM=ON
+		-DEVENT_INPUT=$(usex udev)
+		-DFG_BUILD_TYPE=Release
+		-DFG_DATA_DIR=/usr/share/${PN}
+		-DJSBSIM_TERRAIN=ON
+		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
+		-DSP_FDMS=ON
+		-DSYSTEM_FLITE=ON
+		-DSYSTEM_HTS_ENGINE=ON
+		-DSYSTEM_SPEEX=ON
+		-DSYSTEM_GSM=ON
+		-DSYSTEM_SQLITE=ON
+		-DUSE_AEONWAVE=OFF
+		-DUSE_DBUS=$(usex dbus)
+		-DWITH_FGPANEL=$(usex utils)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Install bash completion (TODO zsh)
+	# Uncomment below when scripts stops writing files...
+#	sed -e "s|/usr/local/share/FlightGear|${GAMES_DATADIR}/${PN}|" \
+#		-i scripts/completion/fg-completion.bash || die 'unable to replace FG_ROOT'
+#	newbashcomp scripts/completion/fg-completion.bash ${PN}
+
+	# Install examples and other misc files
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins -r scripts/java scripts/perl scripts/python
+		insinto /usr/share/doc/"${PF}"/examples/c++
+		doins -r scripts/example/*
+		insinto /usr/share/doc/"${PF}"/tools
+		doins -r scripts/atis scripts/tools/*
+	fi
+
+	# Install nasal script syntax
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/syntax/{ac3d,nasal}.vim
+		insinto /usr/share/vim/vimfiles/ftdetect/
+		doins "${FILESDIR}"/{ac3d,nasal}.vim
+	fi
+}
+
+pkg_postinst() {
+	einfo "Please note that data files location changed to /usr/share/flightgear"
+	if use qt5; then
+		einfo "To use launcher, run fgfs with '--launcher' parameter"
+	fi
+}
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index a4ad24d989ca..2a386a478420 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -113,17 +113,6 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 
-	# Install icons and menu entry
-	local s
-	for s in 16 22 24 32 48 64 128; do
-		doicon -s ${s} icons/${s}x${s}/apps/${PN}.png
-		use utils && doicon -s ${s} icons/${s}x${s}/apps/fgcom.png
-	done
-	doicon -s scalable icons/scalable/${PN}.svg
-	use utils && doicon -s scalable icons/scalable/fgcom.svg
-
-	domenu package/org.flightgear.FlightGear.desktop
-
 	# Install bash completion (TODO zsh)
 	# Uncomment below when scripts stops writing files...
 #	sed -e "s|/usr/local/share/FlightGear|${GAMES_DATADIR}/${PN}|" \
diff --git a/gnustep-apps/terminal/Manifest b/gnustep-apps/terminal/Manifest
index d0e11f99d2eb..0fa8d3143458 100644
--- a/gnustep-apps/terminal/Manifest
+++ b/gnustep-apps/terminal/Manifest
@@ -4,4 +4,4 @@ EBUILD terminal-0.9.8.ebuild 449 SHA256 e124afd13de244386d87346d0af3614d50de2e26
 EBUILD terminal-0.9.9.ebuild 452 SHA256 5c3d67d473b2c279c8f7924f59ac650c0f12e5bee31af4cfa0f3748202f7358b SHA512 94d1646a98ba109eec6b60b25d07ff4d03e321b2e2a872fbbd14f0e36241986cc57ce7820ad6930a88f30a4f05d5d558d2c1b32947aa0f773132f878251e6ac3 WHIRLPOOL 6eb4656542e28805e74451938ea446c598db45e543cf37e5ec897c0d4eb3356e1fd33f044ef90e528bf03a34f727a7051e6edbf5deb1b19cc9ea29e84610be6f
 MISC ChangeLog 2620 SHA256 750b1cd556be52cdfb5a63bac1b2e919e5db9fe78844100b3238cf143d113c0c SHA512 2ccaebe116d5fb9f2bcf33a41e470e429490a70998db5c9dd7040e79acf736e413636fb06cf4da35ee6e7427689021815e451d9db8c566d380256c20cf56572c WHIRLPOOL 38a706a9130a0ceaab7c59b51bd6cb1e982f88bf6b396af755a5ede94699bc2026d8616cf99b7b4742d1f0c9a5d6b9b0068b583b98e5f6199a703067bd192cc7
 MISC ChangeLog-2015 6764 SHA256 ea6ba11b462afb6807bb553174535b03f8309c035f865bdcadd6755f97eb549d SHA512 84b53baf90e9e72989164df4c9404f1fa2fccad57b4cbe9a23b447f05744630e791eef7a2b4a4ad3ea024b5341e902e4f7773ed23d0e2582bd83dbcc03c52bdf WHIRLPOOL a3a17ba131b09c5cb396670a13e924d78a8399bff8e1850d654c0b76df827746e421d1645a5bd3bf97616f133fc5518f4e1419af601129786465e93a9c07b417
-MISC metadata.xml 512 SHA256 a260b6b01cdfd68b26e9d7fb9fdc8c8399e643f32d464513e2abeba6e995f7fb SHA512 c404f7888819ff9e66ba65b58dba52316eacb88a917e9f3edfd601a76335c9b7a3fc5f17607f4bec515a682bfd31c725ecfe75f58266c2511ab75a9754be47c7 WHIRLPOOL bfb1e79c6b5d71554dd514e07fbe6a50e097498db2e0aecd8719f2282f3478a662b83c03f0d55ac2441369995c294acd884ec293419eff630a87d0b3fe3a16de
+MISC metadata.xml 398 SHA256 04e75024f16e6325b027870fdff56d78a5234f9a44d4fbd46598cf2336ff71f7 SHA512 2be2b5a6ff68fad1a03fc4949ef471dc6c9a2c7c9b4401308b893b886c6af925ecf3c817a49bd9cbad3111154e64ccce2cf57cea1915220513c6d0e01a8dddf1 WHIRLPOOL 4549d068fb624216475f06e7fd35dbc5f4efcfc246c92812361aa0de5f9a402f8c320d34a01099b709e4f0a28dfff932bc57e3648ea4405edf27002dbd6a4e3a
diff --git a/gnustep-apps/terminal/metadata.xml b/gnustep-apps/terminal/metadata.xml
index 96b1fb1f81c5..759eb3f6cb07 100644
--- a/gnustep-apps/terminal/metadata.xml
+++ b/gnustep-apps/terminal/metadata.xml
@@ -5,13 +5,8 @@
 	<email>gnustep@gentoo.org</email>
 	<name>Gentoo GNUstep Project</name>
 </maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
 <longdescription>
 Terminal.app - copyright (c) 2002 Alexander Malmberg alexander@malmberg.org
-
 a terminal emulator for GNUstep
 </longdescription>
 </pkgmetadata>
diff --git a/gnustep-base/libobjc2/Manifest b/gnustep-base/libobjc2/Manifest
index f185b2ff297d..db50cdde7aa6 100644
--- a/gnustep-base/libobjc2/Manifest
+++ b/gnustep-base/libobjc2/Manifest
@@ -5,4 +5,4 @@ EBUILD libobjc2-1.8.1.ebuild 967 SHA256 4142369a504a4d946c2434362933e57b0d405764
 EBUILD libobjc2-1.8.ebuild 967 SHA256 4142369a504a4d946c2434362933e57b0d4057645b9662bb8f21dafd97e5354e SHA512 d7118b2b81816fd965251a3d19e246b1b6393c6f3fc8b83772dae17e3a61ea9be39f9714e8c4fbb26f861fafdb7f677bf8728a36cd4eaf252650b6c8a4f9ef20 WHIRLPOOL ce6b9698b7242b4d54bbfa3cc81c482261160f4975f3b2963e4be9551a59535f946276c79ed528896a19bd53d655a20241e286f4cb9bfbd3f0496c1437c398b1
 MISC ChangeLog 2982 SHA256 7079c14213a28ab0a1dcb873137441429904e32710c8822661987c3906b95dd9 SHA512 5ef77a8de19d39f671a1806f7f32e5d7a2e09ceca96039eccd2dddb1276edca983ab7ba5ab3a5cb8d7d74241cfedb48243fdc96b34d2c9c1ab699c3de4e9647f WHIRLPOOL 7368bf0a6cc0d8af8ccfd6152e86d2ce1084b4cf8e4199e221970f3a8238d169bf1147eb1f2c29d73322b11ba15034fd416c96a0d9e65726b235ce78d48ede0a
 MISC ChangeLog-2015 2768 SHA256 5383e79ff2504ee924c7f4692ef685c766883a05a89d904736f03da903e57aae SHA512 665901ee5ea6c018c6c618c14fd4969e35dc6ba2ec69425148e694453f2d6b9be46000f21fe10700f67eb5fd548dc621d99deefa688565b03c69709a4754ab77 WHIRLPOOL 0b0bfe1aef92182bca78dee1b3f9d9e38a130ba2cbbdf0645e3f9b14320c28f068053b8a7835985ddfd22fee6991a75c35129945e8c44b8e08cb639de0365e69
-MISC metadata.xml 1440 SHA256 4f8bb1e6897010fdbe2301c700bc1f27fd469fac4ddc6e7d233ba013fb52ed7c SHA512 4bb1a5b4f33aacd4afa41fa88b5a8760d0136bf7ee5968d1437d4f7bf07e7007e96acade2afd45a283a3ae80f60a900f00058cbbe115a9ac1d3b233e76633545 WHIRLPOOL 1827b3cf0d88923b84234ff6d25878f01d18e81ca192d73bd5c8eef3a483ccaf7e2fdbdd8ba20d4e53a40203987436f135537bee7bf7b04efed171e8748dde4b
+MISC metadata.xml 1323 SHA256 5fb95d5e981d70282863563e3d89608c458236e40dc715a43fc112f0c1292bc0 SHA512 e40c62eeca3951d29105f5a77d3d635028cbda964731c1fc8664f45a622684a63d070d14cfb8c36ba6dcfeb80bf3f59b8a6b7994659b69647be0f9ede8d5563a WHIRLPOOL 6d87477a305f09a9e4d7015fc3697ce7f36b1f2cb50068a20c063b38c98ea056cf6c67e9041d9ed0758f9e8e1a688b1e3ed276142fc255170ed92a8e4c990962
diff --git a/gnustep-base/libobjc2/metadata.xml b/gnustep-base/libobjc2/metadata.xml
index 60bb055a4c41..fdf8cfb7ce10 100644
--- a/gnustep-base/libobjc2/metadata.xml
+++ b/gnustep-base/libobjc2/metadata.xml
@@ -5,10 +5,6 @@
 		<email>gnustep@gentoo.org</email>
 		<name>Gentoo GNUstep Project</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 The GNUstep Objective-C runtime is designed as a drop-in replacement for the
 GCC runtime.  It supports both a legacy and a modern ABI, allowing code
diff --git a/gnustep-libs/pantomime/Manifest b/gnustep-libs/pantomime/Manifest
index c7adc6dc9f4c..afb4b4da4643 100644
--- a/gnustep-libs/pantomime/Manifest
+++ b/gnustep-libs/pantomime/Manifest
@@ -4,4 +4,4 @@ EBUILD pantomime-1.2.2.ebuild 759 SHA256 a2b5607a18ba459960765a94fc996fcb982b757
 EBUILD pantomime-1.2.3.ebuild 622 SHA256 e9e1795bd99a3d21703345247b61d9426998b1151a3ec3667cc9a4b3352b2068 SHA512 d61795b7a49be9565f1f55906494541c93c94fadd71506cc0de375b7a1dbf761ce11d1b8d2222f76f2ceeb8b9946e4bf6c7f574daf0c0bd2f9c725b7cccbb502 WHIRLPOOL fae124fe271a438b952a4822519736c06fc2bcfb168897241185072fa3c75f4b5d92ecf50f94f27d0030cc406e74749fdb02278297953267185eaefdc86b9f03
 MISC ChangeLog 2493 SHA256 ee583c432ca817afd08ac20279a6086c34af12952d62663574d7b082659635f8 SHA512 11b5b798f72d9fbe92218df84aaf286f2c13dc3d47caf8437977cadce7f9263024c4cedf0f8c31c294fd64be54d13504fa28d886b27ba601174ec7c58c42664d WHIRLPOOL 8e4a9755b7cca58f07f4a4d4e2bc28d3a27248d63886c5a5b2aaa91945201de216c1ff6c583e8bb79a13190f70a4be0a90b5f3ea5ca627868806ca0ff3c937d5
 MISC ChangeLog-2015 7469 SHA256 3c2688ccca18bded4b6f2150fa5997cc670657c61655c0b35efd959bfcdb3856 SHA512 1875fb3588fe0a885701e25598a51d96bd2a60b923e335af03b5f0d78ffb83d370c6f230c950ddea60262073b3f8deb6b41ab9bd3ee5db29decfd22a3eb26f1a WHIRLPOOL c3b7f583d6f56919c1de05689ef41cca893456f7ea268d83ac1a0a3d06224f24a841690ff75291024b1a6d355fd9b14a29f8978dc90edf53ffcd5fc7fdd045cc
-MISC metadata.xml 550 SHA256 a1966d20f78af7b8a04a84c07a885c8d262d6defc00b5bd77f28bd71755547b5 SHA512 ee454df09653e452727001d36dd77de0456a62820af43361941cf978e986d9c0ee65d18643caae865681e1931ab8da2ac8a699cfb1aec5773fa64bd675eabccf WHIRLPOOL 3f21381a3ca51abdc5af167e1405a31899c4ba1f0739de3cbc0f2690dbbccbb08cf508de1be838bf72abd04492943bdcdb3aba7dec2d64fdf7501bd8d706399a
+MISC metadata.xml 437 SHA256 2f2d2fc3e361c0caa12afab0c4b06736be9c956a0a02e9fc9f2059913583ee63 SHA512 16697a1ec563eed2bd922aa07fc29c312fbeccbecef4964741ae99685c88743f1224f027791da6cd85e93612023e46365c6dc114705044a5b1d94043c8b124b9 WHIRLPOOL 5eafb651647482aeb02d88a0948c6d18001fc43e869500c2dbdd9a639f622bf07582ef41946a4c856589c63221cd21d22afd0b936228c14f699ed83efb493564
diff --git a/gnustep-libs/pantomime/metadata.xml b/gnustep-libs/pantomime/metadata.xml
index 34187aae7c42..f26605696466 100644
--- a/gnustep-libs/pantomime/metadata.xml
+++ b/gnustep-libs/pantomime/metadata.xml
@@ -5,10 +5,6 @@
 	<email>gnustep@gentoo.org</email>
 	<name>Gentoo GNUstep Project</name>
 </maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
 <longdescription>
 A set of Objective-C classes that model a mail system.
 Author Ludovic Marcotte ludovic@Sophos.ca
diff --git a/kde-apps/kaccounts-providers/Manifest b/kde-apps/kaccounts-providers/Manifest
index 66c82cc5bf12..b266e5774caa 100644
--- a/kde-apps/kaccounts-providers/Manifest
+++ b/kde-apps/kaccounts-providers/Manifest
@@ -1,6 +1,6 @@
 DIST kaccounts-providers-17.04.3.tar.xz 31580 SHA256 6b8d37eb789195e747b85d7d383f0e954c37382d018accac7641a9bd9f317c48 SHA512 9f782bfa1fbafea2bea479f67264e10f515ee154b12ec89413bfcb717e6c861b62b684557d7a3f1ead1c8562ba83ec8627d6ef83f647e2cfed49a017747e9952 WHIRLPOOL 5fc9cc8fc84d509fafdb5211d3b7bb9ce958839d842a03e082251e535c0d334f5122239419bd89aaf085f0f224e5923de503adb1743670921e7819be33155718
 DIST kaccounts-providers-17.08.2.tar.xz 31828 SHA256 b66b3daeea5aca91b02d402f703382368b75091e4938f14de11539c606d024c7 SHA512 610a1c1d30d697c3faf1c16ba8997f4d83970c9d8d483812365fbb8a87b0905cbcf5ba63c8e84e93a68c240de6dba20d9a561a28d4d872e40ec22ce5c1a07ec8 WHIRLPOOL ae7d9f5733aea15f27944bef827e9726749f10414a6a6714ca5a0b409afe85b9dfa799f88ed7b6abb2ca836e0b6ff70af30ee3615362b1568c079f1d8cf84dfb
 EBUILD kaccounts-providers-17.04.3.ebuild 710 SHA256 8ed5c1a7e40abebb7465717940532cbc6f5114a63d048267be951b932861e86b SHA512 8d0f86badf8a1e8e8fd6fab6a767933d937c59046626e56ceccb634daab060e870944fd0be71743811ab1e41e9d78ca3a0653385df44c09a2d5004316c3a0099 WHIRLPOOL b7624bbc986f53b8fa5ecb5207a85d3a643902c56643da435b94560cc230f979714a7c9bb9c9bc9110077f97d60e10b4e110bfd82b1bd48c7b5e5b58aba6d6e0
-EBUILD kaccounts-providers-17.08.2.ebuild 712 SHA256 9fcba6d20e61ccff3baf229d67216fc8b1c1071c60dbade3060fb4adc37dfe75 SHA512 64f033b5db9b874d1d205203fdf9e3ff2228b902d3735d6e691937c58f9ca5d3eb1e17bc6045aff47df8bad77589e26cc6feb7f954094a33dcb7b5f3ade29a2c WHIRLPOOL f2da0d7c1e1d8c9c23b2fdfdafc3358a843fc48f6d491cd5242e30379410bdee41183107624434aedd665d8579473c2f0d3ceda7afb02d6e64737b776b6228f5
+EBUILD kaccounts-providers-17.08.2-r1.ebuild 668 SHA256 9e0d8019269d73d290b22c872b59140541402fb8b9d0d5ff9cc7cd1956a13e3d SHA512 0c42bcd99c0872fef48c2eb730f2f2983a6fd7593477b8d0d50035f0646df809e4085e875a88635a4a289796a08a59090a10cdbed809acfcc0bb276e017f6a31 WHIRLPOOL 5723dc5fcf6fa7171a00e424495a2bca7a6bc739ccd4707f588d13176558d49f827875989153cbaa02688dad12e6e112316211b1294817f518b3d8c0fa9ae313
 MISC ChangeLog 3206 SHA256 81985f3fa8c35894ee0f29a287e3929bbdfb9c3255ccc5aa16469db9fe75a456 SHA512 8596e821459da155f55f0f682e626fa16e10429cf037f0243d18b354d1b7fa40491b7b3f4dc20e6b5135864e70c6892874aea034c8dc9778a0e19e4e89e91a64 WHIRLPOOL b50db1b3f45694e5660f69f3e3b728d1ad383a17fbd6a6cae9f64d1007901064d27fd333213ea7761545dbc41959c352b862eb7d3579827696269becc5fed844
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-17.08.2.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-17.08.2-r1.ebuild
index 86473b4d97a7..e23feaba157c 100644
--- a/kde-apps/kaccounts-providers/kaccounts-providers-17.08.2.ebuild
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-17.08.2-r1.ebuild
@@ -27,7 +27,6 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/intltool
 "
 RDEPEND="${COMMON_DEPEND}
-	net-im/telepathy-connection-managers[xmpp]
 	net-libs/signon-ui
 	net-libs/signon-oauth2
 "
diff --git a/kde-apps/kanagram/Manifest b/kde-apps/kanagram/Manifest
index 5c82e3f00830..516783343f49 100644
--- a/kde-apps/kanagram/Manifest
+++ b/kde-apps/kanagram/Manifest
@@ -1,7 +1,7 @@
 DIST kanagram-17.04.3.tar.xz 7605284 SHA256 0c74249e44d5dede18c931d863f5b91d45017a6e90dad1f04c4e51a87d4e8704 SHA512 b5a5bb200c7b1e0c8bc3abd6b2793eca21dbf6fe2a9102287c1b609a7cdf2da8906f1d2ee47c25e26808a904f429f4315ba1e36ad7cddd4c3ee6c79ddb7ab837 WHIRLPOOL eab7af5e145df87193c9ab6bb372a3deb79c4ee51d622325b5130e4555d39d40aa3b5e97fb8cd3390f4a4f32bb527d156d3a660761cab03921a3df4fad19686f
 DIST kanagram-17.08.2.tar.xz 7605140 SHA256 f27289090f97713bf709fcbac850bd58779895ab500b7ad5c7a9e9c40be741ff SHA512 bd4645e00cf62bac7610b187d72599be5293a712316e9229788cefe1c528105a68669ec87626ef78977eb8253403260d6d500af8af50e68ed68d989db40e19cb WHIRLPOOL f97e62ead3effb268cf4c82415b6cd73f96f8137a85f504f0fd0a35afee14080403c52e4788545a36d8e9505fd47505562918e470a1dc414baf6d54445a65421
 EBUILD kanagram-17.04.3.ebuild 919 SHA256 e97e87c69fa064af5d17896c3781b0a59d12018430d0f6ed1751213ce85f81e5 SHA512 f3a0ecf95fbba2fb133c978c5581a2b44ea86c894f9e5a93a60db1b7fa026cfdf63d4e82d564c89e5004b1c9ebd5d9403f875238422d2c68c49d9b23736c1f0e WHIRLPOOL 3fb57e54f5b6114f8f9725914433d185a3ace2d01a828a12b937bd7c98578b5be01940f51e993c3e346aa450cb7da60a7aeed2af8f61fd57a321b0a6469cab4c
-EBUILD kanagram-17.08.2.ebuild 922 SHA256 84b1f7bbe731495d95bf9b2d18f1eb9433b51e76c170822b71272bc008011a4b SHA512 e64e32147854f65088daa441def4f86da5cb8c37bb1d031e07cb98e4943146669975ea088a4a2a3ced3a64a1e431d3bcb6efbccfd536c23639212ecee5985611 WHIRLPOOL af27167b292e4b87967c6a2b6d23e3c1e9b24ea1bf75ae09ad712a287cc4fee791333ab8b13e8547af274ba70bf693cc9968813e893218148ebff4942f7c5a22
+EBUILD kanagram-17.08.2-r1.ebuild 1087 SHA256 6aef68d0af240362bdd3a1f85ab832ed99b871b46b18ea966d2b12742a872724 SHA512 1e47a583d30988b6ddb56c9ba6df9fc29ab7a1e252fa873753e1adfa18026c7593709c60c21231a9c557c0fe9b4182a75026c9bb4745d90031630025cee99ca8 WHIRLPOOL 9b53f4ce1d83b5e89429e2c5f51b569583d5513d6943e6c24c49418e9514acf5ca7c8ecfd4e121d00e80a163fad607e9fe6f031f664f71937f8e36a03cc15b4d
 MISC ChangeLog 6073 SHA256 1d952f6ba1c7025fd65a3b978f6da168d56a165fe82a7d40308755f16145ad90 SHA512 f46fcb73adc3196379b8f01b4eda997608127b6838344f14a1d1cdc8ff81ca2aafc96d54bd07844dbdd80857ff5461c34e3df446ba488baad2c7bd455974b731 WHIRLPOOL 961d798460826f89eecbcd25104fb6afa277cd09785bbf72d22a9a0c2239285aa549ee94a51be9f09efd7d97a6646e4fde4d05caa5428d4e1b525f7388937ff8
 MISC ChangeLog-2015 35676 SHA256 4095a74c6f60fbebbc10c759050073cbe6a9dc8e8dd12a7d70caa759ed66967a SHA512 e5540040ffc4b2ce13d2563bad177ba32e294317932e092ba6c7b82088f11adab2867dce343057b50daaf4ace03e13007406f44003a4c99b3bb1fa1b7090dc36 WHIRLPOOL 19d13840d4e450ee5a1b6d78ba533068632fc46ae6422af0ac87fe3bf60f66ea9fec50ac679701bbdfbc114779173b27ff59249926ba3e9ed50f2f0bd4be6431
-MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
+MISC metadata.xml 323 SHA256 cdfff3f40f413f66e77cc6ce06fd4798dd10f4991918b4716a6a3ca5e1a88f7f SHA512 873c648b3985a05f119b13bca927dc15bce53b193d7225e1129b4327629192a1b5c23f6137406b2944b01369f2a6d0cd71442f48a14e67758b54c3fb27f07b17 WHIRLPOOL 88c5012a03d46cab74428e1a344fc663f4783f2ac371d654c6784665a3369f44c5e1a6787fc412c73ab80b86d35e36da21b46aacd6fac36f3841b5da93cfdf6a
diff --git a/kde-apps/kanagram/kanagram-17.08.2.ebuild b/kde-apps/kanagram/kanagram-17.08.2-r1.ebuild
index ec15cb26486e..3386d6049bef 100644
--- a/kde-apps/kanagram/kanagram-17.08.2.ebuild
+++ b/kde-apps/kanagram/kanagram-17.08.2-r1.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 DESCRIPTION="Game based on anagrams of words"
 HOMEPAGE="https://www.kde.org/applications/education/kanagram https://edu.kde.org/kanagram/"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="speech"
 
 DEPEND="
 	$(add_frameworks_dep kconfig)
@@ -27,9 +27,18 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 	media-libs/phonon[qt5(+)]
+	speech? ( $(add_qt_dep qtspeech) )
 "
 RDEPEND="${DEPEND}
 	$(add_kdeapps_dep kdeedu-data)
 	$(add_qt_dep qtmultimedia 'qml')
 	$(add_qt_dep qtquickcontrols)
 "
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kanagram/metadata.xml b/kde-apps/kanagram/metadata.xml
index 2fdbf33d963d..b337e66e249b 100644
--- a/kde-apps/kanagram/metadata.xml
+++ b/kde-apps/kanagram/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="speech">Enable text-to-speech support</flag>
+	</use>
 </pkgmetadata>
diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index 17665b61ad5a..635eec1d0b1a 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,6 +1,6 @@
 DIST kdepim-runtime-17.04.3.tar.xz 1492480 SHA256 f85fa76556a5900861e3c9ccca4210af9ac66082109817d7b15d6295f4cecc1d SHA512 dd17f6bb3ba7372bad0e0647de13eb4d54f5d1a6c81f415eb037e7f90cc60fc0723922829282b57fa08559d1e85b4f46c17a7c4c0e85ee96516787fc78ed898d WHIRLPOOL f46ad65fd6a828de4129dffdb378731879c65a6695751bbda567cdc725a13acc7d9ee3bed2a2297847f3057787989d4cdcc2c8d18b19b4994e9379db0f028e23
 DIST kdepim-runtime-17.08.2.tar.xz 1506984 SHA256 9f8e781635401df1f27dba1186b1fb0ce88ea1c7ed17f6e1fcfbf297517c797b SHA512 60b1ba99c8ade659d836e70ebc412900d7c0d8637441b90d879ac5f7e69b64dd26c6d3a69bc555e518c21660768dcd510ceda6fe57b447940a09afea9f467fc6 WHIRLPOOL fce948d5c65f4c0d3d38d556f42a220108e0b91ab99d568690e023fdaa7e21d9c6ebe9ef69a70c6e00940e88d8c79a8b1529b4e318f117ea5e7510f52b352a9d
 EBUILD kdepim-runtime-17.04.3.ebuild 2028 SHA256 42acfd0b3fc2d4ac2b459935968c39303ae80a8a0e7cea66bc9a9a892d70688d SHA512 9b4fe519bbf20003a7b75b9b484144aee2744fb74147f976187d43f9a36b71bdb1f470b3751680b3473a4488a31ba989796ad343a2e40562c2a414d23951e80d WHIRLPOOL 1b8c8c4c6e753b96672a35d2729f2d623240b7a8d591186d92da8040e27cb67571614b6706c6e21ec7d6eee0e855ff29c0998d34b0cf6371e23446c372cfa6a3
-EBUILD kdepim-runtime-17.08.2.ebuild 1926 SHA256 f0bf6516fb4dc91b8f5a91927f914307149dfddc563a4b244642083ac386fa6f SHA512 9fe5ff06d38b3b1da98f7427e2f4eda656676cb5df3188471e16e47153363c57aadedb7ec30c08b35a7f0814eacfbf0ee3f2ee098a23e365c14563f1c59894c7 WHIRLPOOL a41892afc35bf9f036faacea444f9962862c930cd9e9a262f0fce09e942feef01746219b748ab0041d19635b56651a094a29365a18a378f9e878bd33edf6db34
+EBUILD kdepim-runtime-17.08.2-r1.ebuild 2074 SHA256 d349a0c8f03411d41af460517d8d91115f9f46306c58a8106e69e619bb3c81e3 SHA512 1e80e7429ab22932205a0aec7834de0b9f00cf3b7522ac83af9dd8ff92eeeeaaf5d10f836224172a87a71051db13566e02cd13fa8dcbfa8fd2c1df850c23bb34 WHIRLPOOL 5e9b9333f027a90f540d3f936ff6b8dad15f07cfd690a7be838be89e4e8848b38a2a996eaa9790bb77d874198b0dee77511d7fad52efd730d8a449eb803bdeb6
 MISC ChangeLog 5219 SHA256 16573a24520c7b15f28285eda89bbbab92c9066ed02973dcda90047cc21a2b43 SHA512 ca1fff8b10be33fb99b1f82e95a47ed3b634d5e3244860a7141acbfafa02d4ace62357c7e1c7bd7ed205ce53fc937e3daa43271ce3641db90882ffe365b3f8e2 WHIRLPOOL 52eb3275cebbe62195a06c974453e01e4ad7f02112fccabc14a102a7ed0c6a655a4a33e49981a249e260bccde833f7be392a8afd68ca529fc3b832f0c7298833
-MISC metadata.xml 346 SHA256 34b2dad11109f3fd95f1581840f507c1dec059fa1fe802207160fdbd33db31a9 SHA512 178970e394c27f4a7a6503636a393c12c6a43601f9c617aadf297535e031430d60af83c71a69903790f670747ce27342d076ab992fc82dfc890977c2bd81b712 WHIRLPOOL 132c9d80c377c41bb979fabcd84f9666b4093cddc4bd19c30fdc44eea73959b63c4c93ac96f87b24102e7de9f0b6473d659f63830a1f6a1e6a655d28eef886e1
+MISC metadata.xml 412 SHA256 6db317e716fcd1c48171602a48d7060ee05c2a42b058e23a2980d94201526c08 SHA512 101b4954369de91252b4da9e3c4e637ac694959da3707f3b4f6bf126c8a8f167b2de8413c4a2e5da47db41fcdc9a73285a73377b3dfe4549e8fe69736e372478 WHIRLPOOL 13e45916382d85d8b6edb391bee2c17ef2db285ab63b98602204ea895017569708852590fcb0bb770c53fc3de527d87351a1267c3740980f54cab21bfa210fce
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-17.08.2.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-17.08.2-r1.ebuild
index 4bc1495fd790..4073c1b8ac0d 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-17.08.2.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-17.08.2-r1.ebuild
@@ -11,9 +11,9 @@ inherit kde5
 DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
 LICENSE="GPL-2+ LGPL-2.1+"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="speech"
 
-# TODO kolab, Qt5TextToSpeech
+# TODO kolab
 CDEPEND="
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
@@ -59,6 +59,7 @@ CDEPEND="
 	$(add_qt_dep qtxml)
 	dev-libs/cyrus-sasl:2
 	dev-libs/libical:=
+	speech? ( $(add_qt_dep qtspeech) )
 "
 DEPEND="${CDEPEND}
 	$(add_qt_dep qtxmlpatterns)
@@ -70,3 +71,11 @@ RDEPEND="${CDEPEND}
 "
 
 RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kdepim-runtime/metadata.xml b/kde-apps/kdepim-runtime/metadata.xml
index 79bfb58e5487..36d85d6c5631 100644
--- a/kde-apps/kdepim-runtime/metadata.xml
+++ b/kde-apps/kdepim-runtime/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>kde@gentoo.org</email>
-	<name>Gentoo KDE Project</name>
-</maintainer>
-<use>
-	<flag name="google">Google service integration via <pkg>kde-apps/libkgapi</pkg></flag>
-</use>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<use>
+		<flag name="google">Google service integration via <pkg>kde-apps/libkgapi</pkg></flag>
+		<flag name="speech">Enable text-to-speech support</flag>
+	</use>
 </pkgmetadata>
diff --git a/kde-apps/kremotecontrol/Manifest b/kde-apps/kremotecontrol/Manifest
index 98f7b1f3b784..8ea331acd869 100644
--- a/kde-apps/kremotecontrol/Manifest
+++ b/kde-apps/kremotecontrol/Manifest
@@ -1,7 +1,7 @@
 DIST kremotecontrol-17.04.3.tar.xz 1074420 SHA256 8f77d8d6d6e87cadac410b3d5a1d654717fc15287210b05fa6b4c86a27813ed4 SHA512 e4c01fdd977a442416404b3a96c57919aeba947a45579b5ff8e3c360909d404a15de85568e505233990872b9fa8937ba66627b52a39d58c6dd7d4f7ff276e679 WHIRLPOOL 5e69dd13c04b3bc1dbd72c28d0786b0e5510d71156af0886a311296f1b68961baa2e0e64c5421ec13ebfb0928115f37b4e462e767ee0e2bba53951237d1526fa
 DIST kremotecontrol-17.08.2.tar.xz 1074380 SHA256 e9dc309378d090d710c7d24f2366abb540cecf036bc753db96a9307fdcfa6138 SHA512 c6b82cff1507b2f3afbf6d8096680d2124490c51179c8b8c68c0f53609d498ecb19c9c4f0865a96d634f5dc83bf25eebbbe7a666b8fb76fce72204e68285ef78 WHIRLPOOL e82ebc0be98bbfea7fde1363cbdc84852dae56bff82109ccb9aeaa52fdb6b05d83bf98a4c64359a4d03a88f75ceb6b5e2bf00dc8ad62c79a30fd3fdc1341218c
 EBUILD kremotecontrol-17.04.3.ebuild 445 SHA256 6459740e85e4244f6c78b9da88fd6d31275723b3fe6a2f207c113990535d13af SHA512 97e7d82b1776150f37559b9da7f212071901e624e5f59d52a6e0291d4d79aeca6ee15851c1498cc13a1bf5d96b6863514b1c9a22e0cb70766556f99c7cfd8e67 WHIRLPOOL cebaa575d85a1c8b052a98c6cab2feeb020669f69f41dbf21003e3d0bfa384272156b5bf2d37e0a1e266d899046a822dcb666c08b8d8cb809a6f01a33a4113c6
-EBUILD kremotecontrol-17.08.2.ebuild 410 SHA256 8d8e2c802a7d087cf2ab52e6d310407ce6f2e7e208c1af0864be7a77087ccb6f SHA512 71f1d820d191d9a079f984b77c1907070d3d11945152335301ce09ab75a72a6e139eba7d72708cc83799cb30958f972f3a96453be7664bd91046cdc03f853c28 WHIRLPOOL fbbd412e2b1f88f583b5c62cb85aea7837885d1d14e851329f4ae118faf109c30aed9fbadcf75a837c1ac75bf92322ff2f48712c3ba9e56708eaa667972e786c
+EBUILD kremotecontrol-17.08.2-r1.ebuild 467 SHA256 0c84a3fe3b2841c0db4bd9d255d05c8d164520b97f329a5bc2edc99af5fa546c SHA512 159139e2ab78b808fe46ec25e2006ec8e99b90b2d5c57d69d62a5259aeeabd22b6c201ee41846438f1c224df88a0d6113bf87fab17d5bc0c030013cc4a8a9f44 WHIRLPOOL e8147922723fbfb0697d0ca95e432602223028350dda0f7429d66709bb810274163dc6fd72eb4ddf60b37b36339d71672b3a96d1a04f506723fd6081a96e40d4
 MISC ChangeLog 7679 SHA256 7eaa505fcea18032c38716cb0c9b6421b4515071cf5468dd8f4d52aba252b86b SHA512 0d41a54264093a80e877cb04b76a5242a3cc48116bb4203f9ebb6abaffebc7d97cdcb3c55d41b553a6073146ff51dadcdd8c5411c686021762d5200e5e019b35 WHIRLPOOL 07ee00baa2436b6c9d459c066a90b00d533f7fd26679269938795d0c9b1a9391c900fa2f4bea7501466aba73cc4009aee67b5e9cac7cb34637d658dfb7fab02e
 MISC ChangeLog-2015 21097 SHA256 083379ba781daa7313d1f13a93047096e142dc0d866ea81d3a9e74f49b0e8124 SHA512 44242e5a47a1c7ff59f40a371f1e979200c9a5ef916696a2bbbf5bc7e682a775f9950cd7526f5e6ec2e7459695c6e2f071215dda3062a5bfdb22a7acf69dee00 WHIRLPOOL cd2fb37cadc302a12e8d9c1f24ca1d96711efd919635526d27ef2fb233eb0695a12e4956bb57754b80d4282283cb36eafc4e574592d24ed67c2ca6d705b3161e
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-apps/kremotecontrol/kremotecontrol-17.08.2.ebuild b/kde-apps/kremotecontrol/kremotecontrol-17.08.2-r1.ebuild
index 8ecc2d93ce57..55332369ef06 100644
--- a/kde-apps/kremotecontrol/kremotecontrol-17.08.2.ebuild
+++ b/kde-apps/kremotecontrol/kremotecontrol-17.08.2-r1.ebuild
@@ -12,6 +12,9 @@ https://utils.kde.org/projects/kremotecontrol"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-RDEPEND="
+DEPEND="
+	kde-frameworks/kdelibs:4[plasma(+)]
+"
+RDEPEND="${DEPEND}
 	app-misc/lirc
 "
diff --git a/kde-apps/libkface/Manifest b/kde-apps/libkface/Manifest
index 33951217bc2d..49baad600af1 100644
--- a/kde-apps/libkface/Manifest
+++ b/kde-apps/libkface/Manifest
@@ -1,7 +1,7 @@
 AUX libkface-16.11.80-opencv3.2-gentoo-3.1.patch 2093 SHA256 416ca9f1f834c343b2f116c2dea92703c2eddf4eef8b705ccc5a34dcfb7431e4 SHA512 f3af458544a76bc5aa6efa072c712087c3811e1e2c3e6b530b311c3e15bfeb893f0eafbfa2fe9473371548f720275d6c6ea6ff84758e279a428614717b785b0d WHIRLPOOL bfdd582e7bcc1ac55a839ad91ec58f3239f9681c2fdd581d4ae307942754c2dd0aef91f16b1f2b45232cd60b787d124ec2fb5e29bb66b97f9c58ee6b1fbf5f92
 DIST libkface-17.04.3.tar.xz 8983824 SHA256 59091098f2e76a405f65b50feafbd1534dc4c550a529910cee3d0d1786842f20 SHA512 5d776365f83228d6d76c47d79c0c5b4c4cc30de6d7d6ff7e67625844c6e056d0f592827bbec2509fdb034ae93ed8ed548dbddf611c69f0919eff4182de19c9d4 WHIRLPOOL 21060d176aee24f3dc371378956a099bec223011cb0d155b5e0e3755f7796ed15623fb6583daca92b8fd29403bdad574413487c72308a4d3956791cbbc918b8b
 DIST libkface-17.08.2.tar.xz 8983700 SHA256 6ece21c12d8ac42db2ddf9e0dd715962256ae933fb779c2f579dbda61a793bf5 SHA512 d528d60bd3a634aecdc84376b4fa1e0331e10329d9609eddf3f7cdc7624424f635deda17d00621e8ce5a391f2b8cc11f2c73ee5ef191f07800aeff41459b6775 WHIRLPOOL 8d5593195412270d72305acc33f0d0043a04cf9f84a71c591cc87ec18d92590b3a42c4f2d3539cffe4927fbf192070f35696df9202d1224cfd9fa5ca202a9bca
-EBUILD libkface-17.04.3.ebuild 823 SHA256 ac16710bb246550c8b33fe2c7fe40b4fd70ff17c146987a3809d346a33eb80a5 SHA512 504c08c1fa70465cd00bf89a7770af185a2731b0a31e81a98b8d39a05fbec5310ded6270c518b2258f9e1636cc01d4aee09b7108d49baab3738a5d1d19a8facd WHIRLPOOL 1b6b63e46f78c3ecfba309754d2450d211fedce60327edf9e3ebd3e8f73a77ec0d2d604fb3662cc9f66981717bf16b8ce95f3e5cc02a6a6d91ec8031f29cbf06
-EBUILD libkface-17.08.2.ebuild 825 SHA256 0156633bdf2ce571be0b11871a8fed0c272db5abf1913b3b5ba9c0c07d23fc33 SHA512 378d07c58becb43412b9cff1e98916e5a63f40942efde1b8e074de3ca9403a76940c80c7aa3a4ec9cfe4760bb9f888c861653f2539265fd8407d76b3f4edeed8 WHIRLPOOL b6c525a6d7e8cba34d5c4dd1f8af500383a93d343f8a28b243d395773e0cd269b69917b302fffdd5fbf80c37c3382f621d2a546e0131e1a44821de99f7cc828d
+EBUILD libkface-17.04.3.ebuild 853 SHA256 aa1b3584603a12375f6137a16b4cbd813210a81124506b87125a58b0ee8e2eb5 SHA512 fb110bfe446dc68e913d8cfe7505cb36ba35ef5959e9754f618aa6b1ed264f78b2b38f6e982fb3d26f9812c21a0f9f6ff5e3e71525d0a8c6407050aa5e4f814f WHIRLPOOL 206f5e637b458fe08e73b14adaeea9f24cef9850db8766aaa8f337fec99bb3d26060cf61a57866971c04b5176b7c19d5a48c784e5f4a5ae6e8cbc5470372f9ec
+EBUILD libkface-17.08.2.ebuild 855 SHA256 f9e62ac9cbba8bcc4776b00c00f5b7c131535639ad7584e0145d7d6e60dd84d0 SHA512 5b0dee2d0dffcc229729032e5b9ed201208e32cd3a6c0d9ca62cbf98fc61b6f341acd74f5e8c5d3fa9e58bbbe411bf945fa4849118219680a816ce71fc9a9a69 WHIRLPOOL 773bad1200b31f81e1be4e73d5409c4907eee0bfc8eeb630ca03f4eb5af9f54ea3a3cd59bdffd03f1d5ce6de47efb2d885a74578a6d4a955658d0bbf32da6521
 MISC ChangeLog 6322 SHA256 99dbe73d40311e62becf4d11d6be7259441805514bca3c73af006a03bdbaa716 SHA512 a3bae51997535f419233d6a878096309e93a9419acd571e1d5df2a09d510c0fdaf706cd051dd807c9e4e92b72658aa7ff304d0473a2e3fdd645b2b8d034cdee0 WHIRLPOOL d4a18d25ef017f8cbda1c4edea9722d2f2f835ece493f1191775f6e02e19f4fe41cb282c2c111c16d7fab2b6cbc4dca2826261f2c852611d431363906759a6f8
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-apps/libkface/libkface-17.04.3.ebuild b/kde-apps/libkface/libkface-17.04.3.ebuild
index 414a7dfed27a..81b115b45111 100644
--- a/kde-apps/libkface/libkface-17.04.3.ebuild
+++ b/kde-apps/libkface/libkface-17.04.3.ebuild
@@ -19,7 +19,9 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 	media-libs/opencv:=
-	|| ( <media-libs/opencv-3.0.0 >=media-libs/opencv-3.1.0-r6[contrib] )
+	|| ( <media-libs/opencv-3.0.0
+		( >=media-libs/opencv-3.1.0-r6[contrib] <media-libs/opencv-3.3 )
+	)
 "
 RDEPEND="${DEPEND}"
 
diff --git a/kde-apps/libkface/libkface-17.08.2.ebuild b/kde-apps/libkface/libkface-17.08.2.ebuild
index b0d6c7809e90..e2b337582181 100644
--- a/kde-apps/libkface/libkface-17.08.2.ebuild
+++ b/kde-apps/libkface/libkface-17.08.2.ebuild
@@ -19,7 +19,9 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 	media-libs/opencv:=
-	|| ( <media-libs/opencv-3.0.0 >=media-libs/opencv-3.1.0-r6[contrib] )
+	|| ( <media-libs/opencv-3.0.0
+		( >=media-libs/opencv-3.1.0-r6[contrib] <media-libs/opencv-3.3 )
+	)
 "
 RDEPEND="${DEPEND}"
 
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index cf324a4f2441..4ceb63ca3c2b 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -3,7 +3,6 @@ DIST ktexteditor-5.37.0.tar.xz 2285796 SHA256 7ae65ca215a53dc4e35877069004c748d8
 DIST ktexteditor-5.39.0.tar.xz 2288920 SHA256 c5d9c67532ab6f3abee8ae2623ff21e6ca5280d5ea9ca5d23bdb55f937e565ae SHA512 a76828be990bd32275f7de2448e337750aa1766eed669aa7a8c199d3d7db002c9d2193d09cac789c73d7cee783b9b85a21f50563e5beff30fac484f414145f6f WHIRLPOOL 691161b943d569eb634c9c4464e4019e6391caa37b9998a4c1bc46f9fd15e0a87dc118e7b2ecf186a789c138fd18b8a4b057cfaa5823520d52a11c6d2f8d7f82
 EBUILD ktexteditor-5.37.0.ebuild 1420 SHA256 1082a12b0fc4b96a5f89a018e84d1e3b2cf948a33d8a266d53b2e5a60fb2e697 SHA512 ef59eaf8fa5ccadc5203cd001cac39524d55dad4c8984af027ab153c93afa07be775223dbe158f82a61804695ee2e5ef740a3b0d50fe62374996bfad367bcede WHIRLPOOL 64b6d7d14e145ed46c5da566ffbe66c20ea4ba3d1c005eafed9ee31bdb644b476028ef2ba1bda2b5ac34b4c68bd2e256d6f47a3029ea79be2e10a395b29b2f0c
 EBUILD ktexteditor-5.39.0-r1.ebuild 1473 SHA256 735fc00512ca9c957a6fa753ee9b9c29353641d0d579846b0562b3b5769f7500 SHA512 250e0fa009323911bf80e3e55f3c91bb0bde9ae56f6941a85af4a1e39cbb3562ae29a9e3e761b2ebf84db5f8ec56334a194a9bd10db8ebca22debad90ba75116 WHIRLPOOL 8ddb4af8c9a6c23cb02619a24a83f76c5426db99e8be0347ca3aa53760e6c28022b33c011308404f57c362612249143470b92de69df1fc4735269d65d4601fd2
-EBUILD ktexteditor-5.39.0.ebuild 1427 SHA256 009c31ce11608b51e9a2e16ecbcee076b28c2bff54b9a2e1580b635701504151 SHA512 083135bc4e4dfaa5b9acc2ea2a854a4400e89fd087191e98bd4379fe613f3d0b24f289bbc9635ca5eaefca0c2ff2ae58ef79fe6d1107fdd58680146fdc624d02 WHIRLPOOL 23dcbc6c26542fafb0e528de0f2fa8c26e6bad039c5e514cd0be72394aa035d2084629a8109ead90a632f86d6aebc1de687a2079585670fdb1abdfe628593bea
 MISC ChangeLog 10114 SHA256 0586b579e155663504df1b27ecf6ce2f2a68975bccba42da9a746907a3b95640 SHA512 efd826e1c2a57e20912681a6af2987501e1317ca6923141392eeeefcc3b63e93b3d655ccd5328b947c91e0a75c44b3aff0ddc52a341edc48d03d8cbb52f09286 WHIRLPOOL 0efd04b8cc659d0ded525f99fcbf8dcb40b5ef2c7c03576a5214f636600179cd9b3136c9d8072992538fba013a9b7e79dbb1cab19dc626621cae32df201abcd7
 MISC ChangeLog-2015 2515 SHA256 b3a2f5199138502c8ecfb5650140b6675321573df702d7e6faf09d82a299dd69 SHA512 6a5f4253fb25609548ebe3562372a8d139974306018cad052a6ac800178f8d565353081fe3c8b42bf33b959f07e0922503685f43e392dc31bf47ae4574d27df1 WHIRLPOOL 9ea0b7ef0baa2d8aba454ba9b2fd1f9e36fa1b875944a67655dbb15d71516be75124cfbea846759eec4cc02e641c74c2f327f607038b544056d370f6f7f32d18
 MISC metadata.xml 351 SHA256 1b70669a4d83c16f227dde57ebd44aa81ab6dce784da250f7d82df11b7bea057 SHA512 e87786bace9486ef7f23fe747b3a880af51a6b0b2e7dd7c0e6c7e597bb9ac11e787c403e15cded386632d13682061f7dbcd47e2b411b12f998de964bbfe57301 WHIRLPOOL 6879cceb316c57c33e43837b41a547e0d283102c7b05c3290d7f9d4f9d87ec69677b18d5eeac6bba874731dba8af9b2fa8220d93208592ee6b6a0dfdc79f6f9c
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.39.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.39.0.ebuild
deleted file mode 100644
index ce4cdc432cf4..000000000000
--- a/kde-frameworks/ktexteditor/ktexteditor-5.39.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
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing a full text editor component"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="editorconfig git"
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	editorconfig? ( app-text/editorconfig-core-c )
-	git? ( dev-libs/libgit2:= )
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep qtxmlpatterns)
-	test? ( $(add_frameworks_dep kservice) )
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package editorconfig EditorConfig)
-		$(cmake-utils_use_find_package git LibGit2)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-misc/kio-gdrive/Manifest b/kde-misc/kio-gdrive/Manifest
index 4cbd32fcc917..a5059b551f91 100644
--- a/kde-misc/kio-gdrive/Manifest
+++ b/kde-misc/kio-gdrive/Manifest
@@ -1,6 +1,7 @@
+AUX kio-gdrive-1.2.1-doctools.patch 317 SHA256 c9faa7bc903f26e7bd66ae49ab74921b6ecea1fc0030e6fdf35515a1fd128aeb SHA512 467e52dc07cf1726f1bd1231210cee145edd79de560814e9cc9514c1f4c13e369f062de0f8ba4eb961aec0878a96ce37e1555c5c968e70cf8bcbb014b13d1431 WHIRLPOOL c22006a46c28637d0e59b270adf311e6f9b1938a13d3ea49b32c9aa2366ec405a812d35f0da69fe29a7728c41a99917fa1383b0530efd8868e277ae4e383abe8
 DIST kio-gdrive-1.2.0.1.tar.xz 34356 SHA256 7abe7352ae87e16580c6274502c7475d00d852bad96052aec5a3ce09f70a8009 SHA512 8f3cff889ff91c7775733f067ba45097d89e2f98a5ba1202d2fd55645973ffcf03f18002ce73fb5221706d51551af3d44ee2c41229f5c272ccf6913fcdb78c47 WHIRLPOOL b8d5c135123b2d94e0233ed3acf5131c97b3937b5897aadbadb9259b457449d48ed282be09f5d4029f328e1664a98f30b038837daf56dbba2a51f31eda31fcff
 DIST kio-gdrive-1.2.1.tar.xz 33820 SHA256 d0c778538dc20412a944ccbd48fd99dc5f531e4df914bf8cbdf813371e857ca3 SHA512 021612192adc4173d936ee5f16d959db6c2d74aadae0d6dcb25aa1b8f1cd06f650e870d62eb72c9efbd9b581b06a949fcd78f494ec63eaac9ad67b16a0f0ab79 WHIRLPOOL 921771881c3a36f163b9d4f8333fc9ddcfb6c7944769d3f3b36b154f7a1a7684efb25694c04a74d7d1a22e9f2d121c12fc5b6627a51f120c9f0db5da4cbc06d0
 EBUILD kio-gdrive-1.2.0.1.ebuild 976 SHA256 34caedff558eabb949c322ff41152516cb48195d0321964c59c74ccffe077ed9 SHA512 f3e0cfa516f0531eab6bc4ad9ad95dc4605998f950b3db0342eb5ed6f60d0f289a33aaa2146ddf58bbb786812670bab196793b9c45a058bac12e33753fb96b60 WHIRLPOOL ff97df4114f793cc4df7b96d2b3f40bcd62dff265b8b00fa608ab664473c12ed34b87164ab447a8f9a867efbf1c563035cf9489979b0544682c1c9aaab417c75
-EBUILD kio-gdrive-1.2.1.ebuild 978 SHA256 23d7b63a8ec4fd3b67d8cf938103a249113e8615dbd28a7e366c1ac171390a48 SHA512 71f44c2a4d46bced1db936b6879596e949ba74ca240acde5b02ad149641ef0d656b111f3dd48f8a0fb103931201d43485f89e642dfd44ddab8e6f28023194ac0 WHIRLPOOL 57352637d77c10c968480b963e7fd48d789b0374c1346c1ffa36bafed7743f68c40f8102b4cc0dbdf80b547e4103cafd0ab9c3d177f29a7f0f14557f7bc84e6c
+EBUILD kio-gdrive-1.2.1-r1.ebuild 1102 SHA256 100e3cf1e61d1b3640911382db2a892143bc5b0ac58855c66b8b1ca0cb808542 SHA512 d8584e5862408e0ef802000c7f897ba9eceaf0798aab5e67ab19a0f960925188e6c8584fbbf6c69b22e2c3dceaa4dde4e870961371e3723e28065b60828139f1 WHIRLPOOL 6bc4cb0151ebf960d2ece4c9be4d6e4ddb2c775b88d810e6ca85323b7d2c6d17fe4b835b417f9fe48a8bb8955cf5aaa221821ab547690a8fbe525bc7b49c6a87
 MISC ChangeLog 684 SHA256 a50610f0d6d3d81225a74a7600c79d51fa75b78354c30f28b4caa48906ddfb1f SHA512 f68b8e3310f5ddbc6f883692ca4a351b3f0cb430f894da8d2736766588d118855e574a8c0148a73d03fed28ef4f62838fd9be4777f3d3be7e2f697664ed2515d WHIRLPOOL e3eded08ed9c31b5ce3e89b3c8606707c58cde7c03387192e2445bdc5067e2a029103d072918fae41c4fb07a40f3c57b99cd9062416d3fb2803b2058793f201a
 MISC metadata.xml 402 SHA256 244fb7e710486f27ea9b74706eb528dff8aa621720f64afe259a2748d4748e54 SHA512 2c94ff5a07cb0a89d93cf798ee2b9a9f163f448e9d6d3185c06d58b42c1a9ef480adfafd540a021d4f9ebab6bb78e979c74e9a83867abff13f66b2b35eaafd21 WHIRLPOOL 3f1c15aa2815fcd1c7403f1609677a00999107cbb6bead3fec26d9d7cee744ecbcb4ac552e857cef2ef2f40edaa221bc6a7b37551c2bc9bf161af58140b8c6e7
diff --git a/kde-misc/kio-gdrive/files/kio-gdrive-1.2.1-doctools.patch b/kde-misc/kio-gdrive/files/kio-gdrive-1.2.1-doctools.patch
new file mode 100644
index 000000000000..7ddcf1428b52
--- /dev/null
+++ b/kde-misc/kio-gdrive/files/kio-gdrive-1.2.1-doctools.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2017-09-30 17:29:04.000000000 +0200
++++ b/CMakeLists.txt	2017-10-19 20:51:03.198871146 +0200
+@@ -80,5 +80,6 @@
+ find_package(KF5I18n CONFIG REQUIRED)
+ ki18n_install(po)
+ 
+-find_package(KF5DocTools CONFIG REQUIRED)
+-kdoctools_install(po)
++if(KF5DocTools_FOUND)
++    kdoctools_install(po)
++endif()
diff --git a/kde-misc/kio-gdrive/kio-gdrive-1.2.1.ebuild b/kde-misc/kio-gdrive/kio-gdrive-1.2.1-r1.ebuild
index 18c73a7a5a0e..8f56003417b6 100644
--- a/kde-misc/kio-gdrive/kio-gdrive-1.2.1.ebuild
+++ b/kde-misc/kio-gdrive/kio-gdrive-1.2.1-r1.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=6
 
-KDE_APPS_MINIMAL="17.04.0"
-KDE_HANDBOOK="true"
+KDE_HANDBOOK="forceoptional"
 KDE_TEST="optional"
 inherit kde5
 
@@ -18,7 +17,7 @@ fi
 
 IUSE="+kaccounts"
 
-RDEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
@@ -28,14 +27,19 @@ RDEPEND="
 	kaccounts? ( $(add_kdeapps_dep kaccounts-integration) )
 	!kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] )
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtnetwork)
 	dev-util/intltool
 "
+RDEPEND="${COMMON_DEPEND}
+	kaccounts? ( $(add_kdeapps_dep kaccounts-providers) )
+"
 
 DOCS=( README.md )
 
+PATCHES=( "${FILESDIR}/${P}-doctools.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package kaccounts KAccounts)
diff --git a/kde-misc/latte-dock/Manifest b/kde-misc/latte-dock/Manifest
index 58a699103555..25965a0fe463 100644
--- a/kde-misc/latte-dock/Manifest
+++ b/kde-misc/latte-dock/Manifest
@@ -1,6 +1,3 @@
-DIST latte-dock-0.6.2.tar.gz 387854 SHA256 3de5826473f467e2f92fda5296dc1cb4f73aa7cf11c32f5a43d5886b899332b3 SHA512 06bafebddceb57e02c7af806e535b80ef8ce847c9ab4107c77b45815925fccf4e524099218189343da56d9205d89d455f8d8ba5bb2f1ff512fe2cce48946eda0 WHIRLPOOL 829ea1554fe5935e8f8a83bc0efe24ac9e886eef1e072d7f579920636d7ff01deca194e108c8889eeff57c013480f63c7eb6b4ac32a426e11c52e27945a45da6
 DIST latte-dock-0.7.1.tar.gz 1788443 SHA256 b57a5495370fea6ae61f8045590d958c477efbe454690ea52d992d8ec76b80ea SHA512 8bf0acbb913bab7bfa0f9d75ab121dce6c6f86cc5f8f79ea0279f226a9cde4a1f67589c82a78336deeb140008687a3fce252ea5f85d69d3636b75e18180cae00 WHIRLPOOL e8a78f14a0ef431b6afdf48b9b548cf0e983dbe1f4d8b4b69cc6b8788cacc8340a09d4b059f24997b48c972130c85794bf96e1ca49e82e5abafb15003a69a6e5
-EBUILD latte-dock-0.6.2.ebuild 1853 SHA256 a2ab7d6e41df2e2db0a0592b6eb5fff8b3a3ac9d95876717bc677044e567ca4c SHA512 60e7ce85a7d7a9a73016a113d376492c20ccb3bfd31aafc7d26779a72cf7981e40b3cf045a7ff556fba42fd22c82a6f68445cef5ec26e65241823ea2d2fb953e WHIRLPOOL 86d0201af60e09ce0433ed7cedb643b8d701404b5bd5abd25312293a63f9777947e7c3c47cd0283a9ade5d4e22bffb9ba9778bf671ecea57a7404cebd0429836
 EBUILD latte-dock-0.7.1.ebuild 1644 SHA256 e027192ac8673ab92a91a7c06548ba9fc1b5efac8a3a72cde0ca1f75a9ca8c32 SHA512 0b4a3da3cd5a9f9cae6db58ab7887f84e56af452a71ecd392589b39127d88b5031d2f330b3aa893320868f9b251af870a3fe4194ed16558d3705e98faf047c42 WHIRLPOOL 306b3e4eb28d19374c5ab8c11da80bf3b84531af2cb85970b6e7a144e22055b674181ebfbf2970e7c79f1b27de9c3ba7a15082fac12a0ddba3342ca14e28d5c5
-EBUILD latte-dock-9999.ebuild 1644 SHA256 e027192ac8673ab92a91a7c06548ba9fc1b5efac8a3a72cde0ca1f75a9ca8c32 SHA512 0b4a3da3cd5a9f9cae6db58ab7887f84e56af452a71ecd392589b39127d88b5031d2f330b3aa893320868f9b251af870a3fe4194ed16558d3705e98faf047c42 WHIRLPOOL 306b3e4eb28d19374c5ab8c11da80bf3b84531af2cb85970b6e7a144e22055b674181ebfbf2970e7c79f1b27de9c3ba7a15082fac12a0ddba3342ca14e28d5c5
-MISC metadata.xml 460 SHA256 963f45f48a1c05776faf33d9fc27b708f367080b17b2bac2da1a8d126732d0b5 SHA512 381cd3adf4bb50eb998359d061844d129ade891bd197eebd19caf5a5beea0af1f7bc00fcab1cde54d000a1e15ebbc0f87404496bd24555f3a0441313c95a13a7 WHIRLPOOL 8458a33cdb43e4e500d44c4d935beeed93c8ef677c8672a01538f8bfb810f2321559551dd7b957785d1e15165a52ec2a4053f4543fa02bf92f84125a5b238f17
+MISC metadata.xml 453 SHA256 ef2e42212458e3818a1d324fad263b635f34a4590eed0e34b71fd425e77d5243 SHA512 5fd22fbf848fbbc76422a4002e5efdddb8a387c406fc45b580e1ec93c36cd2407582770d5d842367fa0d7dd7fceaec196cf0202f56bd5144f89b4f573c2d9c35 WHIRLPOOL afdac09622c15654aaca13b9ed1f8e1fe4d78f4c6317b5072c2abb24caa9ddecb76b072c6366d6880121ee2b7a755711ff58c844bf10d88a7bf8e03089b99408
diff --git a/kde-misc/latte-dock/latte-dock-0.6.2.ebuild b/kde-misc/latte-dock/latte-dock-0.6.2.ebuild
deleted file mode 100644
index f05326f2ed1c..000000000000
--- a/kde-misc/latte-dock/latte-dock-0.6.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_GCC_MINIMAL="4.9"
-inherit cmake-utils gnome2-utils kde5-functions
-
-DESCRIPTION="Elegant dock, based on KDE Frameworks"
-HOMEPAGE="https://store.kde.org/p/1169519/
-https://github.com/psifidotos/Latte-Dock"
-
-if [[ ${PV} = 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/psifidotos/Latte-Dock.git"
-else
-	SRC_URI="https://github.com/psifidotos/Latte-Dock/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/Latte-Dock-${PV}"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma X)
-	$(add_qt_dep qtcore)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtgui 'xcb')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libX11
-	x11-libs/libxcb
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep extra-cmake-modules)
-"
-
-BUILD_DIR="${S}/build"
-
-DOCS=( CHANGELOG.md README.md TRANSLATORS )
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	if has_version ">=dev-qt/qtcore-5.8.0" ; then
-		ewarn "Qt versions >=5.8 are known to cause runtime problems. If you"
-		ewarn "experience problems while running Latte Dock, please check this"
-		ewarn "out: https://github.com/psifidotos/Latte-Dock/issues/183"
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/kde-misc/latte-dock/latte-dock-9999.ebuild b/kde-misc/latte-dock/latte-dock-9999.ebuild
deleted file mode 100644
index 5dcfa44e5bcf..000000000000
--- a/kde-misc/latte-dock/latte-dock-9999.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-QT_MINIMAL="5.7.1"
-inherit cmake-utils gnome2-utils kde5-functions
-
-DESCRIPTION="Elegant dock, based on KDE Frameworks"
-HOMEPAGE="https://store.kde.org/p/1169519/
-	https://github.com/psifidotos/Latte-Dock"
-
-if [[ ${PV} = 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/psifidotos/Latte-Dock.git"
-else
-	SRC_URI="https://github.com/psifidotos/Latte-Dock/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/Latte-Dock-${PV}"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma X)
-	$(add_qt_dep qtcore)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtgui 'xcb')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libxcb
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep extra-cmake-modules)
-"
-
-DOCS=( CHANGELOG.md README.md TRANSLATORS )
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/kde-misc/latte-dock/metadata.xml b/kde-misc/latte-dock/metadata.xml
index f25a8e14e49e..74f77d024f21 100644
--- a/kde-misc/latte-dock/metadata.xml
+++ b/kde-misc/latte-dock/metadata.xml
@@ -6,8 +6,8 @@
 		<name>Petross404 (Petros S)</name>
 	</maintainer>
 	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">psifidotos/Latte-Dock</remote-id>
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index f15c6775e18f..356c40a3dd65 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -3,7 +3,7 @@ AUX graphicsmagick-1.3.19-perl.patch 491 SHA256 98899a22071a112e332bbe2dfec119e0
 DIST GraphicsMagick-1.3.25.tar.xz 5387880 SHA256 d64bfa52d2e0730eff9ce3ed51d4fc78dbb68e2adaa317b2bb3c56e6ee61ac9f SHA512 d62d6aee96d7b8444f1aa206b0c5cbbed9511612cb71d667af072ea52b68dcd11088699debc58faacbb014ad83fb8c2b3e474220f506069f7b5d22f0340f8ef8 WHIRLPOOL 8c2ffccf588495b78e0d84737e83ae396cbe86efa5dfddf6ec440626829d7b83f036771ec8be585dae58c3076eba8190ee809f0c09fc74c744efec96480a634b
 DIST GraphicsMagick-1.3.26.tar.xz 5400564 SHA256 fba015f3d5e5d5f17e57db663f1aa9d338e7b62f1d415b85d13ee366927e5f88 SHA512 b33ca0f1c858428693aee27a9089acff9e63d1110f85fa036894cfefe6274e7b2422758ea39852f94fdb4823c9c3f3c44b0d8906627503301f5928096f739f22 WHIRLPOOL 8c8874c34be6c921dfc5623352a04d2cf502f2b28aebad1f8d63c1067d5ffa7af6a22e9b9b7095bd98674ffc5c456434598145721431d1d5f7c7e68ab362e238
 EBUILD graphicsmagick-1.3.25.ebuild 3162 SHA256 9772c4d5ffdfbe07e98e4e9597f845925a1b5a29c8890e4c7e64f130bc9d5f8a SHA512 ec889b617290ea3163b25be55260dffc754867db2f730104de45b465e90ad31550fd451c813d52dc611e66f5a2639e5d4923e48e25a5ca49ccd8797183385c32 WHIRLPOOL 617d7a9a3c1ad531e39107a9c1dcf3497e6adee6cb72e4f515afb70e2e273ff9e7f8e320253bed59cb028f913aaa1fc6bec36e96380237cc2583f8a67f8c7bb0
-EBUILD graphicsmagick-1.3.26.ebuild 3282 SHA256 3778b309dff47b0b9d2a8b149b2154a36b1903d2d9adb2792f8809934ce21cc3 SHA512 d3b3e7ad5fda12c5690f2fe565cd5dcd82477c3b35b7af78387d84d707e25688b453c9da5193f188434ff3e86ae8d7da0ab97b5f525b2cba412106f26f538b61 WHIRLPOOL 8b712f6b02acc08eb996e897fd37594a900b0b34b43cbc7c9b541943b25e0a3380b4d5667289b4df3d8f270d96be85c8a67f91f9919bf23c3b6f903d7b0525c7
+EBUILD graphicsmagick-1.3.26.ebuild 3281 SHA256 0d820796918a20a075a2de0ad80fa9e2babec7a6fcc07ae349fe9851efec6c2e SHA512 00779d62e3be7117b5d61950086f16969f8117f0732ec3aae5d8e9d850cc33f497a3322f4c564c0bff96f98db22ee50389c37b5b09a7775001e952aa3df01e3b WHIRLPOOL a1512696dbd6b1673d8c2d730eb3f09d56a5cd0885639bccc7f5cf3f9377844e8f07ef4d0dce1d0ec74c010524e968df6bed071f172d3dfc3f04a6efc6d166e9
 EBUILD graphicsmagick-9999.ebuild 3283 SHA256 604914952995e6c0e53f6b86df71007a8e9c3b13a6351546b82060e3a5970817 SHA512 361ebf78cf28c28073a786931e0470e8bbf0da188edd5c9b68e51d1c3cf04916ead74e743b9fd8e5980bb9de37c4d639c5c32fc630665d55e6fc9c4717a15480 WHIRLPOOL dae4588534d0b627051adae32c8ac6d9b10593bb7e9c6a443e2f9979a5fc9ae9e59d2ae501e90989bcd23bd6361617b1c7f3219a4310e3a26dddf0a5e2338e26
 MISC ChangeLog 8279 SHA256 942d53bb0df3374e5a890ba0fa3b6410a4570e4f32a6140422760aca294f2729 SHA512 4e57e7d633fa10818e13e5b66cbd914a8d359bd1982d828c11328cb52eb00994b0ae62e1917722085736c16e06677da0e67e76b92eb38cb130f13adaec362e05 WHIRLPOOL 21c6e65a2aa94a1588479e9b42943c774507f49127db5c056c3b9d6652562cec97d32e68817052c5a8e95fdfa4f36e710a22e3c55e08fcf88ab31e32005d3b3e
 MISC ChangeLog-2015 14451 SHA256 22b7127860406f4d3c6e56317c76c6765e1fe46a790f238506c83101199c9a92 SHA512 50e9a3c6b90e6ec809048762d154a075f4e3c9468bdfd8d1cebdd4cda067f82a9e58380c7c74565058de80cc4a180558613d9c5c7459bb5b13335b6a84db0cc0 WHIRLPOOL 7820861ab3397fc23dd4a497cc4860beef98393d0e6ed95b82dc35bae54357f8ab4bf2ac6c270fa7bfb6fbcea959f955272cee989b0ae8cc4715226464d6a741
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.26.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.26.ebuild
index d1958488f431..2189f940ff40 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.26.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.26.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
 else
 	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 9173876a3f97..78210c7da7f1 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -3,7 +3,9 @@ AUX krita-3.2.0-tests-optional.patch 8806 SHA256 839bf01eccee18c6dec2cf2b0ab5d47
 AUX krita-vc-fix-gcc49-abi.patch 539 SHA256 c2d38b00853df1fccd2b161b53f8b7b65cc81777ef33a6ee6a9e62d6bac76615 SHA512 41e750c336ce2869d5653fd47ce951977af74bd9d8cd0da6fb3d1bcb770759ca531dfe5bcf9f6d1cb4cdb914f7d374b97c9b3a59fa318f121fccf7527654dd2b WHIRLPOOL f47005d4446f5986517b54fc1979138119ffd99edeb7f7f4cf17967e979fe97fe30eb8dca2a71d3d35c02b791de58d63069f18edc35abea4e07775cc5275e45a
 DIST krita-3.1.4.tar.gz 209778186 SHA256 741837b0d12afa795dbbca45d5efc78966f3041dbfb22a268c101c7dc23e82aa SHA512 6695d8d09552de2d98cb4a8fac1aefc6b5e35df50d7b72c088f11a25af54574b303a7445b4a9cb099844cdf0729a185f03fd208ab2f98329123398fd54a374df WHIRLPOOL 9b8819432594d10377ef6db5adaca06193044203ae5b870a2f014171c817dd2ffc251bd20af0a05183251a798d06fc6aa7b33c1a640879af3ac3c01c0e9869e7
 DIST krita-3.2.1.tar.gz 207014866 SHA256 ef06cee677d75861edca0e1f825bca42ff59b7200aeb827e16f8d1fb5ef14e39 SHA512 ddc7153a3fcef072de762cd48d4d6df765cc88b7a413028b3aec5690382c1ab7f61f6ae37070c78ef2be1bdc26107908d288976bfa12d14ca35934ce33fb10a3 WHIRLPOOL 79bc89b7ebf63b2a31bac726e91e4b77bf7b2a6eafe15a6bf15baf935f2bf56e2f612359fc16c7129251623dfe4d7fe53cd9d2f42d423385487a832309afd17e
+DIST krita-3.3.1.tar.gz 207093337 SHA256 5fb86577753b28b8915ae993c80a417f388977d04159feb69f5afc0e592bfee9 SHA512 b4293e9166a810142f7a5769415f1693d91d1749aa9c4e4ac77686eb705a28522a83242955cbf0f1b64da8c7f1b79a2f3118e04105b3478a090b4fb49baafb7f WHIRLPOOL 571ff3449bb5ab4996bc0dc7712418bf7f1ec4cee905152913b3300155fb7e1447c7b0d5664321878886c4d4557f8ef1a47c7b5a6baa9d255f6181cb4dac80e3
 EBUILD krita-3.1.4.ebuild 2551 SHA256 d56beb770f09e4ddd3907dad4aab1ed3dbb13a0dc36bddf2beca1b64315d6b9c SHA512 74661e02ea49dac6f78a996f839520ebd9e29787293b3585c78c4c5b4faa46f13d31a2dd26765c058f964b925e59fa5ebdf81b95cbc24c7093ae61e84afec022 WHIRLPOOL 629c8eb72b3ebca52674ad569e17558f5337cfbe3e49f551ad4393cc3231d34d1ecfddd187c96ddf47c7088760585b0067d98673e4d01a6bb07835309253e0e3
 EBUILD krita-3.2.1.ebuild 2532 SHA256 e9e620230349be4702b5c5e03410d6ac6911143a93276491538c3236526e459e SHA512 7606da963f518188d2e7b951ffb3095b4e2a69604cfc24ca7251854fab6f0823a6ca54d56eb2d8b4524cb2601ed49fae5ace5c1406ff0d4758d8953535ca09d8 WHIRLPOOL 662c66fcb9c366be39f346612fa879845b5821de9de25c37b9e1e5d1b88bfdc455c0a1ce6562d2821e292fd38891366e17d36c5da437900a0d2e3ce7a1fe0219
+EBUILD krita-3.3.1.ebuild 2532 SHA256 e9e620230349be4702b5c5e03410d6ac6911143a93276491538c3236526e459e SHA512 7606da963f518188d2e7b951ffb3095b4e2a69604cfc24ca7251854fab6f0823a6ca54d56eb2d8b4524cb2601ed49fae5ace5c1406ff0d4758d8953535ca09d8 WHIRLPOOL 662c66fcb9c366be39f346612fa879845b5821de9de25c37b9e1e5d1b88bfdc455c0a1ce6562d2821e292fd38891366e17d36c5da437900a0d2e3ce7a1fe0219
 MISC ChangeLog 1347 SHA256 0842c6da6c74f58c2bf65ea5842f75857f7339daaa702947fef7625893487030 SHA512 51fbe12ec66ca91dcb60cb00d8c0563a7d033da26b9ada5188e94bcaac9852648191e700b62ec8a6f40af2773b1b566bc3de394bccf0d96b716dcc8f72a9460e WHIRLPOOL 8b7a12f8c82b8fcad1bb59e9438a722c5da203a386b97b8b8970b09cc3450fa53887f6354c027fbf0802887b678276dddb76db163e3548a6c702637d3105196b
 MISC metadata.xml 569 SHA256 734de7cdb3cd12de975cf7fa2a02370178fbe8ec8c9f6ea3b424f5bff1fed336 SHA512 44b2dc2f5d0e737a780e16f4d88cb3c2ff1dbab8b1878ae3561659c3a191040ef0f0f2ef0e7325b16ca6c149e29d417c10bec18bfcf06d8e847000e1e8279b27 WHIRLPOOL 67a8f8f9c346a040683a568a63cd3230bcf1a9fa613ceebd3d185179d750d8a050c8b1abb96758e5bd27e70c08683c6727d52c266e63fb22292e3619a4283a39
diff --git a/media-gfx/krita/krita-3.3.1.ebuild b/media-gfx/krita/krita-3.3.1.ebuild
new file mode 100644
index 000000000000..7c6ab717abaa
--- /dev/null
+++ b/media-gfx/krita/krita-3.3.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE="color-management fftw +gsl +jpeg openexr pdf qtmedia +raw tiff vc"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui '-gles2')
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	dev-libs/boost:=
+	media-gfx/exiv2:=
+	media-libs/lcms
+	media-libs/libpng:0=
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXi
+	color-management? ( media-libs/opencolorio )
+	fftw? ( sci-libs/fftw:3.0= )
+	gsl? ( sci-libs/gsl:= )
+	jpeg? ( virtual/jpeg:0 )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr
+	)
+	pdf? ( app-text/poppler[qt5] )
+	qtmedia? ( $(add_qt_dep qtmultimedia) )
+	raw? ( media-libs/libraw:= )
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:3
+	dev-lang/perl
+	sys-devel/gettext
+	vc? ( >=dev-libs/vc-1.1.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!app-office/calligra:4[calligra_features_krita]
+	!app-office/calligra-l10n:4[calligra_features_krita(+)]
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.2.0-tests-optional.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package color-management OCIO)
+		$(cmake-utils_use_find_package fftw FFTW3)
+		$(cmake-utils_use_find_package gsl GSL)
+		$(cmake-utils_use_find_package jpeg JPEG)
+		$(cmake-utils_use_find_package openexr OpenEXR)
+		$(cmake-utils_use_find_package pdf Poppler)
+		$(cmake-utils_use_find_package qtmedia Qt5Multimedia)
+		$(cmake-utils_use_find_package raw LibRaw)
+		$(cmake-utils_use_find_package tiff TIFF)
+		$(cmake-utils_use_find_package vc Vc)
+	)
+
+	kde5_src_configure
+}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index c364301c62bc..888e95c10693 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -9,6 +9,7 @@ DIST mesa-17.1.9.tar.xz 9908296 SHA256 5f51ad94341696097d5df7b838183534478216858
 DIST mesa-17.2.0.tar.xz 10335284 SHA256 3123448f770eae58bc73e15480e78909defb892f10ab777e9116c9b218094943 SHA512 6ac39274fcf86a26ea5fe51aed486ba3d45b75e0d2f7cc17e1e71d4cf9a85420a832fe559a2ac7b215eda615fab99a2bd290c8388a48c52e13737e7e4ef8d4fd WHIRLPOOL 3fec3810c23aa12f49c0fe561b6dbdbd5724a3bff513b21c273d5796c85eebdd889fb405a03f7cc0fe926a8289794e1872a0d04799c31122061a268faceacf36
 DIST mesa-17.2.1.tar.xz 10414776 SHA256 77385d17827cff24a3bae134342234f2efe7f7f990e778109682571dbbc9ba1e SHA512 19a7d6c2e2d439b1c73199bffd4154b42017bccc138be954a893c3b70e885f07988de84dc8aa2aff36e06295e91f0181d5b95372152f6f0f80b7afe4b3846b6a WHIRLPOOL b9048aa4d512307c3f558a925afb39949ea84b7e52ca52e2ba39cf6fba38c284ef527b25fdbfa7ec22ca6c9e17a8628ce41fc8916bfaafc7f5142c3476750b6d
 DIST mesa-17.2.2.tar.xz 10359156 SHA256 cf522244d6a5a1ecde3fc00e7c96935253fe22f808f064cab98be6f3faa65782 SHA512 641342c68989b8d801c37e668b012d3b7c4ad43d8ca01b74f8cbb3a1ec25b7390f69fe7ebc84b29dab1c6a4ac01c882ec9fd4a6b331505629461bdbbe6aa3f7e WHIRLPOOL 74271721fb38a0c62f6f35d84ba9196e000f2fe2a32e75120288e77649a87e225464572d347fc149190b573d22c32dfee3e174d6a2578b3c649c4b72375a94ec
+DIST mesa-17.2.3.tar.xz 10344180 SHA256 a0b0ec8f7b24dd044d7ab30a8c7e6d3767521e245f88d4ed5dd93315dc56f837 SHA512 749a0a46b772974633e405804ace7f509afb79f47811dbbdd390333721d744f2ac64f985ff1fd6c5aa3019b700be70bc1f75f60745ed9f4c5b08a9a8f77dfc76 WHIRLPOOL 333bdb9dd15726a4a19fa7a87d2044aba6ebaea2eb83dd436f916020221a8bc46d667e8710a701c52930217292ecdfd468b654a7846357aa8881356987f394c0
 EBUILD mesa-13.0.5.ebuild 13605 SHA256 94df75dbe63d76d35074eda2826bce65641f4919b94e4c59164474b95e045ede SHA512 95793611d72d699e14747c52b73d98510518d05055ff893c171f79413a00c9ae9a055dd9e240b134771c01070d48691e2e7e9942e19b77474af56ae93bd89d9a WHIRLPOOL 8739463b0dfde12c8b9f069b2373f7c53ee3160b5fb9b28453ebf0eda037365f16b0d91dd22bd4647afdecf979e002721ec6bf6165ce66afc9f1a06f276717df
 EBUILD mesa-13.0.6.ebuild 13553 SHA256 dd0b9f71b641c3405038f640fc8a2a1f04d60447682598e744f52b2c1d51c1eb SHA512 715a50c81cd752dd46b24b41da5e964cfffe13d6870ef9a9f6f18c22adfedd516ffb42845735fb52fe40d4e6ffc7507ee96c569ff3dae89503f3dece72b2647c WHIRLPOOL e2d2086ea547c2bcf34ea4ad19925e6b30bac63809cd311edc6b2a6df3b310d3aa20c706367418b5e142425461b0877d3e2602839beda2f44c8fa7db92c927ec
 EBUILD mesa-17.0.6.ebuild 13560 SHA256 796db0fd56888084e6d8daec8179c65df2eed1dcfe6b0bab80e0c13f81658d22 SHA512 7caefbaed248f2dffd5cc9bb8fe769d3e412c71659f462b9fabed173766b7dac449707d7e80caaed1f3e81ef01c169c6b366376bbf33b8bd4dfc8771f5e6d334 WHIRLPOOL 4f2ba8010bf86e048849a9e7e61c1984bbde4ec23afd9da7d60807b03c58e63dc723b50c0f7118e995a0ad778eb30e00cf3c0b9a596f0d41fff5e2ef24f3efc8
@@ -18,6 +19,7 @@ EBUILD mesa-17.1.9.ebuild 13436 SHA256 dbf163c9d77fc1b9d0ee3af9563d6b27c850865c3
 EBUILD mesa-17.2.0.ebuild 13466 SHA256 4a0ec5433959232820e767d338943dd9c4da54614d165f1d44492b0ed11f95fd SHA512 27302424779fdd5a173f9ba07a0aa75c3efff98314741f9510cce3b6a157baa597d624ce35912abc1faac1b22d14d8cced08300c586be309193d4e22a69ff6b5 WHIRLPOOL fc08a3c90df865d65fb40379ab776043b6d9c96205af9be1f269b7888221a112a8228233cef3a481289fccfb69ee39f5ad2d313a639d6fa52a0f7d3a69ecee1a
 EBUILD mesa-17.2.1.ebuild 14923 SHA256 2b96118b576ba0c40c9453aa832e1a2394b6fcbb3a581d4aa0c640dd536addf1 SHA512 ea96f945aa670ac38147688876fe6c302b6deb41223af6134ac8b958802d1733c5d509419786c8ccd4647fb62ef6fa1e94e9bac7cf1b67c89c606c9090435d9e WHIRLPOOL 59a8b64c5fa8a441a2afea56f08e6b5a09d9186b76f86007f8b16fe3ced33b664130d7d81789104d60a92b6a56e6a36c7a40d4020918e4c59a8f5ff52ef3a065
 EBUILD mesa-17.2.2.ebuild 14923 SHA256 2b96118b576ba0c40c9453aa832e1a2394b6fcbb3a581d4aa0c640dd536addf1 SHA512 ea96f945aa670ac38147688876fe6c302b6deb41223af6134ac8b958802d1733c5d509419786c8ccd4647fb62ef6fa1e94e9bac7cf1b67c89c606c9090435d9e WHIRLPOOL 59a8b64c5fa8a441a2afea56f08e6b5a09d9186b76f86007f8b16fe3ced33b664130d7d81789104d60a92b6a56e6a36c7a40d4020918e4c59a8f5ff52ef3a065
+EBUILD mesa-17.2.3.ebuild 14923 SHA256 2b96118b576ba0c40c9453aa832e1a2394b6fcbb3a581d4aa0c640dd536addf1 SHA512 ea96f945aa670ac38147688876fe6c302b6deb41223af6134ac8b958802d1733c5d509419786c8ccd4647fb62ef6fa1e94e9bac7cf1b67c89c606c9090435d9e WHIRLPOOL 59a8b64c5fa8a441a2afea56f08e6b5a09d9186b76f86007f8b16fe3ced33b664130d7d81789104d60a92b6a56e6a36c7a40d4020918e4c59a8f5ff52ef3a065
 EBUILD mesa-9999.ebuild 14983 SHA256 3218b8bb64c8f94a4f5cb1cdcc25682eab8e829c6d6ce4f4f33e906c2cce5bd2 SHA512 79414136e3d05eed5821bf7044a1aeb673e3974f912718bd1f69eaa51f36d7006e47c48e8a3e25c87393a4d89b0c0387ffdb89dc7d97f425fa4d83541adbd21c WHIRLPOOL d7fe7c8454812dc0175ec473296e254779ed47631b499485947b04a122d35abb3825a47fd2596ec5c44421327a54d5f139f8b2bf4642ae9c334290c8f949033f
 MISC ChangeLog 21209 SHA256 d14f068aa33c388215fda4fe7471524fc8a0cbe19ca2bf4bd7797f3a605bdd96 SHA512 b84d9940b71165e4245b2cd4a6b531ff5837a2656ebf95a71e5b27a9fefcd13e9558687aad79ece814c4af0f0847b69eef7bad4745574f8b8acff040ec9fd9ec WHIRLPOOL e3b472204d51b863b38008d1297ec6e2614b4cfe70c8d2ed0d8609f1856298068a6ac18c226c3403e61173d0494009e809692e882794749403e4bdb4247e7589
 MISC ChangeLog-2015 103777 SHA256 4b0a5d5630eac8d95c57f5bd440e8f743db364db91e3027efb52541230383724 SHA512 acea97a4adc6157a818db9afdcda514cf050cd85c5619531063c2acf74642f86c286b413976404c50d9af3cce6c4da2edea087c7a43ffec2516436a3f47d3e56 WHIRLPOOL 2c7a7b3baae65fcc0234689e1e9cc70cb89b80c96fc28eee359489c485bbe8f401605352b4f6dde3b5b58a3ae39cff8b6c81c6be5e5ee1f1d68aba8b91cbe226
diff --git a/media-libs/mesa/mesa-17.2.3.ebuild b/media-libs/mesa/mesa-17.2.3.ebuild
new file mode 100644
index 000000000000..5183b0939382
--- /dev/null
+++ b/media-libs/mesa/mesa-17.2.3.ebuild
@@ -0,0 +1,579 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git"
+
+if [[ ${PV} = 9999 ]]; then
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/"
+
+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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="!bindist? ( bindist )"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	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"
+
+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 )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.82"
+# keep correct libdrm and dri2proto dep
+# keep blocks in rdepend for binpkg
+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:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	llvm? (
+		video_cards_radeonsi? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_r600? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_radeon? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	opencl? (
+				app-eselect/eselect-opencl
+				dev-libs/libclc
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+	openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
+	vaapi? (
+		>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+		video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+	)
+	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 7.
+# 3. Specify LLVM_MAX_SLOT, e.g. 6.
+LLVM_MAX_SLOT="5"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:5[${MULTILIB_USEDEP}]
+		sys-devel/llvm:4[${MULTILIB_USEDEP}]
+		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
+	)
+	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	llvm? (
+		opencl? (
+			video_cards_r600? (
+				${CLANG_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${CLANG_DEPSTR}
+					)
+				)
+			)
+		)
+		!opencl? (
+			video_cards_r600? (
+				${LLVM_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${LLVM_DEPSTR}
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/gettext
+	virtual/pkgconfig
+	valgrind? ( dev-util/valgrind )
+	>=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
+	dri3? (
+		>=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
+		>=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
+	)
+	>=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
+"
+[[ ${PV} == 9999 ]] && DEPEND+="
+	sys-devel/bison
+	sys-devel/flex
+	$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	!pic? (
+		usr/lib*/libglapi.so.0.0.0
+		usr/lib*/libGLESv1_CM.so.1.1.0
+		usr/lib*/libGLESv2.so.2.0.0
+		usr/lib*/libGL.so.1.2.0
+		usr/lib*/libOSMesa.so.8.0.0
+	)
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm[${flags}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	[[ ${PV} == 9999 ]] && eautoreconf
+	eapply_user
+}
+
+multilib_src_configure() {
+	local myconf
+
+	if use classic; then
+		# Configurable DRI drivers
+		driver_enable swrast
+
+		# Intel code
+		driver_enable video_cards_i915 i915
+		driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		driver_enable video_cards_r100 radeon
+		driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+				! use video_cards_r200; then
+			driver_enable video_cards_radeon radeon r200
+		fi
+	fi
+
+	if use egl; then
+		myconf+=" --with-platforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
+	fi
+
+	if use gallium; then
+		myconf+="
+			$(use_enable d3d9 nine)
+			$(use_enable llvm)
+			$(use_enable openmax omx)
+			$(use_enable vaapi va)
+			$(use_enable vdpau)
+			$(use_enable xa)
+			$(use_enable xvmc)
+		"
+		use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
+
+		gallium_enable swrast
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable video_cards_i915 i915
+		gallium_enable video_cards_imx imx
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			gallium_enable video_cards_intel i915
+		fi
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+				! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		# opencl stuff
+		if use opencl; then
+			myconf+="
+				$(use_enable opencl)
+				--with-clang-libdir="${EPREFIX}/usr/lib"
+				"
+		fi
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_radeonsi radeon
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		myconf+=" $(use_enable pax_kernel glx-read-only-text)"
+	fi
+
+	# on abi_x86_32 hardened we need to have asm disable
+	if [[ ${ABI} == x86* ]] && use pic; then
+		myconf+=" --disable-asm"
+	fi
+
+	if use gallium; then
+		myconf+=" $(use_enable osmesa gallium-osmesa)"
+	else
+		myconf+=" $(use_enable osmesa)"
+	fi
+
+	# build fails with BSD indent, bug #428112
+	use userland_GNU || export INDENT=cat
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--enable-dri \
+		--enable-glx \
+		--enable-shared-glapi \
+		$(use_enable !bindist texture-float) \
+		$(use_enable d3d9 nine) \
+		$(use_enable debug) \
+		$(use_enable dri3) \
+		$(use_enable egl) \
+		$(use_enable gbm) \
+		$(use_enable gles1) \
+		$(use_enable gles2) \
+		$(use_enable nptl glx-tls) \
+		$(use_enable unwind libunwind) \
+		--enable-valgrind=$(usex valgrind auto no) \
+		--enable-llvm-shared-libs \
+		--with-dri-drivers=${DRI_DRIVERS} \
+		--with-gallium-drivers=${GALLIUM_DRIVERS} \
+		--with-vulkan-drivers=${VULKAN_DRIVERS} \
+		PYTHON2="${PYTHON}" \
+		${myconf}
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+
+	if use classic || use gallium; then
+			ebegin "Moving DRI/Gallium drivers for dynamic switching"
+			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
+			keepdir /usr/$(get_libdir)/dri
+			dodir /usr/$(get_libdir)/mesa
+			for x in ${gallium_drivers[@]}; do
+				if [ -f "$(get_libdir)/gallium/${x}" ]; then
+					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
+						|| die "Failed to move ${x}"
+				fi
+			done
+			if use classic; then
+				emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
+			fi
+			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
+				if [ -f ${x} -o -L ${x} ]; then
+					mv -f "${x}" "${x/dri/mesa}" \
+						|| die "Failed to move ${x}"
+				fi
+			done
+			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
+			ln -s ../mesa/*.so . || die "Creating symlink failed"
+			# remove symlinks to drivers known to eselect
+			for x in ${gallium_drivers[@]}; do
+				if [ -f ${x} -o -L ${x} ]; then
+					rm "${x}" || die "Failed to remove ${x}"
+				fi
+			done
+			popd
+		eend $?
+	fi
+	if use opencl; then
+		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
+		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
+		dodir ${cl_dir}/{lib,include}
+		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
+			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
+			"${ED}"${cl_dir}
+		fi
+		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
+			mv -f "${ED}"/usr/include/CL \
+			"${ED}"${cl_dir}/include
+		fi
+		eend $?
+	fi
+
+	if use openmax; then
+		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
+		doenvd "${T}"/99mesaxdgomx
+		keepdir /usr/share/mesa/xdg
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete
+	einstalldocs
+
+	if use !bindist; then
+		dodoc docs/patents.txt
+	fi
+
+	# Install config file for eselect mesa
+	insinto /usr/share/mesa
+	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
+}
+
+multilib_src_test() {
+	if use llvm; then
+		local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
+		pushd src/gallium/drivers/llvmpipe >/dev/null || die
+		emake ${llvm_tests}
+		pax-mark m ${llvm_tests}
+		popd >/dev/null || die
+	fi
+	emake check
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+
+	# Select classic/gallium drivers
+	if use classic || use gallium; then
+		eselect mesa set --auto
+	fi
+
+	# Switch to mesa opencl
+	if use opencl; then
+		eselect opencl set --use-old ${PN}
+	fi
+
+	# run omxregister-bellagio to make the OpenMAX drivers known system-wide
+	if use openmax; then
+		ebegin "Registering OpenMAX drivers"
+		BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
+			OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
+			omxregister-bellagio
+		eend $?
+	fi
+
+	# warn about patent encumbered texture-float
+	if use !bindist; then
+		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
+		elog "enabled. Please see patents.txt for an explanation."
+	fi
+
+	if ! has_version media-libs/libtxc_dxtn; then
+		elog "Note that in order to have full S3TC support, it is necessary to install"
+		elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
+		elog "textures in some apps, and some others even require this to run."
+	fi
+}
+
+pkg_prerm() {
+	if use openmax; then
+		rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
+	fi
+}
+
+# $1 - VIDEO_CARDS flag
+# other args - names of DRI drivers to enable
+# TODO: avoid code duplication for a more elegant implementation
+driver_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			DRI_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					DRI_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
+
+gallium_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			GALLIUM_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					GALLIUM_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
+
+vulkan_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			VULKAN_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					VULKAN_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index 3b8791bf64dd..e64322a873e3 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -9,4 +9,4 @@ EBUILD obs-studio-20.0.1-r1.ebuild 2798 SHA256 7c12481e3b3bd77473f4b1596d1aa5480
 EBUILD obs-studio-20.0.1.ebuild 2744 SHA256 1e6470059421743702d1438d78b92b9a18b3ca9d9ea7690ba061d444d2cfbb09 SHA512 56157c010fd5e108cd6ce8a6689595fe19b3dfd3357c47323ce495bafcff0fbd39546ba166aa04c622031ff74f7f1dabc78211863dce7bc86abfa633870c5c94 WHIRLPOOL a6a11eb73b0f7284e03173021f5751626efc033aaa6645c6212e9a8c2c050cf50d9eea798b3ab0d5ebc6432eaacdee985d6e5ed283e83ed1a224c846be3cc016
 EBUILD obs-studio-9999.ebuild 2654 SHA256 e745f5db8303efb1794b971d6fa17056ed96a00760177a1814d55362b01d881c SHA512 e5a0695d6f87e4335fbf3a51898f05e7ec00c7c9fca12c6a8d71374e54e4fb3389cb711fdc4be4908cc8063297b04528ca9b302e54898871c537d0cd671b2cf8 WHIRLPOOL 86687b0e844c84d89bd64654e5bad06aedcd1168d35041361748c3aba739292d9d8e981eb945f4dbebacf6a83921581efe7669f60624ec0bd02c5a421da83794
 MISC ChangeLog 2578 SHA256 0b32345d309d129d538db25a3de7c29a842fa90e96dd7512d29ccfe72cea3dbd SHA512 e1beab278a575b4059dad958ca01c03bb09cd839cc53b6345ed048bed591ba4222612828f676528877cbf42a2bd7e0eb564891ed7ecd50508f6d367307239cee WHIRLPOOL 93cb13b159a9282db547bc7bbedf159e1e585bbdc4e6a50ef96e8d3d6120b40d2131788373bef15b1521f005c6826b7eda66ce5c79151a3bc59535e101aba74e
-MISC metadata.xml 909 SHA256 55f67f48fe98631bfc8b02782383bad96c275c71fb24e7517b70329b3a04e1f7 SHA512 4f6d22797545b133c0783c97761d2cb4a4da1b251f39f586f4901023f09ad7b6f1bcdc841990b931740849c168d8ca2f91975f9f6fd59feff64895145cc6bd5e WHIRLPOOL 049025abd31fb656fd0bdcdbb449920eb3f50fdd2489ce7288f1c98d5f85d1b0813ca4c3615239351e184646eea25c732b8f0b4da978b039ad0597140b7e607c
+MISC metadata.xml 786 SHA256 ad1780d1edc37a4e0947ed48aac398fbeb887e68bd1fe709aa278b8932251703 SHA512 94ee6c6239b9befb24c87cb647aaed5b87c374deab3791df5742714e7cfabd28cb07822d2cb9a17b310b82f11e2daa6216bb14b327752a7b2a8ddfc9e7062492 WHIRLPOOL 0890c883c7ef15588b132c2c5519096a58d4ee18675ad385b5fc357b761083ad659e797cd9acecfdb178f9fe57469b00c19c39cc4fbfc131654f5cf4bbdd1900
diff --git a/media-video/obs-studio/metadata.xml b/media-video/obs-studio/metadata.xml
index 2ab91340693d..adf3bcb68204 100644
--- a/media-video/obs-studio/metadata.xml
+++ b/media-video/obs-studio/metadata.xml
@@ -5,10 +5,6 @@
     <email>chiitoo@gentoo.org</email>
     <name>Jimi Huotari</name>
   </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
   <longdescription>
     A rewrite of what was formerly known as "Open Broadcaster Software",
     software originally designed for recording and streaming live video
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index d30b64b3c6de..0a214ad7bad0 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 19 Oct 2017 16:09:11 +0000
+Fri, 20 Oct 2017 15:39:13 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index d30b64b3c6de..0a214ad7bad0 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 19 Oct 2017 16:09:11 +0000
+Fri, 20 Oct 2017 15:39:13 +0000
diff --git a/metadata/md5-cache/app-admin/keepassxc-2.1.4-r1 b/metadata/md5-cache/app-admin/keepassxc-2.1.4-r1
index 6b67fd5476c0..93de5fdc7933 100644
--- a/metadata/md5-cache/app-admin/keepassxc-2.1.4-r1
+++ b/metadata/md5-cache/app-admin/keepassxc-2.1.4-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/libgcrypt:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib autotype? ( dev-qt/qtx11extras:5 x11-libs/libXi x11-libs/libXtst ) dev-qt/linguist-tools:5 dev-qt/qtconcurrent:5 test? ( dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DEPEND=dev-libs/libgcrypt:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) dev-qt/linguist-tools:5 dev-qt/qtconcurrent:5 test? ( dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
 DESCRIPTION=KeePassXC - KeePass Cross-platform Community Edition
 EAPI=6
 HOMEPAGE=https://keepassxc.org
 IUSE=autotype debug http test
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1 GPL-2 GPL-3
-RDEPEND=dev-libs/libgcrypt:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib autotype? ( dev-qt/qtx11extras:5 x11-libs/libXi x11-libs/libXtst )
+RDEPEND=dev-libs/libgcrypt:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst )
 SLOT=0
 SRC_URI=https://github.com/keepassxreboot/keepassxc/archive/2.1.4.tar.gz -> keepassxc-2.1.4.tar.gz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e2bdd7fc79abd442df00899c1d8ff8ca
+_md5_=cbfd80cab467f4bd0e2d4a25e5f673fb
diff --git a/metadata/md5-cache/app-backup/backup-manager-0.7.14 b/metadata/md5-cache/app-backup/backup-manager-0.7.14
new file mode 100644
index 000000000000..10cd69d4907e
--- /dev/null
+++ b/metadata/md5-cache/app-backup/backup-manager-0.7.14
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-lang/perl:= sys-devel/gettext
+DESCRIPTION=Backup Manager is a command line backup tool for GNU/Linux
+EAPI=6
+HOMEPAGE=https://github.com/sukria/Backup-Manager
+IUSE=s3
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl:= sys-devel/gettext s3? ( dev-perl/Net-Amazon-S3 dev-perl/File-Slurp )
+SLOT=0
+SRC_URI=https://github.com/sukria/Backup-Manager/archive/0.7.14.tar.gz -> backup-manager-0.7.14.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=62e7833e3a1d1cac99e33757df573409
diff --git a/metadata/md5-cache/app-editors/nvi-1.81.6-r4 b/metadata/md5-cache/app-editors/nvi-1.81.6-r4
deleted file mode 100644
index 9f9b07031fa2..000000000000
--- a/metadata/md5-cache/app-editors/nvi-1.81.6-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=|| ( >=sys-libs/db-4.8.30:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) >=sys-libs/ncurses-5.6-r2 perl? ( dev-lang/perl ) tcl? ( !unicode? ( >=dev-lang/tcl-8.5:0 ) ) 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
-DESCRIPTION=Vi clone
-EAPI=4
-HOMEPAGE=https://sites.google.com/a/bostic.com/keithbostic/vi
-IUSE=perl tcl unicode
-KEYWORDS=alpha amd64 hppa ~mips ppc ppc64 sparc x86
-LICENSE=BSD
-RDEPEND=|| ( >=sys-libs/db-4.8.30:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) >=sys-libs/ncurses-5.6-r2 perl? ( dev-lang/perl ) tcl? ( !unicode? ( >=dev-lang/tcl-8.5:0 ) ) app-eselect/eselect-vi
-REQUIRED_USE=tcl? ( !unicode )
-SLOT=0
-SRC_URI=http://garage.linux.student.kuleuven.be/~skimo/nvi/devel/nvi-1.81.6.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db-use	582140d1a711279e50ce284fc7b609f5	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=47b8029e626ce4b2d48dfd5a02f949dd
diff --git a/metadata/md5-cache/app-editors/nvi-1.81.6-r6 b/metadata/md5-cache/app-editors/nvi-1.81.6-r6
deleted file mode 100644
index 76e0c851697e..000000000000
--- a/metadata/md5-cache/app-editors/nvi-1.81.6-r6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=|| ( >=sys-libs/db-4.8.30:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) >=sys-libs/ncurses-5.6-r2:= perl? ( dev-lang/perl ) tcl? ( !unicode? ( >=dev-lang/tcl-8.5:0 ) ) 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
-DESCRIPTION=Vi clone
-EAPI=6
-HOMEPAGE=https://sites.google.com/a/bostic.com/keithbostic/vi
-IUSE=perl tcl unicode
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=|| ( >=sys-libs/db-4.8.30:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) >=sys-libs/ncurses-5.6-r2:= perl? ( dev-lang/perl ) tcl? ( !unicode? ( >=dev-lang/tcl-8.5:0 ) ) app-eselect/eselect-vi
-REQUIRED_USE=tcl? ( !unicode )
-SLOT=0
-SRC_URI=http://garage.linux.student.kuleuven.be/~skimo/nvi/devel/nvi-1.81.6.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db-use	582140d1a711279e50ce284fc7b609f5	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=02d2cd35c8e304fe8c411e16ea537aef
diff --git a/metadata/md5-cache/app-misc/elasticsearch-5.6.2 b/metadata/md5-cache/app-misc/elasticsearch-5.6.3
index 5ed316a19cbe..052130743f32 100644
--- a/metadata/md5-cache/app-misc/elasticsearch-5.6.2
+++ b/metadata/md5-cache/app-misc/elasticsearch-5.6.3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0 BSD-2 LGPL-3 MIT public-domain
 RDEPEND=virtual/jre:1.8
 SLOT=0
-SRC_URI=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.2.tar.gz
+SRC_URI=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.3.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
 _md5_=46f93b3c1957e165b4549455962ed1db
diff --git a/metadata/md5-cache/app-office/geierlein-0.9.13 b/metadata/md5-cache/app-office/geierlein-0.9.13
new file mode 100644
index 000000000000..698d25bc9a8a
--- /dev/null
+++ b/metadata/md5-cache/app-office/geierlein-0.9.13
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Submit tax forms (Umsatzsteuervoranmeldung) to German ELSTER
+EAPI=6
+HOMEPAGE=https://stesie.github.com/geierlein/
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=|| ( www-client/firefox www-client/firefox-bin )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/stesie/geierlein/archive/V0.9.13.tar.gz -> geierlein-0.9.13.tar.gz
+_md5_=74a99a0c2ef1f7fb6979bca69b0c8027
diff --git a/metadata/md5-cache/app-shells/zsh-completions-0.27.0 b/metadata/md5-cache/app-shells/zsh-completions-0.27.0
new file mode 100644
index 000000000000..8250bb94bd29
--- /dev/null
+++ b/metadata/md5-cache/app-shells/zsh-completions-0.27.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=Additional completion definitions for Zsh
+EAPI=6
+HOMEPAGE=https://github.com/zsh-users/zsh-completions
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=app-shells/zsh
+SLOT=0
+SRC_URI=https://github.com/zsh-users/zsh-completions/archive/0.27.0.tar.gz -> zsh-completions-0.27.0.tar.gz
+_md5_=459111b53304d2f8870f7188b22edd30
diff --git a/metadata/md5-cache/app-text/fbreader-0.99.4-r3 b/metadata/md5-cache/app-text/fbreader-0.99.4-r3
new file mode 100644
index 000000000000..16c3830d536f
--- /dev/null
+++ b/metadata/md5-cache/app-text/fbreader-0.99.4-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=app-arch/bzip2 dev-libs/expat dev-libs/liblinebreak dev-libs/fribidi dev-db/sqlite net-misc/curl sys-libs/zlib dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5[ssl] virtual/pkgconfig
+DESCRIPTION=E-Book Reader. Supports many e-book formats
+EAPI=6
+HOMEPAGE=http://www.fbreader.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/bzip2 dev-libs/expat dev-libs/liblinebreak dev-libs/fribidi dev-db/sqlite net-misc/curl sys-libs/zlib dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5[ssl]
+SLOT=0
+SRC_URI=http://www.fbreader.org/files/desktop/fbreader-sources-0.99.4.tgz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=02f878991d6c230b83b715bf7722c6dd
diff --git a/metadata/md5-cache/dev-games/simgear-2017.3.1 b/metadata/md5-cache/dev-games/simgear-2017.3.1
new file mode 100644
index 000000000000..cc38c7f34508
--- /dev/null
+++ b/metadata/md5-cache/dev-games/simgear-2017.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=dev-libs/expat >=dev-games/openscenegraph-3.2.0 media-libs/openal net-misc/curl sys-libs/zlib virtual/opengl dns? ( net-libs/udns ) gdal? ( sci-libs/gdal ) >=dev-libs/boost-1.44 sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Development library for simulation games
+EAPI=6
+HOMEPAGE=http://www.simgear.org/
+IUSE=+dns debug gdal openmp subversion test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/expat >=dev-games/openscenegraph-3.2.0 media-libs/openal net-misc/curl sys-libs/zlib virtual/opengl dns? ( net-libs/udns ) gdal? ( sci-libs/gdal ) subversion? ( dev-vcs/subversion )
+SLOT=0
+SRC_URI=mirror://sourceforge/flightgear/simgear-2017.3.1.tar.bz2
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=76358d990f3cf51027a07e897b8491a4
diff --git a/metadata/md5-cache/dev-games/simgear-9999 b/metadata/md5-cache/dev-games/simgear-9999
index 5f05330ef62b..9d84e00ff6ac 100644
--- a/metadata/md5-cache/dev-games/simgear-9999
+++ b/metadata/md5-cache/dev-games/simgear-9999
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install prepare pretend test unpack
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
 DEPEND=dev-libs/expat >=dev-games/openscenegraph-3.2.0 media-libs/openal net-misc/curl sys-libs/zlib virtual/opengl dns? ( net-libs/udns ) gdal? ( sci-libs/gdal ) >=dev-libs/boost-1.44 sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Development library for simulation games
 EAPI=6
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/expat >=dev-games/openscenegraph-3.2.0 media-libs/openal net-misc/curl sys-libs/zlib virtual/opengl dns? ( net-libs/udns ) gdal? ( sci-libs/gdal ) subversion? ( dev-vcs/subversion )
 SLOT=0
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=8a4ac3ab5102e786014b18dc263bd4ab
+_md5_=2b78b1ebb3e127ad8c96bdbfe2d1f4b7
diff --git a/metadata/md5-cache/dev-libs/ffcall-2.0 b/metadata/md5-cache/dev-libs/ffcall-2.0
index b90f41b74c83..1c259f6bbe57 100644
--- a/metadata/md5-cache/dev-libs/ffcall-2.0
+++ b/metadata/md5-cache/dev-libs/ffcall-2.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=foreign function call libraries
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libffcall/
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ia64 ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://gnu/libffcall/libffcall-2.0.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=c6f8771e758a6d4d253653c289b81f16
+_md5_=aa776e37ea8d5e0371e5543b3db60cc5
diff --git a/metadata/md5-cache/dev-libs/libmspack-0.6_alpha b/metadata/md5-cache/dev-libs/libmspack-0.6_alpha
new file mode 100644
index 000000000000..56d679f0dbff
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libmspack-0.6_alpha
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install test
+DESCRIPTION=A library for Microsoft compression formats
+EAPI=6
+HOMEPAGE=https://www.cabextract.org.uk/libmspack/
+IUSE=debug 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
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=https://www.cabextract.org.uk/libmspack/libmspack-0.6alpha.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=29f6d13e8432286839a4d52bf97435e6
diff --git a/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r2 b/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r2
deleted file mode 100644
index 5f455b479226..000000000000
--- a/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=perl? ( dev-lang/perl ) >=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-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php? ( php_targets_php5-4? ( dev-lang/php:5.4 ) )
-DESCRIPTION=An ISO-C:1999 API and corresponding CLI for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant UUID
-EAPI=4
-HOMEPAGE=http://www.ossp.org/pkg/lib/uuid/
-IUSE=+cxx perl php static-libs php_targets_php5-4
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=ISC
-RDEPEND=perl? ( dev-lang/perl ) php? ( php_targets_php5-4? ( dev-lang/php:5.4 ) )
-REQUIRED_USE=php? ( || ( php_targets_php5-4 ) )
-SLOT=0
-SRC_URI=ftp://ftp.ossp.org/pkg/lib/uuid/uuid-1.6.2.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-source-r2	f89db15e993f2a909a1baea2031e409d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=46445a04d9c2bb5a0afc3b0520e8b000
diff --git a/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r5 b/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r5
deleted file mode 100644
index bee4b5e9f696..000000000000
--- a/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=perl? ( dev-lang/perl:= ) >=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-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php? ( php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php5-5? ( dev-lang/php:5.5 ) )
-DESCRIPTION=An ISO-C:1999 API and corresponding CLI for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant UUID
-EAPI=5
-HOMEPAGE=http://www.ossp.org/pkg/lib/uuid/
-IUSE=+cxx perl php static-libs php_targets_php5-6 php_targets_php5-5
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=ISC
-RDEPEND=perl? ( dev-lang/perl:= ) php? ( php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php5-5? ( dev-lang/php:5.5 ) )
-REQUIRED_USE=php? ( || ( php_targets_php5-6 php_targets_php5-5 ) )
-SLOT=0
-SRC_URI=ftp://ftp.ossp.org/pkg/lib/uuid/uuid-1.6.2.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	php-ext-source-r2	f89db15e993f2a909a1baea2031e409d	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=47046668458ac5940af2f46384f4b4c8
diff --git a/metadata/md5-cache/dev-perl/DBD-mysql-4.41.0-r1 b/metadata/md5-cache/dev-perl/DBD-mysql-4.41.0-r2
index 8c5e40c170a0..f980f232d11e 100644
--- a/metadata/md5-cache/dev-perl/DBD-mysql-4.41.0-r1
+++ b/metadata/md5-cache/dev-perl/DBD-mysql-4.41.0-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=?? ( embedded ssl )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MICHIELB/DBD-mysql-4.041.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=9ce82018ee8506c9d3798618e4ba14d1
+_md5_=1fd612803731af6f7e04d7c369af1761
diff --git a/metadata/md5-cache/dev-perl/DBIx-Class-InflateColumn-IP-0.20.30-r1 b/metadata/md5-cache/dev-perl/DBIx-Class-InflateColumn-IP-0.20.30-r1
new file mode 100644
index 000000000000..e0f15088b40a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/DBIx-Class-InflateColumn-IP-0.20.30-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/NetAddr-IP >=dev-perl/DBIx-Class-0.81.70 test? ( dev-perl/DBD-SQLite ) dev-lang/perl:=
+DESCRIPTION=Auto-create NetAddr::IP objects from columns
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/DBIx-Class-InflateColumn-IP/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/NetAddr-IP >=dev-perl/DBIx-Class-0.81.70 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/I/IL/ILMARI/DBIx-Class-InflateColumn-IP-0.02003.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=040a49337d125f68fa2efeddb8f57fab
diff --git a/metadata/md5-cache/dev-perl/DBIx-Class-UserStamp-0.110.0-r1 b/metadata/md5-cache/dev-perl/DBIx-Class-UserStamp-0.110.0-r1
new file mode 100644
index 000000000000..427af53cdfbf
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/DBIx-Class-UserStamp-0.110.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/Class-Accessor-Grouped dev-perl/DBIx-Class-DynamicDefault dev-perl/DBIx-Class test? ( dev-perl/DBD-SQLite ) dev-lang/perl:=
+DESCRIPTION=Automatically set update and create user id fields
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/DBIx-Class-UserStamp/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Class-Accessor-Grouped dev-perl/DBIx-Class-DynamicDefault dev-perl/DBIx-Class dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/J/JG/JGOULAH/DBIx-Class-UserStamp-0.11.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=89bbbc00d28e336b6c2e9fdfedb324db
diff --git a/metadata/md5-cache/dev-perl/DBIx-Safe-1.2.5-r1 b/metadata/md5-cache/dev-perl/DBIx-Safe-1.2.5-r1
new file mode 100644
index 000000000000..df186e060113
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/DBIx-Safe-1.2.5-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/DBI dev-perl/DBD-Pg dev-lang/perl:=
+DESCRIPTION=Safer access to your database through a DBI database handle
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/DBIx-Safe/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=dev-perl/DBI dev-perl/DBD-Pg dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TU/TURNSTEP/DBIx-Safe-1.2.5.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=13da55eaa733d2d400862a7f7a927690
diff --git a/metadata/md5-cache/dev-perl/Data-Perl-0.2.9-r1 b/metadata/md5-cache/dev-perl/Data-Perl-0.2.9-r1
new file mode 100644
index 000000000000..117969339396
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Data-Perl-0.2.9-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/Class-Method-Modifiers dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils dev-perl/Module-Runtime dev-perl/Role-Tiny virtual/perl-parent dev-perl/strictures virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Test-Deep dev-perl/Test-Fatal dev-perl/Test-Output ) dev-lang/perl:=
+DESCRIPTION=Base classes wrapping fundamental Perl data types
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Data-Perl/
+IUSE=test
+KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~ppc-macos
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Class-Method-Modifiers dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils dev-perl/Module-Runtime dev-perl/Role-Tiny virtual/perl-parent dev-perl/strictures dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MA/MATTP/Data-Perl-0.002009.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=73b6002ccc11c387063228f16d919bf3
diff --git a/metadata/md5-cache/dev-perl/Data-Serializer-0.600.0-r1 b/metadata/md5-cache/dev-perl/Data-Serializer-0.600.0-r1
new file mode 100644
index 000000000000..94b0c18ac47a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Data-Serializer-0.600.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-AutoLoader virtual/perl-Data-Dumper virtual/perl-Digest-SHA virtual/perl-Exporter virtual/perl-File-Spec dev-perl/Module-Build test? ( virtual/perl-Test-Simple ) dev-lang/perl:=
+DESCRIPTION=Modules that serialize data structures
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Data-Serializer/
+IUSE=test
+KEYWORDS=~x86 ~amd64
+LICENSE=|| ( Artistic GPL-2 )
+RDEPEND=virtual/perl-AutoLoader virtual/perl-Data-Dumper virtual/perl-Digest-SHA virtual/perl-Exporter dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/N/NE/NEELY/Data-Serializer-0.60.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=71e7d653202cbe45983cb7e7174e550e
diff --git a/metadata/md5-cache/dev-perl/DateTime-HiRes-0.10.0-r1 b/metadata/md5-cache/dev-perl/DateTime-HiRes-0.10.0-r1
new file mode 100644
index 000000000000..42bac40ca1d0
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/DateTime-HiRes-0.10.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/DateTime dev-perl/Module-Build dev-lang/perl:=
+DESCRIPTION=Create DateTime objects with sub-second current time resolution
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/DateTime-HiRes/
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/DateTime dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/J/JH/JHOBLITT/DateTime-HiRes-0.01.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=282e8c91f6f18d825a10c1da2931be30
diff --git a/metadata/md5-cache/dev-perl/Devel-StackTrace-2.20.0 b/metadata/md5-cache/dev-perl/Devel-StackTrace-2.20.0
new file mode 100644
index 000000000000..a0ccc3f8247e
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Devel-StackTrace-2.20.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-File-Spec virtual/perl-Scalar-List-Utils virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl:=
+DESCRIPTION=An object representing a stack trace
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Devel-StackTrace/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=Artistic-2
+RDEPEND=virtual/perl-File-Spec virtual/perl-Scalar-List-Utils dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Devel-StackTrace-2.02.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=c382b03b5caecf8d06def4ccd9e01edb
diff --git a/metadata/md5-cache/dev-perl/Device-SerialPort-1.40.0-r2 b/metadata/md5-cache/dev-perl/Device-SerialPort-1.40.0-r2
new file mode 100644
index 000000000000..928a7740202a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Device-SerialPort-1.40.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl:=
+DESCRIPTION=A Serial port Perl Module
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Device-SerialPort/
+IUSE=examples
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CO/COOK/Device-SerialPort-1.04.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=e62847936a03a9f0d705c5b9a3a9c418
diff --git a/metadata/md5-cache/dev-perl/Digest-MD2-2.40.0 b/metadata/md5-cache/dev-perl/Digest-MD2-2.40.0
new file mode 100644
index 000000000000..fed950e019e2
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Digest-MD2-2.40.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl:=
+DESCRIPTION=Perl interface to the MD2 Algorithm
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Digest-MD2/
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Digest-MD2-2.04.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=0bb3c7fa5c4796d5859238d6f5e2e6c3
diff --git a/metadata/md5-cache/dev-perl/Digest-Nilsimsa-0.60.0-r2 b/metadata/md5-cache/dev-perl/Digest-Nilsimsa-0.60.0-r2
new file mode 100644
index 000000000000..e4d2c22b74cd
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Digest-Nilsimsa-0.60.0-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl:=
+DESCRIPTION=Perl version of Nilsimsa code
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Digest-Nilsimsa/
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-2 LGPL-2
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/V/VI/VIPUL/Digest-Nilsimsa-0.06.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=55dcdaf86243548d6ceb98eb9e5e453a
diff --git a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome-0.390.0 b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome-0.390.0
new file mode 100644
index 000000000000..e8799445ac57
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome-0.390.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!<=dev-perl/Dist-Zilla-Plugin-MakeMaker-Fallback-0.11.0 >=virtual/perl-CPAN-Meta-Requirements-2.121.0 >=dev-perl/Dist-Zilla-5.1.0 dev-perl/Moose dev-perl/MooseX-Types-Stringlike dev-perl/Path-Tiny >=virtual/perl-Scalar-List-Utils-1.290.0 dev-perl/namespace-autoclean virtual/perl-version >=dev-perl/Module-Build-Tiny-0.34.0 test? ( >=dev-perl/CPAN-Meta-Check-0.11.0 virtual/perl-File-Spec dev-perl/File-pushd virtual/perl-Module-Metadata dev-perl/Test-Deep dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.960.0 virtual/perl-if ) dev-lang/perl:=
+DESCRIPTION=A more awesome MakeMaker plugin for Dist::Zilla
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Dist-Zilla-Plugin-MakeMaker-Awesome/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=!<=dev-perl/Dist-Zilla-Plugin-MakeMaker-Fallback-0.11.0 >=virtual/perl-CPAN-Meta-Requirements-2.121.0 >=dev-perl/Dist-Zilla-5.1.0 dev-perl/Moose dev-perl/MooseX-Types-Stringlike dev-perl/Path-Tiny >=virtual/perl-Scalar-List-Utils-1.290.0 dev-perl/namespace-autoclean virtual/perl-version dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-MakeMaker-Awesome-0.39.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=fbdb6b7a299f061310078cf04489f754
diff --git a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-OurPkgVersion-0.120.0 b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-OurPkgVersion-0.120.0
new file mode 100644
index 000000000000..360091096507
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-OurPkgVersion-0.120.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Carp dev-perl/Dist-Zilla dev-perl/Moose dev-perl/MooseX-Types-Perl dev-perl/PPI dev-perl/namespace-autoclean virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-CPAN-Meta-2.120.900 virtual/perl-File-Spec virtual/perl-IO dev-perl/Path-Tiny virtual/perl-Test-Simple dev-perl/Test-Version ) dev-lang/perl:=
+DESCRIPTION=No line insertion and does Package version with our
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Dist-Zilla-Plugin-OurPkgVersion/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp dev-perl/Dist-Zilla dev-perl/Moose dev-perl/MooseX-Types-Perl dev-perl/PPI dev-perl/namespace-autoclean dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Dist-Zilla-Plugin-OurPkgVersion-0.12.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=72f4ee0eddd39ebff2267b4bb80d5580
diff --git a/metadata/md5-cache/dev-php/libvirt-php-0.5.2 b/metadata/md5-cache/dev-php/libvirt-php-0.5.2
deleted file mode 100644
index 12aaac0ba95c..000000000000
--- a/metadata/md5-cache/dev-php/libvirt-php-0.5.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=app-emulation/libvirt dev-libs/libxml2 dev-libs/libxslt doc? ( app-text/xhtml1 ) >=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-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=PHP 5 bindings for libvirt
-EAPI=5
-HOMEPAGE=http://libvirt.org/php/
-IUSE=doc php_targets_php5-6
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1
-RDEPEND=app-emulation/libvirt dev-libs/libxml2 php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php5-6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://libvirt.org/sources/php/libvirt-php-0.5.2.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-source-r2	f89db15e993f2a909a1baea2031e409d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=721fdba3352e91397b3e1487d6fad23d
diff --git a/metadata/md5-cache/dev-php/pecl-crack-0.4-r4 b/metadata/md5-cache/dev-php/pecl-crack-0.4-r4
deleted file mode 100644
index e3298dd1e02a..000000000000
--- a/metadata/md5-cache/dev-php/pecl-crack-0.4-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=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-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-4? ( dev-lang/php:5.4 )
-DESCRIPTION=PHP interface to the cracklib libraries
-EAPI=5
-HOMEPAGE=http://pecl.php.net/crack
-IUSE=php_targets_php5-6 php_targets_php5-5 php_targets_php5-4
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=PHP-3 CRACKLIB
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-4? ( dev-lang/php:5.4 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php5-5 php_targets_php5-4 )
-SLOT=0
-SRC_URI=http://pecl.php.net/get/crack-0.4.tgz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-pecl-r2	dff079f0a889226d72912d502a00321c	php-ext-source-r2	f89db15e993f2a909a1baea2031e409d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=93279012738e24e83a2487a9433b00fe
diff --git a/metadata/md5-cache/dev-php/pecl-crack-0.4-r5 b/metadata/md5-cache/dev-php/pecl-crack-0.4-r5
deleted file mode 100644
index ff1d58103cc2..000000000000
--- a/metadata/md5-cache/dev-php/pecl-crack-0.4-r5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=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-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=PHP interface to the cracklib libraries
-EAPI=6
-HOMEPAGE=http://pecl.php.net/crack
-IUSE=php_targets_php5-6
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=PHP-3 CRACKLIB
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php5-6 )
-SLOT=0
-SRC_URI=http://pecl.php.net/get/crack-0.4.tgz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-pecl-r3	f0b4914f85a3c676561454b15a910dc6	php-ext-source-r3	02131d21ec5edc689a1ef97096214131	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=4393a665204c12668cbee0c6e2bd4255
diff --git a/metadata/md5-cache/dev-php/pecl-crack-0.4-r6 b/metadata/md5-cache/dev-php/pecl-crack-0.4-r6
index 83c587cbe984..727e057bded5 100644
--- a/metadata/md5-cache/dev-php/pecl-crack-0.4-r6
+++ b/metadata/md5-cache/dev-php/pecl-crack-0.4-r6
@@ -4,11 +4,11 @@ DESCRIPTION=PHP interface to the cracklib libraries
 EAPI=6
 HOMEPAGE=http://pecl.php.net/crack
 IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=~amd64 ppc ppc64 x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=PHP-3 CRACKLIB
 RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
 REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/crack-0.4.tgz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-pecl-r3	f0b4914f85a3c676561454b15a910dc6	php-ext-source-r3	02131d21ec5edc689a1ef97096214131	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=80dafd12ff83b454c66a069685d2599d
+_md5_=8570e4a06d913e492df7c91a06692d94
diff --git a/metadata/md5-cache/dev-php/pecl-ssh2-0.12-r3 b/metadata/md5-cache/dev-php/pecl-ssh2-0.12-r3
deleted file mode 100644
index a10495f5125e..000000000000
--- a/metadata/md5-cache/dev-php/pecl-ssh2-0.12-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=net-libs/libssh2-1.2 >=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-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=PHP bindings for the libssh2 library
-EAPI=5
-HOMEPAGE=http://pecl.php.net/ssh2
-IUSE=php_targets_php5-4 php_targets_php5-5 php_targets_php5-6
-KEYWORDS=amd64 x86
-LICENSE=PHP-3.01
-RDEPEND=>=net-libs/libssh2-1.2 php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php5-4 php_targets_php5-5 php_targets_php5-6 )
-SLOT=0
-SRC_URI=http://pecl.php.net/get/ssh2-0.12.tgz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-pecl-r2	dff079f0a889226d72912d502a00321c	php-ext-source-r2	f89db15e993f2a909a1baea2031e409d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=2cdd41e3239edd74aac986dfadae5cb5
diff --git a/metadata/md5-cache/dev-php/pecl-ssh2-0.13-r3 b/metadata/md5-cache/dev-php/pecl-ssh2-0.13-r3
index 01dcf70dac3e..60a853937a3a 100644
--- a/metadata/md5-cache/dev-php/pecl-ssh2-0.13-r3
+++ b/metadata/md5-cache/dev-php/pecl-ssh2-0.13-r3
@@ -4,7 +4,7 @@ DESCRIPTION=PHP bindings for the libssh2 library
 EAPI=6
 HOMEPAGE=http://pecl.php.net/ssh2
 IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=PHP-3.01
 PDEPEND=php_targets_php7-0? ( dev-php/pecl-ssh2:7 ) php_targets_php7-1? ( dev-php/pecl-ssh2:7 )
 RDEPEND=net-libs/libssh2[-gcrypt] php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/ssh2-0.13.tgz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-pecl-r3	f0b4914f85a3c676561454b15a910dc6	php-ext-source-r3	02131d21ec5edc689a1ef97096214131	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=199b05ec1c45abdedbcc691687f04e06
+_md5_=38c4d2f14af78ac730b16525a55ed288
diff --git a/metadata/md5-cache/dev-php/pecl-ssh2-1.1.1 b/metadata/md5-cache/dev-php/pecl-ssh2-1.1.1
index 3473b49a2a61..4879bf3c2c29 100644
--- a/metadata/md5-cache/dev-php/pecl-ssh2-1.1.1
+++ b/metadata/md5-cache/dev-php/pecl-ssh2-1.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=PHP bindings for the libssh2 library
 EAPI=6
 HOMEPAGE=http://pecl.php.net/ssh2
 IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=PHP-3.01
 RDEPEND=>=net-libs/libssh2-1.2[-gcrypt] php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
 REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
 SLOT=7
 SRC_URI=http://pecl.php.net/get/ssh2-1.1.1.tgz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-pecl-r3	f0b4914f85a3c676561454b15a910dc6	php-ext-source-r3	02131d21ec5edc689a1ef97096214131	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=d3b4d196003d2b53f2ce5f774344429f
+_md5_=6f983a1ffece80017ea5486c8407db47
diff --git a/metadata/md5-cache/dev-python/ImageHash-3.7 b/metadata/md5-cache/dev-python/ImageHash-3.7
new file mode 100644
index 000000000000..fe3adf7bf260
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ImageHash-3.7
@@ -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_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/numpy[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(-)] dev-python/pillow[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(-)] dev-python/pywavelets[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(-)] dev-python/six[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(-)] sci-libs/scipy[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(-)] ) 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(-)]
+DESCRIPTION=Image Hashing library
+EAPI=6
+HOMEPAGE=https://github.com/JohannesBuchner/imagehash
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND=dev-python/numpy[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(-)] dev-python/pillow[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(-)] dev-python/pywavelets[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(-)] dev-python/six[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(-)] sci-libs/scipy[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(-)] 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(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/I/ImageHash/ImageHash-3.7.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_=1b887145bcb88b536f930183f8847036
diff --git a/metadata/md5-cache/dev-python/PyQt5-5.9 b/metadata/md5-cache/dev-python/PyQt5-5.9
new file mode 100644
index 000000000000..8e4983ef95d7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/PyQt5-5.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sip-4.19.3:=[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-qt/qtcore-5.6.0:5 >=dev-qt/qtxml-5.6.0:5 bluetooth? ( >=dev-qt/qtbluetooth-5.6.0:5 ) dbus? ( dev-python/dbus-python[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-qt/qtdbus-5.6.0:5 ) declarative? ( >=dev-qt/qtdeclarative-5.6.0:5[widgets?] ) designer? ( >=dev-qt/designer-5.6.0:5 ) gui? ( >=dev-qt/qtgui-5.6.0:5[gles2=] ) help? ( >=dev-qt/qthelp-5.6.0:5 ) location? ( >=dev-qt/qtlocation-5.6.0:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.6.0:5[widgets?] ) network? ( >=dev-qt/qtnetwork-5.6.0:5 ) opengl? ( >=dev-qt/qtopengl-5.6.0:5 ) positioning? ( >=dev-qt/qtpositioning-5.6.0:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.6.0:5 ) sensors? ( >=dev-qt/qtsensors-5.6.0:5 ) serialport? ( >=dev-qt/qtserialport-5.6.0:5 ) sql? ( >=dev-qt/qtsql-5.6.0:5 ) svg? ( >=dev-qt/qtsvg-5.6.0:5 ) testlib? ( >=dev-qt/qttest-5.6.0:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.6.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.6.0:5[widgets?] ) webkit? ( >=dev-qt/qtwebkit-5.6.0:5[printsupport] ) websockets? ( >=dev-qt/qtwebsockets-5.6.0:5 ) widgets? ( >=dev-qt/qtwidgets-5.6.0:5 ) x11extras? ( >=dev-qt/qtx11extras-5.6.0:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.6.0:5 ) dbus? ( virtual/pkgconfig )
+DESCRIPTION=Python bindings for the Qt framework
+EAPI=6
+HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/intro
+IUSE=bluetooth dbus debug declarative designer examples gles2 gui help location multimedia network opengl positioning printsupport sensors serialport sql svg testlib webchannel webengine webkit websockets widgets x11extras xmlpatterns python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=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(-)] >=dev-python/sip-4.19.3:=[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-qt/qtcore-5.6.0:5 >=dev-qt/qtxml-5.6.0:5 bluetooth? ( >=dev-qt/qtbluetooth-5.6.0:5 ) dbus? ( dev-python/dbus-python[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-qt/qtdbus-5.6.0:5 ) declarative? ( >=dev-qt/qtdeclarative-5.6.0:5[widgets?] ) designer? ( >=dev-qt/designer-5.6.0:5 ) gui? ( >=dev-qt/qtgui-5.6.0:5[gles2=] ) help? ( >=dev-qt/qthelp-5.6.0:5 ) location? ( >=dev-qt/qtlocation-5.6.0:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.6.0:5[widgets?] ) network? ( >=dev-qt/qtnetwork-5.6.0:5 ) opengl? ( >=dev-qt/qtopengl-5.6.0:5 ) positioning? ( >=dev-qt/qtpositioning-5.6.0:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.6.0:5 ) sensors? ( >=dev-qt/qtsensors-5.6.0:5 ) serialport? ( >=dev-qt/qtserialport-5.6.0:5 ) sql? ( >=dev-qt/qtsql-5.6.0:5 ) svg? ( >=dev-qt/qtsvg-5.6.0:5 ) testlib? ( >=dev-qt/qttest-5.6.0:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.6.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.6.0:5[widgets?] ) webkit? ( >=dev-qt/qtwebkit-5.6.0:5[printsupport] ) websockets? ( >=dev-qt/qtwebsockets-5.6.0:5 ) widgets? ( >=dev-qt/qtwidgets-5.6.0:5 ) x11extras? ( >=dev-qt/qtx11extras-5.6.0:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.6.0:5 )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) bluetooth? ( gui ) declarative? ( gui network ) designer? ( widgets ) help? ( gui widgets ) location? ( positioning ) multimedia? ( gui network ) opengl? ( gui widgets ) positioning? ( gui ) printsupport? ( gui widgets ) sensors? ( gui ) serialport? ( gui ) sql? ( widgets ) svg? ( gui widgets ) testlib? ( gui widgets ) webchannel? ( network ) webengine? ( network widgets? ( webchannel ) ) webkit? ( gui network printsupport widgets ) websockets? ( network ) widgets? ( gui ) xmlpatterns? ( network )
+SLOT=0
+SRC_URI=mirror://sourceforge/pyqt/PyQt5_gpl-5.9.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=dcd34c26b6dc654063900512b63f2ad3
diff --git a/metadata/md5-cache/dev-python/cryptography-2.0.2-r1 b/metadata/md5-cache/dev-python/cryptography-2.0.2-r1
new file mode 100644
index 000000000000..6177776613ed
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cryptography-2.0.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] ) libressl? ( dev-libs/libressl ) python_targets_python2_7? ( >=dev-python/cffi-1.7:=[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/cffi-1.7:=[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/cffi-1.7:=[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/cffi-1.7:=[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? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/idna-2.1[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/asn1crypto-0.21.0[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/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-python/six-1.4.1[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(-)] virtual/python-ipaddress[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/setuptools-1.0[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(-)] test? ( ~dev-python/cryptography-vectors-2.0.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(-)] dev-python/hypothesis[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/iso8601[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/pretend[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/pyasn1-modules[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-2.9.0[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/pytz[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=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) 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_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(-)]
+DESCRIPTION=Library providing cryptographic recipes and primitives
+EAPI=6
+HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/
+IUSE=libressl 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 arm arm64 hppa ia64 mips ppc ppc64 x86
+LICENSE=|| ( Apache-2.0 BSD )
+RDEPEND=!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] ) libressl? ( dev-libs/libressl ) python_targets_python2_7? ( >=dev-python/cffi-1.7:=[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/cffi-1.7:=[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/cffi-1.7:=[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/cffi-1.7:=[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? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/idna-2.1[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/asn1crypto-0.21.0[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/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-python/six-1.4.1[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(-)] virtual/python-ipaddress[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=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) 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_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/cryptography/cryptography-2.0.2.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=65b0fbf17bb70ee71f3d36cab31444c2
diff --git a/metadata/md5-cache/dev-python/debtcollector-1.17.1 b/metadata/md5-cache/dev-python/debtcollector-1.17.1
index 8d6495bb13a4..2d3ff4218c36 100644
--- a/metadata/md5-cache/dev-python/debtcollector-1.17.1
+++ b/metadata/md5-cache/dev-python/debtcollector-1.17.1
@@ -1,5 +1,5 @@
 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(-)] >=dev-python/pbr-2.0.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/pbr-2.1.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(-)] test? ( >=dev-python/coverage-4.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/coverage-4.4[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/subunit-0.0.18[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/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testrepository-0.0.18[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/testtools-1.4.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/fixtures-3.0.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/doc8[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/reno-1.8.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/reno-2.3.1[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(-)] ) doc? ( >=dev-python/sphinx-1.6.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/openstackdocstheme-1.16.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/reno-1.8.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/reno-2.3.1[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(-)]
+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(-)] >=dev-python/pbr-2.0.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/pbr-2.1.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(-)] test? ( >=dev-python/coverage-4.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/coverage-4.4[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/subunit-0.0.18[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/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testrepository-0.0.18[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/testtools-1.4.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/fixtures-3.0.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/doc8[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/reno-1.8.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/reno-2.3.1[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(-)] ) doc? ( >=dev-python/fixtures-3.0.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/sphinx-1.6.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/openstackdocstheme-1.16.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/reno-1.8.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/reno-2.3.1[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=Python deprecation patterns and strategies that collect technical debt
 EAPI=6
 HOMEPAGE=http://www.openstack.org/
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/d/debtcollector/debtcollector-1.17.1.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_=a5f0504fe46984497390698a321c1051
+_md5_=20a59d658461089209fdc508a663ab09
diff --git a/metadata/md5-cache/dev-python/libnacl-1.6.0 b/metadata/md5-cache/dev-python/libnacl-1.6.0
index aa31fb8a26e5..d78c2daeefa9 100644
--- a/metadata/md5-cache/dev-python/libnacl-1.6.0
+++ b/metadata/md5-cache/dev-python/libnacl-1.6.0
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/libsodium 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=https://github.com/saltstack/libnacl/archive/v1.6.0.tar.gz
+SRC_URI=https://github.com/saltstack/libnacl/archive/v1.6.0.tar.gz -> libnacl-1.6.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=366483b745b9aa9c0e1ebba4731b0f86
+_md5_=4b6d12d600aa7ce4949ea59aaa11dccd
diff --git a/metadata/md5-cache/dev-python/matplotlib2tikz-0.6.11 b/metadata/md5-cache/dev-python/matplotlib2tikz-0.6.13
index 6b8cee43a4c0..6027cd03cf91 100644
--- a/metadata/md5-cache/dev-python/matplotlib2tikz-0.6.11
+++ b/metadata/md5-cache/dev-python/matplotlib2tikz-0.6.13
@@ -10,6 +10,6 @@ RDEPEND=dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/nschloe/matplotlib2tikz/archive/v0.6.11.tar.gz -> matplotlib2tikz-0.6.11.tar.gz
+SRC_URI=https://github.com/nschloe/matplotlib2tikz/archive/v0.6.13.tar.gz -> matplotlib2tikz-0.6.13.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3d36e64364b6a09dee628ec9b618d465
+_md5_=646ab8f88512a194d808ebad14db8c42
diff --git a/metadata/md5-cache/dev-python/pysha3-1.0.2 b/metadata/md5-cache/dev-python/pysha3-1.0.2
new file mode 100644
index 000000000000..897a9c740238
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pysha3-1.0.2
@@ -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_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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(-)]
+DESCRIPTION=SHA-3 (Keccak) for Python 2.7 - 3.5
+EAPI=6
+HOMEPAGE=https://github.com/tiran/pysha3 https://pypi.python.org/pypi/pysha3
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=CC0-1.0 PSF-2
+RDEPEND=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(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pysha3/pysha3-1.0.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_=675f89750db94ddcc562b1aa36cc766e
diff --git a/metadata/md5-cache/dev-python/python-musicbrainz-ngs-0.6 b/metadata/md5-cache/dev-python/python-musicbrainz-ngs-0.6
index 9c0c45175a6d..2da7887f6f58 100644
--- a/metadata/md5-cache/dev-python/python-musicbrainz-ngs-0.6
+++ b/metadata/md5-cache/dev-python/python-musicbrainz-ngs-0.6
@@ -1,14 +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_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[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(-)] ) 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(-)]
+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(-)] doc? ( dev-python/sphinx[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=Python bindings for the MusicBrainz NGS and the Cover Art Archive webservices
 EAPI=5
 HOMEPAGE=https://github.com/alastair/python-musicbrainzngs
-IUSE=doc examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+IUSE=doc examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=BSD-2 ISC
-RDEPEND=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(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+RDEPEND=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=https://github.com/alastair/python-musicbrainzngs/archive/v0.6.tar.gz -> python-musicbrainzngs0.6.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=52e6136d941c9f900d275079f8636c7f
+_md5_=7df98f3580cc763d8f608de8bba31e96
diff --git a/metadata/md5-cache/dev-ruby/rubygems-2.6.14 b/metadata/md5-cache/dev-ruby/rubygems-2.6.14
index 7d4042b39fca..8a9e98376df1 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-2.6.14
+++ b/metadata/md5-cache/dev-ruby/rubygems-2.6.14
@@ -4,7 +4,7 @@ DESCRIPTION=Centralized Ruby extension management system
 EAPI=6
 HOMEPAGE=https://rubygems.org/
 IUSE=server test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
-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 ~sparc-solaris ~sparc64-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby MIT )
 PDEPEND=server? ( >=dev-ruby/builder-2.1 )
 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 )
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-2.6.14.tgz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	7b6fb2fc216b101b5d97d171925a847c	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=123a8e9b0f57fd431e6275c1ac1fd39b
+_md5_=7065535cec7e47de3a040baa9be913e5
diff --git a/metadata/md5-cache/dev-util/cmake-3.10.0_rc2 b/metadata/md5-cache/dev-util/cmake-3.10.0_rc3
index e2d73ab69923..34f7ab7eb3ee 100644
--- a/metadata/md5-cache/dev-util/cmake-3.10.0_rc2
+++ b/metadata/md5-cache/dev-util/cmake-3.10.0_rc3
@@ -7,6 +7,6 @@ IUSE=doc emacs server system-jsoncpp ncurses qt5 test
 LICENSE=CMake
 RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.0.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
 SLOT=0
-SRC_URI=https://cmake.org/files/v3.10/cmake-3.10.0-rc2.tar.gz
+SRC_URI=https://cmake.org/files/v3.10/cmake-3.10.0-rc3.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9ba479e279231e26c29a80521d2ba214
diff --git a/metadata/md5-cache/dev-util/kbuild-0.1.9998_pre20131130 b/metadata/md5-cache/dev-util/kbuild-0.1.9998_pre20171020
index cdd12e2c9f6a..d160fc08afdd 100644
--- a/metadata/md5-cache/dev-util/kbuild-0.1.9998_pre20131130
+++ b/metadata/md5-cache/dev-util/kbuild-0.1.9998_pre20171020
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install prepare
 DEPEND=sys-apps/texinfo sys-devel/flex sys-devel/gettext virtual/yacc >=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=A makefile framework for writing simple makefiles for complex tasks
-EAPI=4
+EAPI=6
 HOMEPAGE=http://svn.netlabs.org/kbuild/wiki
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
+KEYWORDS=~amd64 ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-3+
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~polynomial-c/kBuild-0.1.9998-pre20131130-src.tar.xz
+SRC_URI=https://dev.gentoo.org/~polynomial-c/kbuild-0.1.9998_pre20171020-src.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=5fb0bce5d0dee71f7944d0594108d864
+_md5_=06fb24f45a208be115ded00368ac1a1e
diff --git a/metadata/md5-cache/dev-util/kdevelop-5.1.2 b/metadata/md5-cache/dev-util/kdevelop-5.1.2
index c0fafe738ec0..e1db8fcb84bd 100644
--- a/metadata/md5-cache/dev-util/kdevelop-5.1.2
+++ b/metadata/md5-cache/dev-util/kdevelop-5.1.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktexteditor-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/threadweaver-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qthelp-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-util/kdevplatform-5.1.2:5 >=sys-devel/clang-3.5.0:* x11-misc/shared-mime-info gdbui? ( >=kde-plasma/libksysguard-5.10.5:5 ) okteta? ( >=kde-apps/okteta-14.12.0:5 ) plasma? ( >=kde-frameworks/krunner-5.37.0:5 >=kde-frameworks/plasma-5.37.0:5 ) qmake? ( dev-util/kdevelop-pg-qt:5 ) >=dev-qt/qtconcurrent-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.37.0:5 handbook? ( >=kde-frameworks/kdoctools-5.37.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktexteditor-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/threadweaver-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qthelp-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-util/kdevplatform-5.1.2:5 >=sys-devel/clang-3.5.0:= x11-misc/shared-mime-info gdbui? ( >=kde-plasma/libksysguard-5.10.5:5 ) okteta? ( >=kde-apps/okteta-14.12.0:5 ) plasma? ( >=kde-frameworks/krunner-5.37.0:5 >=kde-frameworks/plasma-5.37.0:5 ) qmake? ( dev-util/kdevelop-pg-qt:5 ) >=dev-qt/qtconcurrent-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.37.0:5 handbook? ( >=kde-frameworks/kdoctools-5.37.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Integrated Development Environment, supporting KF5/Qt, C/C++ and much more
 EAPI=6
 HOMEPAGE=https://www.kdevelop.org/
 IUSE=+gdbui okteta +plasma +qmake test debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 LGPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktexteditor-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/threadweaver-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qthelp-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-util/kdevplatform-5.1.2:5 >=sys-devel/clang-3.5.0:* x11-misc/shared-mime-info gdbui? ( >=kde-plasma/libksysguard-5.10.5:5 ) okteta? ( >=kde-apps/okteta-14.12.0:5 ) plasma? ( >=kde-frameworks/krunner-5.37.0:5 >=kde-frameworks/plasma-5.37.0:5 ) qmake? ( dev-util/kdevelop-pg-qt:5 ) >=kde-apps/kapptemplate-14.12.0:5 >=kde-apps/kio-extras-14.12.0:5 dev-util/ninja >=sys-devel/gdb-7.0[python] !dev-util/kdevelop:4 !dev-util/kdevelop-clang !dev-util/kdevelop-cppcheck !dev-util/kdevelop-qmake !dev-util/kdevelop-qmljs !<kde-apps/kapptemplate-16.04.0 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktexteditor-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/threadweaver-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qthelp-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-util/kdevplatform-5.1.2:5 >=sys-devel/clang-3.5.0:= x11-misc/shared-mime-info gdbui? ( >=kde-plasma/libksysguard-5.10.5:5 ) okteta? ( >=kde-apps/okteta-14.12.0:5 ) plasma? ( >=kde-frameworks/krunner-5.37.0:5 >=kde-frameworks/plasma-5.37.0:5 ) qmake? ( dev-util/kdevelop-pg-qt:5 ) >=kde-apps/kapptemplate-14.12.0:5 >=kde-apps/kio-extras-14.12.0:5 dev-util/ninja >=sys-devel/gdb-7.0[python] !dev-util/kdevelop:4 !dev-util/kdevelop-clang !dev-util/kdevelop-cppcheck !dev-util/kdevelop-qmake !dev-util/kdevelop-qmljs !<kde-apps/kapptemplate-16.04.0 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.1.2/src/kdevelop-5.1.2.tar.xz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6f2785898dd5672b3a14d428ad25085f
+_md5_=c86db79c4ca0849aa5333b039eeada41
diff --git a/metadata/md5-cache/dev-vcs/git-2.15.0_rc1 b/metadata/md5-cache/dev-vcs/git-2.15.0_rc2
index e696ac677c63..86b9f9d58a48 100644
--- a/metadata/md5-cache/dev-vcs/git-2.15.0_rc1
+++ b/metadata/md5-cache/dev-vcs/git-2.15.0_rc2
@@ -8,6 +8,6 @@ LICENSE=GPL-2
 RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) 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(+)] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=mirror://kernel/software/scm/git/testing/git-2.15.0.rc1.tar.xz mirror://kernel/software/scm/git/testing/git-manpages-2.15.0.rc1.tar.xz doc? ( mirror://kernel/software/scm/git/testing/git-htmldocs-2.15.0.rc1.tar.xz )
+SRC_URI=mirror://kernel/software/scm/git/testing/git-2.15.0.rc2.tar.xz mirror://kernel/software/scm/git/testing/git-manpages-2.15.0.rc2.tar.xz doc? ( mirror://kernel/software/scm/git/testing/git-htmldocs-2.15.0.rc2.tar.xz )
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	l10n	2c2e15383ba891d642f51896a7f0ecfe	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
 _md5_=20a7644f6b3f786c6e37824e4ef6a3ed
diff --git a/metadata/md5-cache/games-simulation/flightgear-2017.3.1 b/metadata/md5-cache/games-simulation/flightgear-2017.3.1
new file mode 100644
index 000000000000..75804ceba192
--- /dev/null
+++ b/metadata/md5-cache/games-simulation/flightgear-2017.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend test
+DEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[png] ~dev-games/simgear-2017.3.1[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.4.1:5 >=dev-qt/qtdeclarative-5.4.1:5 >=dev-qt/qtgui-5.4.1:5 >=dev-qt/qtnetwork-5.4.1:5 >=dev-qt/qtwidgets-5.4.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.4.1:5 ) ) >=dev-libs/boost-1.44 >=media-libs/plib-1.8.5 utils? ( x11-libs/libXi x11-libs/libXmu ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Open Source Flight Simulator
+EAPI=6
+HOMEPAGE=http://www.flightgear.org/
+IUSE=dbus debug examples gdal openmp qt5 test +udev +utils vim-syntax
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[png] ~dev-games/simgear-2017.3.1[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.4.1:5 >=dev-qt/qtdeclarative-5.4.1:5 >=dev-qt/qtgui-5.4.1:5 >=dev-qt/qtnetwork-5.4.1:5 >=dev-qt/qtwidgets-5.4.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.4.1:5 ) ) ~games-simulation/flightgear-data-2017.3.1
+SLOT=0
+SRC_URI=mirror://sourceforge/flightgear/flightgear-2017.3.1.tar.bz2
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d4f7a13210c0ee23483f1ee6d5b4fc69
diff --git a/metadata/md5-cache/games-simulation/flightgear-9999 b/metadata/md5-cache/games-simulation/flightgear-9999
index 6f2b784c292c..3ce043872d05 100644
--- a/metadata/md5-cache/games-simulation/flightgear-9999
+++ b/metadata/md5-cache/games-simulation/flightgear-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[png] ~dev-games/simgear-9999[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.4.1:5 >=dev-qt/qtdeclarative-5.4.1:5 >=dev-qt/qtgui-5.4.1:5 >=dev-qt/qtnetwork-5.4.1:5 >=dev-qt/qtwidgets-5.4.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.4.1:5 ) ) ~games-simulation/flightgear-data-9999
 SLOT=0
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=87a1f1712f0c07f9cc5a558f760533cf
+_md5_=411cecd163bfeaac63b0df972f8a36a6
diff --git a/metadata/md5-cache/games-simulation/flightgear-data-2017.3.1 b/metadata/md5-cache/games-simulation/flightgear-data-2017.3.1
new file mode 100644
index 000000000000..c789f7e3c3af
--- /dev/null
+++ b/metadata/md5-cache/games-simulation/flightgear-data-2017.3.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=FlightGear data files
+EAPI=6
+HOMEPAGE=http://www.flightgear.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!<games-simulation/flightgear-2.10.0
+SLOT=0
+SRC_URI=mirror://sourceforge/flightgear/FlightGear-2017.3.1-data.tar.bz2
+_md5_=6d1392d5134baed3cb4d88f3ec7e4527
diff --git a/metadata/md5-cache/kde-apps/kaccounts-providers-17.08.2 b/metadata/md5-cache/kde-apps/kaccounts-providers-17.08.2-r1
index a2c3bd815782..544350d05e98 100644
--- a/metadata/md5-cache/kde-apps/kaccounts-providers-17.08.2
+++ b/metadata/md5-cache/kde-apps/kaccounts-providers-17.08.2-r1
@@ -6,8 +6,8 @@ HOMEPAGE=https://community.kde.org/KTp
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kpackage-5.37.0:5 >=kde-apps/kaccounts-integration-17.08.2:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 net-im/telepathy-connection-managers[xmpp] net-libs/signon-ui net-libs/signon-oauth2 >=kde-frameworks/kf-env-4 !kde-apps/kaccounts-providers:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kpackage-5.37.0:5 >=kde-apps/kaccounts-integration-17.08.2:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 net-libs/signon-ui net-libs/signon-oauth2 >=kde-frameworks/kf-env-4 !kde-apps/kaccounts-providers:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kaccounts-providers-17.08.2.tar.xz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6f327ec521a489364df77d6080c2add2
+_md5_=43f55919daf6816a96551286df961ac6
diff --git a/metadata/md5-cache/kde-apps/kanagram-17.08.2 b/metadata/md5-cache/kde-apps/kanagram-17.08.2-r1
index d7ab96ccaf73..1bc8c64f9578 100644
--- a/metadata/md5-cache/kde-apps/kanagram-17.08.2
+++ b/metadata/md5-cache/kde-apps/kanagram-17.08.2-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/sonnet-5.37.0:5 >=kde-apps/libkeduvocdocument-17.08.2:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.37.0:5 handbook? ( >=kde-frameworks/kdoctools-5.37.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/sonnet-5.37.0:5 >=kde-apps/libkeduvocdocument-17.08.2:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.37.0:5 handbook? ( >=kde-frameworks/kdoctools-5.37.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Game based on anagrams of words
 EAPI=6
 HOMEPAGE=https://www.kde.org/applications/education/kanagram https://edu.kde.org/kanagram/
-IUSE=debug +handbook
+IUSE=speech debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/sonnet-5.37.0:5 >=kde-apps/libkeduvocdocument-17.08.2:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] >=kde-apps/kdeedu-data-17.08.2:5 >=dev-qt/qtmultimedia-5.7.1:5[qml] >=dev-qt/qtquickcontrols-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kanagram:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/sonnet-5.37.0:5 >=kde-apps/libkeduvocdocument-17.08.2:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.7.1:5 ) >=kde-apps/kdeedu-data-17.08.2:5 >=dev-qt/qtmultimedia-5.7.1:5[qml] >=dev-qt/qtquickcontrols-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kanagram:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kanagram-17.08.2.tar.xz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0897b2cbc8bdb6125901007170c759c5
+_md5_=87ef376754addfdbc09a90cb435c1462
diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-17.08.2 b/metadata/md5-cache/kde-apps/kdepim-runtime-17.08.2-r1
index 5da6d1acd932..430407820431 100644
--- a/metadata/md5-cache/kde-apps/kdepim-runtime-17.08.2
+++ b/metadata/md5-cache/kde-apps/kdepim-runtime-17.08.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/akonadi-17.08.2:5 >=kde-apps/akonadi-calendar-17.08.2:5 >=kde-apps/akonadi-contacts-17.08.2:5 >=kde-apps/akonadi-mime-17.08.2:5 >=kde-apps/akonadi-notes-17.08.2:5 >=kde-apps/kalarmcal-17.08.2:5 >=kde-apps/kcalcore-17.08.2:5 >=kde-apps/kcalutils-17.08.2:5 >=kde-apps/kcontacts-17.08.2:5 >=kde-apps/kdav-17.08.2:5 >=kde-apps/kidentitymanagement-17.08.2:5 >=kde-apps/kimap-17.08.2:5 >=kde-apps/kmailtransport-17.08.2:5 >=kde-apps/kmbox-17.08.2:5 >=kde-apps/kmime-17.08.2:5 >=kde-apps/libkgapi-17.08.2:5 >=kde-apps/pimcommon-17.08.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= >=dev-qt/qtxmlpatterns-5.7.1:5 dev-libs/libxslt sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.37.0:5 handbook? ( >=kde-frameworks/kdoctools-5.37.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/akonadi-17.08.2:5 >=kde-apps/akonadi-calendar-17.08.2:5 >=kde-apps/akonadi-contacts-17.08.2:5 >=kde-apps/akonadi-mime-17.08.2:5 >=kde-apps/akonadi-notes-17.08.2:5 >=kde-apps/kalarmcal-17.08.2:5 >=kde-apps/kcalcore-17.08.2:5 >=kde-apps/kcalutils-17.08.2:5 >=kde-apps/kcontacts-17.08.2:5 >=kde-apps/kdav-17.08.2:5 >=kde-apps/kidentitymanagement-17.08.2:5 >=kde-apps/kimap-17.08.2:5 >=kde-apps/kmailtransport-17.08.2:5 >=kde-apps/kmbox-17.08.2:5 >=kde-apps/kmime-17.08.2:5 >=kde-apps/libkgapi-17.08.2:5 >=kde-apps/pimcommon-17.08.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= speech? ( >=dev-qt/qtspeech-5.7.1:5 ) >=dev-qt/qtxmlpatterns-5.7.1:5 dev-libs/libxslt sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.37.0:5 handbook? ( >=kde-frameworks/kdoctools-5.37.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Runtime plugin collection to extend the functionality of KDE PIM
 EAPI=6
 HOMEPAGE=https://www.kde.org/
-IUSE=test debug +handbook test
+IUSE=speech test debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/akonadi-17.08.2:5 >=kde-apps/akonadi-calendar-17.08.2:5 >=kde-apps/akonadi-contacts-17.08.2:5 >=kde-apps/akonadi-mime-17.08.2:5 >=kde-apps/akonadi-notes-17.08.2:5 >=kde-apps/kalarmcal-17.08.2:5 >=kde-apps/kcalcore-17.08.2:5 >=kde-apps/kcalutils-17.08.2:5 >=kde-apps/kcontacts-17.08.2:5 >=kde-apps/kdav-17.08.2:5 >=kde-apps/kidentitymanagement-17.08.2:5 >=kde-apps/kimap-17.08.2:5 >=kde-apps/kmailtransport-17.08.2:5 >=kde-apps/kmbox-17.08.2:5 >=kde-apps/kmime-17.08.2:5 >=kde-apps/libkgapi-17.08.2:5 >=kde-apps/pimcommon-17.08.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= !kde-apps/kdepim-l10n >=kde-frameworks/oxygen-icons-5.37.0:5 >=kde-frameworks/kf-env-4 !kde-apps/kdepim-runtime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/akonadi-17.08.2:5 >=kde-apps/akonadi-calendar-17.08.2:5 >=kde-apps/akonadi-contacts-17.08.2:5 >=kde-apps/akonadi-mime-17.08.2:5 >=kde-apps/akonadi-notes-17.08.2:5 >=kde-apps/kalarmcal-17.08.2:5 >=kde-apps/kcalcore-17.08.2:5 >=kde-apps/kcalutils-17.08.2:5 >=kde-apps/kcontacts-17.08.2:5 >=kde-apps/kdav-17.08.2:5 >=kde-apps/kidentitymanagement-17.08.2:5 >=kde-apps/kimap-17.08.2:5 >=kde-apps/kmailtransport-17.08.2:5 >=kde-apps/kmbox-17.08.2:5 >=kde-apps/kmime-17.08.2:5 >=kde-apps/libkgapi-17.08.2:5 >=kde-apps/pimcommon-17.08.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= speech? ( >=dev-qt/qtspeech-5.7.1:5 ) !kde-apps/kdepim-l10n >=kde-frameworks/oxygen-icons-5.37.0:5 >=kde-frameworks/kf-env-4 !kde-apps/kdepim-runtime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kdepim-runtime-17.08.2.tar.xz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4c7e8ee5fdcec319e50de4dd0120a5d0
+_md5_=5fdfe88863a0f9303bd4f9da31a7b173
diff --git a/metadata/md5-cache/kde-apps/kremotecontrol-17.08.2 b/metadata/md5-cache/kde-apps/kremotecontrol-17.08.2-r1
index f51a9767d2c8..b5e38babaeef 100644
--- a/metadata/md5-cache/kde-apps/kremotecontrol-17.08.2
+++ b/metadata/md5-cache/kde-apps/kremotecontrol-17.08.2-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) 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
+DEPEND=kde-frameworks/kdelibs:4[plasma(+)] >=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 handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) 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 the Linux Infrared Remote Control system
 EAPI=6
 HOMEPAGE=https://www.kde.org/applications/utilities/kremotecontrol https://utils.kde.org/projects/kremotecontrol
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=app-misc/lirc kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) 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
+RDEPEND=kde-frameworks/kdelibs:4[plasma(+)] app-misc/lirc kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) 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/17.08
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kremotecontrol-17.08.2.tar.xz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3d86932dce874566671c4f2ba67890ad
+_md5_=efa52115363c1c5ca223c1b19e603321
diff --git a/metadata/md5-cache/kde-apps/libkface-17.04.3 b/metadata/md5-cache/kde-apps/libkface-17.04.3
index 66d9a1000449..c883bd04d59b 100644
--- a/metadata/md5-cache/kde-apps/libkface-17.04.3
+++ b/metadata/md5-cache/kde-apps/libkface-17.04.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/opencv:= || ( <media-libs/opencv-3.0.0 >=media-libs/opencv-3.1.0-r6[contrib] ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.37.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/opencv:= || ( <media-libs/opencv-3.0.0 ( >=media-libs/opencv-3.1.0-r6[contrib] <media-libs/opencv-3.3 ) ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.37.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Qt/C++ wrapper around LibFace to perform face recognition and detection
 EAPI=6
 HOMEPAGE=https://projects.kde.org/projects/kde/kdegraphics/libs/libkface
 IUSE=debug
 KEYWORDS=amd64 x86
 LICENSE=BSD GPL-2+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/opencv:= || ( <media-libs/opencv-3.0.0 >=media-libs/opencv-3.1.0-r6[contrib] ) >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/opencv:= || ( <media-libs/opencv-3.0.0 ( >=media-libs/opencv-3.1.0-r6[contrib] <media-libs/opencv-3.3 ) ) >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/libkface-17.04.3.tar.xz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6db5c7894beb341324393a2066a412c4
+_md5_=1b4531e02e3a9f734c2a4b4243e67968
diff --git a/metadata/md5-cache/kde-apps/libkface-17.08.2 b/metadata/md5-cache/kde-apps/libkface-17.08.2
index c14205128e4a..5d12f5c1927e 100644
--- a/metadata/md5-cache/kde-apps/libkface-17.08.2
+++ b/metadata/md5-cache/kde-apps/libkface-17.08.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/opencv:= || ( <media-libs/opencv-3.0.0 >=media-libs/opencv-3.1.0-r6[contrib] ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.37.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/opencv:= || ( <media-libs/opencv-3.0.0 ( >=media-libs/opencv-3.1.0-r6[contrib] <media-libs/opencv-3.3 ) ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.37.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Qt/C++ wrapper around LibFace to perform face recognition and detection
 EAPI=6
 HOMEPAGE=https://projects.kde.org/projects/kde/kdegraphics/libs/libkface
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD GPL-2+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/opencv:= || ( <media-libs/opencv-3.0.0 >=media-libs/opencv-3.1.0-r6[contrib] ) >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/opencv:= || ( <media-libs/opencv-3.0.0 ( >=media-libs/opencv-3.1.0-r6[contrib] <media-libs/opencv-3.3 ) ) >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/libkface-17.08.2.tar.xz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d966c2d7c4662d9ea1f0c9f5e5a54835
+_md5_=7f36d85dc9de94bf69597a0fa74cd73a
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.39.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.39.0
deleted file mode 100644
index ef91f5b92ec6..000000000000
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.39.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.39:5 >=kde-frameworks/kauth-5.39:5 >=kde-frameworks/kcodecs-5.39:5 >=kde-frameworks/kcompletion-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kguiaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/kitemviews-5.39:5 >=kde-frameworks/kjobwidgets-5.39:5 >=kde-frameworks/kparts-5.39:5 >=kde-frameworks/ktextwidgets-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kxmlgui-5.39:5 >=kde-frameworks/sonnet-5.39:5 >=kde-frameworks/syntax-highlighting-5.39:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=dev-qt/qtxmlpatterns-5.7.1:5 test? ( >=kde-frameworks/kservice-5.39:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing a full text editor component
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=editorconfig git test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.39:5 >=kde-frameworks/kauth-5.39:5 >=kde-frameworks/kcodecs-5.39:5 >=kde-frameworks/kcompletion-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kguiaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/kitemviews-5.39:5 >=kde-frameworks/kjobwidgets-5.39:5 >=kde-frameworks/kparts-5.39:5 >=kde-frameworks/ktextwidgets-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kxmlgui-5.39:5 >=kde-frameworks/sonnet-5.39:5 >=kde-frameworks/syntax-highlighting-5.39:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.39
-SRC_URI=mirror://kde/stable/frameworks/5.39/ktexteditor-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=22b745661e768be0c03c17795737baa9
diff --git a/metadata/md5-cache/kde-misc/kio-gdrive-1.2.1 b/metadata/md5-cache/kde-misc/kio-gdrive-1.2.1-r1
index b27197cfc289..fdf6b7f0f5c7 100644
--- a/metadata/md5-cache/kde-misc/kio-gdrive-1.2.1
+++ b/metadata/md5-cache/kde-misc/kio-gdrive-1.2.1-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-apps/libkgapi-17.04.0:5 >=dev-qt/qtwidgets-5.7.1:5 kaccounts? ( >=kde-apps/kaccounts-integration-17.04.0:5 ) !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] ) >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 dev-util/intltool sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.37.0:5 handbook? ( >=kde-frameworks/kdoctools-5.37.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-apps/libkgapi-14.12.0:5 >=dev-qt/qtwidgets-5.7.1:5 kaccounts? ( >=kde-apps/kaccounts-integration-14.12.0:5 ) !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] ) >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 dev-util/intltool sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.37.0:5 handbook? ( >=kde-frameworks/kdoctools-5.37.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KIO Slave for Google Drive service
 EAPI=6
 HOMEPAGE=https://phabricator.kde.org/project/profile/72/
 IUSE=+kaccounts debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-apps/libkgapi-17.04.0:5 >=dev-qt/qtwidgets-5.7.1:5 kaccounts? ( >=kde-apps/kaccounts-integration-17.04.0:5 ) !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-apps/libkgapi-14.12.0:5 >=dev-qt/qtwidgets-5.7.1:5 kaccounts? ( >=kde-apps/kaccounts-integration-14.12.0:5 ) !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] ) kaccounts? ( >=kde-apps/kaccounts-providers-14.12.0:5 ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kio-gdrive/1.2.1/src/kio-gdrive-1.2.1.tar.xz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f9c5c9e0078418e9e19a8f7014d8cf5b
+_md5_=64428bb80dd57cd35a653c5328f618b3
diff --git a/metadata/md5-cache/kde-misc/latte-dock-0.6.2 b/metadata/md5-cache/kde-misc/latte-dock-0.6.2
deleted file mode 100644
index b6c009e4f0c9..000000000000
--- a/metadata/md5-cache/kde-misc/latte-dock-0.6.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=kde-frameworks/kactivities-5.37.0 >=kde-frameworks/karchive-5.37.0 >=kde-frameworks/kconfig-5.37.0 >=kde-frameworks/kcoreaddons-5.37.0 >=kde-frameworks/kdbusaddons-5.37.0 >=kde-frameworks/kdeclarative-5.37.0 >=kde-frameworks/ki18n-5.37.0 >=kde-frameworks/kiconthemes-5.37.0 >=kde-frameworks/knotifications-5.37.0 >=kde-frameworks/kpackage-5.37.0 >=kde-frameworks/kwayland-5.37.0 >=kde-frameworks/kwindowsystem-5.37.0 >=kde-frameworks/kxmlgui-5.37.0 >=kde-frameworks/plasma-5.37.0[X] >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[xcb] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb >=kde-frameworks/extra-cmake-modules-5.37.0 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
-DESCRIPTION=Elegant dock, based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://store.kde.org/p/1169519/ https://github.com/psifidotos/Latte-Dock
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kactivities-5.37.0 >=kde-frameworks/karchive-5.37.0 >=kde-frameworks/kconfig-5.37.0 >=kde-frameworks/kcoreaddons-5.37.0 >=kde-frameworks/kdbusaddons-5.37.0 >=kde-frameworks/kdeclarative-5.37.0 >=kde-frameworks/ki18n-5.37.0 >=kde-frameworks/kiconthemes-5.37.0 >=kde-frameworks/knotifications-5.37.0 >=kde-frameworks/kpackage-5.37.0 >=kde-frameworks/kwayland-5.37.0 >=kde-frameworks/kwindowsystem-5.37.0 >=kde-frameworks/kxmlgui-5.37.0 >=kde-frameworks/plasma-5.37.0[X] >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[xcb] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb
-SLOT=0
-SRC_URI=https://github.com/psifidotos/Latte-Dock/archive/v0.6.2.tar.gz -> latte-dock-0.6.2.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8a9d4927b132f8165e0f93ebd5a8958e
diff --git a/metadata/md5-cache/kde-misc/latte-dock-9999 b/metadata/md5-cache/kde-misc/latte-dock-9999
deleted file mode 100644
index 318d0ee3e836..000000000000
--- a/metadata/md5-cache/kde-misc/latte-dock-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=kde-frameworks/kactivities-5.37.0 >=kde-frameworks/karchive-5.37.0 >=kde-frameworks/kconfig-5.37.0 >=kde-frameworks/kcoreaddons-5.37.0 >=kde-frameworks/kcrash-5.37.0 >=kde-frameworks/kdbusaddons-5.37.0 >=kde-frameworks/kdeclarative-5.37.0 >=kde-frameworks/kglobalaccel-5.37.0 >=kde-frameworks/ki18n-5.37.0 >=kde-frameworks/kiconthemes-5.37.0 >=kde-frameworks/knotifications-5.37.0 >=kde-frameworks/kpackage-5.37.0 >=kde-frameworks/kwayland-5.37.0 >=kde-frameworks/kwindowsystem-5.37.0 >=kde-frameworks/kxmlgui-5.37.0 >=kde-frameworks/plasma-5.37.0[X] >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[xcb] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-frameworks/extra-cmake-modules-5.37.0 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
-DESCRIPTION=Elegant dock, based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://store.kde.org/p/1169519/ https://github.com/psifidotos/Latte-Dock
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kactivities-5.37.0 >=kde-frameworks/karchive-5.37.0 >=kde-frameworks/kconfig-5.37.0 >=kde-frameworks/kcoreaddons-5.37.0 >=kde-frameworks/kcrash-5.37.0 >=kde-frameworks/kdbusaddons-5.37.0 >=kde-frameworks/kdeclarative-5.37.0 >=kde-frameworks/kglobalaccel-5.37.0 >=kde-frameworks/ki18n-5.37.0 >=kde-frameworks/kiconthemes-5.37.0 >=kde-frameworks/knotifications-5.37.0 >=kde-frameworks/kpackage-5.37.0 >=kde-frameworks/kwayland-5.37.0 >=kde-frameworks/kwindowsystem-5.37.0 >=kde-frameworks/kxmlgui-5.37.0 >=kde-frameworks/plasma-5.37.0[X] >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[xcb] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libSM x11-libs/libX11 x11-libs/libxcb
-SLOT=0
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3dce10a87f92369bb2356828b38c059b
diff --git a/metadata/md5-cache/media-gfx/graphicsmagick-1.3.26 b/metadata/md5-cache/media-gfx/graphicsmagick-1.3.26
index 998b86999e36..812828780157 100644
--- a/metadata/md5-cache/media-gfx/graphicsmagick-1.3.26
+++ b/metadata/md5-cache/media-gfx/graphicsmagick-1.3.26
@@ -4,10 +4,10 @@ DESCRIPTION=Collection of tools and libraries for many image formats
 EAPI=6
 HOMEPAGE=http://www.graphicsmagick.org/
 IUSE=bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp perl png postscript q16 q32 static-libs svg test threads tiff truetype webp wmf X zlib
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
 RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) fpx? ( media-libs/libfpx ) imagemagick? ( !media-gfx/imagemagick ) jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) lcms? ( media-libs/lcms:2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0 ) postscript? ( app-text/ghostscript-gpl ) svg? ( dev-libs/libxml2 ) tiff? ( media-libs/tiff:0 ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libSM x11-libs/libXext ) zlib? ( sys-libs/zlib )
 SLOT=0/1.3
 SRC_URI=mirror://sourceforge/graphicsmagick/GraphicsMagick-1.3.26.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=6f474e7df0a604c280ea8f2154a2625d
+_md5_=7023bbad353e969a9c7569ec9821386d
diff --git a/metadata/md5-cache/media-gfx/krita-3.3.1 b/metadata/md5-cache/media-gfx/krita-3.3.1
new file mode 100644
index 000000000000..cc84af18e9de
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/krita-3.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[-gles2] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/boost:= media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXi color-management? ( media-libs/opencolorio ) fftw? ( sci-libs/fftw:3.0= ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) openexr? ( media-libs/ilmbase:= media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.7.1:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) dev-cpp/eigen:3 dev-lang/perl sys-devel/gettext vc? ( >=dev-libs/vc-1.1.0 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.37.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Free digital painting application. Digital Painting, Creative Freedom!
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/graphics/krita/ https://krita.org/
+IUSE=color-management fftw +gsl +jpeg openexr pdf qtmedia +raw tiff vc test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[-gles2] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/boost:= media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXi color-management? ( media-libs/opencolorio ) fftw? ( sci-libs/fftw:3.0= ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) openexr? ( media-libs/ilmbase:= media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.7.1:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) !app-office/calligra:4[calligra_features_krita] !app-office/calligra-l10n:4[calligra_features_krita(+)] >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/krita/3.3.1/krita-3.3.1.tar.gz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d2251404ccc9f3fe08f596bcf1c95938
diff --git a/metadata/md5-cache/media-libs/mesa-17.2.3 b/metadata/md5-cache/media-libs/mesa-17.2.3
new file mode 100644
index 000000000000..8ad7d0fd245c
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-17.2.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test
+DEPEND=!<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(-)?] ) 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(-)?] ) ) 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(-)?] >=dev-libs/wayland-protocols-1.8 ) 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.82[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_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.82[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.82[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.82[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] >=sys-devel/clang-3.9.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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] >=sys-devel/clang-3.9.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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] >=sys-devel/clang-3.9.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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,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/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,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/clang-3.9.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(-)?] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,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? ( video_cards_r600? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,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:4[abi_x86_32(-)?,abi_x86_64(-)?,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.9.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(-)?] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,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-lang/python-2.7.5-r2:2.7 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/gettext virtual/pkgconfig valgrind? ( dev-util/valgrind ) >=x11-proto/dri2proto-2.8-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(-)?] dri3? ( >=x11-proto/dri3proto-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(-)?] >=x11-proto/presentproto-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(-)?] ) >=x11-proto/glproto-1.4.17-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-proto/xextproto-7.2.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(-)?] >=x11-proto/xf86driproto-2.1.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(-)?] >=x11-proto/xf86vidmodeproto-2.3.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(-)?] >=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=OpenGL-like graphic library for Linux
+EAPI=6
+HOMEPAGE=https://www.mesa3d.org/
+IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_imx video_cards_intel 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
+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(-)?] ) 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(-)?] ) ) 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(-)?] >=dev-libs/wayland-protocols-1.8 ) 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.82[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_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.82[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.82[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.82[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] >=sys-devel/clang-3.9.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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] >=sys-devel/clang-3.9.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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] >=sys-devel/clang-3.9.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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,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/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,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/clang-3.9.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(-)?] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,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? ( video_cards_r600? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,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_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,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:4[abi_x86_32(-)?,abi_x86_64(-)?,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.9.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(-)?] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,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=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 )
+RESTRICT=!bindist? ( bindist )
+SLOT=0
+SRC_URI=https://mesa.freedesktop.org/archive/mesa-17.2.3.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_=2505735c6e01029e44e2ce389679e602
diff --git a/metadata/md5-cache/net-analyzer/prometheus-1.7.1 b/metadata/md5-cache/net-analyzer/prometheus-1.7.1
deleted file mode 100644
index 092c48a9d91b..000000000000
--- a/metadata/md5-cache/net-analyzer/prometheus-1.7.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.8 dev-util/promu >=dev-lang/go-1.8
-DESCRIPTION=Prometheus monitoring system and time series database
-EAPI=6
-HOMEPAGE=https://github.com/prometheus/prometheus
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/prometheus/prometheus/archive/v1.7.1.tar.gz -> prometheus-1.7.1.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=c68e1bd04214fc7699d374f4b5290e09
diff --git a/metadata/md5-cache/net-analyzer/prometheus-2.0.0_rc0 b/metadata/md5-cache/net-analyzer/prometheus-2.0.0_rc0
deleted file mode 100644
index 29f4d95d618b..000000000000
--- a/metadata/md5-cache/net-analyzer/prometheus-2.0.0_rc0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup test unpack
-DEPEND=dev-util/promu >=dev-lang/go-1.8
-DESCRIPTION=Prometheus monitoring system and time series database
-EAPI=6
-HOMEPAGE=https://github.com/prometheus/prometheus
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/prometheus/prometheus/archive/v2.0.0-rc.0.tar.gz -> prometheus-2.0.0_rc0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=6dad5a671464593c0c7a89b6fe330b89
diff --git a/metadata/md5-cache/net-analyzer/prometheus-alertmanager-0.9.1 b/metadata/md5-cache/net-analyzer/prometheus-alertmanager-0.9.1
new file mode 100644
index 000000000000..6a8532de0b3f
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/prometheus-alertmanager-0.9.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-util/promu >=dev-lang/go-1.8
+DESCRIPTION=Alertmanager for alerts sent by client applications such as Prometheus
+EAPI=6
+HOMEPAGE=https://github.com/prometheus/alertmanager
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/prometheus/alertmanager/archive/v0.9.1.tar.gz -> prometheus-alertmanager-0.9.1.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	e4b567c44272a719fabf53f0f885d3f7
+_md5_=6367706b78c1984ccf55c7a5205f0237
diff --git a/metadata/md5-cache/net-fs/minio-0_pre20170929 b/metadata/md5-cache/net-fs/minio-0_pre20170929
new file mode 100644
index 000000000000..76667cd25a32
--- /dev/null
+++ b/metadata/md5-cache/net-fs/minio-0_pre20170929
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=>=dev-lang/go-1.8
+DESCRIPTION=An Amazon S3 compatible object storage server
+EAPI=6
+HOMEPAGE=https://github.com/minio/minio
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/minio/minio/archive/60cc6184d253efee4a3120683517028342229e21.tar.gz -> minio-0_pre20170929.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=4a92f8af25125e6283f249e4c9372acf
diff --git a/metadata/md5-cache/net-irc/irssi-0.8.21 b/metadata/md5-cache/net-irc/irssi-0.8.21
deleted file mode 100644
index 69fde768ced3..000000000000
--- a/metadata/md5-cache/net-irc/irssi-0.8.21
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) 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 dev-lang/perl:=
-DESCRIPTION=A modular textUI IRC client with IPv6 support
-EAPI=6
-HOMEPAGE=https://irssi.org/
-IUSE=ipv6 +perl selinux ssl socks5 +proxy libressl
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) selinux? ( sec-policy/selinux-irc ) perl? ( !net-im/silc-client ) dev-lang/perl:=
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/irssi/irssi/releases/download/0.8.21/irssi-0.8.21.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=49fd2b4df3af23818296e28104927576
diff --git a/metadata/md5-cache/net-irc/irssi-1.0.2 b/metadata/md5-cache/net-irc/irssi-1.0.2
deleted file mode 100644
index faf37e1d331f..000000000000
--- a/metadata/md5-cache/net-irc/irssi-1.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) virtual/pkgconfig dev-lang/perl:=
-DESCRIPTION=A modular textUI IRC client with IPv6 support
-EAPI=6
-HOMEPAGE=https://irssi.org/
-IUSE=+perl selinux socks5 +proxy libressl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) selinux? ( sec-policy/selinux-irc ) perl? ( !net-im/silc-client ) dev-lang/perl:=
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/irssi/irssi/releases/download/1.0.2/irssi-1.0.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=b408edd4211b67ebdfcce2c9e9c4dc04
diff --git a/metadata/md5-cache/net-irc/irssi-1.0.3 b/metadata/md5-cache/net-irc/irssi-1.0.3
deleted file mode 100644
index 0f0d548d0143..000000000000
--- a/metadata/md5-cache/net-irc/irssi-1.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) virtual/pkgconfig dev-lang/perl:=
-DESCRIPTION=A modular textUI IRC client with IPv6 support
-EAPI=6
-HOMEPAGE=https://irssi.org/
-IUSE=+perl selinux socks5 +proxy libressl
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) selinux? ( sec-policy/selinux-irc ) perl? ( !net-im/silc-client ) dev-lang/perl:=
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/irssi/irssi/releases/download/1.0.3/irssi-1.0.3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=6c934856797e98bfa250ffa454473964
diff --git a/metadata/md5-cache/net-irc/irssi-xmpp-0.52 b/metadata/md5-cache/net-irc/irssi-xmpp-0.52
deleted file mode 100644
index f73d12de48da..000000000000
--- a/metadata/md5-cache/net-irc/irssi-xmpp-0.52
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=<net-irc/irssi-1 >=net-libs/loudmouth-1.4.0[debug]
-DESCRIPTION=An irssi plugin providing Jabber/XMPP support
-EAPI=4
-HOMEPAGE=http://cybione.org/~irssi-xmpp/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=<net-irc/irssi-1 >=net-libs/loudmouth-1.4.0[debug]
-SLOT=0
-SRC_URI=http://cybione.org/~irssi-xmpp/files/irssi-xmpp-0.52.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=0e765667765e6ba0d84f8e18f8e772be
diff --git a/metadata/md5-cache/net-irc/quassel-irssi-0_p20170107 b/metadata/md5-cache/net-irc/quassel-irssi-0_p20170107
deleted file mode 100644
index f4305f0d6ca1..000000000000
--- a/metadata/md5-cache/net-irc/quassel-irssi-0_p20170107
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=<=net-irc/irssi-0.8.21 net-libs/quasselc
-DESCRIPTION=Irssi module to connect to Quassel cores.
-EAPI=6
-HOMEPAGE=https://github.com/phhusson/quassel-irssi/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=<=net-irc/irssi-0.8.21
-SLOT=0
-SRC_URI=https://github.com/phhusson/quassel-irssi/archive/f23e97a6188129cfae4c52f7e1a75940185454f4.zip -> quassel-irssi-0_p20170107.zip
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=943fdc6c608c217990a5e08b1c5d7bd1
diff --git a/metadata/md5-cache/net-libs/gtk-vnc-0.7.1 b/metadata/md5-cache/net-libs/gtk-vnc-0.7.1
index a54d0d81c3e6..11e52da5ab35 100644
--- a/metadata/md5-cache/net-libs/gtk-vnc-0.7.1
+++ b/metadata/md5-cache/net-libs/gtk-vnc-0.7.1
@@ -4,11 +4,11 @@ DESCRIPTION=VNC viewer widget for GTK
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/gtk-vnc
 IUSE=examples +gtk3 +introspection pulseaudio python sasl vala python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.30.1:2 >=dev-libs/libgcrypt-1.4.2:0= dev-libs/libgpg-error >=net-libs/gnutls-3.0:0= >=x11-libs/cairo-1.2 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 gtk3? ( >=x11-libs/gtk+-2.91.3:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.4:= ) pulseaudio? ( media-sound/pulseaudio ) 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_python2_7(-)] >=dev-python/pygtk-2:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sasl? ( dev-libs/cyrus-sasl )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) ) vala? ( gtk3 introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-vnc/0.7/gtk-vnc-0.7.1.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vala	103e6885c83965507391cdc5b6fa0e67	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0e0061de6834aa3e4bf2d7c7a2144073
+_md5_=48adf6033964dc46b985bad6aa57c314
diff --git a/metadata/md5-cache/net-misc/networkmanager-openvpn-1.8.0 b/metadata/md5-cache/net-misc/networkmanager-openvpn-1.8.0
new file mode 100644
index 000000000000..ab3df86e37d4
--- /dev/null
+++ b/metadata/md5-cache/net-misc/networkmanager-openvpn-1.8.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=>=dev-libs/glib-2.32:2 >=net-misc/networkmanager-1.7.0:= >=net-vpn/openvpn-2.1 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.7.0 >=x11-libs/gtk+-3.4:3 ) sys-devel/gettext >=dev-util/intltool-0.35 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=NetworkManager OpenVPN plugin
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IUSE=gtk test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.32:2 >=net-misc/networkmanager-1.7.0:= >=net-vpn/openvpn-2.1 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.7.0 >=x11-libs/gtk+-3.4:3 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.0.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=23ff36b2a7dbfe1f102185ed9f65cdaa
diff --git a/metadata/md5-cache/net-misc/ntp-4.2.8_p9 b/metadata/md5-cache/net-misc/ntp-4.2.8_p9
deleted file mode 100644
index 9d4820f95662..000000000000
--- a/metadata/md5-cache/net-misc/ntp-4.2.8_p9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !openntpd? ( !net-misc/openntpd ) snmp? ( net-analyzer/net-snmp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) parse-clocks? ( net-misc/pps-tools ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Network Time Protocol suite/programs
-EAPI=5
-HOMEPAGE=http://www.ntp.org/
-IUSE=caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint
-LICENSE=HPND BSD ISC
-PDEPEND=openntpd? ( net-misc/openntpd )
-RDEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !openntpd? ( !net-misc/openntpd ) snmp? ( net-analyzer/net-snmp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) parse-clocks? ( net-misc/pps-tools ) selinux? ( sec-policy/selinux-ntp ) vim-syntax? ( app-vim/ntp-syntax )
-SLOT=0
-SRC_URI=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p9.tar.gz https://dev.gentoo.org/~polynomial-c/ntp-4.2.8p9-manpages.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=c5c7d39306640dcc196e832d09a09141
diff --git a/metadata/md5-cache/net-misc/rabbitmq-server-3.6.9 b/metadata/md5-cache/net-misc/rabbitmq-server-3.6.9
index 2dcc8b5eedc2..e6f649e0b47c 100644
--- a/metadata/md5-cache/net-misc/rabbitmq-server-3.6.9
+++ b/metadata/md5-cache/net-misc/rabbitmq-server-3.6.9
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/erlang-18[ssl] app-arch/zip app-arch/unzip app-text/docbook-xm
 DESCRIPTION=RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang
 EAPI=5
 HOMEPAGE=http://www.rabbitmq.com/
-KEYWORDS=~amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2 MPL-1.1
 RDEPEND=>=dev-lang/erlang-18[ssl]
 SLOT=0
 SRC_URI=http://www.rabbitmq.com/releases/rabbitmq-server/v3.6.9/rabbitmq-server-3.6.9.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=134381bd1f766608011fc69039969b6f
+_md5_=5c569ca9e5deec8e63de6daeef64b485
diff --git a/metadata/md5-cache/sci-mathematics/why3-for-spark-2017 b/metadata/md5-cache/sci-mathematics/why3-for-spark-2017
new file mode 100644
index 000000000000..2260c7612554
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/why3-for-spark-2017
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=dev-lang/ocaml-4.02.3 dev-ml/menhir coq? ( sci-mathematics/coq ) doc? ( dev-tex/rubber ) gtk? ( dev-ml/lablgtk[sourceview] ) emacs? ( app-editors/emacs:* ) html? ( dev-tex/hevea ) hypothesis-selection? ( dev-ml/ocamlgraph ) zarith? ( dev-ml/zarith ) >=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=Platform for deductive program verification
+EAPI=6
+HOMEPAGE=http://why3.lri.fr/
+IUSE=coq doc emacs gtk html hypothesis-selection profiling zarith
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=>=dev-lang/ocaml-4.02.3 dev-ml/menhir coq? ( sci-mathematics/coq ) doc? ( dev-tex/rubber ) gtk? ( dev-ml/lablgtk[sourceview] ) emacs? ( app-editors/emacs:* ) html? ( dev-tex/hevea ) hypothesis-selection? ( dev-ml/ocamlgraph ) zarith? ( dev-ml/zarith )
+REQUIRED_USE=html? ( doc )
+SLOT=0
+SRC_URI=https//mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed055 -> why3-for-spark-gpl-2017-src.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=3b036bb9e1be99d971f76fb71838a9ac
diff --git a/metadata/md5-cache/sys-apps/gawk-4.1.4 b/metadata/md5-cache/sys-apps/gawk-4.1.4
index 25a5b4269b97..2d647eb74efa 100644
--- a/metadata/md5-cache/sys-apps/gawk-4.1.4
+++ b/metadata/md5-cache/sys-apps/gawk-4.1.4
@@ -4,10 +4,10 @@ DESCRIPTION=GNU awk pattern-matching language
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/gawk/gawk.html
 IUSE=mpfr nls readline
-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=mpfr? ( dev-libs/mpfr:0= ) readline? ( sys-libs/readline:0= )
 SLOT=0
 SRC_URI=mirror://gnu/gawk/gawk-4.1.4.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=449497277cb04812c83f77cede1b8607
+_md5_=ad812f17ec92a1820a7dddca020c25d3
diff --git a/metadata/md5-cache/sys-apps/gawk-4.2.0 b/metadata/md5-cache/sys-apps/gawk-4.2.0
new file mode 100644
index 000000000000..599312f1c4b4
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/gawk-4.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=dev-libs/gmp:0= mpfr? ( dev-libs/mpfr:0= ) readline? ( sys-libs/readline:0= ) nls? ( sys-devel/gettext )
+DESCRIPTION=GNU awk pattern-matching language
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/gawk/gawk.html
+IUSE=mpfr nls readline
+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-libs/gmp:0= mpfr? ( dev-libs/mpfr:0= ) readline? ( sys-libs/readline:0= )
+SLOT=0
+SRC_URI=mirror://gnu/gawk/gawk-4.2.0.tar.xz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=3fb18e884c759742386bbe388754eb82
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.10 b/metadata/md5-cache/sys-apps/portage-2.3.12
index 555357ca414d..dd8bb8c8418d 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.10
+++ b/metadata/md5-cache/sys-apps/portage-2.3.12
@@ -10,6 +10,6 @@ PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.
 RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,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(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !<app-admin/logrotate-3.8.0 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) >=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=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-SRC_URI=mirror://gentoo/portage-2.3.10.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.10.tar.bz2
+SRC_URI=mirror://gentoo/portage-2.3.12.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.12.tar.bz2
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e1ec7598e680c3b1f409631562a3e2cf
diff --git a/metadata/md5-cache/sys-block/thin-provisioning-tools-0.7.1 b/metadata/md5-cache/sys-block/thin-provisioning-tools-0.7.4
index 57767d0a2646..e3875814a7ed 100644
--- a/metadata/md5-cache/sys-block/thin-provisioning-tools-0.7.1
+++ b/metadata/md5-cache/sys-block/thin-provisioning-tools-0.7.4
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 LICENSE=GPL-3
 RDEPEND=!static? ( dev-libs/expat dev-libs/libaio )
 SLOT=0
-SRC_URI=https://github.com/jthornber/thin-provisioning-tools/archive/v0.7.1.tar.gz -> thin-provisioning-tools-0.7.1.tar.gz
+SRC_URI=https://github.com/jthornber/thin-provisioning-tools/archive/v0.7.4.tar.gz -> thin-provisioning-tools-0.7.4.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=67cef7ddaeb93ed3d60a598862311c66
+_md5_=0b4d68e1515c26b29321ff8e7a4c5d84
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.29.1-r1 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.29.1-r1
new file mode 100644
index 000000000000..388f72d0fb9f
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/binutils-hppa64-2.29.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=sys-devel/patch-2.6.1 >=app-portage/elt-patches-20170422 sys-devel/gnuconfig >=sys-devel/binutils-config-3 sys-libs/zlib test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) sys-devel/flex virtual/yacc >=sys-libs/binutils-libs-2.29.1
+DESCRIPTION=binutils package for building 64bit kernels on HPPA
+EAPI=5
+HOMEPAGE=https://sourceware.org/binutils/
+IUSE=cxx multitarget nls static-libs test vanilla
+KEYWORDS=-* ~hppa
+LICENSE=|| ( GPL-3 LGPL-3 )
+RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
+SLOT=2.29.1
+SRC_URI=mirror://gnu/binutils/binutils-2.29.1.tar.bz2 mirror://gentoo/binutils-2.29.1-patches-2.tar.xz https://dev.gentoo.org/~vapier/dist/binutils-2.29.1-patches-2.tar.xz https://dev.gentoo.org/~tamiko/distfiles/binutils-2.29.1-patches-2.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.29.1-patches-2.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-binutils	836af54604b9fef015d2bfd165d4ca32	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=23a5cb9a8ff451c290a7c5995158d323
diff --git a/metadata/md5-cache/sys-fs/eudev-1.10-r2 b/metadata/md5-cache/sys-fs/eudev-1.10-r2
deleted file mode 100644
index 85ab8411562a..000000000000
--- a/metadata/md5-cache/sys-fs/eudev-1.10-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test
-DEPEND=>=sys-apps/util-linux-2.20 gudev? ( >=dev-libs/glib-2.34.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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) keymap? ( dev-util/gperf ) virtual/os-headers virtual/pkgconfig >=sys-devel/make-3.82-r4 >=sys-kernel/linux-headers-2.6.39 doc? ( >=dev-util/gtk-doc-1.18 ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt >=dev-util/intltool-0.50 test? ( app-text/tree dev-lang/perl ) >=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=Linux dynamic and persistent device naming support (aka userspace devfs)
-EAPI=5
-HOMEPAGE=https://github.com/gentoo/eudev
-IUSE=doc gudev +hwdb +kmod introspection +keymap +modutils +openrc +rule-generator selinux static-libs test abi_x86_32 abi_x86_64 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 arm hppa ~mips ppc ppc64 x86
-LICENSE=LGPL-2.1 MIT GPL-2
-PDEPEND=hwdb? ( >=sys-apps/hwids-20140304[udev] ) keymap? ( >=sys-apps/hwids-20140304[udev] ) openrc? ( >=sys-fs/udev-init-scripts-26 )
-RDEPEND=>=sys-apps/util-linux-2.20 gudev? ( >=dev-libs/glib-2.34.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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd gudev? ( !dev-libs/libgudev )
-REQUIRED_USE=keymap? ( hwdb )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~blueness/eudev/eudev-1.10.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=54744625c90434a9e6b57749aa617b9d
diff --git a/metadata/md5-cache/sys-fs/eudev-1.9-r2 b/metadata/md5-cache/sys-fs/eudev-1.9-r2
deleted file mode 100644
index fb48beab305c..000000000000
--- a/metadata/md5-cache/sys-fs/eudev-1.9-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test
-DEPEND=>=sys-apps/util-linux-2.20 gudev? ( >=dev-libs/glib-2.34.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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) keymap? ( dev-util/gperf ) virtual/os-headers virtual/pkgconfig >=sys-devel/make-3.82-r4 >=sys-kernel/linux-headers-2.6.39 doc? ( >=dev-util/gtk-doc-1.18 ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt >=dev-util/intltool-0.50 test? ( app-text/tree dev-lang/perl ) >=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=Linux dynamic and persistent device naming support (aka userspace devfs)
-EAPI=5
-HOMEPAGE=https://github.com/gentoo/eudev
-IUSE=doc gudev +hwdb +kmod introspection +keymap +modutils +openrc +rule-generator selinux static-libs test abi_x86_32 abi_x86_64 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 arm hppa ~mips ppc ppc64 x86
-LICENSE=LGPL-2.1 MIT GPL-2
-PDEPEND=hwdb? ( >=sys-apps/hwids-20140304[udev] ) keymap? ( >=sys-apps/hwids-20140304[udev] ) openrc? ( >=sys-fs/udev-init-scripts-26 )
-RDEPEND=>=sys-apps/util-linux-2.20 gudev? ( >=dev-libs/glib-2.34.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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd gudev? ( !dev-libs/libgudev )
-REQUIRED_USE=keymap? ( hwdb )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~blueness/eudev/eudev-1.9.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=943490354d087a76ba296b9e7e220a21
diff --git a/metadata/md5-cache/sys-fs/eudev-3.1.2 b/metadata/md5-cache/sys-fs/eudev-3.1.2
deleted file mode 100644
index e3fdc228ec02..000000000000
--- a/metadata/md5-cache/sys-fs/eudev-3.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test
-DEPEND=>=sys-apps/util-linux-2.20 gudev? ( >=dev-libs/glib-2.34.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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) dev-util/gperf virtual/os-headers virtual/pkgconfig >=sys-devel/make-3.82-r4 >=sys-kernel/linux-headers-2.6.39 doc? ( >=dev-util/gtk-doc-1.18 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt ) >=dev-util/intltool-0.50 test? ( app-text/tree dev-lang/perl ) >=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=Linux dynamic and persistent device naming support (aka userspace devfs)
-EAPI=5
-HOMEPAGE=https://github.com/gentoo/eudev
-IUSE=doc gudev +hwdb +kmod introspection selinux static-libs test abi_x86_32 abi_x86_64 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 hppa ia64 ~mips ppc ppc64 sparc x86
-LICENSE=LGPL-2.1 MIT GPL-2
-PDEPEND=>=sys-fs/udev-init-scripts-26 hwdb? ( >=sys-apps/hwids-20140304[udev] )
-RDEPEND=>=sys-apps/util-linux-2.20 gudev? ( >=dev-libs/glib-2.34.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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd gudev? ( !dev-libs/libgudev )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~blueness/eudev/eudev-3.1.2.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0185730c03d6860912594ad86552468e
diff --git a/metadata/md5-cache/sys-fs/eudev-3.1.5 b/metadata/md5-cache/sys-fs/eudev-3.1.5
index a0a05cf09752..7bf37f41402e 100644
--- a/metadata/md5-cache/sys-fs/eudev-3.1.5
+++ b/metadata/md5-cache/sys-fs/eudev-3.1.5
@@ -11,4 +11,4 @@ RDEPEND=>=sys-apps/util-linux-2.20 introspection? ( >=dev-libs/gobject-introspec
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/eudev/eudev-3.1.5.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=e83fc74d7fd9368afa9206180f17d4fc
+_md5_=3f6bfc2097ef5952558d32bedbcfbd6d
diff --git a/metadata/md5-cache/sys-fs/eudev-3.2.2 b/metadata/md5-cache/sys-fs/eudev-3.2.2
deleted file mode 100644
index ca0356d23ea4..000000000000
--- a/metadata/md5-cache/sys-fs/eudev-3.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=sys-apps/util-linux-2.20 introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) dev-util/gperf virtual/os-headers virtual/pkgconfig >=sys-devel/make-3.82-r4 >=sys-kernel/linux-headers-2.6.39 >=dev-util/intltool-0.50 test? ( app-text/tree dev-lang/perl ) >=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=Linux dynamic and persistent device naming support (aka userspace devfs)
-EAPI=5
-HOMEPAGE=https://github.com/gentoo/eudev
-IUSE=+hwdb +kmod introspection rule-generator selinux static-libs test abi_x86_32 abi_x86_64 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 ~sparc ~x86
-LICENSE=LGPL-2.1 MIT GPL-2
-PDEPEND=>=sys-fs/udev-init-scripts-26 hwdb? ( >=sys-apps/hwids-20140304[udev] )
-RDEPEND=>=sys-apps/util-linux-2.20 introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~blueness/eudev/eudev-3.2.2.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=759f548595473cc0018dfad2b19f73fe
diff --git a/metadata/md5-cache/sys-fs/eudev-3.2.2-r1 b/metadata/md5-cache/sys-fs/eudev-3.2.2-r1
deleted file mode 100644
index 5c77ddb7ad0b..000000000000
--- a/metadata/md5-cache/sys-fs/eudev-3.2.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=sys-apps/util-linux-2.20 introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) dev-util/gperf virtual/os-headers virtual/pkgconfig >=sys-devel/make-3.82-r4 >=sys-kernel/linux-headers-2.6.39 >=dev-util/intltool-0.50 test? ( app-text/tree dev-lang/perl ) >=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=Linux dynamic and persistent device naming support (aka userspace devfs)
-EAPI=6
-HOMEPAGE=https://github.com/gentoo/eudev
-IUSE=+hwdb +kmod introspection rule-generator selinux static-libs test abi_x86_32 abi_x86_64 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 ~sparc ~x86
-LICENSE=LGPL-2.1 MIT GPL-2
-PDEPEND=>=sys-fs/udev-init-scripts-26 hwdb? ( >=sys-apps/hwids-20140304[udev] )
-RDEPEND=>=sys-apps/util-linux-2.20 introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~blueness/eudev/eudev-3.2.2.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=42029d4e5d70dc4374894eb6e846deb6
diff --git a/metadata/md5-cache/sys-fs/eudev-3.2.4 b/metadata/md5-cache/sys-fs/eudev-3.2.4
index 4dffd3315e70..f18f551e7391 100644
--- a/metadata/md5-cache/sys-fs/eudev-3.2.4
+++ b/metadata/md5-cache/sys-fs/eudev-3.2.4
@@ -11,4 +11,4 @@ RDEPEND=>=sys-apps/util-linux-2.20 introspection? ( >=dev-libs/gobject-introspec
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/eudev/eudev-3.2.4.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=65a2540d0e8dcde4c04038bd7c4fbc87
+_md5_=4b6e4a3d2a1ee95d843b5835cd261e2f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.93 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.93
new file mode 100644
index 000000000000..23eb40f6102c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.93
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~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.4.93
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-97.base.tar.xz mirror://gentoo/genpatches-4.4-97.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-97.experimental.tar.xz )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5f0171ec92791cac9609502f3f2f43af
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.57 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.57
new file mode 100644
index 000000000000..99ec13705f28
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.57
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~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.9.57
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-59.base.tar.xz mirror://gentoo/genpatches-4.9-59.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-59.experimental.tar.xz )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=efa9230be29616c41e5a5770bfb84d07
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.1.44 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.1.45
index 2a2857467eb0..fe454e93e015 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.1.44
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.1.45
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~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.1.44
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.1.44.xz mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz
+SLOT=4.1.45
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.1.45.xz mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7df30779922bb2272dc09a0172b257c0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.13.7 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.13.8
index 898f338082b7..72e30d6619a8 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.13.7
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.13.8
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~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.13.7
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.13.7.xz mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz
+SLOT=4.13.8
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.13.8.xz mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7df30779922bb2272dc09a0172b257c0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.92 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.93
index 82019f712d48..dd2609b01e33 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.92
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.93
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~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.4.92
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.92.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz
+SLOT=4.4.93
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.93.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7df30779922bb2272dc09a0172b257c0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.56 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.57
index 2d0bbc10788a..2c24cb50f6c0 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.56
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.57
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~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.9.56
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.56.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
+SLOT=4.9.57
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.57.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7df30779922bb2272dc09a0172b257c0
diff --git a/metadata/md5-cache/www-client/chromium-61.0.3163.100 b/metadata/md5-cache/www-client/chromium-61.0.3163.100
deleted file mode 100644
index 7e4a8ab05036..000000000000
--- a/metadata/md5-cache/www-client/chromium-61.0.3163.100
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 system-icu? ( <dev-libs/icu-59:= ) dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.4.2:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-4.6.1 sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=6
-HOMEPAGE=http://chromium.org/
-IUSE=component-build cups gnome-keyring +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW test
-KEYWORDS=amd64 ~arm ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 system-icu? ( <dev-libs/icu-59:= ) dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.4.2:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
-RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
-SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-61.0.3163.100.tar.xz
-_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	portability	2b88d3ecc35035a3b8ab628b49cafb0e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=835f2f4e0de8f49c17d3501bec82cbd8
diff --git a/metadata/md5-cache/www-client/chromium-62.0.3202.62 b/metadata/md5-cache/www-client/chromium-62.0.3202.62
index a42040dd57f8..d97b62c2cc55 100644
--- a/metadata/md5-cache/www-client/chromium-62.0.3202.62
+++ b/metadata/md5-cache/www-client/chromium-62.0.3202.62
@@ -4,11 +4,11 @@ DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=6
 HOMEPAGE=http://chromium.org/
 IUSE=component-build cups gnome-keyring +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.4.2:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
 RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-62.0.3202.62.tar.xz
 _eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	portability	2b88d3ecc35035a3b8ab628b49cafb0e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fabc6994238c984ac9accfe506324d20
+_md5_=ce8aefa06f3c9a42281f1b1d9fdb8bef
diff --git a/metadata/md5-cache/www-client/opera-48.0.2685.35 b/metadata/md5-cache/www-client/opera-48.0.2685.50
index 4cc72e848440..b5d663a196bd 100644
--- a/metadata/md5-cache/www-client/opera-48.0.2685.35
+++ b/metadata/md5-cache/www-client/opera-48.0.2685.50
@@ -7,6 +7,6 @@ KEYWORDS=~amd64
 LICENSE=OPERA-2014
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
 SLOT=0
-SRC_URI=http://download1.operacdn.com/pub/opera/desktop/48.0.2685.35/linux/opera-stable_48.0.2685.35_amd64.deb http://download2.operacdn.com/pub/opera/desktop/48.0.2685.35/linux/opera-stable_48.0.2685.35_amd64.deb http://download3.operacdn.com/pub/opera/desktop/48.0.2685.35/linux/opera-stable_48.0.2685.35_amd64.deb http://download4.operacdn.com/pub/opera/desktop/48.0.2685.35/linux/opera-stable_48.0.2685.35_amd64.deb
+SRC_URI=http://download1.operacdn.com/pub/opera/desktop/48.0.2685.50/linux/opera-stable_48.0.2685.50_amd64.deb http://download2.operacdn.com/pub/opera/desktop/48.0.2685.50/linux/opera-stable_48.0.2685.50_amd64.deb http://download3.operacdn.com/pub/opera/desktop/48.0.2685.50/linux/opera-stable_48.0.2685.50_amd64.deb http://download4.operacdn.com/pub/opera/desktop/48.0.2685.50/linux/opera-stable_48.0.2685.50_amd64.deb
 _eclasses_=chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7a5314a73caa178adc7cf4c9e41a354a
diff --git a/metadata/md5-cache/www-client/opera-beta-49.0.2725.12 b/metadata/md5-cache/www-client/opera-beta-49.0.2725.23
index e2e0c67ab81e..41bad0d44cef 100644
--- a/metadata/md5-cache/www-client/opera-beta-49.0.2725.12
+++ b/metadata/md5-cache/www-client/opera-beta-49.0.2725.23
@@ -7,6 +7,6 @@ KEYWORDS=~amd64
 LICENSE=OPERA-2014
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
 SLOT=0
-SRC_URI=amd64? ( http://download1.operacdn.com/pub/opera-beta/49.0.2725.12/linux/opera-beta_49.0.2725.12_amd64.deb http://download2.operacdn.com/pub/opera-beta/49.0.2725.12/linux/opera-beta_49.0.2725.12_amd64.deb http://download3.operacdn.com/pub/opera-beta/49.0.2725.12/linux/opera-beta_49.0.2725.12_amd64.deb http://download4.operacdn.com/pub/opera-beta/49.0.2725.12/linux/opera-beta_49.0.2725.12_amd64.deb )
+SRC_URI=amd64? ( http://download1.operacdn.com/pub/opera-beta/49.0.2725.23/linux/opera-beta_49.0.2725.23_amd64.deb http://download2.operacdn.com/pub/opera-beta/49.0.2725.23/linux/opera-beta_49.0.2725.23_amd64.deb http://download3.operacdn.com/pub/opera-beta/49.0.2725.23/linux/opera-beta_49.0.2725.23_amd64.deb http://download4.operacdn.com/pub/opera-beta/49.0.2725.23/linux/opera-beta_49.0.2725.23_amd64.deb )
 _eclasses_=chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=cb5a936376dbfd4b3baa37d419ce9c09
diff --git a/metadata/md5-cache/x11-apps/xinit-1.3.4-r2 b/metadata/md5-cache/x11-apps/xinit-1.3.4-r3
index e7e61579dd40..ecc340ed000b 100644
--- a/metadata/md5-cache/x11-apps/xinit-1.3.4-r2
+++ b/metadata/md5-cache/x11-apps/xinit-1.3.4-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=!systemd? ( sys-apps/gentoo-functions ) !<x11-base/xorg-server-1.8.0 x11-apps/xauth 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 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=!<x11-base/xorg-server-1.8.0 x11-apps/xauth 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 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X Window System initializer
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/
@@ -7,8 +7,8 @@ IUSE=+minimal systemd
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=MIT GPL-2
 PDEPEND=x11-apps/xrdb !minimal? ( x11-apps/xclock x11-apps/xsm x11-terms/xterm x11-wm/twm )
-RDEPEND=!systemd? ( sys-apps/gentoo-functions ) !<x11-base/xorg-server-1.8.0 x11-apps/xauth x11-libs/libX11
+RDEPEND=!<x11-base/xorg-server-1.8.0 x11-apps/xauth x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xinit-1.3.4.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=37667a8408256f734f88b28bc4198144
+_md5_=6ad39be658b1df7de34f55c647098cda
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.19.5 b/metadata/md5-cache/x11-base/xorg-server-1.19.5
index 606e0896d97d..869a0d8b1582 100644
--- a/metadata/md5-cache/x11-base/xorg-server-1.19.5
+++ b/metadata/md5-cache/x11-base/xorg-server-1.19.5
@@ -4,7 +4,7 @@ DESCRIPTION=X.Org X servers
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/
 IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind xcsecurity static-libs doc
-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
 PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.19 )
 RDEPEND=>=app-eselect/eselect-opengl-1.3.0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.46 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) glamor? ( media-libs/libepoxy[X] >=media-libs/mesa-10.3.4-r1[egl,gbm] !x11-libs/glamor ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-10.3.4-r1 ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=virtual/udev-150 ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 media-libs/libepoxy >=dev-libs/wayland-protocols-1.1 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) selinux? ( sec-policy/selinux-xserver ) !x11-drivers/xf86-video-modesetting
@@ -12,4 +12,4 @@ REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) xeph
 SLOT=0/1.19.5
 SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-1.19.5.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=22480d1650f4760ae9c6b8236232cc9f
+_md5_=406fd7cd594d7919bd5bae9ad6da6fd3
diff --git a/metadata/md5-cache/x11-libs/libXfont-1.5.3 b/metadata/md5-cache/x11-libs/libXfont-1.5.3
new file mode 100644
index 000000000000..84eba11a1218
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libXfont-1.5.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=x11-libs/xtrans x11-libs/libfontenc sys-libs/zlib truetype? ( >=media-libs/freetype-2 ) bzip2? ( app-arch/bzip2 ) x11-proto/xproto >=x11-proto/fontsproto-2.1.3 !<x11-base/xorg-server-1.5.99.901 >=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 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DESCRIPTION=X.Org Xfont library
+EAPI=5
+HOMEPAGE=https://www.x.org/wiki/
+IUSE=bzip2 ipv6 truetype static-libs doc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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=MIT
+RDEPEND=x11-libs/xtrans x11-libs/libfontenc sys-libs/zlib truetype? ( >=media-libs/freetype-2 ) bzip2? ( app-arch/bzip2 ) x11-proto/xproto >=x11-proto/fontsproto-2.1.3 !<x11-base/xorg-server-1.5.99.901
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libXfont-1.5.3.tar.bz2
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
+_md5_=b2a29c27f3d78b73b4c4741eee9aaf89
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index d30b64b3c6de..0a214ad7bad0 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 19 Oct 2017 16:09:11 +0000
+Fri, 20 Oct 2017 15:39:13 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 93e93f689436..09a1367e0f45 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Oct 19 16:09:11 UTC 2017
+Fri Oct 20 15:39:13 UTC 2017
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index ce64be399123..0a2a306ab79c 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 19 Oct 2017 16:15:01 +0000
+Fri, 20 Oct 2017 15:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 5c0462eafd82..7efd6e7e9c1c 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-9cd550632fe63c4a85f7e663266d45ae3370f268 1508428236 2017-10-19T15:50:36+00:00
+bd34ee04ede7a510652cbc0263a2b8d9ed571d5c 1508512460 2017-10-20T15:14:20+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index f235a6c69416..15815b807628 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1508429101 Thu 19 Oct 2017 04:05:01 PM UTC
+1508513701 Fri 20 Oct 2017 03:35:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index d30b64b3c6de..0a214ad7bad0 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 19 Oct 2017 16:09:11 +0000
+Fri, 20 Oct 2017 15:39:13 +0000
diff --git a/net-analyzer/hexinject/Manifest b/net-analyzer/hexinject/Manifest
index 85baff35eabe..6f1954f3ba24 100644
--- a/net-analyzer/hexinject/Manifest
+++ b/net-analyzer/hexinject/Manifest
@@ -1,4 +1,4 @@
 AUX hexinject-1.5-fix-build-system.patch 433 SHA256 87a83bb89c834aba9f6fdf5e9c56de6473660278834ee67bfeeeabc64423f89c SHA512 db17bbb6d1ac936b5eedadd9460bacb1f59c21556fcc8c60e135920383d6990b0498a1f74182352b8061629934e728a865e2cba922abec4c7c7035bbc346e2e1 WHIRLPOOL cf691c1ff0c7c7d44abd85a2f6153fe99dce19319dcc009c9259c1a095deac79444ec47bb97b48fcf94b63fd2a6923997332f5b65327d5e8136af147d75b37dd
 DIST hexinject-1.5.tar.gz 14449 SHA256 329f0686069988ac0dae4a00082b205ac9669bc8e202d4b112c600bcbc198ce9 SHA512 cd145b6f2ae9d739effca03959fb474df11d28ff015c0e5bd1e30c341f60085154795f3c8a601b7241623944b3868b6fc9a3e1530a3aa4e7aaa2b3794a5aa34a WHIRLPOOL 96e065ca7135f12db6e5949fb8fd537e0981f5b0cc1d57d40eb59003aabc87ae2459872cb11108727c0032b6c5282d385512678859da081d783bc692f8044c93
 EBUILD hexinject-1.5.ebuild 756 SHA256 09565bedd7830e8f0d97ffdd8a51d4fe2da4ea8909b8e99465849c801184c513 SHA512 2d17be0ac7931ac94d94924681f8f6f7ed0ed4b2072f2e5e46a5bf1277b4a67b62cdcabdad61d3db5fc7eb216258135d4ce389e4cae4a5ab476a209a62878a92 WHIRLPOOL 8fd175a1aeaca97833912647e1e8414ee268c19a7bb229a7ed8fa227346e076036e319451037b8a39b75e342e21e9f4969680dc9f2c161f8b4d6f45e2d81152e
-MISC metadata.xml 893 SHA256 32347e309dbb0477991d4eafb310fdb1118fb88a40215d883b2978841c0e4d2f SHA512 6ef4476679512d3e08baf37a3c27c304613b281d1da242a675c3da4c907100fb98c594a8b03970e3b8a9571e441f4e6b40b4cd971199bcc62db6713161128367 WHIRLPOOL cb086d0d2c6d925621e4dd6a1d8d4008796b9672c6ff103bb893f6910fcf6e10928450fa30ec80af2d00c28f5858163feb2c230680c66d0860be47e190d1b340
+MISC metadata.xml 1004 SHA256 e507c67a149b536ccfaaaaf3bbbcf5f2afb75e19fa2a3a641dfa400ded2ff182 SHA512 e9e01a46cc45ab6625e4d444d857a31340b93879c24cb7e2a1d420e644b376f484ad4076bc36302ab536bf88a9ffd7c1850115d3c2433181b82c948e84077ccd WHIRLPOOL 891d1d137c3481c9bb69cf843fed93fe0167b328cbd5e95bbbe115bb8802ec9923a896b3d0b1296838bbc563d584c66f95e7b1c4f8ff3c41d72d5499f853546c
diff --git a/net-analyzer/hexinject/metadata.xml b/net-analyzer/hexinject/metadata.xml
index b4d8ef8ab509..e3ef4f8b00b1 100644
--- a/net-analyzer/hexinject/metadata.xml
+++ b/net-analyzer/hexinject/metadata.xml
@@ -1,7 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>holgersson@posteo.de</email>
+		<name>Nils Freydank</name>
+	</maintainer>
+	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
@@ -17,6 +21,6 @@
 		<flag name="experimental">Install experimental packets.tcl</flag>
 	</use>
 	<upstream>
-		<remote-id type="sourceforge">downloads</remote-id>
+		<remote-id type="sourceforge">hexinject</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/prometheus-alertmanager/Manifest b/net-analyzer/prometheus-alertmanager/Manifest
new file mode 100644
index 000000000000..b536416d42dd
--- /dev/null
+++ b/net-analyzer/prometheus-alertmanager/Manifest
@@ -0,0 +1,5 @@
+AUX prometheus-alertmanager.confd 56 SHA256 822dc8df1e3b74ddb51bdfd27cf312d24048f10040bf6cd7be53cce772619c5e SHA512 3ec5894fa121a3449f2b1c3f82283abc3fc31f39b4397760101a5d3c7c41a35cad50b03387542e4c950ae61bcc456b3ff4a92b52c53a04d12755005d0287d57e WHIRLPOOL 65a2b32dc9c8e5081b0c0f2acc22a2168f30a7bc58de6fe0619c6ab027ae76db4d232c93b10debd9554c183505b1fc5001b7026ee4799b97fbae24843bedbe07
+AUX prometheus-alertmanager.initd 587 SHA256 8e2e5d66d386500257cd8056bf9b7fe9d32c46a71c0cdd33dc0dca4ae4f40504 SHA512 7e19c82d62d9b226d2bc5926ba6a988bdd283bbeb911cb9339e451885ded5a1e9a4a1f5635f5d5266b23f3fbe896a334586c940ccc505ffbb84ff9fb9ff7d75f WHIRLPOOL 0662b12be3214f947f85246968e1026ad353e2243c3bead29a276d0b4c9f3a414376010925a6897a38f0d7e2af5b61c4ea6cda5389f70d355b79f743480f5597
+DIST prometheus-alertmanager-0.9.1.tar.gz 3671292 SHA256 067e00773efd0948918a30449d5e96b5cc9b0b9ecb1271d75bbd46ad3944a699 SHA512 423079c630466a6c3eeaab56d60bd9b7c77049955e9a67b703ef51665ccf7af0b319e8e3748c8e6d055dcf442173028cbe475181be08221d93a5ad3d20900c65 WHIRLPOOL 1fdf9803ffb99bda6ca49f250ff2895e29a6a77b17b1f38f47ca1f858262580f307f56bd95f0a6e97cd7a0a04e3b0df1fe28401cc6f66b71a72311df0971b970
+EBUILD prometheus-alertmanager-0.9.1.ebuild 1340 SHA256 4e59b840318773b52452bcec046748333185053549ff1562b22ab6c23c93e208 SHA512 e9a557f400e3dac49a33c5773b9c51ae7780781098aa11a2167ed352aceac02667584f31f03859e44776d47f66c98468aa9575765ab39014855f5eb45e0d0f6b WHIRLPOOL 9ddb57b19cd6677a8efd221d15913911fb020f5b089354a1ff80e3c1e82b2cea312b0e3d32330888abeff93c934851d014e50c7c2e2d541807f3ac12f6d4cc83
+MISC metadata.xml 333 SHA256 87b061dda62d5911cfa1088391d83b6486b4fc817ddaf93d174dab1aca11c186 SHA512 2059ca45e92e3a833d93097362e1ae79ef085c35f87ec2bcbde4ee2d20f8938cb27fb19647d083990c1224b3d0c06f163a3f1bedfabfb59a6b3b15a90697ac0f WHIRLPOOL 188807823233f2274caa356920208f2395bc43fb8e839d0a016a165d99647e05a68e62a28aaf9b41f4f562deabcfdf988d27abece5de28bb3f0a9926434a2789
diff --git a/net-analyzer/prometheus-alertmanager/files/prometheus-alertmanager.confd b/net-analyzer/prometheus-alertmanager/files/prometheus-alertmanager.confd
new file mode 100644
index 000000000000..a0ae34c4bc0d
--- /dev/null
+++ b/net-analyzer/prometheus-alertmanager/files/prometheus-alertmanager.confd
@@ -0,0 +1,2 @@
+# arguments for prometheus alertmanager
+command_args=""
diff --git a/net-analyzer/prometheus-alertmanager/files/prometheus-alertmanager.initd b/net-analyzer/prometheus-alertmanager/files/prometheus-alertmanager.initd
new file mode 100644
index 000000000000..ece8bf145876
--- /dev/null
+++ b/net-analyzer/prometheus-alertmanager/files/prometheus-alertmanager.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 2016-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Prometheus alertmanager"
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+user=${user:-${RC_SVCNAME}}
+group=${group:-${RC_SVCNAME}}
+
+command="/usr/bin/alertmanager"
+command_args="${command_args:--config.file=/etc/alertmanager/config.yml}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+	--stdout /var/log/alertmanager/${RC_SVCNAME}.log \
+	--stderr /var/log/alertmanager/${RC_SVCNAME}.log"
+
+depend() {
+	after net
+}
diff --git a/net-analyzer/prometheus-alertmanager/metadata.xml b/net-analyzer/prometheus-alertmanager/metadata.xml
new file mode 100644
index 000000000000..714320b4f365
--- /dev/null
+++ b/net-analyzer/prometheus-alertmanager/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">prometheus/alertmanager</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.9.1.ebuild b/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.9.1.ebuild
new file mode 100644
index 000000000000..d04d5de449d7
--- /dev/null
+++ b/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.9.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/prometheus/alertmanager"
+EGIT_COMMIT="v${PV/_rc/-rc.}"
+ALERTMANAGER_COMMIT="9f5f4b2"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Alertmanager for alerts sent by client applications such as Prometheus"
+HOMEPAGE="https://github.com/prometheus/alertmanager"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-util/promu"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${ALERTMANAGER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	mkdir -p bin || die
+	GOPATH="${S}" promu build -v --prefix alertmanager || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin alertmanager/alertmanager
+	dodoc {README,CHANGELOG,CONTRIBUTING}.md
+	insinto /etc/alertmanager/
+	newins doc/examples/simple.yml config.yml.example
+	popd || die
+	keepdir /var/lib/alertmanager /var/log/alertmanager
+	fowners ${PN}:${PN} /var/lib/alertmanager /var/log/alertmanager
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/net-analyzer/prometheus/Manifest b/net-analyzer/prometheus/Manifest
index d299ea3418d5..0d46377b8343 100644
--- a/net-analyzer/prometheus/Manifest
+++ b/net-analyzer/prometheus/Manifest
@@ -1,13 +1,9 @@
 AUX prometheus-3.initd 659 SHA256 2f5790b241f544e2f73687c15b1cf8efc79fbfbff5502cf973c6bef4ce850498 SHA512 14321f0a0e39e4ed1b879ba956855046c21dff85770d3d269492a6d0b911af69ccbf047ec48b91c56bfb678da9390fb236ce165326dc2139b1255d448f2512fa WHIRLPOOL 595254176744eb3794b760830bb4036813df31dd6ce5f91890463db9db8bde3733b23914c8b725e5543e49d5c3c9ea1a4bd9f87b7ce612e17533ad4bb03884f8
 AUX prometheus.confd 43 SHA256 940f1a3ad08f0eb370951b1a42c29a9217cba9ae2f5cb6cc675bdec1d51e8309 SHA512 37468e897cd34b50b0edc65ada3f0c2e05459c3d96bb7f82d58b6de5bf10a127f1bf7912af93d83d94e3ea7287cfeb2311e36535f291d01a11d152a0b438591c WHIRLPOOL b8bdd0bc16fde3fb99cf8939427781a1b250df7e4a607fb8c780f75d502e7d2aa76aef6a1b4c082d3aa32f0a9a21b3b39df72fcf5e6d26592df43661f8d08169
 AUX prometheus.initd 664 SHA256 566db492c8da87e1de8b655247dce11e43d83b85c9bf9bef7a9fd715e4667516 SHA512 95e2ac4969c26f2e91330b521223e94912d68832ef29429e68930479c29b24027c138011bd1f480546c14a07ae15800967e9ff114cdec3cabd0c15bdca489665 WHIRLPOOL e972726fac805f43772dc871a2a3af45d5421f1c15ab05fd0e7d5368b282164021a0079cfd9d3f5de4656739ccfa339ed80d3fb2ae50b429d5ae806441edc5fa
-DIST prometheus-1.7.1.tar.gz 5122747 SHA256 209832310f5bef99faef3beaaa95263612a4d0126ca512c4a4c23a8543d3ccf5 SHA512 98a42e95978477530082d7549c29f17b133043d7c233ba3c90b183f06a3f24ee578f8fed75cba476d3c93a22abcccfdbccc94488beb8450a02f260d24165ba26 WHIRLPOOL 8ab473430752336e09b4a0c38fd1117abe21196478d7f2f7e813c27f07c950cc3525d9e9ba32309711c73a1032f3cff27ddc1582d0c4b6c66fe82d5b58675550
 DIST prometheus-1.8.0.tar.gz 5194115 SHA256 556247d750b3618b74ccf59669f74a8c0c39e72cdf51cbcc0c0bcc392de195df SHA512 1ac00ddae4753f99f167db9b6efc5fa442918284f59468b8e1c7743e3f946eab895678c87e12a73bf158e3c0bf3df7345dd59855baaabb54fc86f1ae1014192d WHIRLPOOL 9ff6f0dc36f022b2be107ce59878f81b210b196858064655a74e098650abc77d5a0c2afb11dd5ebb242d1e2addbc3a182b1a6ce1f751eed723e3fff3434d319c
-DIST prometheus-2.0.0_rc0.tar.gz 5524499 SHA256 e1615defddf3e0a2d32e22ffba5bc3f0f37ff98fac7d4bba2b2c5bb8219f2a22 SHA512 fd382f559ea9a362e2493ea2d317afe600b0ed2299e3d6ef12678658cd62320ad39deec1b4639819b32c4ba34f124792d00dd101632b1c1e4f1123005e20e38d WHIRLPOOL 1d0ed8f35c9f9d5fca8310af21b93d35bad3397fbf88ea0cc2573412c8d58291e521212283abbe5ed4a461e2e1f62f704f96a6070509864972ff3dd1c0eacd67
 DIST prometheus-2.0.0_rc1.tar.gz 5538094 SHA256 5d80280d4f8de0e5c79b02fa2ab9cbe4cf49a287ed268ed85a0f87abd257d226 SHA512 c89509693608a4f00713cb3b9f11b533236898af4a08580ecb4aa5f198d7f568719ddb78225f9d260128288aa7e037d0a0a820f8e42e2db4c7745e2f993fb4fe WHIRLPOOL 1765d9eb600da28e12d2c679a60f050d9557bbf974a53ff86363fb66fb82d64c4b55a85f9aac4c80039c317a88028c794e8387e0db3f0b925b86057d5ae17f7e
-EBUILD prometheus-1.7.1.ebuild 1603 SHA256 2058c7921ecb848a13651d7320aff7908bcfc18fd29ce88e05b00a9dfdb0be42 SHA512 b646178f6b66987d638ad53cecaf26f2eb01619010d037020c33a8ae88793b2b4fd46615fb3608313706cdc82a06089fc26b255fca8238bbfad7419a695a8c14 WHIRLPOOL 4fe3e8573129430024de11ddbf42c7283831cbe559a57f38fde49af2c60d8de792596d4e1e8b61c9c676203420d6fb7a041de73daa7acc3c1e6069d332bdb3af
 EBUILD prometheus-1.8.0.ebuild 1603 SHA256 fd4ee62da65a03450f6192c00ba513c82f286d09ecf6e2587e637d3257c19ffb SHA512 dce3a7f7706f60c84aec1e994eba9c8af32995972ac3312e13ce1ea44c79eb8315e32c8ab735b5054bd7f6ff72125e1dd20c62de6360c01de7e18a8bd2a9d8ad WHIRLPOOL b37ddb874abcbae32d01e2700139e3b42f2d8b538d728779e0237376d7a3c88322ad7fb5c9e7649a95b25cb379df78c496ed78366d6a9b659d19d70a2020a8c7
-EBUILD prometheus-2.0.0_rc0.ebuild 2000 SHA256 f1a5c96261f70b5989c14beb664c6bca41d4298168ce3bd8711ce007acf6889f SHA512 1a7dcd5248ba0eac23f2791ae892358738db9edd278c2fbfa549e4944eb4122f982c15443ba2c888c806249316a6f8a041249532737544946455680665249962 WHIRLPOOL 91dcfcdac5919c2a2b14c37cef878a7aa4f2e0ca3d95b09f4176533db620785d3e8a4e723f54fdf77b3cf5d7aa6e1377454080ce056162d5a0b56c15909f8d7f
 EBUILD prometheus-2.0.0_rc1.ebuild 2000 SHA256 a4c9a98be5c9fcdfde08360a8eeabf19258d699f9ac402727836b959b237ee9f SHA512 0a141038f1dace00a6ebc0e54b5d4714bb72efdc733e99c8c32efb194f8b1ff7c726f5951199ca64448402d4f9b7aa9985353620bcf3410616532171e97dc0a1 WHIRLPOOL 22e1c4b127f02c5c4a5b00774f2774d56e45274a5bc178d7cbdb1f7586dc06c9ee5591d9dc9ca15194c6787038139378778f361a364df5b8beee428d26e00f6e
 MISC ChangeLog 552 SHA256 be1d133e356e6eb2ad19eb3900722da8fa6495af85bc38a2b90f6845c62dc27d SHA512 7d5bf11cda31ce2fcae3a752ec9eb0d17b212c0ea1a480e09436d41a24eae4ba5689aa43727a8ac5882c5b1ddc741c717a3c8d509d69204fd44eeb00460a4e60 WHIRLPOOL 7ddcb758ecc1426a520a97c6b27b1c0e9752422c9c0f16b1746e11aa91edc37f5289b096430a0b8e05535818901f6f1745144107a2000cb771843de038b07963
 MISC metadata.xml 331 SHA256 1e206a714f59c466b3f41285ea73b6b3a0919c2f8c0a4cf5350ccea436bb26d9 SHA512 06fd0da413c0280a902bbdf50e1e0557375d2208021fda3c3081d8a25a4b17ad1ca647d994dd97ba2d838ea5c87148d3ffd13a8a54cb8dc007b45927df8de47a WHIRLPOOL 0c98900489068124a7afcf1f40d1c9964089ead950e8e16dbc4a0389487187d9af6802a6e86fb6dcf541784f09acd8e0ee27f3215deb16de56495af2b1ee85fc
diff --git a/net-analyzer/prometheus/prometheus-1.7.1.ebuild b/net-analyzer/prometheus/prometheus-1.7.1.ebuild
deleted file mode 100644
index a480c7952919..000000000000
--- a/net-analyzer/prometheus/prometheus-1.7.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/prometheus"
-EGIT_COMMIT="v${PV}"
-PROMETHEUS_COMMIT="3afb3ff"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus monitoring system and time series database"
-HOMEPAGE="https://github.com/prometheus/prometheus"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.8
-	dev-util/promu"
-
-PROMETHEUS_HOME="/var/lib/prometheus"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup prometheus
-	enewuser prometheus -1 -1 "${PROMETHEUS_HOME}" prometheus
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${PROMETHEUS_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" promu build -v || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin promtool prometheus
-	dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
-	insinto /etc/prometheus
-	doins documentation/examples/prometheus.yml
-	insinto /usr/share/prometheus
-	doins -r console_libraries consoles
-	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
-	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
-	popd || die
-
-	newinitd "${FILESDIR}"/prometheus.initd prometheus
-	newconfd "${FILESDIR}"/prometheus.confd prometheus
-	keepdir /var/log/prometheus /var/lib/prometheus
-	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
-}
diff --git a/net-analyzer/prometheus/prometheus-2.0.0_rc0.ebuild b/net-analyzer/prometheus/prometheus-2.0.0_rc0.ebuild
deleted file mode 100644
index 76067595c5b5..000000000000
--- a/net-analyzer/prometheus/prometheus-2.0.0_rc0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/prometheus"
-MY_PV=${PV/_rc/-rc.}
-EGIT_COMMIT="v${MY_PV}"
-PROMETHEUS_COMMIT="012e52e"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus monitoring system and time series database"
-HOMEPAGE="https://github.com/prometheus/prometheus"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-PROMETHEUS_HOME="/var/lib/prometheus"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup prometheus
-	enewuser prometheus -1 -1 "${PROMETHEUS_HOME}" prometheus
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${PROMETHEUS_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" promu build -v || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin promtool prometheus
-	dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
-	insinto /etc/prometheus
-	doins documentation/examples/prometheus.yml
-	insinto /usr/share/prometheus
-	doins -r console_libraries consoles
-	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
-	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
-	popd || die
-
-	newinitd "${FILESDIR}"/prometheus-3.initd prometheus
-	newconfd "${FILESDIR}"/prometheus.confd prometheus
-	keepdir /var/log/prometheus /var/lib/prometheus
-	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
-}
-
-pkg_postinst() {
-	if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
-		ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
-		ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
-		ewarn "This release requires a clean storage directory and is not compatible with"
-		ewarn "files created by previous beta releases"
-	fi
-}
diff --git a/net-fs/minio/Manifest b/net-fs/minio/Manifest
index 9616b98ec5df..cccfa6342a10 100644
--- a/net-fs/minio/Manifest
+++ b/net-fs/minio/Manifest
@@ -1,5 +1,7 @@
 DIST minio-0_pre20170613.tar.gz 5037377 SHA256 a44ee8c0933e55c1c561d4ed154564af1d45571a2cd0b00b0788b59d9475c402 SHA512 3844ce71dc5b7736e9a1ecdc8771b863879b195f22546e74e5c29a8100c3102bced971f138f19fd7788d2cc6cf6c766f3b9727af8770ca59cc4d621e92dd22a7 WHIRLPOOL cf8809d03530468e5bff26e6afc3f031d78f979dd02f254d9f50faf515e94d87de2f45a39b9dace65f28928698a12f94891c9c0ef6d51b3e18bd0de41f06ef7f
 DIST minio-0_pre20170805.tar.gz 6891365 SHA256 78d4cf72bca7e9c1e2b6c8afa2eec13139c3d246672737ad4b07be16f3f4d8a1 SHA512 318bbebf7cddc956e2ac5bb39e3316bb43b71c3a57bfe00fa868fe3ac94f7eabdcb8c62b1460105051b89014e6a2bb6eee7e6a5da7b17e512c9af8437aec75fa WHIRLPOOL 5f09f7f2e177dca8abf8cd61b556f3b5ca252ec365dfffc6f933d5967b423b2d5d023b8aece2f3c00f4388320b888676eab27def23e9f623f2ee959a9be06e27
+DIST minio-0_pre20170929.tar.gz 6976881 SHA256 6e78d07d272630f1cad4cd7950a19206bdadaa2b6721f74df65ec85dd88b36a0 SHA512 f22ab87f4fadbe332acd7db9155fff5fb79c55357071627397d51b3a2c26eaf7f80c53b9ed37822d72948610d3d1805e70abaca6f3e39b26c3c1e4e6770cae44 WHIRLPOOL bd43ae7b1dcd196e90db5ffac8aa6643435af76582147ac50890221ff964a1cf36d8fe8411ae47148bb5cd0929f09c541c11abbaa3eb54c2efb40f3368104894
 EBUILD minio-0_pre20170613.ebuild 1123 SHA256 36c7b2b369d2d5e35714d6cd56c1ce685f1ff16051b3eb166c4cf72924614179 SHA512 234c685e79254311efdfc195375b80f566c63a8ad0c3fafdf2227fc7dcdb2b93de2eef022dc5c2cd2aacf9025e08348de706a74a45608262baaff1fc21d6535a WHIRLPOOL 17391e3f87cee75b87b5119967b0654723845a268e7ff88f6d1a5cee41fc0460b931d3480e7a9d16f20fa58972a7a535ffb859b04adf9c02e0d9ac43d51696c7
 EBUILD minio-0_pre20170805.ebuild 1123 SHA256 41d86ce8fc59039490a27ad7137f1bf80f6553863b7cd925e35c710ce317137a SHA512 6ba20846467a4a54325d2db0c0f0e7047516500e38ff056377288523f12ee2a7ff40029e84d93ae584b4dc2bd069f27f9703549e07e2162984b62b198cd71ed7 WHIRLPOOL c3370646238d607ec0766f947f778c45b8d5159409264cfe521a58a38d2946965c089afbca7e81aa2ca23b3be3df17fc9cf806fb97495fc21bd6470f50dd1478
+EBUILD minio-0_pre20170929.ebuild 1123 SHA256 c3d469f31a36485ddfd0c914bd49685dd72cd3c84dd18b4d72a3ebf0b6355e61 SHA512 db893053f7004abec07fa7ac4039e5b9919500974121a995db4f84963d0458fa4efa1f7f50e3d4b94110fd14dfc51094a3b4c2456b9e3315ae39d553bc7335ea WHIRLPOOL ab0144ddacde471c01644d5c6b7aaf189c6b920fc5638a33380352cd3c3fc79a74ed5e372f81ac9f40cb43a652deee4380af612e0d245159664e917c33231c6e
 MISC metadata.xml 245 SHA256 6fedd876236c2f1fe2687e73628381650ebecef9734f88f6d483bec5bf475a7f SHA512 ce14e948c06d19eefb8504b77746e191099fd4d66083ad01ac62d874029b397af4edc5940312dac09c9ed18ccbcd98909b93fc0bc463c15db97bf68d13c9fec4 WHIRLPOOL 4957affde63b54e118270c40ce12683872777b41ec1a798f7b03807a99917148279d392f71cbcf95ec4e5d586ee5fc0400aea77d9e46083873a441a4907ba13d
diff --git a/net-fs/minio/minio-0_pre20170929.ebuild b/net-fs/minio/minio-0_pre20170929.ebuild
new file mode 100644
index 000000000000..af45e7bd5245
--- /dev/null
+++ b/net-fs/minio/minio-0_pre20170929.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/minio/minio"
+VERSION="2017-09-29T19-16-56Z"
+EGIT_COMMIT="60cc6184d253efee4a3120683517028342229e21"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="An Amazon S3 compatible object storage server"
+HOMEPAGE="https://github.com/minio/minio"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/"\
+		-e "s/-s //"\
+		-e "/time/d"\
+		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
+		src/${EGO_PN}/buildscripts/gen-ldflags.go || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	MINIO_RELEASE="${VERSION}"
+	go run buildscripts/gen-ldflags.go
+	GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs
+	dobin minio
+	popd  || die
+}
diff --git a/net-fs/smbnetfs/Manifest b/net-fs/smbnetfs/Manifest
index f645ece5f3a1..484cbce80f46 100644
--- a/net-fs/smbnetfs/Manifest
+++ b/net-fs/smbnetfs/Manifest
@@ -2,4 +2,4 @@ DIST smbnetfs-0.6.0.tar.bz2 147946 SHA256 6dd20bf01201f8be4b5d20cfbfba627f6825bc
 EBUILD smbnetfs-0.6.0-r1.ebuild 790 SHA256 7aba273284b231c4a61943ff873d41bab41274d86e3aec74cf0ee95263e4b5e2 SHA512 d0c7bc5c5933e7f007b4e873696c8d029ae775ac4fa3e9babe7080f8a821113b005e6e9fee5c2d3ad2d7cd7ff914aae16c10ca7e8f2cf36d1bbd39a405a7ca5f WHIRLPOOL bcdc37d8ba02c8b50fbbb157e55276ee5175ffe05884cd1f7ef0bdabf8c8cd95553250d2d5caedfaa12f92b499c681616445d03f5796157ae94ea4246280e398
 MISC ChangeLog 2846 SHA256 e9c5ffcec955ca151cfdafc10e801b02c9679b63ec2d62b073473ad70465b4c9 SHA512 cbebb1cfe94c9a32d096fd0d22cfecc91d21fcd75e1a096c813d5b1118a9e05f7c3c874dfd5cce1a844fc408460e0b96792ebbbbc3ef916c060281dcadad17fd WHIRLPOOL 9a4b3373aba5a3e044065b04a525e5afa5643b3c2ad87448f81e08931acf21d518f8f6b9702a92fe6ec0d9c44fcde103e1cbc8c6529996de9e989c22ffb89174
 MISC ChangeLog-2015 2204 SHA256 743325eb1cac7fb27d1910fd578dbaf50358b558b40bedbda58226af4a00a2c1 SHA512 1e1931838c1e1be393c78e4d70341dd3b9cb87e673508c3e54d49d6d81457aa4086c6a067c7dc6b52a2e2c0679006fb8eccad92b6f1482799fbb7cbc00be6187 WHIRLPOOL 71d6bbd806ee9cc62edfb8d1a5c66427270d43932207953fc92ae05b06244a39265b57c1d63bb26d08f76a68f442423b4ba2fa4231f7a48d87375422cc9ebeec
-MISC metadata.xml 1455 SHA256 9973869a00407a2b026ab389f7b4f56a07e2917e45ce333d1008339e2b0bd10f SHA512 918e726a9369b531385f53649de0f413df1185ecbbe3d4dd66b2a5e531d97b79327b657679125c11474913ad6fe12ea7fe16d5df6313654294a151b85597a3fd WHIRLPOOL b7c3c8787037e04ad6d6c1727e8b400d6c9355121318ea20e61957a2bfa8d60f46557751c2b55dda434c9973a9d1fb4f6a053857729988d307e84c9f4a3a9ce3
+MISC metadata.xml 1338 SHA256 da2370d54a8b3d6e1d2c187677b6b1632f874a0b6806965d13d5b4d5c3694934 SHA512 14da17bfe8cf2e8c8f7ebfeb9ff71b6daa12ad4f6751f3cbe11604df51cf04371f150d0bc52c60a92cbb5e29b5f085d4908903dd271bdadf2d442fb12d41b9ed WHIRLPOOL 12c2c34f2a584620492f3d96cd1d9cca4a05b840ed6c5a996756342a992452f9ecb1c1ad4710ea258b50b867893a71f5e5ea29c7e0cf4f15d671ed8141745bae
diff --git a/net-fs/smbnetfs/metadata.xml b/net-fs/smbnetfs/metadata.xml
index a9595027206b..840694f05035 100644
--- a/net-fs/smbnetfs/metadata.xml
+++ b/net-fs/smbnetfs/metadata.xml
@@ -6,10 +6,6 @@
 		<name>Sergei Trofimovich</name>
 		<description>Primary Maintainer</description>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		SMBNetFS is a Linux/FreeBSD FUSE filesystem that allow you to use samba/microsoft network.
 
diff --git a/net-irc/irssi-xmpp/Manifest b/net-irc/irssi-xmpp/Manifest
index 721d082eb94e..e21508a1b225 100644
--- a/net-irc/irssi-xmpp/Manifest
+++ b/net-irc/irssi-xmpp/Manifest
@@ -1,7 +1,5 @@
 AUX irssi-xmpp-0.53-irssi-1.0.patch 1877 SHA256 8c84ae86a980cb37455ce93e79dc1b856c8d1a9f4995fc6c96e24a0811226d96 SHA512 8fabc71b9b45eace69041c4b446f8227e92ce426980bb03f3251d7fac1d0cf96ef00a3f5f0a21b07590dabc97db605ac39f5d78131d945b95e466c3fd6a2cac7 WHIRLPOOL 968067ba325d9e7b08a4d375d39a5e5622ec8986d799ec1e21dd88cff3aae108fd5aef69f9ca6decb99d982b57380c4cff41399503a196b1404ce8f62f2d3892
-DIST irssi-xmpp-0.52.tar.gz 68105 SHA256 c63975e0562e7ec6a1b68cb607829b3933ec822aa4a844c3d6dccf16f110dbdc SHA512 27f7b877d02e0812b59e9f23ee12e58b842e3923ab5f0aa8cdf874dc9b30d9d22dbae9ef848ee5ffe2dcb667a0344f960125a3ffc072ce065e1fdf714eb98b27 WHIRLPOOL d6b760de57542a6d3e2fa8e167d2c21700f59bd9c64252cc6448dcebf935507adc9ef5dc8f10874c620cfd1c447871a5ac5a906921a3e9b532be9f91e54f64b7
 DIST irssi-xmpp-0.53.tar.gz 65649 SHA256 6487362d23af7b9c185d8ac74e6b651e697cacc01de8bb9c750db1752140536f SHA512 09969db01b77e95248a080599d480b8271dcbe6d42bc90e5e2bb304a2d1b9695b70090ef0a6b7342bf6e17326e0f7a50c11c85e02e6ed742ec55820ffad655be WHIRLPOOL ab43a8436f6e7ceb548f238d4c57665ad6c5e46eec9a68fd9346af0d70d0e826bbf03e9c1749b1ccca7e5524eb9999c10bfe99f3ccaebcdf9eda9854f615345e
-EBUILD irssi-xmpp-0.52.ebuild 776 SHA256 24b1b26d1dc1d083e979213424f6cef66c16eef7733c74978e80f203022f99f0 SHA512 9940d259b0bece0c06c2f92446d5e0d815a783757d3881dd53a5ed622aa69a4444f7f33e297876d13a408d2dcb4e418889e49bc014fbe5852be5147926599215 WHIRLPOOL 41fe92eb738ecc56be8dab045af52bd9ccad03c9a7f78b730ff3e1a47dd5d42b84700bec28f04e997029a06bee6faee09feed850d04fa43da7eb037b6d4b4492
 EBUILD irssi-xmpp-0.53.ebuild 794 SHA256 8a758a98d5c99690a6ce4bb611eef02833ab58b6b69ae623c0cbaed41f91bce7 SHA512 3236a53cdb10bebaf15f5644f20fec2a1a47f2423d7c0d03163978d9c41a1a86a66a5bf6d611cb259db9345d825b6409b1631abd33aac24d5229147eb7bcc83a WHIRLPOOL d7065b064293551389e07704b280b8ad74207912e20411ba204e686d6dcbb4e53e317b6c7b1c3da2571638805dd40d578bfa6218a3b4005d23e53ca1da3c43df
 MISC ChangeLog 3091 SHA256 28e92bdaf38b5dfdf765e0b54d567e3bb228626a7bda56c4d3ce36c14432fe96 SHA512 58bfb5f5ed949d5736e3b1eacbf87e4f2c451bee6d798c90116cc1eb141939c7026eef4cad3484a19031e176b44d5573d0737cbea0b4907f891b0d259a18d807 WHIRLPOOL 5a8b8cba9ca4827fedbe19381dc4bba68bee233b76fb65e9e5a70749a62c60771a602645e1949f84e6414d922f4b6d7399df8e08c07fced2340f55bb0177afd2
 MISC ChangeLog-2015 2010 SHA256 c37d4da48460c2b404b0b71f69a3aea4268ff39955e402df25735ada8ea78a68 SHA512 ca408f38f68f7f24210692fac690f7d12b1d0c19c04ad98652bffc8cd19ebee77e275b6e94f0a1c7db4db5866eb8e3125e80f840fe110c41e51a1a49b099d5e0 WHIRLPOOL 856612e3b4e4dc0ab4eead0ca24f9ef182d7f8f40a2522c62a05740e6802e03d260b29515b4cdabd88fa68cab8855e0135eeba2f1757d34493ae15ecd090b903
diff --git a/net-irc/irssi-xmpp/irssi-xmpp-0.52.ebuild b/net-irc/irssi-xmpp/irssi-xmpp-0.52.ebuild
deleted file mode 100644
index cc4668cad98f..000000000000
--- a/net-irc/irssi-xmpp/irssi-xmpp-0.52.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit toolchain-funcs multilib
-
-DESCRIPTION="An irssi plugin providing Jabber/XMPP support"
-HOMEPAGE="http://cybione.org/~irssi-xmpp/"
-SRC_URI="http://cybione.org/~${PN}/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="<net-irc/irssi-1
-	>=net-libs/loudmouth-1.4.0[debug]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -e "s/{MAKE} doc-install/{MAKE}/" \
-		-i Makefile || die #322355
-	sed -e "/^CFLAGS\|LDFLAGS/ s/=/+=/" \
-		-i config.mk || die
-}
-
-src_compile() {
-	emake PREFIX=/usr CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr IRSSI_LIB=/usr/$(get_libdir)/irssi install
-	dodoc README NEWS TODO docs/*
-}
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index f7f538c77d6f..145c61b0a5ae 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,11 +1,4 @@
-AUX irssi-0.8.20-tinfo.patch 639 SHA256 945b046849bbbe90ed166c5f5fbb1f6dbb0b9e5e8988f6da33e6ae3ade5fb722 SHA512 2fb53e8bd0cfd3d07b33d532cb63af95e8b1b6fe742634f6f8598dfcd06cda94b3f564a53b14daa4005cb0217bece531804faf82cc06cfbb191695e73840266d WHIRLPOOL e2e83adc4173881a1701046e1002a9ea4e986c2cbb4a9076a9ea24aff274b5613f52da1ea6ac332eae2186af2bc6a6e41ba4d999d7c85449891eb6bc28eeb259
-DIST irssi-0.8.21.tar.xz 1007524 SHA256 e433063b8714dcf17438126902c9a9d5c97944b3185ecd0fc5ae25c4959bf35a SHA512 110934ab85c8574fc76bce367c58378e28603898e63a5014a72170ffe441ffe3dbda432531e899176f5c4126f47d929a3a01a2f87bcacbfe0ba4d6d8cb31e642 WHIRLPOOL 8426a82cbf5b488c1fd9497fdeb69ee98d211aa9775560b9d6efc9645d74926fff6b627c2f681642a0df10e83f68dc4d6403d706faaf677391005af5bdccf143
-DIST irssi-1.0.2.tar.xz 1027912 SHA256 5c1c3cc2caf103aad073fadeb000e0f8cb3b416833a7f43ceb8bd9fcf275fbe9 SHA512 0b5048b1babecaafcd6f2be59523635a3f028c17ceb751776099d74c50fc3daf8fdf52ef5c37f9b765f7a1e5e82f5e41230d14f05530de54386f7190c610d458 WHIRLPOOL 59cd0ee40115f8a93769b693d1d6a3f8f3c004ce03c19c3b87548d6fd5b1313c26b7258049ac2bf6015f3c502d9ba9e773f48b5784b5e8d0f5afb3f4797cef47
-DIST irssi-1.0.3.tar.xz 1029980 SHA256 838220297dcbe7c8c42d01005059779a82f5b7b7e7043db37ad13f5966aff581 SHA512 3a369d9bad4e2016a6a0395b35e3db1f1a6ff7ff6b8361fe5d828c29dd6f81c4b8d1bdfe0304cb05402eecddde97f6d369a5e98f215bfd177287f303d3d714eb WHIRLPOOL 2cdef3c2208cbe93d74298862add82281d36cd518ad5baf9285aa14df8fef263cd857ad39f5058635f9e81938385fc07b6c545685681562ad4f7273b4ca1e6da
 DIST irssi-1.0.4.tar.xz 1030956 SHA256 b85c07dbafe178213eccdc69f5f8f0ac024dea01c67244668f91ec1c06b986ca SHA512 8025c3b90275e5c0b910c08efcac80f56da4400662cd4a9f09cc6035ce23840fe6ed0ac5297b9631a5b28bd798b4ebca2bb5550f9e0e01aefc7a69e9f787195d WHIRLPOOL 27065e67eda3fd09a88989456ba36a748965190a1a808a8dcab9c1170e7d7c856987e98801fdc83cdcced6aa47539410be0c2207fb037454a659b0a3973b6f5f
-EBUILD irssi-0.8.21.ebuild 1570 SHA256 60ae5fd3f3a7968a44deb1163922b68c49de376075038aad75a154a84836c3af SHA512 5eb487ea8dfa8aa99fa13c33da3806f7fa0dd507571a99aa4594341ebe17f254c2a9aecbcdf2a176840e426a766898001bff5decbdfc0b6fab9582225e7de39d WHIRLPOOL 075422ffc7313ae60639b4c7334c400d03e8a8a5e0b28eda41056fccf85d1985ae5beb49d99a4bb9d7752f4c1ee7030d4afbb2e4c6f598bb838ab227d99d623e
-EBUILD irssi-1.0.2.ebuild 1342 SHA256 0a0344944b1c5ce2392f1a41fc7647a5efdfde81032bbe5bbe2035b87adbe7ac SHA512 78620fa32de9108c8ae115394c474a1846e4030ea49c3fda5001c6c7ee55122ea22a1448482ea772693871fa21f30e47f0104d85a79c1f7cbe7af701f0643a02 WHIRLPOOL 089194a6f163e0f29b40058a1bdd27a71951b17265d92f3c2b07bb49b22c6effbbb86f4139f60c08bf82a9460aacd700ce0d9d0e1094e8be086e34a3e223a4fb
-EBUILD irssi-1.0.3.ebuild 1283 SHA256 aea3699cf11642b76f920f01d7d0c4aea90160d226214adc94564d81e1a35370 SHA512 bf9a1f2cd57182443182e14fd340f30eb811e6a3c070425673e98e9b10b35369adbc66476d30719176866cba7e3317f4b596273d5910125055f13b68dba4778d WHIRLPOOL 265d9929a0b503fda5fdf3015d57f2100c076b36a3f6304325de1ed468df66d601d8a9932202a5951243f5a8973eac42752c7e8f4a5ef854abe8cd140400ae91
 EBUILD irssi-1.0.4.ebuild 1262 SHA256 c7285b8b22b4bb139b7324494b9a77bf945f9439d5f61cf363ebecf1e1d86fa0 SHA512 b4ba04fe03cc81a833aa1394303bb2055718293b8c906edd46fcc97af54ffb1cd0a353c16416bb3598626bbdfc2ff1b19c8a93f4f262a18b830eec0b7661c164 WHIRLPOOL b3c640badeaa973f0967709d0f2411a2705da0c5e217088e55ec20a1749b05fb9683507f14e47a407368952e68b1ef6bb89e8746324b4a7a82616fe17b589566
 EBUILD irssi-9999.ebuild 1202 SHA256 cc5f71cddf2eecaadd1ffe49c3c9b90a81440687707ca89473185b9b19c3e69f SHA512 fc9126562591b6df88a71b2c3beb4d99a91f62f65f3df46da2808b63eee490f988291b6271de857ea430fcc3c4e1cedb9bc1e00248877bc22d5414f408943954 WHIRLPOOL 76c0b70e8baa0aa959eaa08137aa11e2f2db56534550d9b35d5180b19d373a88a5108924344f100b165b3154742ef48ea75a7dfd26bef885f27744ec5957a9ae
 MISC ChangeLog 7207 SHA256 6d69fc71b2c617fed5ed3c8fd3dbce54d9a2b5c28bc6e74277a2f891b2881360 SHA512 48602f0c9f995060181002b7e4cb806844a067d698932dd6d2b6094d6e13b6cea19cc5a4f52247fc41d6ea6266ec8fd6a9326b2203d47d8617a4d98acad82cdc WHIRLPOOL 5d56140c7e0f3f37db62f49ea0524702814ec0dc4c5ceadc8d91a0e69b9195fda8c1b8dbb608a5bdca65e0f023628f3e3106cbe1837960d0af321e29075403c4
diff --git a/net-irc/irssi/files/irssi-0.8.20-tinfo.patch b/net-irc/irssi/files/irssi-0.8.20-tinfo.patch
deleted file mode 100644
index 346c6e963e56..000000000000
--- a/net-irc/irssi/files/irssi-0.8.20-tinfo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/m4/curses.m4	2010-04-04 02:19:58.000000000 +1000
-+++ b/m4/curses.m4	2014-03-06 16:36:12.404404130 +1100
-@@ -218,9 +218,17 @@
- 			CURSES_LIBS="$CHECKLIBS"
- 		],, $CHECKLIBS)
- 	    ], $CURSES_LIBS)
-+	    AC_CHECK_LIB(ncurses, tputs, [
-+	        true;
-+	    ], [
-+                CHECKLIBS=`echo "$3"|sed 's/-lncurses/-lncurses -ltinfo/g'`
-+		AC_CHECK_LIB(tinfo, tputs, [
-+			CURSES_LIBS="$CHECKLIBS"
-+		],, $CHECKLIBS)
-+	    ], $CURSES_LIBS)
- 	    CURSES_INCLUDEDIR="$4"
- 	    search_ncurses=false
--	    screen_manager="$5"
-+	    screen_manager=$5
-             AC_DEFINE(HAS_CURSES)
-             has_curses=true
- 	    has_ncurses=true
diff --git a/net-irc/irssi/irssi-0.8.21.ebuild b/net-irc/irssi/irssi-0.8.21.ebuild
deleted file mode 100644
index a82b29f33ae2..000000000000
--- a/net-irc/irssi/irssi-0.8.21.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic perl-module toolchain-funcs
-
-# Keep for _rc compability
-MY_P="${P/_/-}"
-
-DESCRIPTION="A modular textUI IRC client with IPv6 support"
-HOMEPAGE="https://irssi.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ipv6 +perl selinux ssl socks5 +proxy libressl"
-
-CDEPEND="sys-libs/ncurses:0=
-	>=dev-libs/glib-2.6.0
-	ssl? (
-		!libressl? ( dev-libs/openssl:= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	perl? ( dev-lang/perl:= )
-	socks5? ( >=net-proxy/dante-1.1.18 )"
-
-DEPEND="
-	${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-irc )
-	perl? ( !net-im/silc-client )"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.8.20-tinfo.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-ncurses="${EPREFIX}"/usr \
-		--with-perl-lib=vendor \
-		--enable-static \
-		--enable-true-color \
-		$(use_with proxy) \
-		$(use_with perl) \
-		$(use_with socks5 socks) \
-		$(use_enable ssl) \
-		$(use_enable ipv6)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use perl && perl_delete_localpod
-
-	prune_libtool_files --modules
-
-	dodoc AUTHORS ChangeLog README.md TODO NEWS
-}
diff --git a/net-irc/irssi/irssi-1.0.2.ebuild b/net-irc/irssi/irssi-1.0.2.ebuild
deleted file mode 100644
index 43b884cd42cf..000000000000
--- a/net-irc/irssi/irssi-1.0.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils perl-module
-
-# Keep for _rc compability
-MY_P="${P/_/-}"
-
-DESCRIPTION="A modular textUI IRC client with IPv6 support"
-HOMEPAGE="https://irssi.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+perl selinux socks5 +proxy libressl"
-
-CDEPEND="
-	sys-libs/ncurses:0=
-	>=dev-libs/glib-2.6.0
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( dev-libs/libressl:= )
-	perl? ( dev-lang/perl:= )
-	socks5? ( >=net-proxy/dante-1.1.18 )"
-
-DEPEND="
-	${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-irc )
-	perl? ( !net-im/silc-client )"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS ChangeLog README.md TODO NEWS )
-
-src_configure() {
-	econf \
-		--with-perl-lib=vendor \
-		--enable-true-color \
-		$(use_with proxy) \
-		$(use_with perl) \
-		$(use_with socks5 socks)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use perl && perl_delete_localpod
-
-	prune_libtool_files --modules
-
-	einstalldocs
-}
diff --git a/net-irc/irssi/irssi-1.0.3.ebuild b/net-irc/irssi/irssi-1.0.3.ebuild
deleted file mode 100644
index 5cf5aa46b11c..000000000000
--- a/net-irc/irssi/irssi-1.0.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils perl-module
-
-# Keep for _rc compability
-MY_P="${P/_/-}"
-
-DESCRIPTION="A modular textUI IRC client with IPv6 support"
-HOMEPAGE="https://irssi.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+perl selinux socks5 +proxy libressl"
-
-CDEPEND="
-	sys-libs/ncurses:0=
-	>=dev-libs/glib-2.6.0
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( dev-libs/libressl:= )
-	perl? ( dev-lang/perl:= )
-	socks5? ( >=net-proxy/dante-1.1.18 )"
-
-DEPEND="
-	${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-irc )
-	perl? ( !net-im/silc-client )"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	econf \
-		--with-perl-lib=vendor \
-		--enable-true-color \
-		$(use_with proxy) \
-		$(use_with perl) \
-		$(use_with socks5 socks)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use perl && perl_delete_localpod
-	prune_libtool_files --modules
-	einstalldocs
-}
diff --git a/net-irc/quassel-irssi/Manifest b/net-irc/quassel-irssi/Manifest
index 8850e9cc98d2..f2ede6519abb 100644
--- a/net-irc/quassel-irssi/Manifest
+++ b/net-irc/quassel-irssi/Manifest
@@ -1,8 +1,6 @@
 AUX quassel-irssi-0_p20170107-fix_build_with_irssi_1.0.patch 1192 SHA256 8402bf43c3d624b3fa1ba7ad07fb930ea34e08997700f63eae9b9bac83db888e SHA512 71ff7b0dd2dd14556be5dfd6b92f2ca13af51fb876e731980a979ac27d0e195170e92a915f48bdeaa3556eff7666ee9f563fd5cf89a565d9b6da93dadea5e40a WHIRLPOOL d6700424c3540d2f818a089c6c5f08ad6f6e1401d810cdbc648a0a11f709a417cd647612fd36e8ee3393b91d39b558e04d1b2af7af70f17dd2f0e95b92ab6e72
 AUX quassel-irssi-0_p20170107-tls-ssl-rename.patch 1017 SHA256 6279ae5575a3bc3ac45790478f60d57f4d9582077d5a356077f548eee25f97fc SHA512 33d4e78d9872a24819a8b653d2d635992377ab3b6b1b990af5b14381be109a11c8a139e3fc578090dbf2bee6f1b3b5d26847f2dc1fbfcb5c4c42f52192f08d93 WHIRLPOOL e49620fed909e333a229c37a5dc5797a5ce98eaa0917936bb46213e3c61c00a53340983f15174b4c5e7c477ebe27fd27b85819a59c100d487e26248db966324b
 DIST quassel-irssi-0_p20170107-r1.zip 42745 SHA256 d159b7db11dbd741fbbc1569f3583301fc36697d5efb770696bb7f8813ce2e67 SHA512 1d7e4e15af2d73fd7e581c517384604a41b68e3a5152dcaf2776a20bc15b459e4a5a7caf39a9c06a11e65ad5d9fea0aa81fa001caa9060f55b821e12b4fed814 WHIRLPOOL a74b6452fe0cece5b63e326dc10522a45d6bbb7a80554027af52f8a8dd9a690d862ab75201f98260eed841b473cfc10bbe21ee78ec878f808c19e69156944c5e
-DIST quassel-irssi-0_p20170107.zip 42745 SHA256 d159b7db11dbd741fbbc1569f3583301fc36697d5efb770696bb7f8813ce2e67 SHA512 1d7e4e15af2d73fd7e581c517384604a41b68e3a5152dcaf2776a20bc15b459e4a5a7caf39a9c06a11e65ad5d9fea0aa81fa001caa9060f55b821e12b4fed814 WHIRLPOOL a74b6452fe0cece5b63e326dc10522a45d6bbb7a80554027af52f8a8dd9a690d862ab75201f98260eed841b473cfc10bbe21ee78ec878f808c19e69156944c5e
 EBUILD quassel-irssi-0_p20170107-r1.ebuild 1762 SHA256 f45c6ee8c991a3e7e93cdaf15a9832b217a53fc6d9b25c1e2156b7c43e99c35a SHA512 b4aaacfb00912017081c755bff069dfd34944062220ac6953589c754a3e2e669630947b3e630954cc46aad7c0a06d25c6b3c46aec642f0f7ada6de871f919796 WHIRLPOOL 745681f06b2047b9d821dcafe985d795c8ea9345111171b83b3a02780d28623a95b56f4021c6adbd1386f0a39db4288cf64a190111952025971d4e2289f804d2
-EBUILD quassel-irssi-0_p20170107.ebuild 1383 SHA256 c0d69319e833b8e730bc2ec28750e259d9742fdd91dd53afe58a74ddd71c855c SHA512 bffed91730d9e2f882766036ce81fc93f57c7cf7848b68466a319eb8d77ba35c443a6fafe90a587bdd09a2c8eb781c319b9fce4918ad60442bf4c5653e32ddbb WHIRLPOOL bd6a96ae7c1cf54ab1f1aff22227d4fa3ac9ca79689183646dff9448ebb1565ab61e6eab78647f4da2751be798b4ce6dc63844aac5b4732e5166cae5d075493d
 MISC ChangeLog 454 SHA256 b43e7aa1677bfe5cf479d016ca3ed1505c014691e3ce30467cea189e4a28c741 SHA512 cbc09fc8529c78cb935f27ba98a788de916b686acd8b8017e230fc2fd12d5a8139cb5c911be8563fed5d57c49dccbc870a592772aa1630f1e0e88f8caed2d899 WHIRLPOOL f4c6a266158ee873a73f2b5516b65d7e927d0614b896a8a2f6d91817bd284c498f9208db98e7ffc71944b941a0d54560dd8112d826e52ed1a2d85828e486b565
 MISC metadata.xml 557 SHA256 5613b558b7a5d8a5e77786da97ec90da47889937eddc5edf111aa47259b75b2a SHA512 4e9f077d0c9b6945e0fc66312ec7a264e5a7ba59039add39c2283debaf97ff71c921d016090ecbc27cdbba222672db8fc209fad11ededafe0354bbceaf068d78 WHIRLPOOL 0517ec1a7010dcd4421fcae8daae5935327f3998fc5da64d5f70aea53abc64ed0792b2c5c6d60281c60976c645e8e161764c395a1e7b642e33cd906ed369339e
diff --git a/net-irc/quassel-irssi/quassel-irssi-0_p20170107.ebuild b/net-irc/quassel-irssi/quassel-irssi-0_p20170107.ebuild
deleted file mode 100644
index 6a49ea9bf6f1..000000000000
--- a/net-irc/quassel-irssi/quassel-irssi-0_p20170107.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-# https://github.com/phhusson/quassel-irssi/pull/10 if accepted will
-# allow QuasselC to be installed as a separate package.
-
-# Commit Date: Sat, 7 Jan 2017 14:50:15 +0000
-COMMIT="f23e97a6188129cfae4c52f7e1a75940185454f4"
-
-DESCRIPTION="Irssi module to connect to Quassel cores."
-HOMEPAGE="https://github.com/phhusson/quassel-irssi/"
-SRC_URI="https://github.com/phhusson/${PN}/archive/${COMMIT}.zip -> ${PF}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# fails to build with irssi-1.0
-RDEPEND="<=net-irc/irssi-0.8.21"
-DEPEND="${RDEPEND}
-	net-libs/quasselc"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-src_prepare() {
-	default
-
-	sed -e "s:pkg-config:$(tc-getPKG_CONFIG):" \
-		-e 's:^CFLAGS=.*:CFLAGS+=$(IRSSI_CFLAGS) $(QUASSELC_FLAGS):' \
-		-i "${S}/core/Makefile" || die
-
-	sed -e 's:gcc -shared:$(CC) -shared:' -i "${S}/core/Makefile" || die
-
-	tc-export CC
-	export SYSTEM_QUASSELC=1
-}
-
-src_compile() {
-	emake IRSSI_LIB="${ROOT}usr/$(get_libdir)/irssi" -C core
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="${ROOT}usr/$(get_libdir)" -C core install
-	default
-}
-
-pkg_postinst() {
-	elog "Note that this requires additional configuration of your irssi client. See"
-	elog "    ${ROOT}usr/share/doc/${P}/README.md.bz2'"
-	elog "for instructions."
-}
diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
index a3704b5cf8bd..563fdefe9040 100644
--- a/net-libs/gtk-vnc/Manifest
+++ b/net-libs/gtk-vnc/Manifest
@@ -1,7 +1,7 @@
 DIST gtk-vnc-0.6.0.tar.xz 439104 SHA256 9559348805e64d130dae569fee466930175dbe150d2649bb868b5c095f130433 SHA512 38d37753bd8c88d112c046eb8430383b073b6516c72660b3e53612986a6772b72e3e6037f61e7a3700980ab1509c1f44fbfe0b80594c8a5e5520df166212f158 WHIRLPOOL e156f368a9d70e90077253b031db49f5f58e2f248b3e15bc11340f01f6bcbd342cf08dd9810c8ee447ab372159d09c3353aa5ce6195f67c677e7c43a563a75c0
 DIST gtk-vnc-0.7.1.tar.xz 444380 SHA256 f34baa696615ef67666e8465b4d0ac563355e999a77d2cc42ad4625a24f7aab1 SHA512 5d62f60e1c9fe70f93a9d21c529145459f0d59d588631597d533ecba94864271d1095599db9447ac4843814be61af7a7c947f69e5a9cd26db7e811f2c4e95f0c WHIRLPOOL b4736926bbd8ad49c6b2dd2a1b921a35a9ca5b8987c04b03ea588efe09b3db20eade41204d0a0542ee683efd6d2ec23636c13bc2e214ed452d885aef1302902a
 EBUILD gtk-vnc-0.6.0.ebuild 4272 SHA256 cd9d2c1d0ac45f531199575435c401bda98a722bb7e13e4d662080973094070d SHA512 b2a232de413a5be9ef4f0ff8764ffc533f6c6498b3348da255674942e8d474f93327b584db6697afc926cf827808ad0f3334b44d2baca94a1b49fceb4d18ed41 WHIRLPOOL 5ad6090b08b6e471e605dd42a5cf47d148fcb2789b8ab3b781345f314a256934a35e38396270d1e1d6611651a0310b6fcc127b6876da399eef81d378d0900a8b
-EBUILD gtk-vnc-0.7.1.ebuild 4273 SHA256 558f01a088c039aa038150325d454d3b8abd50e6b83afaa01c2ca951fe9fd8ff SHA512 3f9a38184a33a20c19e94861a22c8ec6ea03cfe3c9c7c76bd831fe3343cf781908a19ab7f24f4e35ad3918b9764bc2ffe872f0c5abe2fec3918396402c9f03ef WHIRLPOOL 4a1a6fa51a2129a4919d6322ebd95c03b49c7ffd391249e0bbaf84194f3bfafd8207dfc7ffb58fa64966fdd2c853b1c08dc0605f67b28373d735990c33006573
+EBUILD gtk-vnc-0.7.1.ebuild 4272 SHA256 cd9d2c1d0ac45f531199575435c401bda98a722bb7e13e4d662080973094070d SHA512 b2a232de413a5be9ef4f0ff8764ffc533f6c6498b3348da255674942e8d474f93327b584db6697afc926cf827808ad0f3334b44d2baca94a1b49fceb4d18ed41 WHIRLPOOL 5ad6090b08b6e471e605dd42a5cf47d148fcb2789b8ab3b781345f314a256934a35e38396270d1e1d6611651a0310b6fcc127b6876da399eef81d378d0900a8b
 MISC ChangeLog 3566 SHA256 b3fe6a69fac240ab4d92d7f391665ca02dd0d3d0b5219dfdcd54bbbf0b1d9254 SHA512 6120268845595f9fa76af003600818ce924d6426b611ca086a64449a9cc7fafd09906a0c2ed02e3e380cd1a9a05ae8d2d78efeccd08befff5f944de832874ed0 WHIRLPOOL fdafc9210492328154646791c614402d2969949ca23c5c6d0594e643bf54b9533db20533ab73f3ad9d2dcd7a402233143f8ab02b9a15cf74911eb3ec085b71b5
 MISC ChangeLog-2015 18144 SHA256 2e2e10e3799768848762378e009823ba9a184d506ddd268bbe1207082343a913 SHA512 32da60bfd0f5b28e97eace4df4ca280041760ad64a179394549681fc5de85e1cf6f77b53ad4f07b705773e7ccf0882d2ca0d7410d9457f5fec497527f1360c4e WHIRLPOOL f4ea0319830cbddec3c8a0a2a30e3614ad78ae0b45e7f1f4f231690680397a7b97a63f92a5479d15f3d2ff36a1239b8ad8f439511d734dc238246196122efa68
 MISC metadata.xml 496 SHA256 53d3267fa5e4b2fa703d429175dc45ff76cc7424290cc81172acb937eb1ccbf8 SHA512 202c723c8a0b40f56f57c6949f3826d53cddd2a90133546863c7f2a166cffd212fe2e25275315b68fa0946e539472336ce462ea17ce5d6c032503d8726b83ad0 WHIRLPOOL 9589da2666927d8e080224292e5593dc04448e117b326818f5b53a59dfc615d19209050fc4bfafcea450c664b397289f95e5f3f626696e796616b44a3ac1df7d
diff --git a/net-libs/gtk-vnc/gtk-vnc-0.7.1.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.7.1.ebuild
index bb4c26646411..e8d0f456c9b3 100644
--- a/net-libs/gtk-vnc/gtk-vnc-0.7.1.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-0.7.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="examples +gtk3 +introspection pulseaudio python sasl vala"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/net-misc/networkmanager-openvpn/Manifest b/net-misc/networkmanager-openvpn/Manifest
index 943e65f3c73d..bb92773626a2 100644
--- a/net-misc/networkmanager-openvpn/Manifest
+++ b/net-misc/networkmanager-openvpn/Manifest
@@ -1,9 +1,11 @@
 DIST NetworkManager-openvpn-1.2.10.tar.xz 509148 SHA256 ac86a7a539d78df90095676e9183f2d422fb93dbfe4b3afef22f81825d303d61 SHA512 d597e8b3d2935c6874a283d2a036c511e1f3625aed7f5e6fbf5c77d3c3f5f6d170b19fe69202d74b2b1ac6d47d3704d3177598fd1889a19003fed98416ea6521 WHIRLPOOL 75669197a378d775eef26e6a69e764578d5628b2d8a6f11bf08b93e60a2e823b8138827e2456b37d8296def2c074362d0d4bc28b8e56389f5a826bcbdf19b502
 DIST NetworkManager-openvpn-1.2.6.tar.xz 494132 SHA256 2373e2bb0a8a876cb2997cd8b0e3d6e10012d9bef3705ea3ac21f6394b3f1fb0 SHA512 973b13937bd14891181cfac4b3c8df891bbbd8aad31769130d7acd6f3c41e23fb3359a49a750c885e2c72c94aaf357ff1e326ece7a304b2154c6b33c35118a05 WHIRLPOOL b99542e3529b73d21770dc1ca492e29131f04de0336b6a53f58ed9a4e1f886e04bbebd32b33dc3a1b11483dd6a73779964af3a64d06edd8fb6f4c759c021cc2a
 DIST NetworkManager-openvpn-1.2.8.tar.xz 498732 SHA256 3e0b4007f248d96df4b8eb5d0f937536044af7053debbbf525e67c9bc5d30654 SHA512 e6d64106cd93f91d292a6b2346dc31317e1056d2bbaf09a376c84ffaaa8fd584f92999865bdf52531b44de7ae144e1ae9271b9efc564d99f8569b0d059ab8019 WHIRLPOOL ead14f8ca4e194c0ff2b9b2151b44e3a2d97c81a4c89187c701090ce891861ba0f5a947e4b132bb2c70a28647ddb976d3989b1a3f54be87a22e983afad49f161
+DIST NetworkManager-openvpn-1.8.0.tar.xz 530112 SHA256 166e1123ade1b322162b83876c605393a8e74240aa908cba934319f312b2e3a4 SHA512 fd70e5ae6e85daf8ad0aaf3cc1b6388dc78b8e4e35c3535eb723cfcc5f4fd2e14062237829b27a644a8d057e034c6ebc6a1aeb78abc87e9de5773115ae7c642c WHIRLPOOL 170b6d02a4e2d2d9ebd5246fd390cc9a40f3b56fad019348b66e83d88458c309c61324bf528695c0295ae95e93a08918c4c4222582788789ccb97701b75f3230
 EBUILD networkmanager-openvpn-1.2.10.ebuild 1243 SHA256 5d13cba073020830242f5fad22dc1dcc10ff645abbb21117c4783620a1a5aaf6 SHA512 955a3cd12fff958a92408723971c478a3ff170171975cee1eec74c0c13bc551603286f96c5c0005705f563f56e28fa3a7c9b4d866ff3f9dbb9474b62d1f7dc33 WHIRLPOOL 8d5df4f8a45b19a133651d59b00070b771fc690b6f16d20c402969b72c6af57d346204d41072861668ab11ff91193b67cbe5d33522048bd67ee76464a312f832
 EBUILD networkmanager-openvpn-1.2.6.ebuild 1243 SHA256 5d13cba073020830242f5fad22dc1dcc10ff645abbb21117c4783620a1a5aaf6 SHA512 955a3cd12fff958a92408723971c478a3ff170171975cee1eec74c0c13bc551603286f96c5c0005705f563f56e28fa3a7c9b4d866ff3f9dbb9474b62d1f7dc33 WHIRLPOOL 8d5df4f8a45b19a133651d59b00070b771fc690b6f16d20c402969b72c6af57d346204d41072861668ab11ff91193b67cbe5d33522048bd67ee76464a312f832
 EBUILD networkmanager-openvpn-1.2.8.ebuild 1245 SHA256 234a539a6cc0ebf77faa1ec4f97124f0bf6a6b43128a9ce25cdc3d8d9c1d0bbe SHA512 caa8db384290d9bf0700e3b3c827a70283c8ddae7fe83b37736bae29010a542f075f8ce06337f3cbd7eb5bcb9cb56990f797fffd812e61be8bff3b51d3d44d27 WHIRLPOOL 7796beba48b6b4b74807184642ff41179367e5f1f91da5588be844f7ba2ff9821178bf3095fef99a21aad07d442c3217d8703cf6e2d48495ce6b058451041fd8
+EBUILD networkmanager-openvpn-1.8.0.ebuild 1241 SHA256 ac4d463b1ab578419ff133c15368992a8d01792d1b6878a659857ab31e3fbaf8 SHA512 c39724749b53fe42f23bb132f36af2154dd88b73d18e93e4b0373ed5b839c45642f48a67a81d0abed98b9ea20f5f3b54edab528608fe67a6da59763bc4be1288 WHIRLPOOL 460263132ff46174d7a453ae775e22940e3f13f22abd30365d107650315acb3f1b3fd8710f9ecf2f48d47a8eee2bb70d8f952307c963d3d9c705ce9790393d3a
 MISC ChangeLog 6211 SHA256 f2380c9cff2bf554d42c7e59f6f110bba3e5538d10c59519e7dedfb550038a13 SHA512 d67c67ef8813695dc23432e047d51be81322f8143377a7261ead6811f33b03c2b24fea5e5895613ce9d9ff3ba6396b07c244adaa4560f37c15c0e1f9c6f5a98c WHIRLPOOL f807fecc1858b4ad433fb7c002c518dff5db7772f01b282edf3447490ae6c2ae4cbdf21c9465d071237105511f7b67aed6cc5b797bc7b874561122d0eea6d12d
 MISC ChangeLog-2015 10215 SHA256 8a2dc9e16a52b5984d2662f79bd4d0e29019afdee312eac6071214c9104ddde5 SHA512 4141295a2b577c691a404e81350fff792628fc3a9a4dd9f968a1514ef178b1fcd3d941fabbc5acfb3f9c77e3cea3d5f4485c0c1be591aec63e1d6563b2456353 WHIRLPOOL ed7aa3cd25fd7dab23bcad9edc8bf065527d3feb0f63ff48a87227a4652e1f0aa83f632c5746c2e40c7f16086b57cc2619c48886e0f3baf2fc118303c255346b
 MISC metadata.xml 364 SHA256 e6a633c44ccc4f899313669263d9153e6d3166aa5652abd5b41d4620f73bd3cc SHA512 cb3d4cc4abb57bb9c1d0a0ecc8089999004059711de27d9457e4dd022d4f5f1a32c5115ee557395286e4c3d7c84f2ef7765c737ebd929524fd8ccb5e2b39c1e6 WHIRLPOOL a5e20ea714cf2b258d3384e537c7a51c63a9831e2305e57f13d0544fd2250dc684ad7471054f2b4a1660e61088bb9006488d69c36fc3539d73b2daf6bda907a9
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.0.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.0.ebuild
new file mode 100644
index 000000000000..cdb1898ecebd
--- /dev/null
+++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit gnome2 user
+
+DESCRIPTION="NetworkManager OpenVPN plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gtk test"
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=net-misc/networkmanager-1.7.0:=
+	>=net-vpn/openvpn-2.1
+	gtk? (
+		>=app-crypt/libsecret-0.18
+		>=gnome-extra/nm-applet-1.7.0
+		>=x11-libs/gtk+-3.4:3
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	enewgroup nm-openvpn
+	enewuser nm-openvpn -1 -1 -1 nm-openvpn
+}
+
+src_prepare() {
+	# Test will fail if the machine doesn't have a particular locale installed
+	# FAIL: (tls-import-data) unexpected 'ca' secret value, upstream bug #742708
+	sed '/test_non_utf8_import (plugin, test_dir)/ d' \
+		-i properties/tests/test-import-export.c || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --localstatedir=/var needed per bug #536248
+	gnome2_src_configure \
+		--localstatedir=/var \
+		--disable-more-warnings \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		$(use_with gtk gnome)
+}
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 4836ada87315..329bff69d144 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -4,9 +4,7 @@ AUX man-pages/ntp.xsl 5831 SHA256 8a41227ded8953c90f49022f68bdaba60f9d82fe528d5a
 AUX ntp-4.2.8-ipc-caps.patch 471 SHA256 2b63684fdf2d77d4b85081b1d2809a52b34b1406c0d469000ae12795c4b91394 SHA512 549a92021ebceb1a3ea8d6599e9aa31983b0db96a2ab88959e422a0f9b7a9a4e811b943de1ac4d04e3303309b43391610beec0d1a354eb320dc795576afdd81f WHIRLPOOL c3dd13f7ef04d4f42e37da3ad6c205d91a312600eb45ff1497c8a6ecb58cc83f400763e23ce2f19aff0b025ce9890082d2b7f84cfa69acb13ca6d895a3e84cce
 AUX ntp-4.2.8-sntp-test-pthreads.patch 325 SHA256 3af800a07382a217cfa854166664dbe6c91c54d23cca9c7a2bab01d433d50cd2 SHA512 d4eef7c2bdcd1db9bdb6923d78b106519efe927134a0133bd18c07195214c64535d47a0265647f2c55ff08f9ede192c2fa05a8a52bf2c1e1532d3bee9f0de8a4 WHIRLPOOL d8151be7a9a0966bd390246d4d31f229e0071969c94293a0c01944bfd610ba50a0c6d639832fe026dc0708e827a3aa0674320251f82badf0e321958ea6b50b32
 AUX ntp-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch 1305 SHA256 312c45416216f0061777f6cf02b5dde6ec6d3c75fbf3a70fff11d947d93e043b SHA512 6d6e3d98ff3b76575df8c5fa57e9ed4f7f9a4e12c2ffcfafe762a5f93ca3af8a807fd08a1cbb7c276748384702d98b60e160795cc0875fa73a3304bbe0038ba9 WHIRLPOOL 7db8ad867eb39b6b913d536229171134b04a99772594a6b0a6dfa0a87f59a1f8ba505945a6d5dd4d4f9ca9396c383b72b8b9d9e1068c86366a5c4c29b8dc5493
-AUX ntp-4.2.8_p10-libressl.patch 1669 SHA256 1f77e7b0d125e8f3502139e6052d46849b5861d9915adfda9b11616fab42e9a8 SHA512 2a44b250fa33725d0cee075dbf3fdbe616335432f7b31a0753c037765cfb91445aea35dee0f245f6dfbbb27d9eb1d107a412ab6325707711b65650a4785695df WHIRLPOOL e59916ac22db745f2742e775cabe85c30612154ce42d239de579bf957ea0ecc40eb968b44f2b28367a407ac3ac7c7e86c555a1faf6e15370aafb0aa5ce572f98
 AUX ntp-4.2.8_p10-ntpq-fpic.patch 464 SHA256 189d24170b6d8df22feac6881394f0a64aa06c04e6e1e8cd2d39104fbb5e753a SHA512 706f199b612f7a30f385668a2624cc442bcf0b2674f779488a03f94d659c5efa5355fcfb4e221e14d7eed608edd5a678dce4d1e110c97640d8e489d50e223b09 WHIRLPOOL 629d44eb3193bc222f6ec09c0f42c79ba24d9735c10137ac1478836c5263b3bf962a4e02d4d6fc5949cad6a5f12722020b32bbf279266a35527ea254aae22f15
-AUX ntp-4.2.8_p9-fix-build-wo-ssl-or-libressl.patch 7611 SHA256 ede0c5ef472de78cf7c083f6e1e7372430fd51d8de39d2b841f8354212b45dd0 SHA512 630a29233b86bddaa2439a130533ebfb5bdff5cda5be6c578600a0022f8c1439538dbb72b6a9de65023920782ff7912e0ec63291f92d5e4bb7d4908fd39db692 WHIRLPOOL 4d1c6f5b74171c2ab0f7440687d13a5fc1dee5e65cbb44998e015acd87a76944fc435c0bcaaf571dff8f1b7541dd52b8dd8e03ecbddfb8b6d8b260c3b7e358b0
 AUX ntp-client.confd 776 SHA256 c7dc517cdb5ee10e2a07ccea15ec47ba0b7aff8ac1469204c8d7faf71bcae2c5 SHA512 2d6b9d96c55787cf4556332054a61399368dcf37cf76a14aaba3f8e2e4fdd47ce25808f9babda2ca1f2a6e7387c043e023251ba2b99786426c875bd7cb6592a6 WHIRLPOOL 7282c74d564f776cb6e8e15d79cb77e60088c516a71f87c28d96bda7e67bddc3d35e01cf86eac58655c2536d0a4a023b6142527bc8ec62318524114502d5cc99
 AUX ntp-client.rc 720 SHA256 49f6634a258d4a91dc12c3b6bf9014b05a39cfe121ad52f826721ab791a28aa3 SHA512 557cb44fc911dcf34d21227c5d92c2ab56ca3fd855a5d2715c5f7343ae45a91c4b5492a84ac01a712bc251ea2a83810f4eb33e467b456b42c79052454a68dc81 WHIRLPOOL a5dd1c93b007255ed2148e1e48e3a1447b730031a7be5f7f7744559304028f11d622e668b5f6a2564f9d1a18734bfa0964c30862e66b40503e59da0e37033fce
 AUX ntp.conf 1614 SHA256 1e644397a0360a997064d0704b489c66b17ae2c50b49278ba46ec04942f13fb6 SHA512 b21afb9d2b9302edf702fce536218fa916e810e916c207dd6f2f09a9a793a465bc929b9a36108d49ddb3552e221b57cbb2e9f916eba78662b19c4b9c2b3e806c WHIRLPOOL c84ab4e53d8c778f64a656a920aa062b4c03cd871684814f3f2bf6a3d8b76870a921d91676cfe71d84db0865b887f64ebe3d403a81a91af656987d74469cc6cf
@@ -21,10 +19,7 @@ AUX sntp.service-r2 324 SHA256 4e36dca24d29c0debf5882193b870685f32e65f37f02068bb
 AUX sntp.service.conf 119 SHA256 a7f886d6f5e671005da8ef9b53567884a8467239528bf860db61230b73097eb3 SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8 WHIRLPOOL 6d99157e99026fdd4734674647bbb9a721f8766d5708f6c6f725fa88687bbb2995233fd02ccb34ebed7b80570e1a309a857ddb58fc08e0255268880eb8d18d9e
 DIST ntp-4.2.8p10-manpages.tar.xz 25004 SHA256 7d968a7e68e0ce26c56635e452468b3583e2cb8bfcf558127c753c62e31d7007 SHA512 5b31a1429484ad30a35c8fa38157190a66b0983b5bf1a802c0817613901b5e0644941a3f4d5b660fcfe4ca04968766a5981331a6f9353316e7de953e55c33a09 WHIRLPOOL 6f5d593be7003fa9212364c0409f7e1ae7adcd6d1134c6db5bfb92fbbeb181495c3d484ff73bdfe55f231bb323e286ef4e1eb2ba588fcf3acd360ac8bf53b259
 DIST ntp-4.2.8p10.tar.gz 6998648 SHA256 ddd2366e64219b9efa0f7438e06800d0db394ac5c88e13c17b70d0dcdf99b99f SHA512 67e01ab533c3dfabb0bdd3ced848bdd239980bde28fdb2791d167b7e9690ab3b3759e1bd99e9fddcce03ddef4cd63a47eb85941bb127ceb79b7ecff22cce9c05 WHIRLPOOL 7a72762d349591808c0f3d4686bbb2fbf60a0915769e77140414795892d6929feb0aae30cf2f2ea1febd3c4fecb9d3d62401e1f66033bb2dc57e3245f41708c8
-DIST ntp-4.2.8p9-manpages.tar.xz 24988 SHA256 a7814373e7ceb73a9e426b2e60a9966b6d053f145fd0253bbccf407af9f7ad3f SHA512 23ba80c540d12e78012a448348b94ccb68d0a8078e2e6fe05be58d89aa5e6e31ee8d686920c0f841ad12eade84a081e393885760fdf81bad5c30c76006df0094 WHIRLPOOL 49259ef4bade074bbcb5d87dd21bd93538a3a17405a42e483d10168fd609f908b59c86c73b01d2db2e683ff43fa0fdc0cdf297bfcc452d223dcb78bcef3f46c3
-DIST ntp-4.2.8p9.tar.gz 7231884 SHA256 b724287778e1bac625b447327c9851eedef020517a3545625e9f652a90f30b72 SHA512 ffd9e34060210d1cfb8ca0d89f2577df1c5fbe3ba63c620cdadc3ccc3c9d07f518783c6b91e57bffc77b08f449fdbab12faf226672ebd2dde5a0b4a783322a04 WHIRLPOOL ea96b106fd06f2b536394ad2a3dcc2a973aa0cec96140a292bc13b6ceb4159208a59b9c51936240c8a44fa7b2caa4be60d07d3c53066ce8588b0561bef64c070
 EBUILD ntp-4.2.8_p10-r1.ebuild 4509 SHA256 26b89ffff258d7e1fbf788d6f3e06a39370f4dcc4c5c2629f214bcbd4b815260 SHA512 8fc3394ea6cfca15557422ffd6c87dbe074cb955af8537ff8f912dd061015fae3597680de9b7d14dfe99ff871643567e519aa75f10f85e74be427c555b861230 WHIRLPOOL 2a30aee1615dd94b84705129572ae57275a6f9a28f692561a20bd87de14621c7d68734a11c3819269ebc4cc1abc3e919a17938432500c9c19e8a4c98c83c1928
-EBUILD ntp-4.2.8_p9.ebuild 4406 SHA256 e7a849cb4c96c7a8c96a07cc932c4a32d1da0a3f8a6a32c74f44fa8e15371566 SHA512 9fa23bbb7e9ad2283064b22f4661ce2a5855cbc93be296c80aa909303577cff999538cb53ab79dee77999d37a88f27ee9443f418f6505de93e2da9530f54807d WHIRLPOOL 85712eb9b856f2f40e65533771db6bbd870b34ec503763e2eb9dd39618b659a53c8f3fdff0baa3adfbf448f709b339d0423b39ba1da79925fbaab28bceabaa98
 MISC ChangeLog 13329 SHA256 4af69e0b1f274b3ab6e6c2a5762160ef6d3a586968ccf1e07001611240081294 SHA512 fbd7c3013a20ff722226fda2a417715c344669b99e2e2b746c581251334a2fd1fa7180702d33d61a90b9f381bbd31fb52d89bc9923f2fc2c274231b930ddf22f WHIRLPOOL 891184bca6aab64014578c812dd13bd28b0255f98fed3168d5a88b0ce3084ffda8a4acde412c43ca02855b4c5733b9c1ea8133056e438d1cc9e56f8c55d6c0e0
 MISC ChangeLog-2015 35438 SHA256 b1ee0c5247f54077d519bdc0f28d204058b1bc0f27ce0e633b11855c619bd28e SHA512 23317f991b73a9da7eac36d54739e7904ddb33ff652a40ed998c27a3a974eb4f05a359d131dc60960cf52cee5491476b45850a7a13611f339d54fccbdd8a2f82 WHIRLPOOL fcc2d0fd512bc87440c6ee5d4ba79d9c462a0a4946cbf6c481f8141a9f5b868086cd8478f322daa794fdaa53499faffdd76c02c3d56bef1bebcc69ecd117b302
 MISC metadata.xml 1014 SHA256 76b51a00c0cc2ba0dc0d3438da3b1ddf576197fb1e867e2956daa1908bbc8ac6 SHA512 37f6b14a86b13c20ecc83967332599b26e958015798e341ca3e1c1d79a666a3b69904c4aeb5ff298477d2b5fd709a2fe09271dbe41910e3f439bef47efa6b650 WHIRLPOOL c5aabcb26063c306bd27b069b2f2ce099c330110089ec07e26559d383678812117fa94cbc3ea039f73d1c833dc9a2a1b5c38368dbf004b203e69f2c3286e6781
diff --git a/net-misc/ntp/files/ntp-4.2.8_p10-libressl.patch b/net-misc/ntp/files/ntp-4.2.8_p10-libressl.patch
deleted file mode 100644
index 98ca61af4595..000000000000
--- a/net-misc/ntp/files/ntp-4.2.8_p10-libressl.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ur a/include/libssl_compat.h ntp-4.2.8p10/include/libssl_compat.h
---- ntp-4.2.8p10.orig/include/libssl_compat.h	2017-03-21 06:04:20.000000000 -0700
-+++ ntp-4.2.8p10/include/libssl_compat.h	2017-03-30 16:34:03.892173084 -0700
-@@ -37,7 +37,7 @@
- #endif
- 
- /* ----------------------------------------------------------------- */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER)
- /* ----------------------------------------------------------------- */
- 
- # include <openssl/objects.h>
-diff -ur ntp-4.2.8p10.orig/libntp/a_md5encrypt.c ntp-4.2.8p10/libntp/a_md5encrypt.c
---- ntp-4.2.8p10.orig/libntp/a_md5encrypt.c	2017-02-01 01:47:13.000000000 -0800
-+++ ntp-4.2.8p10/libntp/a_md5encrypt.c	2017-03-30 16:55:49.830229507 -0700
-@@ -11,6 +11,7 @@
- #include "ntp.h"
- #include "ntp_md5.h"	/* provides OpenSSL digest API */
- #include "isc/string.h"
-+#include "libssl_compat.h"
- /*
-  * MD5authencrypt - generate message digest
-  *
-diff -ur ntp-4.2.8p10.orig/libntp/libssl_compat.c ntp-4.2.8p10/libntp/libssl_compat.c
---- ntp-4.2.8p10.orig/libntp/libssl_compat.c	2017-02-01 01:47:13.000000000 -0800
-+++ ntp-4.2.8p10/libntp/libssl_compat.c	2017-03-30 16:52:17.287543795 -0700
-@@ -26,7 +26,7 @@
- /* ----------------------------------------------------------------- */
- 
- /* ----------------------------------------------------------------- */
--#if defined(OPENSSL) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(OPENSSL) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER)
- /* ----------------------------------------------------------------- */
- 
- #include "libssl_compat.h"
diff --git a/net-misc/ntp/files/ntp-4.2.8_p9-fix-build-wo-ssl-or-libressl.patch b/net-misc/ntp/files/ntp-4.2.8_p9-fix-build-wo-ssl-or-libressl.patch
deleted file mode 100644
index 5166e5f9a1d0..000000000000
--- a/net-misc/ntp/files/ntp-4.2.8_p9-fix-build-wo-ssl-or-libressl.patch
+++ /dev/null
@@ -1,236 +0,0 @@
-Fix building with libressl or without SSL.
-
-Origin: http://bugs.ntp.org/attachment.cgi?id=1481
-
-LibreSSL fix from Joe Kappus (https://bugs.gentoo.org/show_bug.cgi?id=600668#c2)
-
-diff -Nru a/include/ntp_md5.h b/include/ntp_md5.h
---- a/include/ntp_md5.h	2016-11-23 08:35:18.248130387 +0100
-+++ b/include/ntp_md5.h	2016-11-23 08:35:18.248130387 +0100
-@@ -8,6 +8,7 @@
- 
- #ifdef OPENSSL
- # include "openssl/evp.h"
-+# include "libssl_compat.h"
- #else	/* !OPENSSL follows */
- /*
-  * Provide OpenSSL-alike MD5 API if we're not using OpenSSL
-@@ -23,6 +24,9 @@
- # endif
- 
-   typedef MD5_CTX			EVP_MD_CTX;
-+
-+# define EVP_MD_CTX_free(c)		free(c)
-+# define EVP_MD_CTX_new()		calloc(1, sizeof(MD5_CTX))
- # define EVP_get_digestbynid(t)		NULL
- # define EVP_md5()			NULL
- # define EVP_MD_CTX_init(c)
-diff -Nru a/libntp/a_md5encrypt.c b/libntp/a_md5encrypt.c
---- a/libntp/a_md5encrypt.c	2016-11-23 08:35:18.248130387 +0100
-+++ b/libntp/a_md5encrypt.c	2016-11-23 08:35:18.248130387 +0100
-@@ -11,7 +11,6 @@
- #include "ntp.h"
- #include "ntp_md5.h"	/* provides OpenSSL digest API */
- #include "isc/string.h"
--#include "libssl_compat.h"
- /*
-  * MD5authencrypt - generate message digest
-  *
-diff -Nru a/libntp/libssl_compat.c b/libntp/libssl_compat.c
---- a/libntp/libssl_compat.c	2016-11-23 08:35:18.248130387 +0100
-+++ b/libntp/libssl_compat.c	2016-11-23 08:35:18.248130387 +0100
-@@ -15,15 +15,18 @@
-  * ---------------------------------------------------------------------
-  */
- #include "config.h"
--
--#include <string.h>
--#include <openssl/bn.h>
--#include <openssl/evp.h>
--
- #include "ntp_types.h"
- 
- /* ----------------------------------------------------------------- */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#ifdef OPENSSL
-+# include <string.h>
-+# include <openssl/bn.h>
-+# include <openssl/evp.h>
-+#endif
-+/* ----------------------------------------------------------------- */
-+
-+/* ----------------------------------------------------------------- */
-+#if defined(OPENSSL) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER)
- /* ----------------------------------------------------------------- */
- 
- #include "libssl_compat.h"
-@@ -325,7 +328,7 @@
- }
- 
- /* ----------------------------------------------------------------- */
--#else /* OPENSSL_VERSION_NUMBER >= v1.1.0 */
-+#else /* OPENSSL && OPENSSL_VERSION_NUMBER >= v1.1.0 */
- /* ----------------------------------------------------------------- */
- 
- NONEMPTY_TRANSLATION_UNIT
-diff -Nru a/ntpd/ntp_control.c b/ntpd/ntp_control.c
---- a/ntpd/ntp_control.c	2016-11-23 08:35:18.256130015 +0100
-+++ b/ntpd/ntp_control.c	2016-11-23 08:35:18.260129828 +0100
-@@ -33,8 +33,6 @@
- # include "ntp_syscall.h"
- #endif
- 
--#include "libssl_compat.h"
--
- /*
-  * Structure to hold request procedure information
-  */
-@@ -1653,8 +1651,10 @@
- }
- 
- /*
-- * ctl_putcal - write a decoded calendar data into the response
-+ * ctl_putcal - write a decoded calendar data into the response.
-+ * only used with AUTOKEY currently, so compiled conditional
-  */
-+#ifdef AUTOKEY
- static void
- ctl_putcal(
- 	const char *tag,
-@@ -1678,6 +1678,7 @@
- 
- 	return;
- }
-+#endif
- 
- /*
-  * ctl_putfs - write a decoded filestamp into the response
-@@ -1838,7 +1839,7 @@
- 	char *	oplim;
- 	char *	iptr;
- 	char *	iplim;
--	char *	past_eq;
-+	char *	past_eq = NULL;
- 
- 	optr = output;
- 	oplim = output + sizeof(output);
-diff -Nru a/ntpd/ntp_io.c b/ntpd/ntp_io.c
---- a/ntpd/ntp_io.c	2016-11-23 08:35:18.268129456 +0100
-+++ b/ntpd/ntp_io.c	2016-11-23 08:35:18.272129269 +0100
-@@ -516,13 +516,17 @@
- /*
-  * function to dump the contents of the interface structure
-  * for debugging use only.
-+ * We face a dilemma here -- sockets are FDs under POSIX and
-+ * actually HANDLES under Windows. So we use '%lld' as format
-+ * and cast the value to 'long long'; this should not hurt
-+ * with UNIX-like systems and does not truncate values on Win64.
-  */
- void
- interface_dump(const endpt *itf)
- {
- 	printf("Dumping interface: %p\n", itf);
--	printf("fd = %d\n", itf->fd);
--	printf("bfd = %d\n", itf->bfd);
-+	printf("fd = %lld\n", (long long)itf->fd);
-+	printf("bfd = %lld\n", (long long)itf->bfd);
- 	printf("sin = %s,\n", stoa(&itf->sin));
- 	sockaddr_dump(&itf->sin);
- 	printf("bcast = %s,\n", stoa(&itf->bcast));
-@@ -570,11 +574,11 @@
- static void
- print_interface(const endpt *iface, const char *pfx, const char *sfx)
- {
--	printf("%sinterface #%d: fd=%d, bfd=%d, name=%s, flags=0x%x, ifindex=%u, sin=%s",
-+	printf("%sinterface #%d: fd=%lld, bfd=%lld, name=%s, flags=0x%x, ifindex=%u, sin=%s",
- 	       pfx,
- 	       iface->ifnum,
--	       iface->fd,
--	       iface->bfd,
-+	       (long long)iface->fd,
-+	       (long long)iface->bfd,
- 	       iface->name,
- 	       iface->flags,
- 	       iface->ifindex,
-diff -Nru a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
---- a/ntpd/ntp_proto.c	2016-11-23 08:35:18.280128897 +0100
-+++ b/ntpd/ntp_proto.c	2016-11-23 08:35:18.284128711 +0100
-@@ -4054,7 +4054,7 @@
- 		    ntoa(&peer->srcadr), peer->hmode, xkeyid, sendlen,
- 		    peer->keynumber));
- #else	/* !AUTOKEY follows */
--	DPRINTF(1, ("peer_xmit: at %ld %s->%s mode %d keyid %08x len %d\n",
-+	DPRINTF(1, ("peer_xmit: at %ld %s->%s mode %d keyid %08x len %zu\n",
- 		    current_time, peer->dstadr ?
- 		    ntoa(&peer->dstadr->sin) : "-",
- 		    ntoa(&peer->srcadr), peer->hmode, xkeyid, sendlen));
-diff -Nru a/ports/winnt/ntpd/ntp_iocompletionport.c b/ports/winnt/ntpd/ntp_iocompletionport.c
---- a/ports/winnt/ntpd/ntp_iocompletionport.c	2016-11-23 08:35:18.288128524 +0100
-+++ b/ports/winnt/ntpd/ntp_iocompletionport.c	2016-11-23 08:35:18.288128524 +0100
-@@ -1391,8 +1391,7 @@
- 		goto fail;
- 	}
- 
--	;
--	if ( ! (rio->ioreg_ctx = iopad = iohpCreate(rio))) {
-+	if (NULL == (rio->ioreg_ctx = iopad = iohpCreate(rio))) {
- 		msyslog(LOG_ERR, "%s: Failed to create shared lock",
- 			msgh);
- 		goto fail;
-@@ -1401,13 +1400,13 @@
- 	iopad->riofd      = rio->fd;
- 	iopad->rsrc.rio   = rio;
- 
--	if (!(rio->device_ctx = DevCtxAttach(serial_devctx(h)))) {
-+	if (NULL == (rio->device_ctx = DevCtxAttach(serial_devctx(h)))) {
- 		msyslog(LOG_ERR, "%s: Failed to allocate device context",
- 			msgh);
- 		goto fail;
- 	}
- 
--	if ( ! (lpo = IoCtxAlloc(iopad, rio->device_ctx))) {
-+	if (NULL == (lpo = IoCtxAlloc(iopad, rio->device_ctx))) {
- 		msyslog(LOG_ERR, "%: Failed to allocate IO context",
- 			msgh);
- 		goto fail;
-@@ -1594,7 +1593,6 @@
- 	static const char * const msg =
- 		"OnSocketSend: send to socket failed";
- 
--	IoHndPad_T *	iopad	= NULL;
- 	endpt *		ep	= NULL;
- 	int		rc;
- 
-@@ -1662,7 +1660,7 @@
- 
- 	INSIST(hndIOCPLPort && hMainRpcDone);
- 	if (iopad)
--		iocpl_notify(iopad, OnInterfaceDetach, -1);
-+		iocpl_notify(iopad, OnInterfaceDetach, (UINT_PTR)-1);
- }
- 
- /* --------------------------------------------------------------------
-diff -Nru a/sntp/crypto.c b/sntp/crypto.c
---- a/sntp/crypto.c	2016-11-23 08:35:18.288128524 +0100
-+++ b/sntp/crypto.c	2016-11-23 08:35:18.288128524 +0100
-@@ -2,7 +2,7 @@
- #include "crypto.h"
- #include <ctype.h>
- #include "isc/string.h"
--#include "libssl_compat.h"
-+#include "ntp_md5.h"
- 
- struct key *key_ptr;
- size_t key_cnt = 0;
-diff -urN ntp-4.2.8p9/include/libssl_compat.h ntp-4.2.8p9_fixed/include/libssl_compat.h
---- a/include/libssl_compat.h	2016-11-21 07:28:40.000000000 -0500
-+++ b/include/libssl_compat.h	2016-11-23 12:10:33.014148604 -0500
-@@ -25,7 +25,7 @@
- #include "openssl/rsa.h"
- 
- /* ----------------------------------------------------------------- */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER)
- /* ----------------------------------------------------------------- */
- 
- # include <openssl/objects.h>
diff --git a/net-misc/ntp/ntp-4.2.8_p9.ebuild b/net-misc/ntp/ntp-4.2.8_p9.ebuild
deleted file mode 100644
index 4ff1b7a2eb34..000000000000
--- a/net-misc/ntp/ntp-4.2.8_p9.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs flag-o-matic user systemd
-
-MY_P=${P/_p/p}
-DESCRIPTION="Network Time Protocol suite/programs"
-HOMEPAGE="http://www.ntp.org/"
-SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
-	https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz"
-
-LICENSE="HPND BSD ISC"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
-IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
-
-CDEPEND="readline? ( >=sys-libs/readline-4.1:0= )
-	>=dev-libs/libevent-2.0.9:=[threads?]
-	kernel_linux? ( caps? ( sys-libs/libcap ) )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-	!openntpd? ( !net-misc/openntpd )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)
-	parse-clocks? ( net-misc/pps-tools )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-ntp )
-	vim-syntax? ( app-vim/ntp-syntax )"
-PDEPEND="openntpd? ( net-misc/openntpd )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966
-	"${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
-	"${FILESDIR}"/${P}-fix-build-wo-ssl-or-libressl.patch
-)
-
-pkg_setup() {
-	enewgroup ntp 123
-	enewuser ntp 123 -1 /dev/null ntp
-}
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	append-cppflags -D_GNU_SOURCE #264109
-	# Make sure every build uses the same install layout. #539092
-	find sntp/loc/ -type f '!' -name legacy -delete || die
-	# Disable pointless checks.
-	touch .checkChangeLog .gcc-warning FRC.html html/.datecheck
-}
-
-src_configure() {
-	# avoid libmd5/libelf
-	export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
-	export ac_cv_lib_elf_nlist=no
-	# blah, no real configure options #176333
-	export ac_cv_header_dns_sd_h=$(usex zeroconf)
-	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
-	# Increase the default memlimit from 32MiB to 128MiB.  #533232
-	econf \
-		--with-lineeditlibs=readline,edit,editline \
-		--with-yielding-select \
-		--disable-local-libevent \
-		--docdir='$(datarootdir)'/doc/${PF} \
-		--htmldir='$(docdir)/html' \
-		--with-memlock=256 \
-		$(use_enable caps linuxcaps) \
-		$(use_enable parse-clocks) \
-		$(use_enable ipv6) \
-		$(use_enable debug debugging) \
-		$(use_with readline lineeditlibs readline) \
-		$(use_enable samba ntp-signd) \
-		$(use_with snmp ntpsnmpd) \
-		$(use_with ssl crypto) \
-		$(use_enable threads thread-support)
-}
-
-src_install() {
-	default
-	# move ntpd/ntpdate to sbin #66671
-	dodir /usr/sbin
-	mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin"
-
-	dodoc INSTALL WHERE-TO-START
-	doman "${WORKDIR}"/man/*.[58]
-
-	insinto /etc
-	doins "${FILESDIR}"/ntp.conf
-	use ipv6 || sed -i '/^restrict .*::1/d' "${ED}"/etc/ntp.conf #524726
-	newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd
-	newconfd "${FILESDIR}"/ntpd.confd ntpd
-	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
-	newconfd "${FILESDIR}"/ntp-client.confd ntp-client
-	newinitd "${FILESDIR}"/sntp.rc sntp
-	newconfd "${FILESDIR}"/sntp.confd sntp
-	if ! use caps ; then
-		sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die
-	fi
-	sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die
-
-	keepdir /var/lib/ntp
-	use prefix || fowners ntp:ntp /var/lib/ntp
-
-	if use openntpd ; then
-		cd "${ED}"
-		rm usr/sbin/ntpd || die
-		rm -r var/lib
-		rm etc/{conf,init}.d/ntpd
-		rm usr/share/man/*/ntpd.8 || die
-	else
-		systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service
-		use caps && sed -i '/ExecStart/ s|$| -u ntp:ntp|' "${ED}"/usr/lib/systemd/system/ntpd.service
-		systemd_enable_ntpunit 60-ntpd ntpd.service
-	fi
-
-	systemd_newunit "${FILESDIR}"/ntpdate.service-r1 ntpdate.service
-	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
-	systemd_newunit "${FILESDIR}"/sntp.service-r2 sntp.service
-	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
-}
-
-pkg_postinst() {
-	if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
-		eerror "The notrust option was found in your /etc/ntp.conf!"
-		ewarn "If your ntpd starts sending out weird responses,"
-		ewarn "then make sure you have keys properly setup and see"
-		ewarn "https://bugs.gentoo.org/41827"
-	fi
-}
diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index e481a56502c0..26fd487917d3 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -6,7 +6,7 @@ DIST rabbitmq-server-3.6.5.tar.xz 2923164 SHA256 9550433ca8aaf5130bf5235bb978c44
 DIST rabbitmq-server-3.6.9.tar.xz 1422316 SHA256 2df4f09860167de803f592a45792f3f83533bd97acdd7e18569c5bafcf2e470f SHA512 a003d2343c97e546ac01a5aadc46e94e2dbcc78349072b362950e5c5e11229e2a6fc4020d281f9fbb5cc0f577d2a166ef09671e931ec1470ab2edcdd98443662 WHIRLPOOL af674e8e555b6ee94f72f5d09d795f3a53f41ec9cf7a00ecefa3a418935742cc568319b82735da2ef9374e64b41ecf89bf234d02be0e66dce4d4aff0b82f3d77
 EBUILD rabbitmq-server-3.6.10.ebuild 2862 SHA256 8f209c80cd5bf3ca1a8bd7c869470f9d1320f4a4f0d4e7c7c6667ff071e84939 SHA512 30b2b5abea99f3f7d277c73135ebcfa15e592650dfd5b7815c81824efc495e3d3fcdeb350e3fba5d6e465a73d844230ff46da2083c580819146b8548361ca0a5 WHIRLPOOL 3d5c5c6804d55b4156fdaddfc1c8fe3e5f301437235343f9b7d41eb089c4cc6b8164028720a24bf87c049c0e0fe2f38c60588eb572b282f746da31d2418bf44c
 EBUILD rabbitmq-server-3.6.5.ebuild 2784 SHA256 f5244a685d4a98b0b43f0769d42b361c174666c1e43da5ecde0f812c92f17c6c SHA512 e56a01c1d4c0cc7537fdd680387a845c0077c744fa29faf73777d258b8d7399233ccf58bc5368a10c5949ed9685a4fc14c9778a43bd03a98564451b0028b584e WHIRLPOOL da5f7793fc3f4d937384c50612c00151e440b1d3c717986a547ec537ccee11b5aa5811f0091dd29acbf888eaa1524bcde7ebce08a4ec5c1917b92c1d7457fb4e
-EBUILD rabbitmq-server-3.6.9.ebuild 2861 SHA256 4a0e3b55ae099d77c5c0017820f9e212b272937a2e3c18797d75e4c0c6b5737e SHA512 d3bbb35338e57667d2dbf6a2524e9bafdbfbb7195f1af53c6a4cca0c15c320092607e43ba7c1a18cbd3568fbcfc261a85e35e0efcb05814c864a6deddeaa0501 WHIRLPOOL 50299ded32d29f4336f40a4a6001dc5a2f619c81b2a009554ea4fac7f3ce8126fc39bdaa812052d13c361c9648f227a851797304ce6a808a6faeb6f75de48979
+EBUILD rabbitmq-server-3.6.9.ebuild 2860 SHA256 9f3a0f9ec8a2d456fd5f8b218791362c5ba4d0d2c70d320dea220bd049478772 SHA512 17951e227b45b1230bae2992b3f4530e7c2e7dabd62cfd8c9950254cdf0633dace11b45da1ff34934adac1a365032d72e87adf3ad64051e3942d1077b9b59303 WHIRLPOOL d6d4395b0564c34beed29a0d9db66e5348f22a7250316b939acc9e4b604305662c0e21534002561d7480cc80ee8dc498e2dafc880ae599fb56dd75bdc89cb68a
 MISC ChangeLog 4923 SHA256 f9d6c91ff43982646a66e386ecf8096ec13a05d118335143959297889d29d86d SHA512 bb0db708d4948042fb50adc991ae49868c11db7788e8e21bb8ae85fe1d237a0552b9afe184cfa57198ed00bf6f9793d2fc575744bd0d7b0f6222e89465e68ca5 WHIRLPOOL a0f679867374f75a84ee82bd025211cbb5b2a8b44e990bf33f084917fa0e9f8822c11d59a365b5ca3ce955e938e0f80bf2dd1d3edf00240334b3edf9f39abbf1
 MISC ChangeLog-2015 9325 SHA256 909f07a4b271e41482d034bd4da6b8939dd3023bb4eeb2fb9912e3248d35d3be SHA512 68317f1c63f79a38c282dd4f45964198e5f4977f58b856fb4aef2feabadefd5cc0a756f29edd64b2a1b00c0ca94fc28ab466e54d97a7d291cc289132050c086f WHIRLPOOL 5882a7ce7855b9b436ed63bed531009095eef28af3e466678fba8899d725b355004e67da3524bd4f657346174651c3d2298e20c6698aee5ff2de2998dfade1a7
 MISC metadata.xml 243 SHA256 1446624bfa571e6b512e5cf6df92ad4773a91dd5066b852d48b6629df20dd42d SHA512 d44d6b045d6b171e487d632935b2ffd1d5c567b28e273aadde4799d45d94f1dfd75873d296d4e9de1e431d5a8de4a0337e9e3fa648545c182f225e4f45652701 WHIRLPOOL e55b1ed28253d63931acbabcf8c0e2a7e88c8bb61d1fe9cbf4795ca3aae755749b7a4a01d3fcf4d7461dfe60c9a2e5a06a68549f016d021440d22653ddf7d6b8
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.6.9.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.6.9.ebuild
index d57de986cabb..669fedafa631 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.6.9.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.6.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/rabbitmq-server
 
 LICENSE="GPL-2 MPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/erlang-18[ssl]"
diff --git a/profiles/features/hardened/make.defaults b/profiles/features/hardened/make.defaults
index f753f571b723..d83d7eab8856 100644
--- a/profiles/features/hardened/make.defaults
+++ b/profiles/features/hardened/make.defaults
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation.
+# Copyright 1999-2017 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
 # Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
 # Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value
-BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pax_kernel pic xtpax -jit -orc"
+BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic xtpax -jit -orc"
 
-USE="hardened pax_kernel pic urandom xtpax -fortran -jit -orc"
+USE="hardened pic urandom xtpax -fortran -jit -orc"
 
 # Ian Stakenvicius, 2014-09-03
 # Set a variable just to indicate that the current profile is a hardened one
diff --git a/profiles/hardened/linux/make.defaults b/profiles/hardened/linux/make.defaults
index f753f571b723..d83d7eab8856 100644
--- a/profiles/hardened/linux/make.defaults
+++ b/profiles/hardened/linux/make.defaults
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation.
+# Copyright 1999-2017 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
 # Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
 # Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value
-BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pax_kernel pic xtpax -jit -orc"
+BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic xtpax -jit -orc"
 
-USE="hardened pax_kernel pic urandom xtpax -fortran -jit -orc"
+USE="hardened pic urandom xtpax -fortran -jit -orc"
 
 # Ian Stakenvicius, 2014-09-03
 # Set a variable just to indicate that the current profile is a hardened one
diff --git a/profiles/hardened/linux/musl/make.defaults b/profiles/hardened/linux/musl/make.defaults
index ec5b4ed52d25..518c214765bc 100644
--- a/profiles/hardened/linux/musl/make.defaults
+++ b/profiles/hardened/linux/musl/make.defaults
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation.
+# Copyright 1999-2017 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
 ELIBC="musl"
 
 FEATURES="sandbox sfperms strict"
 
-USE="hardened nptl pax_kernel pic unicode -berkdb -jit -orc"
-BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened nptl pax_kernel pic -berkdb -jit -nls -orc"
+USE="hardened nptl pic unicode -berkdb -jit -orc"
+BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened nptl pic -berkdb -jit -nls -orc"
 
 SYMLINK_LIB="no"
 
diff --git a/profiles/hardened/linux/uclibc/make.defaults b/profiles/hardened/linux/uclibc/make.defaults
index c08f30f5e7f9..1212f635f54f 100644
--- a/profiles/hardened/linux/uclibc/make.defaults
+++ b/profiles/hardened/linux/uclibc/make.defaults
@@ -1,5 +1,5 @@
-# Copyright 1999-2014 Gentoo Foundation.
+# Copyright 1999-2017 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
-USE="${USE} hardened pax_kernel pic -jit -orc"
-BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pax_kernel pic -jit -orc"
+USE="${USE} hardened pic -jit -orc"
+BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic -jit -orc"
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 6aa891a76e25..2fee13ec0ca9 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -3408,6 +3408,7 @@ kde-apps/kaccessible:speechd - Enable support for the speech-dispatcher speech s
 kde-apps/kaddressbook:prison - Enable support for QRcodes in contacts
 kde-apps/kalzium:editor - Enable the embedded molecule editor/viewer
 kde-apps/kalzium:solver - Enable the equation solver
+kde-apps/kanagram:speech - Enable text-to-speech support
 kde-apps/kate:addons - Build and install additional plugins
 kde-apps/kde-apps-meta:pim - Pull in KDE PIM suite
 kde-apps/kde-apps-meta:sdk - Pull in developer-specific meta-packages
@@ -3423,6 +3424,7 @@ kde-apps/kdepim-addons:importwizard - Enable additional import plugins for kde-a
 kde-apps/kdepim-apps-libs:prison - Enable support for QRcodes in contacts
 kde-apps/kdepim-meta:google - Google service integration via kde-apps/libkgapi
 kde-apps/kdepim-runtime:google - Google service integration via kde-apps/libkgapi
+kde-apps/kdepim-runtime:speech - Enable text-to-speech support
 kde-apps/kdeutils-meta:floppy - Install kde-apps/kfloppy to format and create DOS or ext2fs filesystems in a floppy.
 kde-apps/keditbookmarks:man - Build and install man pages
 kde-apps/kget:mms - Enable MMS (Microsoft Media Server) plugin through media-libs/libmms
@@ -7321,6 +7323,11 @@ sci-mathematics/singular:boost - Compile against external boost headers (dev-lib
 sci-mathematics/spass:isabelle - Add integration support for the Isabelle/HOL theorem prover.
 sci-mathematics/unuran:prng - Use sci-mathematics/prng library
 sci-mathematics/unuran:rngstreams - Use sci-mathematics/rngstreams library
+sci-mathematics/why3-for-spark:coq - Add sci-mathematics/coq support
+sci-mathematics/why3-for-spark:html - Build HTML documentation
+sci-mathematics/why3-for-spark:hypothesis-selection - Enable hypothesis selection
+sci-mathematics/why3-for-spark:profiling - Enable profiling
+sci-mathematics/why3-for-spark:zarith - Use dev-ml/zarith
 sci-mathematics/yacas:doc - Generate HTML documentation
 sci-mathematics/yacas:gui - Build graphical interface for the native yacas engine. Requires Qt5
 sci-mathematics/yacas:java - Build the Java yacas engine and text console for it
@@ -7980,12 +7987,8 @@ sys-fs/ecryptfs-utils:pkcs11 - Enable PKCS#11 (Smartcards) key module
 sys-fs/ecryptfs-utils:tpm - Enable support for Trusted Platform Module (TPM) using app-crypt/trousers
 sys-fs/eudev:blkid - enable blkid support
 sys-fs/eudev:efi - enable EFI support
-sys-fs/eudev:gudev - enable libudev gobject interface
 sys-fs/eudev:hwdb - read vendor/device string database and add it to udev database
-sys-fs/eudev:keymap - map custom hardware's multimedia keys
 sys-fs/eudev:kmod - enable module loading through libkmod
-sys-fs/eudev:modutils - enable module loading support - use modutils calls if kmod not enabled
-sys-fs/eudev:openrc - install the OpenRC init scripts
 sys-fs/eudev:rule-generator - install legacy rule generator rules and support scripts - note that the functionality within was dropped from sys-fs/udev as it is not stable in all cases; use at your own risk
 sys-fs/eudev:smack - enable SMACK security model
 sys-fs/ext4magic:expert-mode - Builds ext4magic with expert mode. Highly useful in recovering data from a corrupted filesystem
diff --git a/sci-mathematics/why3-for-spark/Manifest b/sci-mathematics/why3-for-spark/Manifest
new file mode 100644
index 000000000000..e5c0b2a5e8ea
--- /dev/null
+++ b/sci-mathematics/why3-for-spark/Manifest
@@ -0,0 +1,4 @@
+AUX why3-for-spark-2017-gentoo.patch 488 SHA256 7fe1764ad2502c9983023417e1645299ae9a141e683f2a2b6abdf9fe5920ee7f SHA512 53c31e57021e1f7f9ca3e74447be403f99bff8009634ef400b72c48a15458230f1007e26c4070e04e3bea732d596a68ea20717a413ea13282a518d2eb29c6215 WHIRLPOOL 8514135f362dd67512a19095bfc15fcee2f22e07c9e23a069f18a7bd9e4a4ff15218a8c5368a56a6cefedc3e40ef11051a07243c315f05105c8f083145663fb1
+DIST why3-for-spark-gpl-2017-src.tar.gz 9248235 SHA256 7e7aee3912421847c416bc1f066ac342e811601c29d7b69e98e789a59a724d8e SHA512 8f444402f6c1744cd7c565117732935791b1ae7996a94314c40a66d125eae8a81f2257314246c94fd29d3cd16abcff6a50a152a1191a4aae39a2c8a8d7c3b9e1 WHIRLPOOL 256648567b3a220f762c7e30d0f90265fd10af21b66c3607b9072e81444b0a33dc971126232e11f3edc64eac2598fbd3ad428d063f2c9db8d247be2abe5be904
+EBUILD why3-for-spark-2017.ebuild 1536 SHA256 046ef9e20ce360ada8d848552391e6e304bc3faf10ad6ce0f16434e2b498b59e SHA512 2e8764f302313f5d4779e3a1ead43716ba0da210eaee8a176a983ba3e3fe085d33da032ec78ddbe6c959e147d33d777c6745d2f6691e98e595beafdf2d971f27 WHIRLPOOL 55718e4feeffa9f7c345258d2da626ea25c93ad825f222358fa5b09dbf22046e475bb637360a31c3e7a76fc8ec7e232e5acea25a4062149d3f5b7457d6dc603f
+MISC metadata.xml 1301 SHA256 9a581657e60cdc997d5541d7361ad05353fd278160e3fdb78cb32660f18737c6 SHA512 390303b44331c039d301a143c151c01a9ac6ce2467bf9079b16ac169af4bf5b24e21326c7a01747e8156e661e88d489d440344aa5cfb166e66cd6687fc7b95fd WHIRLPOOL 7b0df2710e2ac8dad3dca0103cc1326d966e9343c6dd7bda0f5103c28615bdaa1a5b6f87399cd124bfdee5d6ff700e2fb8ad61d9c742eabae68a1b8d0da13c79
diff --git a/sci-mathematics/why3-for-spark/files/why3-for-spark-2017-gentoo.patch b/sci-mathematics/why3-for-spark/files/why3-for-spark-2017-gentoo.patch
new file mode 100644
index 000000000000..502f394afa2b
--- /dev/null
+++ b/sci-mathematics/why3-for-spark/files/why3-for-spark-2017-gentoo.patch
@@ -0,0 +1,14 @@
+--- why3-for-spark-gpl-2017-src/src/gnat/gnat_config.ml.old	2017-10-18 09:07:03.118919785 +0200
++++ why3-for-spark-gpl-2017-src/src/gnat/gnat_config.ml	2017-10-18 09:07:45.198216939 +0200
+@@ -12,10 +12,7 @@
+   | Limit_Check of Gnat_expl.check
+   | Limit_Line of Gnat_loc.loc
+ 
+-let spark_prefix =
+-  (Filename.dirname
+-          (Filename.dirname (Filename.dirname
+-          (Filename.dirname Sys.executable_name))))
++let spark_prefix = "/usr"
+ 
+ let rec file_concat l =
+   match l with
diff --git a/sci-mathematics/why3-for-spark/metadata.xml b/sci-mathematics/why3-for-spark/metadata.xml
new file mode 100644
index 000000000000..f73ffa40b698
--- /dev/null
+++ b/sci-mathematics/why3-for-spark/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<longdescription lang="en">
+		Why3 is a platform for deductive program verification. It provides a
+		rich language for specification and programming, called WhyML, and
+		relies on external theorem provers, both automated and interactive, to
+		discharge verification conditions. Why3 comes with a standard library
+		of logical theories (integer and real arithmetic, Boolean operations,
+		sets and maps, etc.) and basic programming data structures (arrays,
+		queues, hash tables, etc.). A user can write WhyML programs directly
+		and get correct-by-construction OCaml programs through an automated
+		extraction mechanism. WhyML is also used as an intermediate language
+		for the verification of C, Java, or Ada programs.
+	</longdescription>
+	<use>
+		<flag name="coq">Add <pkg>sci-mathematics/coq</pkg> support</flag>
+		<flag name="html">Build HTML documentation</flag>
+		<flag name="hypothesis-selection">Enable hypothesis selection</flag>
+		<flag name="profiling">Enable profiling</flag>
+		<flag name="zarith">Use <pkg>dev-ml/zarith</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2017.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2017.ebuild
new file mode 100644
index 000000000000..b69b22e506fc
--- /dev/null
+++ b/sci-mathematics/why3-for-spark/why3-for-spark-2017.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+MYP=${PN}-gpl-${PV}-src
+
+DESCRIPTION="Platform for deductive program verification"
+HOMEPAGE="http://why3.lri.fr/"
+SRC_URI="https//mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed055
+	-> ${MYP}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="coq doc emacs gtk html hypothesis-selection profiling zarith"
+
+DEPEND=">=dev-lang/ocaml-4.02.3
+	dev-ml/menhir
+	coq? ( sci-mathematics/coq )
+	doc? ( dev-tex/rubber )
+	gtk? ( dev-ml/lablgtk[sourceview] )
+	emacs? ( app-editors/emacs:* )
+	html? ( dev-tex/hevea )
+	hypothesis-selection? ( dev-ml/ocamlgraph )
+	zarith? ( dev-ml/zarith )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+REQUIRED_USE="html? ( doc )"
+
+src_prepare() {
+	mv configure.{in,ac} || die
+	sed -i \
+		-e "s:configure.in:configure.ac:g" \
+		Makefile.in
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-coq-tactic \
+		--disable-pvs-libs \
+		--disable-isabelle-libs \
+		--disable-zip \
+		$(use_enable coq coq-libs) \
+		$(use_enable doc) \
+		$(use_enable emacs emacs-compilation) \
+		$(use_enable gtk ide) \
+		$(use_enable html html-doc) \
+		$(use_enable hypothesis-selection) \
+		$(use_enable profiling) \
+		$(use_enable zarith)
+}
+
+src_compile() {
+	default
+	use doc && emake doc
+}
+
+src_install() {
+	default
+	emake DESTDIR="${D}" install_spark2014_dev
+	if use doc; then
+		dodoc doc/manual.pdf
+		use html && dodoc -r doc/html
+	fi
+}
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index ae40c24c790a..4c7749efc308 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -5,10 +5,12 @@ DIST gawk-3.1.8.tar.bz2 1984129 SHA256 5dbc7b2c4c328711337c2aacd09a122c731312226
 DIST gawk-4.0.2.tar.xz 1626808 SHA256 21e1f28c51b5160f0a4bf1a735c6109b46a3bd6a43de808eabc21c17bb026d13 SHA512 069f68b6792521d94d4003764006ad8fbe9a17c60a88212629204d9a5eb3f662903fff6d91dd3c1834597b76c18f9d3231c93a033f456c59c0571ac13eb77b27 WHIRLPOOL 8b2916d964c5fa67a46c0a5fc39d424b03e6b39a3335ad796a224feb760528631199c1ec6ee2b6719bdc014ab190ddf38092211685020c92851d617e6ca08690
 DIST gawk-4.1.3.tar.xz 2311268 SHA256 e3cf55e91e31ea2845f8338bedd91e40671fc30e4d82ea147d220e687abda625 SHA512 8b9470a1bba397353f10e4e652e8589a637a49e8235fb39ca7681ae662fd27cd140c193d0634179c800f99e19b0e49aef55dfa6612f9695ba80760a36936a1c3 WHIRLPOOL ddcd0f218a08c7d54beaaa28db3a965c57b1d394dd294f142970cbf3b4777a407bbb491b7442f9e4de0b7435167919e76b16f4c5ab28eb62758a3d44d11a49e1
 DIST gawk-4.1.4.tar.xz 2367832 SHA256 53e184e2d0f90def9207860531802456322be091c7b48f23fdc79cda65adc266 SHA512 6a0e9cf086544212f54b54261dcd517b611aaf495ef99c4b7740d07e363bb00c5632f3d7fd5e12a954d5aa9793764162a57453e0e18884b29c6c54b5f444c097 WHIRLPOOL 5103388e7260cd9d4e777a5b53e93ae2eb1270c5baec462d0d4c244fde12bb29d41864ebb22de5c9b797fb9678c548cf3059a39488d35660b508b90c802346ff
+DIST gawk-4.2.0.tar.xz 2948108 SHA256 d4f3cd31c001fd0ed52832d4fbfbdfeaa38ad541c182f80ff8fdf87324a6a9f2 SHA512 3076b2f42e43fff0ce63dcaa3fb749ce421473d0abc3e1e2d9dd375207d3e35c98d5bf91c3179f49156e8a4977424c16bb2d3d662846ad487153729dd4cfeb4c WHIRLPOOL 5fe8f46d78effeef2563446b6c73c7e5bcc4e1f8b565ca2bed3bbf30017683e784daa9655cfb7722ea090a8c9a3ce6f5740f278c0ff3a70d85ec67d7a8b5808a
 EBUILD gawk-3.1.8.ebuild 1794 SHA256 b794beff4f8ce3bb31d416ea4e7cffa083ee432991e4f6b86a1a071b63444845 SHA512 ca82d7bba5d88aadb4616817d0d55f001446a90da3def7fd49fb817c5b2674cd389f5a92efe82736e562ea0f46c9a214286f96137f324ee2be2149d09f298f61 WHIRLPOOL 9b2abe1d8028961d76032e39a359ae76d82ab647008e48d79c887e6ad3b2bd017ab33d7e877582fb34868ee604ed78d8169134c75d1dbfc6b466507847eb2a78
 EBUILD gawk-4.0.2.ebuild 2088 SHA256 aeb7bc3dda2def791ba830ff3052247292249a6fcb270c81412651a5fd013761 SHA512 b15b3c32c04c724e7b0c5c6f8d7cae86e3118c1560ca2fae0f5ded39fc098afa29987e425733e96daedbf1db5757e15fb21059a023c5158498f5b6168809f063 WHIRLPOOL 0197d1effc02f2668e3834108eab717407fb02bb880fdd1a964fdbc0a5bfb44a0f5cd1ab6893af0da3aadd0e22c1e9444af46a98b2fdd74b341877d7d9fd00fd
 EBUILD gawk-4.1.3.ebuild 2201 SHA256 e973870920b273d6f516ccb6a47265d0b793916d60a3a72aa8c7153cd90ff8c3 SHA512 fd78556fbd0d2ba92c2816d4a82330a365ca99985b042a3431e075e7a1390954bec0139d7dc63370c564eb90ab3f0a97c6966230a7309d46462d5e934b090d0b WHIRLPOOL 8c4ab7736911b57077dda94446831b6bb1b7fe1c839f6d06b22f42b6d7cc0b763a94e2b5aca899ae0b6641bc5b9a0dc79aafc07f325a885a9ea9f2aa336c7d1a
-EBUILD gawk-4.1.4.ebuild 2301 SHA256 26d24d086963e0347732c0c450a18eb3827779a4259f8173683c05f41c780235 SHA512 7264a7180f127dbe7147db5eaee201f37bd4ec25f1478029086720ee59fa96ac3d3516ae1eafeccdfffd8ccb5107152310311953e40c1d0ec9053a6e1a53c27c WHIRLPOOL 93816fee2ee67f75f898f28e2966c90d3f5ef1878213ab0110a63782a4cf3baae7509dfc13ce982058f21b90b9ac253bb552c8674b6e8b8adcedd8089ef19f6a
+EBUILD gawk-4.1.4.ebuild 2300 SHA256 d8f662346008bbd6b0ffce8bda3b720a81a22382689e58b41aa18e5a1f23c27d SHA512 3b8a5f9fa6b07b50eac243ccf6857a709dbed88d18fc9711d114c9ea8e89d72c9aae5fd776cffb383961d8082c55fc01f718fa0954f93c91c08cfc93c072b741 WHIRLPOOL 3958171ffacbac65767b9616331fcb3ca2dbc74a86e53e4d79da31cad490be6d5c91fa623293c5dae270b926af0fa28d0441cb24a960e36333441a137980d3cf
+EBUILD gawk-4.2.0.ebuild 2370 SHA256 f8860f720eba40291cfcd692fbdd34a6c4147d940caf3765fb0ce63d865caa45 SHA512 c5bf4b2ca22f4d630105f091a80c5c41dbb63189c794ef7c2b42c960b714b87bf927e9c345dcc86bba40931597f72f66d5177a59a9080a336e81e04ac0ece31d WHIRLPOOL 80f680fe852472fc45e974e6ac32a26eda5f0951b738dc8c758818b6417e95b5a85954bb11a210c3fbd6eddcfa48979b024a445ef9a398900f5f2edc33636571
 MISC ChangeLog 5037 SHA256 d91b8f1506cf9102f4f46dbdd03d6c757ed521c54e08b1f03c70ea61d950ee1a SHA512 22fec5534ecd42063f666080c6e9690197120700d23277ca718181306715c41e2253f684efb4c9cdb4456c1a0609d6b45c8a644c4f2e3b86f5e9f5f84a5ec3d6 WHIRLPOOL 69b1294e44f270910dcf450bf3a83167d1665d195b8767f950f45443ab5c5e187afa22c8d49246a3a5c1721650698983407c9e80fa9e964290fc7ca35b0e2f7d
 MISC ChangeLog-2015 25235 SHA256 bde68cfbf1ddb7ec621042d675bab7b5aeffed7f3f092dc278b0c0ac2cd602de SHA512 243495808dbef55124b5a8d02e27b87550ad40104b427ed9bb63d3c8785a84d0acd3675a8d15c8579553c22f06809a47d19530eea0300a0b616ed2e3fb527dee WHIRLPOOL 70afaf3d02a4f5a3e4b4b13bb3c9f912d55c4b4c6f06beb10412f52b59fd82e5b6bfb9548fbe1a625e933750e903cb179cf31267b4abba103b3539d95622e8d8
 MISC metadata.xml 347 SHA256 cfaa5b9985d20997a4800b7a60f7804bf8660d217ef2421732c2e296532d6862 SHA512 1150e37d64393f26ef81056ff25e9720a4bc82dd28c9cffd164d144bb6d2f660f802a31d5ebf4fd121a01b36a4a5073893ebec6b735d3eb570da36705d5f446e WHIRLPOOL f4cc92f281dfb2f436c979257347ac8694056a8d9a4a3c794056027a12c64f6cf04023641b0462d57a376335d93c55f3b6722504e7f7e32baf702c4c7578e5f9
diff --git a/sys-apps/gawk/gawk-4.1.4.ebuild b/sys-apps/gawk/gawk-4.1.4.ebuild
index 303da0e8c823..6de13808dc55 100644
--- a/sys-apps/gawk/gawk-4.1.4.ebuild
+++ b/sys-apps/gawk/gawk-4.1.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 
 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="mpfr nls readline"
 
 RDEPEND="mpfr? ( dev-libs/mpfr:0= )
diff --git a/sys-apps/gawk/gawk-4.2.0.ebuild b/sys-apps/gawk/gawk-4.2.0.ebuild
new file mode 100644
index 000000000000..da57da475731
--- /dev/null
+++ b/sys-apps/gawk/gawk-4.2.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs multilib
+
+DESCRIPTION="GNU awk pattern-matching language"
+HOMEPAGE="https://www.gnu.org/software/gawk/gawk.html"
+SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
+
+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"
+IUSE="mpfr nls readline"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	mpfr? ( dev-libs/mpfr:0= )
+	readline? ( sys-libs/readline:0= )
+"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	default
+
+	# use symlinks rather than hardlinks, and disable version links
+	sed -i \
+		-e '/^LN =/s:=.*:= $(LN_S):' \
+		-e '/install-exec-hook:/s|$|\nfoo:|' \
+		Makefile.in doc/Makefile.in || die
+	sed -i '/^pty1:$/s|$|\n_pty1:|' test/Makefile.in #413327
+	# disable pointless build time hack that breaks cross-compiling #493362
+	sed -i \
+		-e '/check-recursive all-recursive: check-for-shared-lib-support/d' \
+		extension/Makefile.in || die
+	# fix standards conflict on Solaris
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i \
+			-e '/\<_XOPEN_SOURCE\>/s/$/600/' \
+			extension/inplace.c || die
+	fi
+}
+
+src_configure() {
+	export ac_cv_libsigsegv=no
+	local myeconfargs=(
+		--libexec='$(libdir)/misc'
+		$(use_with mpfr)
+		$(use_enable nls)
+		$(use_with readline)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	rm -rf README_d # automatic dodocs barfs
+	default
+
+	# Install headers
+	insinto /usr/include/awk
+	doins *.h || die
+	rm "${ED}"/usr/include/awk/config.h || die
+}
+
+pkg_postinst() {
+	# symlink creation here as the links do not belong to gawk, but to any awk
+	if has_version app-admin/eselect \
+			&& has_version app-eselect/eselect-awk ; then
+		eselect awk update ifunset
+	else
+		local l
+		for l in "${EROOT%/}"/usr/share/man/man1/gawk.1* "${EROOT%/}"/usr/bin/gawk; do
+			[[ -e ${l} && ! -e ${l/gawk/awk} ]] && ln -s "${l##*/}" "${l/gawk/awk}"
+		done
+		[[ ! -e ${EROOT%/}/bin/awk ]] && ln -s "../usr/bin/gawk" "${EROOT%/}/bin/awk"
+	fi
+}
+
+pkg_postrm() {
+	if has_version app-admin/eselect \
+			&& has_version app-eselect/eselect-awk ; then
+		eselect awk update ifunset
+	fi
+}
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index bd1f7bc6550c..325832d3eb25 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -1,5 +1,4 @@
 AUX hdparm-9.48-sysmacros.patch 474 SHA256 6e75ceceac0065586af5982822d3c54fbd189dbd929102d40ac3fbf372fc1698 SHA512 cd12a544f6149076c48657f572d71dbc400fa80fa26e6604325d3812159f2a3cd3ab79d8f248b64aac3db7c9913c6f406e427cab62103c927274ff6439a4151a WHIRLPOOL 453542b64f9c64dce17824a46d4d81468b79f7252eb8dc502578264cc3735d15c08ee69a61e98be5e451f4477e05c4fdf70248ec2267d4d177295e9f515ce65c
-AUX hdparm-9.50-build.patch 1216 SHA256 389c96c9769b470b7a6e50d3a02ace02cc15d4f4058229e24f808e1f47c8ec99 SHA512 5b914d446a1a8ee5e99253abc450dec706e57a55d87d82b14e4fcabf1cd76d0575f3adc1a3a226925662ac30cd674403d5b652af17e8776bdc43453b2cda9951 WHIRLPOOL 837f6e449cdbd20ae2991b57f01d6542d4ac5f00ef8d63e1b6449fe026e3c6e50ae96c27c3c769cea27e71b04cc4fd24c0b082243f65f1262b18145908a7f598
 AUX hdparm-9.51-build.patch 1210 SHA256 cb69bd4c70ee1e5c0e854ff4f9c86b512e1dee1b9843eb64b74643d477155e39 SHA512 d8efe50cc8ab963be2ace3e52e077e3be8d266b2c5c293febe344fc53760d53c1b52f7bbd1c7813f7a7979a6e4ebc52cb808dc3797f6e1ac7949ac5f9696239a WHIRLPOOL 77f0351420208af26c3e48ae022396cf9535093914341ab2510e33ac94872863f75e91f7b95062e1a495d50ff2f87c2efad553f52485d7c17f00f62ecff7e11b
 AUX hdparm-conf.d.3 872 SHA256 37c95ff723fa578e9039613d09dbf790d99113a318c065422986c744519214e9 SHA512 968c6b9d26a71bf724728c259d35a499a644496875eac255dcac3cb4a7e5cadb677a4f6e5e0f8bbd7e1826b6fb77cb39af15b11d1e59b3e9daf9ba442b9e6f02 WHIRLPOOL 110d330860c4f5e3b1626b85ab369a02e5c092acf656edc845a2f311b5349644317ec2021063a0fb977d3b9851e0bb9c54fd66e814a080d6af3aa0f05fbd658b
 AUX hdparm-init-8 1360 SHA256 05b264cadc84984f773cd555af322b41fdb13da7cb2ca60d8a7d590ddf4d5e5f SHA512 0417168cf540d2385c5edc4e199c9c2318f97c397d4bbb8b0ac6d4dcadf153564a51a9a5da172442c75a670f79fdec84da5db777a1400cf3c8d8cf6a7066fcc8 WHIRLPOOL 5b0a1ac41153ba724540cdc8285dda32916ce1251ef94cca3b2bfd10ceff2d317f838827efb5f8646993617436f030768b00cf24ccd8dfa786f592128d90f69c
diff --git a/sys-apps/hdparm/files/hdparm-9.50-build.patch b/sys-apps/hdparm/files/hdparm-9.50-build.patch
deleted file mode 100644
index ff1948acb01e..000000000000
--- a/sys-apps/hdparm/files/hdparm-9.50-build.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-* drop hardcoded -O2 flag from CFLAGS
-* drop hardcoded -s (strip) flag from LDFLAGS, and respect user LDFLAGS
-* fix hardcoded `make` and hardcoded -j2 flags
-* respect CFLAGS when linking
-
---- a/Makefile
-+++ b/Makefile
-@@ -13,9 +13,8 @@
- CC ?= gcc
- STRIP ?= strip
- 
--CFLAGS := -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS)
-+CFLAGS += -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs
- 
--LDFLAGS = -s
- #LDFLAGS = -s -static
- INSTALL = install
- INSTALL_DATA = $(INSTALL) -m 644
-@@ -24,11 +23,10 @@ INSTALL_PROGRAM = $(INSTALL)
- 
- OBJS = hdparm.o identify.o sgio.o sysfs.o geom.o fallocate.o fibmap.o fwdownload.o dvdspeed.o wdidle3.o
- 
--all:
--	make -j2 hdparm
-+all: hdparm
- 
- hdparm: hdparm.h sgio.h $(OBJS)
--	$(CC) $(LDFLAGS) -o hdparm $(OBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o hdparm $(OBJS)
- 	$(STRIP) hdparm
- 
- hdparm.o:	hdparm.h sgio.h
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 025b661df644..fabe2c55100e 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -5,10 +5,8 @@ AUX kexec-tools-2.0.4-disable-kexec-test.patch 473 SHA256 95d7d6756aa438af926358
 AUX kexec-tools-2.0.4-out-of-source.patch 816 SHA256 f86f053efcd210f7919f458a52721ae3704a905488935a66f67a039bd915d6bf SHA512 4839800f99e2bdb7dfbf3aa1f3ad795feb63b4e493812a50d4baa839a27b5e96319c4e848969cbcedf627a32ed5fbfb312461c2ac89b73daaa7f8f680f35f504 WHIRLPOOL ec72be471f55d26f18152d6c92c85974c9e2c89021566d2311e517b880846c94d19057f69d055de74954efdef9301fd356b87ff1647467d425bb755c54f338bb
 AUX kexec.conf 340 SHA256 19d6a02cf0bf3cebf03dc81c3b9fd5f517815ab1060f67cb9019b7e9653a7fc0 SHA512 66beb57ee13dba70f75f12326643270a0c888e178fdfca8ba7a566a874707aebe2afebb6ceae976dfb0aaf3135048daad6277e70580e4c7911b9ddbf74e4f00a WHIRLPOOL b77bb59ab16ea67690fa3e551995510b0fb0d82f7e2f10f9ed7d7815eb1e498cdda9ea667d2648b62cd1ae86a3ab67ae2ca1abd1fd2b9fce376b64ac41fb8725
 AUX kexec.conf-2.0.4 1013 SHA256 4c1b7e4651cd4be342db48389bc560589c896004f0274f8aba35a92fcd790531 SHA512 96db2834454aa4d038061e9b1f918932da3d3054021487425d0f70c6ad32096b9433ae2f3921e83196b23af901c32e591df3d6a84a6d14e064608d8ad895a599 WHIRLPOOL 3041644bf1688ac6c89e6078adcee987913bce124ea3ae4a2ce342c0956f319cccae93aabf39ee4aed9f23812e575f7f06cbf110bf39d9d961a1a19294108f27
-AUX kexec.init-2.0.12 3361 SHA256 f462ad4908cd12f19d8255a1efb96cf98bef74d9965f9f47a914096d7b129fc5 SHA512 b4152adced5f2fb6b31b9a42d898efc83d5b6a612b315bc7960fcd16361ed85a465032ce46e54c49c11b0817b84dfa59f1ee00d43442c17ab23bece65e032060 WHIRLPOOL c5eaf77bc2f559d190c9ff7708d79e620071565005febf64e202df79769f0e46b9d4c1bcb5048408222d6312c0eb6b072b41a2805be912ad738668e0dd433e12
 AUX kexec.init-2.0.13-r1 3655 SHA256 c93221d21b73e58efab8d045e164a9be7caf8bed427380a6a75dc996085faf96 SHA512 1d04e14e6fe1debc55fa23029a68f78f2d2a408c12bee6d55252109da178c3dbc998db4ccc7f05f7f8c65b333b50d6a1da7bf0d325ee6cae2f00840078d8a457 WHIRLPOOL 3ea9d42e4bf63845e5310c9108690ee24867628cf89d688c7b0c70b5fc35c97a17ed1c073dc3871826b628986b2a5da7087f625e259625ab88558fd9d163828e
 AUX kexec.init-2.0.4-r2 3507 SHA256 643a90ea83b3940e44e6631337d8a56cb21c7b70408603a44611a52a0cce86c1 SHA512 a1b1d907a349b66b97bdbd04fcb0baf03add50816538591a6273e2c3e991b36dd9e15cbe694d915e369ad425c313673b2f9dfd756000fae22102c73ed07deff2 WHIRLPOOL e2b06e98a3c309055e05a88b5291a831c4d8f59e621ec6b52a7a62892f5e7fba75278af16fe9e0534fc274b96cbe04b7b5eb1cd56a938bcd4d79e4493571be0f
-AUX kexec.init-2.0.4-r3 3515 SHA256 3e179b6fd9515f8ce97a1ba15a3bb705bbb401e583a674932c664ac7955099a6 SHA512 b9de8b745bc343a6da559064ba1410fffd62e1c8a158012b7dc4c801dc5e5ab6be2aca81be0db7f235c5d1aace308f2d6ff3a3cbf09b7246dd9e1fe4f18655c1 WHIRLPOOL e7786abe4845f7e675b6963a709627b6870e2615bde5fd56b8895c327a31ac74bc1bd81e1e6213e262e46340b0af71ecce25a65371fae15f3d205d8d0316ddce
 AUX kexec.service 407 SHA256 d95610609301d46e0f67efd78653beabd7dd253d2bf00f5736de5cdfbf2ea94e SHA512 9f0fa6d39c67048fe774fee0f2e8ed10e9e12a2468e7dda193cd8c5bd8b4cf49819d14703efad35c91265cd4e03c6f5460934b5fe92efd06eab8dc619920b1e3 WHIRLPOOL 9a412481d729e7ec7cec3a4142f2159337d61baf22431e4129f1e7798bf2683f1802e51edc92800e6b42b8b9b01cd83ef51f67cbc1cb7a4b209f923f3180948f
 DIST kexec-tools-2.0.14.tar.xz 283640 SHA256 ffb2e7e99d9d08754c6bc1922aed3c000094f318665d82a72ecc76c4ff1c0dc6 SHA512 8c1f9d1f4bb69a621961d45091f9c8349535ae69b80168423663685b44d89e1b9324d5cd11c83e86d805a3371f4f1600b0def551c52efb3c6cf020e9c11c273f WHIRLPOOL 1f9cc414724bf2d710876b2fbf721543cbd973b272a66b86bf134774b946ec540579b698fa3bcb56a2041d226da2c4298f750180c671ece17633067370a9df8e
 DIST kexec-tools-2.0.15.tar.xz 286944 SHA256 899b7b861431eb51886d0c12866e91b036228244d35a5fb04762dd1a3c0194e7 SHA512 0bddf31b9bb0e203b813d820e1e248974c2d62cb388dfaf4f2f4971f764cc71e54edbaeaeb663c15d6fa06574beceb87d9ffd7d822ac6699d86c54645096e7e9 WHIRLPOOL 8d40f03cc9cbaf90a9ab9bcb009dfd3c5b1130eec6ac515c3d3a2f7d7205d856fb43ff748a4ef51a1d3169f7ba068d998baafc155c7400a8e96245e326d62558
diff --git a/sys-apps/kexec-tools/files/kexec.init-2.0.12 b/sys-apps/kexec-tools/files/kexec.init-2.0.12
deleted file mode 100644
index a7bd859f0826..000000000000
--- a/sys-apps/kexec-tools/files/kexec.init-2.0.12
+++ /dev/null
@@ -1,174 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Set up some defaults.
-: "${LOAD_DURING_SHUTDOWN:=yes}"
-: "${BOOTPART:=/boot}"
-: "${DONT_MOUNT_BOOT:=no}"
-
-depend() {
-	need localmount
-}
-
-auto_prefix_bootpath() {
-	# Only auto-add prefix to relative paths.
-	case $1 in
-	*/*) echo "$1";;
-	*)   echo "${BOOTPART}/$1" ;;
-	esac
-}
-
-image_path() {
-	# Do no sanity checking if the user has set a value.
-	if [ -n "${KNAME}" ]; then
-		auto_prefix_bootpath "${KNAME}"
-		return
-	fi
-
-	local x kver="$(uname -r)" karch="$(uname -m)"
-	for x in \
-		"bzImage" \
-		"vmlinuz" \
-		"bzImage-${kver}" \
-		"vmlinuz-${kver}" \
-		"kernel-genkernel-${karch}-${kver}" \
-		"kernel-${kver}" \
-		"kernel-${karch}"; do
-		if [ -e "${BOOTPART}/${x}" ]; then
-			echo "${BOOTPART}/${x}"
-			return
-		fi
-	done
-
-	return 1
-}
-
-initrd_path() {
-	# Do no sanity checking if the user has set a value.
-	if [ -n "${INITRD}" ]; then
-		auto_prefix_bootpath "${INITRD}"
-		return 0
-	fi
-
-	local x kver="$(uname -r)" karch="$(uname -m)"
-	for x in \
-		"initrd" \
-		"initrd.img-${kver}" \
-		"initrd-${kver}.img" \
-		"initrd-${kver}" \
-		"initramfs-${kver}.img" \
-		"initramfs-genkernel-${karch}-${kver}"; do
-		if [ -e "${BOOTPART}/${x}" ]; then
-			echo "${BOOTPART}/${x}"
-			return 0
-		fi
-	done
-
-	return 1
-}
-
-mount_boot() {
-	[ "${DONT_MOUNT_BOOT}" != "no" ] && return 1
-	mountinfo -q "${BOOTPART}" && return 1
-
-	ebegin "Mounting ${BOOTPART}"
-	mount "${BOOTPART}"
-	eend $?
-}
-
-load_image() {
-	if [ "${KNAME}" = "-" ]; then
-		ebegin "Disabling kexec"
-		kexec -u
-		eend $?
-		return  # eend preserved $? for us.
-	fi
-
-	local img initrd="$(initrd_path)" mounted=false kparamopt initrdopt
-
-	if ! img="$(image_path)"; then
-		if mount_boot; then
-			if img="$(image_path)"; then
-				mounted=true
-				initrd="$(initrd_path)"
-			else
-				eerror "No kernel image found in ${BOOTPART}!"
-				umount "${BOOTPART}"
-				return 1
-			fi
-		else
-			eerror "No kernel image found in ${BOOTPART}!"
-			return 1
-		fi
-	fi
-
-	if [ -z "${ROOTPART}" ]; then
-		ROOTPART="$(readlink -f "$(sed -n '/^\/[^ ]* \/ / s,^\([^ ]*\).*,\1,p' /proc/mounts)")"
-	fi
-
-	if [ -z "${KPARAM}" ]; then
-		kparamopt="--reuse-cmdline"
-	fi
-
-	if [ -n "${initrd}" ]; then
-		initrdopt="--initrd=${initrd}"
-	fi
-
-	local msg
-	[ -n "${initrd}" ] && \
-		msg=" (with ${initrd})"
-	ebegin "Using kernel image ${img}${msg} for kexec"
-
-	kexec ${KEXEC_OPT_ARGS} ${kparamopt} \
-		-l "${img}" --append="root=${ROOTPART} ${KPARAM}" ${initrdopt}
-	local ret=$?
-
-	${mounted} && umount "${BOOTPART}"
-	eend ${ret}
-	return ${ret}
-}
-
-start() {
-	if [ "${LOAD_DURING_SHUTDOWN}" = "yes" ]; then
-		local mounted
-		if mount_boot; then
-			mounted=true
-		fi
-		if ! image_path >/dev/null; then
-			ewarn "Cannot find kernel image!"
-			ewarn "Please make sure a valid kernel image is present before reboot."
-			return 0
-		fi
-		if [ -n "${mounted}" ]; then
-			ebegin "Unmounting ${BOOTPART}"
-			umount "${BOOTPART}"
-			eend $?
-		fi
-		# $? is already set to the previous calls.
-		return
-	else
-		load_image
-	fi
-}
-
-stop() {
-	if ! yesno ${RC_REBOOT}; then
-		ebegin "Not rebooting; disabling kexec"
-		kexec -u
-		eend $?
-		return
-	fi
-
-	if [ -f /nokexec ]; then
-		ebegin "Rebooting; disabling kexec due to /nokexec"
-		rm -f /nokexec
-		kexec -u
-		eend $?
-		return
-	fi
-
-	if [ "${LOAD_DURING_SHUTDOWN}" = "yes" ]; then
-		load_image
-	fi
-}
diff --git a/sys-apps/kexec-tools/files/kexec.init-2.0.4-r3 b/sys-apps/kexec-tools/files/kexec.init-2.0.4-r3
deleted file mode 100644
index 6eb2a748c9e9..000000000000
--- a/sys-apps/kexec-tools/files/kexec.init-2.0.4-r3
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount
-}
-
-image_path() {
-	local x= kver=$(uname -r) karch=$(uname -m)
-	BOOTPART="${BOOTPART:-/boot}"
-	KNAME="${KNAME:-bzImage}"
-	if [ -e "${KNAME}" ]; then
-		echo "${KNAME}"
-		return 0
-	fi
-	for x in "${KNAME#${BOOTPART}}" vmlinuz \
-		bzImage-${kver} vmlinuz-${kver} \
-		kernel-genkernel-${karch}-${kver} \
-		kernel-${kver} kernel-${karch}; do
-		if [ -e "${BOOTPART}/${x}" ]; then
-			echo "${BOOTPART}/${x}"
-			return 0
-		fi
-	done
-
-	return 1
-}
-
-initrd_path() {
-	local x= kver=$(uname -r) karch=$(uname -m)
-	BOOTPART="${BOOTPART:-/boot}"
-	INITRD="${INITRD:-initrd}"
-	if [ -e "${INITRD}" ]; then
-		echo "${INITRD}"
-		return 0
-	fi
-	for x in "${INITRD#${BOOTPART}}" \
-		initrd.img-${kver} initrd-${kver}.img \
-		initrd-${kver} initramfs-${kver}.img \
-		initramfs-genkernel-${karch}-${kver} ; do
-		if [ -e "${BOOTPART}/${x}" ]; then
-			echo "${BOOTPART}/${x}"
-			return 0
-		fi
-	done
-
-	return 1
-}
-
-mount_boot(){
-	local ret
-
-	[ "${DONT_MOUNT_BOOT:-no}" = "no" ] || return 1
-	grep -q " ${BOOTPART:-/boot} " /proc/mounts && return 1
-
-	BOOTPART="${BOOTPART:-/boot}"
-	ebegin "Mounting ${BOOTPART}"
-	mount "${BOOTPART}"; ret=$?
-	eend ${ret}
-	return ${ret}
-}
-
-load_image() {
-	local ret
-	if [ "${KNAME}" = "-" ]; then
-		ebegin "Disabling kexec"
-		kexec -u; ret=$?
-		eend ${ret}
-		return ${ret}
-	fi
-
-	BOOTPART="${BOOTPART:-/boot}"
-	local img= initrd="$(initrd_path)" mounted=false initrdopt=
-
-	if ! img="$(image_path)"; then
-		if mount_boot; then
-			if img="$(image_path)"; then
-				mounted=true
-				initrd="$(initrd_path)"
-			else
-				eerror "No kernel image found in ${BOOTPART}!"
-				umount "${BOOTPART}"
-				return 1
-			fi
-		else
-			eerror "No kernel image found in ${BOOTPART}!"
-			return 1
-		fi
-	fi
-
-	if [ -n "${INITRD}" ] && \
-		! [ "${BOOTPART}/${INITRD#${BOOTPART}}" = "${initrd}" ]; then
-		eerror "Requested initrd: ${INITRD#${BOOTPART}}"
-		eerror "could not be found"
-		return 1
-	fi
-
-	[ -n "${ROOTPART}" ] || \
-		ROOTPART="$(readlink -f "$(sed -n '/^\/[^ ]* \/ / s,^\([^ ]*\).*,\1,p' /proc/mounts)")"
-
-	[ -n "${KPARAM}" ] || KEXEC_OPT_ARGS="${KEXEC_OPT_ARGS} --reuse-cmdline"
-
-	[ -n "${initrd}" ] && [ -e "${initrd}" ] && initrdopt="--initrd=${initrd}"
-
-	local msg=
-	[ -n "${initrd}" ] && \
-		msg="with ${initrd}"
-	einfo "Using kernel image ${img} ${msg} for kexec"
-
-	ebegin "Setting kexec with ${KEXEC_OPT_ARGS} -l ${img} root=${ROOTPART} ${KPARAM} ${initrdopt}"
-	kexec ${KEXEC_OPT_ARGS} -l "${img}" --append="root=${ROOTPART} ${KPARAM}" ${initrdopt}
-	local res=$?
-
-	${mounted} && umount "${BOOTPART}"
-	eend ${res}
-	return ${res}
-}
-
-start() {
-	if [ "${LOAD_DURING_SHUTDOWN:-yes}" = "yes" ]; then
-		local ret=0
-		BOOTPART="${BOOTPART:-/boot}"
-		if mount_boot; then
-			mounted=true
-		fi
-		if ! image_path > /dev/null; then
-			ewarn "Cannot find kernel image!"
-			ewarn "Please make sure a valid kernel image is present before reboot."
-			return 0
-		fi
-		if [ -n "${mounted}" ]; then
-			ebegin "Unmounting ${BOOTPART}"
-			umount "${BOOTPART}"; ret=$?
-			eend ${ret}
-		fi
-		return ${ret}
-	else
-		ebegin "Configuring kexec"
-		load_image
-		eend $?
-	fi
-}
-
-stop() {
-	if ! yesno $RC_REBOOT; then
-		einfo "Not rebooting, so disabling"
-		kexec -u
-		return 0
-	fi
-
-	if [ -f /nokexec ]; then
-		einfo "Not using kexec during reboot"
-		rm -f /nokexec
-		kexec -u
-		return 0
-	fi
-
-	[ "${LOAD_DURING_SHUTDOWN:-yes}" != "yes" ] && return 0
-
-	ebegin "Configuring kexec"
-	load_image
-	eend $?
-}
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 3c252406829b..d4673e9c5597 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -1,5 +1,4 @@
 AUX README.Gentoo 823 SHA256 3985fd1810f660ea1c1f2732f719b069b6934d62d8d9e8a09287e63f049ba27d SHA512 fe18f4f5bac70f31ca833cb25d4f1aecde03c3993495ab964cc67f0e52737e3d04aa2263eff26ded279121cc346ef77738743943b5b092c9586c5622ee3a6c92 WHIRLPOOL 7b4de4d109da49392cf9ded961fc9aa0a7cda1ff82dc837b0303f02d00f76f73563397c14440ab0c8638a5a2a92e3b6c62f20a904ae7cd1dd0f5eb8efa68ec39
-AUX code2color-0.2.patch 919 SHA256 1792992964eb024150025b6e357649e07dab6209254512cc9be1a7d5bcc31b77 SHA512 6569c652dc5bcff9eb0eb3d85699b319f1439bb69268157d2d63a96ebe5a48577ed2f5e6af4510a8c742b38848e5f76a79397fd3b05e7acaf487955d60f6b5ce WHIRLPOOL d661d0226a753e4aaf1d60dc1fc756e05a78490d5781df54db1c2da73fee0a44edf4e70f28aeb9ca6e888a2d5c8cb94f3ed9e864c034d9e9b7219e2f6e191600
 AUX less.envd 47 SHA256 961d6e87eeb2b41d163def66718ee78d4b7c778dbe91b24c6764635b0ae1cdd7 SHA512 261b25887b08b3255e412b36130d014fc37ffc7de75dce3b5ba2521d94a1b0be4c584808b9698c30a8dafea70c62fae2cd0642d0983f96cdb418c3c501433674 WHIRLPOOL dbb1fbec8c6370a5feec2eecdb3e109e035f2f40c2a1d00672d7660d2058aaf0a104487e1ae8c06ecfb32161d4aa2aceed6194e60cacde3590974bbcb00511ba
 AUX lesspipe.sh 7797 SHA256 576331d742e19a8cec0adeba185bacb7b4b67f7fb93be9c52fa4701d3c5a0a94 SHA512 d7bbae07e8ddcae2981549f958daffc3750f3a343da37cd5e43df86b4dcab35c3121d7fa7b76d61dd457c972a888bcce1c85d01fa1e685aadf169d5541bb0d8b WHIRLPOOL 63a57b5dacf480680377ff67a285a893b3a3eeb7071159c2139c75af02aeb2a4c419ecf515d4ab16a2c0ac18612039c4dfb2225ac3540663eec7367e302ae6a0
 DIST less-487.tar.gz 318488 SHA256 f3dc8455cb0b2b66e0c6b816c00197a71bf6d1787078adeee0bcf2aea4b12706 SHA512 d31274fdada570fbc6706d7c52637d1accbd18ce947ec062e10b1624c251a8533c6638bc3a1d89d3c70a0c7b9c6d45740598bec9003f281d64c587b1f829125a WHIRLPOOL e1a6c5dc2ea17e57226083f022d3c39b8a9d17428b7aa15385138680e78fa1ee22800e216a40fe5aa0ca38ca4c0025792a2839031faabdf8f9384dec3c750f74
diff --git a/sys-apps/less/files/code2color-0.2.patch b/sys-apps/less/files/code2color-0.2.patch
deleted file mode 100644
index f8a782504e60..000000000000
--- a/sys-apps/less/files/code2color-0.2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- code2color
-+++ code2color
-@@ -163,11 +163,11 @@
-       # building up the database
-       # newer entries overwrite old ones
-       my @CONFIG_FILES;
--      push @CONFIG_FILES, "/etc/code2html.config";
-+      push @CONFIG_FILES, "/etc/code2color";
-       push @CONFIG_FILES, 
--        $ENV{'HOME'}."/.code2html.config"   if $ENV{'HOME'};
-+        $ENV{'HOME'}."/.code2color"   if $ENV{'HOME'};
-       push @CONFIG_FILES, 
--        split(/:/,$ENV{'CODE2HTML_CONFIG'}) if $ENV{'CODE2HTML_CONFIG'};
-+        split(/:/,$ENV{'CODE2COLOR_CONFIG'}) if $ENV{'CODE2COLOR_CONFIG'};
-       push @CONFIG_FILES, 
-         split(/:/,$params{'langfile'})      if $params{'langfile'};
-       
-@@ -3192,7 +3192,7 @@
- #
- 
- $LANGUAGE{'shellscript'} = {
--	'filename' => '\\.(sh|shell)$',
-+	'filename' => '\\.(ebuild|eclass|sh|shell)$',
- 	'regex' => '^\\s*#\\s*![^\\s]*(sh|bash|ash|zsh|ksh)',
- 	'patterns' => [ {
- 		'name' => 'comment',
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 91f0ec3e746c..b69ab41ab8f2 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,10 +1,10 @@
 AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5
-DIST portage-2.3.10.tar.bz2 939871 SHA256 f7cf1f74e62b7288fd4392c254940a3b70608f45c33ccfa9dbf60457d53cc28a SHA512 2db5d1f77f8f6dc7a88a22a7d213c6af441fdcced2ab3c8e60f6cd1b9f97aa25261f7a4de750303d3b1ea77d9e8c01b77b37f5d285b0704e884a57d800dbfd60 WHIRLPOOL 96178cc869e0b580ea813ab5fa38eb3226d094e6bdceb559cc88fcba9b1e71f0e2baebcd50ccebfc716ae037090534324ac6554318c5fd40b8aecb49041d7545
 DIST portage-2.3.11.tar.bz2 940732 SHA256 f2596fc8e5eaaaab19be88c5c0a92d9f304eddb14ebe1230ab6f8d841ae90720 SHA512 16047fae060eb400e0fd01ca4966d69c0413e90659b33e4511b34464a24e9beb510c4c785af713921240e893c3031d3c3c3f2332eb175a21bb34b414962058fd WHIRLPOOL b0d357e626710c3574dde9228c68d604eb70843d083917d761a0c55680702da96d2157566e04d7f7c6c900d8120909d1faa00e6ff2a8fe970d53da05288ae0ad
+DIST portage-2.3.12.tar.bz2 944929 SHA256 4a6b6c1d038131d141b932b1ad93768a7823acd0704093c6c1e5adb9f913ba1d SHA512 39f6d938e167a96b338dc85191bfc25d6db2328014f13386dd2552b9a3c36308b9b4d444dcd3342e7f6761e26d97fc0b3e2c8a9092ef7aa863d55c26bdccfd3a WHIRLPOOL 34cc7567dfe4913129a451a8e8597c48382c6c423ec1a008db1fc489f5da99d5cf371ffa48b8449d799aa98e3f0dba98f7c8b55a4b8744fdb857f914448b6f5c
 DIST portage-2.3.6.tar.bz2 943085 SHA256 2f57545fcb142a4b23c2052c523d3d858754b232be21455ee6c6cd3ff0903cc2 SHA512 5bcfb678c1ea0cd97a983ee7520c9ecabd07d5bb0fd01c70b74fd7b6ce478f4a109aac84d40b82426719ca7c9ee6aed3affb3b9754045e62b4c664ae113cf055 WHIRLPOOL d0258c579597690e8bf2cc2a3ecc36d543e67a728c302a9b16ae361086023a7e059ac1a9e2e64f026b7d975d6b619d3b981062227042098ed3afc1b86658b636
 DIST portage-2.3.8.tar.bz2 938062 SHA256 19b73658dca848d215c5527d1d020c8106352007a84d7675e5efd0a7b9b48a8a SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8 WHIRLPOOL 0c576bbd8aaf8b27fa1746c863ac02b2a5f361d9011d17250ffbe4b830a8a6bf10a0aee48b5181a8aa6c55d8ad81ad411195da2a6253e9b324d3c7397053fe29
-EBUILD portage-2.3.10.ebuild 8216 SHA256 4396a5edc8391d04c412e20694e71311dc34a288ab1dd67b1455aa29524f8fde SHA512 8f5e923a644abc5cb704ba3cc0ab54c8dc254cb77e3f9fab207d40b6aa80dcffb2e6aedeaab649108a744ebd1d88c827cde81fa131e3e94360db921fcaf853f9 WHIRLPOOL a39d650d8fdba9181c1e1220bf9868467e31360e474ceca40f0548eebb1bd3eba088203fb86f62c5a674ca8f532e9180d916ed707cf0833623f74770d81faaa7
 EBUILD portage-2.3.11.ebuild 8216 SHA256 4396a5edc8391d04c412e20694e71311dc34a288ab1dd67b1455aa29524f8fde SHA512 8f5e923a644abc5cb704ba3cc0ab54c8dc254cb77e3f9fab207d40b6aa80dcffb2e6aedeaab649108a744ebd1d88c827cde81fa131e3e94360db921fcaf853f9 WHIRLPOOL a39d650d8fdba9181c1e1220bf9868467e31360e474ceca40f0548eebb1bd3eba088203fb86f62c5a674ca8f532e9180d916ed707cf0833623f74770d81faaa7
+EBUILD portage-2.3.12.ebuild 8216 SHA256 4396a5edc8391d04c412e20694e71311dc34a288ab1dd67b1455aa29524f8fde SHA512 8f5e923a644abc5cb704ba3cc0ab54c8dc254cb77e3f9fab207d40b6aa80dcffb2e6aedeaab649108a744ebd1d88c827cde81fa131e3e94360db921fcaf853f9 WHIRLPOOL a39d650d8fdba9181c1e1220bf9868467e31360e474ceca40f0548eebb1bd3eba088203fb86f62c5a674ca8f532e9180d916ed707cf0833623f74770d81faaa7
 EBUILD portage-2.3.6.ebuild 8661 SHA256 9590a689915eea31ffc5dd347154719d70cfb4b000a60e0f6e6294fe0c3e1df7 SHA512 53301757289cc37690020ac7b5379d026ff1e87f9d558c913eae213d0f33b75261045616c9259fe28684aa1031c27d4f58a52438e67eb91a97d186a80ad298a4 WHIRLPOOL c70770b2e9ac8b9af931d9f9918af82ac20eda198a33d9cc19c5d457701fe09c3cd5d45fb756457b05209cc0594c2b0b4efe3d544e1966d759c6a27fcf5b0743
 EBUILD portage-2.3.8.ebuild 8207 SHA256 dd61d45fccf60247d105993e2c73fb16a3ab59322add5701b636361b035ce6ec SHA512 24985286ffe9d4adc99aa65b26b4a15784b7edc84187a3a85b22751854f4845ea00573493a949f5aa6c3f270e4b52138a246006b71c9e6cc04ea402b820aee48 WHIRLPOOL e4ae75b7b4ee0ecf71328dcaebcfc4bb440e3c700156c2a17db3455b54066241285e8c625a5e2a2167c0d8ef31ec855d09219ab7cae1f5285057e95a1bb77165
 EBUILD portage-9999.ebuild 7697 SHA256 c7d91c34e7fb25283f6ac634a00686273fd3f286ecfb9fc1ab3bc685ae8fd9c4 SHA512 6b8342034752512df0345d386f67c025b0ba15439ae5758783b16973d16b3b3b4d866abfb65bac2e26424e270294bebe26e43f12539ef141891b567dc0f000ce WHIRLPOOL 0b2b3f122d57a5c9d3dd63ea09c7a7bd05e1eaf298cd5018d400543cd825469e108fdd981c06518d24a37f7a339195fb01b04480143c0d9f93cce18093119c42
diff --git a/sys-apps/portage/portage-2.3.10.ebuild b/sys-apps/portage/portage-2.3.12.ebuild
index af287ccb8752..af287ccb8752 100644
--- a/sys-apps/portage/portage-2.3.10.ebuild
+++ b/sys-apps/portage/portage-2.3.12.ebuild
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index a0580e93b527..a2a389418096 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,6 +1,5 @@
 AUX runuser-l.pamd 188 SHA256 3d825e3e6fe56f0e90fab528867cb476e24857c6cb0fc0a85a28ddaea0aa549b SHA512 86538adbd3d01c4b9e46fee00c38d298d2857fb1224461206425532404c212f03331308b74347c9af2e00583a3b50802085bdc6cb2bd393cf5e9d032e7290301 WHIRLPOOL e7ba3299d6ccecfdf81ada063786822b2590c42c3ea42043659ce933a6734192d8b45452c6f2679f9e06faa2b39deec6ae4713f638c46d5886aebb9fc69df080
 AUX runuser.pamd 278 SHA256 1b6b168edd9b4ec4d787bd0ef627881c035f7d8080a126a367105d0935e3e123 SHA512 a4c4d41078acdc7c7f1d1f1894d20d052d3d5a3c66d5680d7f76665e251c614fd76ca9678a27ea376147f49250c716a1b3b0c0afa9595bd74d26d2190d1680fd WHIRLPOOL 4c2ca705a0faf01eb627e8fe30fa104923be938fb2a56d463edf94a2ebf7d7fbd3a0558ab247515d360bac1b9b6b3967509c0ffeccf5f168aa7964bcae0ab1b2
-AUX util-linux-2.30-pylibmount_segfault.patch 823 SHA256 92aaa379c86dd721d77316f02e6411f40670c036415d29e9a4f4ad1a4f302509 SHA512 999474f53e8986af1c57ae73e21dd2264e70dedb9c91c2d83b584fdc68c6850489082df68353d666cc415dbb301e7238b6ad87ed3e3e7e738994d874ee44c809 WHIRLPOOL 88b41138873dbe2b2817d47991eda4deb57d99750d16d775ded1b55569feebb71f377a9371613ec6f45a23ec1ac479a1bec3901aa31ec730ebb38849a6f7348d
 DIST util-linux-2.28.2.tar.xz 4149700 SHA256 b89d37146f20bede93a42c847bce881a17e6dbd8066ff2db2bee733fa409f0cd SHA512 ac1c2d4c92bbc4eabed464cb0334c1d9b21e58df0f07f0b26e7adcfa188879de8632d195b65a4358c5e11e14ac6e09a1c6206265bbf1fab4ce122414bee7e940 WHIRLPOOL 1735e33620dba30cc1f42e60b707adb72234006b7fea242ac98c389295617bd0225563bcffa76b9d0753dfa100775dd9a2b73614843645ce667db5536842e308
 DIST util-linux-2.29.2.tar.xz 4277668 SHA256 accea4d678209f97f634f40a93b7e9fcad5915d1f4749f6c47bee6bf110fe8e3 SHA512 0a87e6758531f74276f3de7607ef545f324b9b36b444aa5d163140c5fb0f4f7602655d7ec9939f92550dcb320d922cd69521a2183199d463795e67d3c27fce79 WHIRLPOOL 1f45711e593c76c6e208a28892ed2bf2622adb5fa1334867e13c6bf775a8903c2f1ebf18c3238d96fe139c5b60d61abf496251cf594a339209ce044f2bb8c17a
 DIST util-linux-2.30.1.tar.xz 4459284 SHA256 1be4363a91ac428c9e43fc04dc6d2c66a19ec1e36f1105bd4b481540be13b841 SHA512 bcf1807198660c133c380e13d6ba5dcdb7470c47bcaeea03ccc5a78a0d834e3df3d13ae5ffc35fd7f8fff7ba062629d4b1f5cde78452b846c9315c51c9e108f5 WHIRLPOOL 19e78768cf2fd2d73bb7b45cb826101b4653bf49c9838bda10f05e508f06b117bb846ce517726465384bfe94ba24981f261d7b5091458242fb0c14d593d4b29e
diff --git a/sys-apps/util-linux/files/util-linux-2.30-pylibmount_segfault.patch b/sys-apps/util-linux/files/util-linux-2.30-pylibmount_segfault.patch
deleted file mode 100644
index 73fbc9949232..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.30-pylibmount_segfault.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bugs.gentoo.org/621176
-
-From 29b721bc9d20ed44858017689ce1745c220bd0d4 Mon Sep 17 00:00:00 2001
-From: Zac Medico <zmedico@gentoo.org>
-Date: Wed, 7 Jun 2017 17:21:33 -0700
-Subject: [PATCH] pylibmount: NULL terminate kwlist in Context_init
-
-Fixes a segfault observed with python3.6.
----
- libmount/python/context.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libmount/python/context.c b/libmount/python/context.c
-index 6d82e1432..982414d01 100644
---- a/libmount/python/context.c
-+++ b/libmount/python/context.c
-@@ -90,7 +90,7 @@ static int Context_init(ContextObjext *self, PyObject *args, PyObject *kwds)
- 		"source", "target", "fstype",
- 		"options", "mflags", "fstype_pattern",
- 		"options_pattern", "fs", "fstab",
--		"optsmode"
-+		"optsmode", NULL
- 	};
- 
- 	if (!PyArg_ParseTupleAndKeywords(
diff --git a/sys-block/thin-provisioning-tools/Manifest b/sys-block/thin-provisioning-tools/Manifest
index af0f421dddcb..356e1b70a15c 100644
--- a/sys-block/thin-provisioning-tools/Manifest
+++ b/sys-block/thin-provisioning-tools/Manifest
@@ -1,15 +1,16 @@
 AUX thin-provisioning-tools-0.6.3-build-fixes.patch 2206 SHA256 721c4657d66fa00bef105c80c7d08c4882c9f3f1975b1816dee6764b0e53927a SHA512 1a9fee83de23f67a9b8051c3ccef47de212dedbc4dff585137628b7069fc204c7fbb116d3528db2e39c8fd8a104442ded83f303742b63a1981b06fd85a434353 WHIRLPOOL 0e7ed90d0ad1044465b4c65360c696f2f66ae019b22d6ac9a0d82d31cac660fe41ee062348c3db164bc97a5d95ada66ca9d4a80c749167afb32747d6f70ce45d
 AUX thin-provisioning-tools-0.7.0-build-fixes.patch 1077 SHA256 863806519182c7c07f79cf299ce7accf85c7132e112f7305bdcf21bde834ae0c SHA512 fbdf778774bca2e608bbab7696b6646c64ee740c40c743f40f28e7e360fc2a6c6c3752992d9d5f7bbb624a9240ba480a6e58a7c5956ba6d2b772ece18502afe7 WHIRLPOOL bfab3309c5218828ea0ab7ce2b4d1e6b6199ec593b6e5fa0e1e96aacafa5b84ce86fd13178db9f5e2d29730bd0feb9b164b74289f3873a51b32fe1c5d64c9c12
+AUX thin-provisioning-tools-0.7.4-disabled-tests_build_fix.patch 909 SHA256 ba0d9d6de8a5e67778569b492c6960f3f3242d5a48e23d215db1dc51f8dea00b SHA512 bed70d275d0cd98198432998e33ae8998141e03b066323a3cb38113030604dfde524dc5abe89a6fafab86e8700387340002585b950143fb3904adabd5c66e011 WHIRLPOOL 4742991ecaf4c4d32c547572f5b47c340735117399c5f0041e291245c32ee692a7b6555ec414ff2bd5d13a61e476387fa51a5772588a78759053097df670644e
 DIST thin-provisioning-tools-0.4.1.tar.gz 186979 SHA256 59c8a787df8d4828bf9ca1b6310584f2b7723068901e20aa609015ce85df1d46 SHA512 e148296b55f7ff4ab85dc3b4679c7eab0ee8d56e61415397fc2e46f17bcc16a6a582c17343381320f8582bc4f12311af622d43aabe60e7abb25a882446016b7e WHIRLPOOL a7e5da6879dfdc64d5e60e9072d43db21fb8f328d268366a6e4892cad9b2d55e907d564240f9bd67da0d726d80eab9d45e151bbe6d89272887703a8ae8b66c8c
 DIST thin-provisioning-tools-0.6.3.tar.gz 198697 SHA256 52d808c29dcaa83c142ceb2b418d01e9423811b082eff63fa0336bb7f0590c45 SHA512 ccebf5bb1ac2da56a3dab5b7ce8d61f6a71f84b5168c2680618d724340bbf8cf97c935c1bce966a296331d9dc048a855d81775d2a39f10b4096ab3ee835286d9 WHIRLPOOL b83c0aa081a27bfd0652d3d2d9786849e998487ce70864b8996b1e5f780b56753e52fa6a3243f62183692d9393643a0a30978069672fd4272e692dea98b93d88
 DIST thin-provisioning-tools-0.7.0.tar.gz 230595 SHA256 68a815860fce3f09f64ef241fd4ba45713f4c7be384fe116ec1dbea467684b32 SHA512 cb6c44c7215aadd72292d73e2374d8c0c28566adcb10c7a3de83576dbd28649ebba6e2cc59945a28921e423540969cb21f648c37e375d68f48e56a8be4a4c7b8 WHIRLPOOL 80201034dafd00617951a30369fc617a9c91b4408ec5c5272b4406c8f86caf0ff738938d6ef92d27a9ac96c3110edfa16609f0777c8592e6a100aeb3e02d3837
-DIST thin-provisioning-tools-0.7.1.tar.gz 247111 SHA256 da45e387bb7ad5b1b8727dc3e013a1136a18fe7a59bea19074a945ff6d73b925 SHA512 47ce2f0699e3bc21fa5bb1175e12fa8f545d2abfbed4529b144bd4812a4a0021635713c3e71228f20b30cbe067c77fb93db20b65075b2689ec2aa5b0385854b9 WHIRLPOOL 9723450f069df280b9dce3c53e0dff7342ed6757135ea3e07f7df5c081896d003aceafcb00af8f40a98aae7c42c401b7d363ebc4080f16435ba3962ae4f3edfb
 DIST thin-provisioning-tools-0.7.2.tar.gz 265819 SHA256 98e779cb3f9131bc0bb3051ac33ff93562085bee1cb5409f2184163d74092e7e SHA512 563363842ab0b92f563ac7fcaedb18b8fca70b0894ff30d55cc40487d53b035c32d3ef711adb7102ef1a55b26a75510239da2542b791d850a5cbccf1ddf1acdd WHIRLPOOL e0e0ab86a5d6746744b7cc2e75d3b9ea729ea7ecd4aa59b0eeaeaecf8746ddf10385b8ecad564d6dbab77e2defa641a717a0cbe83fab470a8dabc19013fcfff0
+DIST thin-provisioning-tools-0.7.4.tar.gz 276652 SHA256 f65f84e653e182480dacad77c611e13cd6de1c354e02fb4b96db4d2f328c3904 SHA512 cf7f15efc1dca4e4961ae72a1cafa46985639619da90d0ef192d14e0c45ae7996365f3f87846cce6d27259f72caf14cba653254414876687e4d14f500687b3cb WHIRLPOOL ffbf7c098ae5844aead5383a3f65df5b16d7c2ce3702f92cee5c4468b772fa777bc7ec1333f41c96a9b55d54a483d15386e19499fb034224339f1b6a79e77956
 EBUILD thin-provisioning-tools-0.4.1.ebuild 1556 SHA256 a88d41a8382734da8d584aa692078d0c3e941c4a574d6a2b93de6c0d36bf15d4 SHA512 aa53f7f3f63c1ba9b1f4921d08924a9a38db2346a96520f4b2fe3a43b8c13c824c8cf93f6651c2c3bbce8902e484351c710dd729bda15b5ade160f3a522f3d0a WHIRLPOOL fe50a8045dc133ded01e99a1d61a7d489cbcda06e0f79dbf4eb96c72af8674990a790e98c1d00091ee220e5c808ebe648b773bab0d60a10e0c087d7ff5ef7256
 EBUILD thin-provisioning-tools-0.6.3.ebuild 1535 SHA256 1263e4c9131ed3353be4c0cfc1802cbbd6304eec8163dc9d31b66896bcb70478 SHA512 2d0b39da75af09bb22226fe5e5078de529a50218fe0036ca4b5145b142147030609a6ab906fc216f056c90ef219c4d533ea08f013d25a316efc31648bfb13d7d WHIRLPOOL f3f26fee3638e854f39664cf5b4334df1519a75b52f397cc4c691cd34bdf257d00e0aef7d197e0e0cfd301d3f3456274df5ff80f0c2bb3c5f984c77e13801735
 EBUILD thin-provisioning-tools-0.7.0.ebuild 1523 SHA256 487c4478550ba34a67b574ca2e654bfa421f9994079b15ebdc23e97b7d7edddf SHA512 edd9fc811b465d130e3fb5b950bace1e3cbd187e98eea360c1eda0a5264dbd71763bb6f77a001efe6d1417abf62756949a197cc850ffd6698cc2eb50eba2e2d8 WHIRLPOOL d8015f6a289cd7b89d532193812610ace494d6f4258ebc072564a9685c13c839b3300aa4c1c2cc9bb6bb58a67f1a4638c1c9a377f0a491250d640b76f2c30f20
-EBUILD thin-provisioning-tools-0.7.1.ebuild 1526 SHA256 37660c240d4c2475496fcde3e2bddb195444f41769b586c66f4a4b2d864f6807 SHA512 8dd47fbcb609a0ae5ce12962f81c758e4108b4e68b7464749fbe0dee268578f049e5aa10d1b2083a3c320a6b77c1bb938ca8912241731ac64951a741bbd65b8b WHIRLPOOL 6db782ce195eb8ef7074cbf8cf5c4a1c10bbcfe542e9ddcff76d084aee1d4a4ab5bfd92a51026b63942442fa29905b559c55501ba46a14f81a5c4706296153fc
 EBUILD thin-provisioning-tools-0.7.2.ebuild 1526 SHA256 37660c240d4c2475496fcde3e2bddb195444f41769b586c66f4a4b2d864f6807 SHA512 8dd47fbcb609a0ae5ce12962f81c758e4108b4e68b7464749fbe0dee268578f049e5aa10d1b2083a3c320a6b77c1bb938ca8912241731ac64951a741bbd65b8b WHIRLPOOL 6db782ce195eb8ef7074cbf8cf5c4a1c10bbcfe542e9ddcff76d084aee1d4a4ab5bfd92a51026b63942442fa29905b559c55501ba46a14f81a5c4706296153fc
+EBUILD thin-provisioning-tools-0.7.4.ebuild 1586 SHA256 78a9eb10c64da348f0e7b3bf53e456a0c9a609ab27116a9b208ecb385917f472 SHA512 1deb6732a34855f7d0ae235f4aaa5d8a176569c3b48ea0dad2888d5d71bd5b6dc9b535215d8f6320f8f370ff316a3d19c11dae17ebb33ac68ac97a62e3ea253a WHIRLPOOL 1c7ef7966dd6918809caa4bdba90ece6aaf89f4d4cac631fde5267bf1c81c9f15c59b4268a10b5887bde0070a6eb84640b0ab69fcf8177ef148dd78695d3de87
 EBUILD thin-provisioning-tools-9999.ebuild 1677 SHA256 7125e5e2bba810678683818ee9603069b198fb70e758e0a0aeaf0e50f111d550 SHA512 dde0fa7fe6a63172082cb6520d4bd301b67a5c7dec68de3131417b25fd5a86d0fa4dfcbabf5707103c4d8df4f1fea28a7afc61b52bac0c8ba33b6fd30313da12 WHIRLPOOL 3b88c0b06f28ea6217f6b1f50ff446472c48155d320ef858ec6582a99ac4ecaa04cc25f5ba3c1f2febb9b18517e2e48546020ab7594e06233eba35ed6e79e24f
 MISC ChangeLog 4860 SHA256 98ff581f26c6eb93b79b955cf4a137bf649403ecbe987a3a19792d638997714e SHA512 4de4b7156c89d49b9b02248bca6d0b1ad9bb7f6c3e21ff2b0ffc7dcfec4a30f6c375442ffec2a98d4ca23de1f7589aa027541e0d7783788b0c76a7bce7368755 WHIRLPOOL 9e7c64037e390685a742b40f84f97da730e52b4292eed20bf7747d8e8c5e3ad55ee4406b89195cf1e0201d21c25732b31060661aa05e32c6e496f67b0ab9d591
 MISC ChangeLog-2015 10388 SHA256 e21c9629ea6d0bf35062cef7530a9f6108c08e84c052199ba7047fb4ebcb33f1 SHA512 95790b12c870ff343b7c905363a22f0f42f266ed26982790d6d5a211aa82a927d510487e89d2007c0b84a2884a5c803be0733d4fb5363281fd8608dbd1bfbe14 WHIRLPOOL 3f565d524d65d1f5a5f5a9c2103a1b5fde6a1f647d0506ffae9dfd6ff7380fa5457618db3697474c9673b63ab835e0ec2fc4625f6d6fc3d65f103db8e6a199b7
diff --git a/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.7.4-disabled-tests_build_fix.patch b/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.7.4-disabled-tests_build_fix.patch
new file mode 100644
index 000000000000..f9a64b2188d0
--- /dev/null
+++ b/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.7.4-disabled-tests_build_fix.patch
@@ -0,0 +1,32 @@
+From 8d75be81120b9cf172c95d0153c5f845ed804234 Mon Sep 17 00:00:00 2001
+From: Adam Sampson <ats-github@offog.org>
+Date: Mon, 16 Oct 2017 13:07:36 +0100
+Subject: [PATCH] [functional-tests] fix build with testing disabled (#88)
+
+The rule for lib/libft.so is only enabled with --enable-testing,
+so the default target shouldn't depend unconditionally on it.
+With the default configure options, the build failed with:
+make: *** No rule to make target 'lib/libft.so', needed by 'all'.  Stop.
+---
+ Makefile.in | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index e745739..02b75dd 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -21,8 +21,13 @@ V=@
+ PROGRAMS=\
+ 	bin/pdata_tools
+ 
++ifeq ("@TESTING@", "yes")
++TESTLIBS=\
++	lib/libft.so
++endif
++
+ .PHONY: all
+-all: $(PROGRAMS) lib/libft.so
++all: $(PROGRAMS) $(TESTLIBS)
+ 
+ SOURCE=\
+ 	base/output_file_requirements.cc \
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.1.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.4.ebuild
index 36d3cd79766f..b0807e8fcff4 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.1.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.4.ebuild
@@ -29,7 +29,10 @@ DEPEND="${RDEPEND}
 	)
 	dev-libs/boost"
 
-PATCHES=( "${FILESDIR}"/${PN}-0.7.0-build-fixes.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.0-build-fixes.patch
+	"${FILESDIR}/${P}-disabled-tests_build_fix.patch" #634868
+)
 
 src_prepare() {
 	default
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 66c8aeca5071..f9f3bac576b1 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -27,11 +27,11 @@ AUX ceph-osd_at.service 362 SHA256 c628755279d58a860d8a35c693d21d7b532c13880a181
 AUX ceph-osd_at.service.conf 115 SHA256 e3515ad3e002969ff3b06069ef8ccdad2fae5cd4aa35d9e982b59d386ae0e40e SHA512 8f169a73f21968f550c6fb21ca7b1efde522b7cccaae0e0c4e22c67ee9c7ccfec7845de3cf84af1075ac9f8840b044dc9440e7936fb9079899df06df350ff9f2 WHIRLPOOL b783cf96382d901b4203d12cd4be6278cdd2f9b53808fbf9194bde58a252d855343f802586925731abc97e2d8c605ef7b5d19fcf3a5e2e6fbf2695c0404c17aa
 AUX ceph.confd-r1 69 SHA256 68d0b46b925fbc0e1571230c8bcc55f46beab4e575a3d964a3753534d751fe31 SHA512 b7f7ebb48b94398eaabb6df2cf3a5697d9a055ea4dd9b73c40d2bbf0e1445f418ed760b1f4ebb13cbb7315b2583847eb97b8649f67b6b7cf98081c0599c86aaa WHIRLPOOL 0e1989d813e7e8234112f656a4e017fae521aa5f09d344ddd1f685a6afbe3afdd51adcaf979a8395ab85ae30e6526a03d8c838d10e46f674eec7651d2df43abe
 AUX ceph.confd-r2 171 SHA256 8c6d7e408165eaf95b2736b27d670a0c2c43b60c6458e4e33969140c3f3fb171 SHA512 f7170644341e6c8dcb71ca3a4325c8da3325ebe83898cbf11b47b41ea4f899781b9bc87fd21e006292de78fe9e905ac4703d10afcf91a4687002663469201ba9 WHIRLPOOL f64c2db5852675b88da0c8db64b0702f1282d27763453f6a8c7aa0c92fcf5295d6e02acde76bc4a1c374c7ceeb5754d81978fd6467000b8a3dc6ebf1a7b3aaaf
-AUX ceph.confd-r3 1227 SHA256 ab73671e1b2972d888f3b20272be615baa5e8d936840e50c3ff14f7fa437f41e SHA512 821b86e196d17abaefa6b6c74f451cede62ca813ed0aeb5c497bd78e48bf55c19cc6af98c0d74ad63a4e359ec27af101dddeb88033cbf449333833a3a7fb8185 WHIRLPOOL fb395d4f5b589c83d20ed5cb7cf140edfe1ae63c0a1c93c3d1ebd205abdcd7cd76835b87480ec24b51aa61223ef857093c338d27d160036d52eabaa5d3fb0e0e
+AUX ceph.confd-r3 1315 SHA256 5790d77b9ed6ffb6173f9f8de24e2db58b3d9fb1a56d5454c698d4842e08bcf3 SHA512 1d192cc8eec9b294440ee6c43966ccc36669b94007dd6b990c5ee8d18ee1b36730a9a0082ef7170846dcc64adcc61481808e854b6c9bdb2eb1db1c71435d3f05 WHIRLPOOL f91b980a925f70c4b475264fe7af3fe82ed3a9a8e9b393f5ce3f6f36a59166e45f820d25ed12ce3b31f4d0ddfa54e0b8be00fed2975e433a6df11965213ad6d3
 AUX ceph.initd-r1.1 908 SHA256 7ec4e82f8ed2b25accb929a6700e70078a64a7ecf5abc92f9a2c918b3dbbbcfc SHA512 a6860372f935d64a978f0b2584074791ed945af8172f57910b42a2d92f373711c655a566e6935ca4bba28d3d87aafecb3242d307631378481fd9d05207dd4809 WHIRLPOOL c110163ed12b9220d970b198c789435eff137b55f595aa31f3c2b765338d91e2d88343e6542509714f4ea694f3f6764213402e1f90238e719de09615361b8735
 AUX ceph.initd-r2 958 SHA256 49e69cb418f76a45dc933edca944d78630a8460153bf0a4c511b6d10223615f4 SHA512 6f42b8540797d3f55d64b9842e190ca2973c1779c720b7c9923b8bcc06dddf95672bee066275599e4feafeff38652235746433305dd4d7df8ad086a8deb960c0 WHIRLPOOL 3670c40a1ecd935667f1c8e5d3ebd25d0a41dcc18c3ac6a6e155e95a28682295858f2c06794beba7c7173c40ad403986541ebe8827370ee4aa9c922b40ae636c
 AUX ceph.initd-r4 1189 SHA256 03a6fe825f5bdfe2a9e91b8dc2f1b1d16bb2f487f617bf35f58cfd8b514de5b8 SHA512 dbb69228ee566490bec93823040885e419bfbd7dc076c802cc97b47dde9fbb06a99f61498cc438c90fd0474b2ad7247d756b977fb415b0f1168442036a48bd97 WHIRLPOOL 11dfa061dfad1018f0f4feff279cc2d449bdb57c85bebc5160271a65752c1e9198be5cfcd55ad457b8649aa997a0cb61e41650c6c29cd2be0863d35a5febe9f1
-AUX ceph.initd-r5 2149 SHA256 6c148a328c3ac8082dd2e5d2eb1e3396f65feebd7711c411a715fa8d98f914d4 SHA512 e572d91f5fab3f77ef39759e1e145f0d73c5bde3515c8b3c6185f58fb28592da38e13201972b61c7071daa338a997e78e051a4f2adac912d7e8d1ddd3809345c WHIRLPOOL d2be9e89e5bb408da4a8aab1477c8f0182bd768a39a77fb98d743c1804983a1fc08fb87882dd28ff2232e44090cda68acd34bc5202b96e247230c4791e9b566f
+AUX ceph.initd-r5 2178 SHA256 234f27c1f880954b660f3366f4c12748d346aa7f84b5bea8c8044c7c8f4b64b4 SHA512 4037639b6de65e0966f1aa850778b87f4f8f926af621f68155e98f103e233b7ebb2fba18a65ca150b16767bb80581259f4720c925ed00777d640f19471147c90 WHIRLPOOL e66279a443835e00a9c48f691b13b2fecab49d5fdc641d8119e0bbc2265a1485501c894f49f13445943e0f0a3a0b705ca25caaccfe7536c37bee92188231d036
 AUX ceph.logrotate 427 SHA256 f893364080dfaf5fb3b250e4811be7f1880ea937c7a6b70f913ad560fb14381d SHA512 6edace611f46683ca3b8d2154b86ec77cc241909704e0362b728a5f51c2a809c22e83d69df0d58ec6b3a6b8dc8ef2518c220cac920f51e63fe668cdfe1b48bae WHIRLPOOL f9e3643177805202a0c07b04cc38e7a3e8bdce76f59bbdd4aca050527ceab04ddcfb293e13632c2fd25eeff725f3bc532e90e223b4f003ecfc5bab377e8669cb
 AUX ceph.target 128 SHA256 2dc38c2aff560067604d4ee0a3b569ed0032928223bf865198c500560bd8ea0e SHA512 f667a92e9d8dfcd52dab8ce8bcdeb4c7da1fc65f5b11df96340df3b6362a06b3ba71bbc6677aef278514b856a85a65ddfd9e7b96b48a9684256ccf4825e98dd5 WHIRLPOOL 0bd67c47391ad21853f3a859b8cfa53d740f41a06f024526bba29c69c98a5bffb871ba45581a3fbfaf8b3fff9ac2c04a8e4e042e364926ccbfd0c01f52a1ebd9
 AUX envd-tcmalloc 48 SHA256 b24741f787828fa45844af0a5ed36ac89e2e4139244990bf044268e28f0d7e15 SHA512 d180b1a888ec6d870ff523a3b10fd00eca479ee2586a236458af5ffaba21c84e7b8098da6d4bc08fb86c82c61a861dd3c3596a01063d734c329a92808682fc8c WHIRLPOOL 73468450e14c4e55dcfef10c8cf17ca1f2471a54752d4c0ae110dccf43bae47db5641d62f16ac331b0fb78e0b0a52edcae370a18c7870dcc1501c3d288cf791a
diff --git a/sys-cluster/ceph/files/ceph.confd-r3 b/sys-cluster/ceph/files/ceph.confd-r3
index 54673c2688f7..281037c59982 100644
--- a/sys-cluster/ceph/files/ceph.confd-r3
+++ b/sys-cluster/ceph/files/ceph.confd-r3
@@ -14,6 +14,8 @@
 # settings for openrc supervisor for various ceph daemons
 #
 # defaults (can be overidden for each daemon)
+# stderr and stdout values get .${id}-std{out,err}.log appended to the provided value
+#
 #respawn_delay=20
 #respawn_max=5
 #respawn_period=1800
diff --git a/sys-cluster/ceph/files/ceph.initd-r5 b/sys-cluster/ceph/files/ceph.initd-r5
index 7087de605175..18f539a57a8f 100644
--- a/sys-cluster/ceph/files/ceph.initd-r5
+++ b/sys-cluster/ceph/files/ceph.initd-r5
@@ -73,7 +73,7 @@ start_pre() {
 		fi
 
 		if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then
-			supervise_daemon_args="${supervise_daemon_args} --${arg_name//_/-}=${arg_val}"
+			supervise_daemon_args="${supervise_daemon_args} --${arg_name//_/-}=${arg_val}.${daemon_id}-${arg_name}.log"
 		fi
 	done
 }
diff --git a/sys-devel/binutils-hppa64/Manifest b/sys-devel/binutils-hppa64/Manifest
index 9514346201a0..f3b6f4d7cabb 100644
--- a/sys-devel/binutils-hppa64/Manifest
+++ b/sys-devel/binutils-hppa64/Manifest
@@ -21,6 +21,7 @@ DIST binutils-2.28.1-patches-1.0.tar.xz 19772 SHA256 50cfce6ef7f546dcdb983a8b632
 DIST binutils-2.28.1.tar.bz2 28120394 SHA256 6924999be62d4464458eb53c11f27277cfb63755df8c1cd47b8d15d02c1942ea SHA512 5ec5212497b0fa8324f6a0884c284cb71c01942bbd39356d1ae745a5c9d97274c10f9d9c723f4bef6f0217662dfcd0c36e4e955a7599b11217658dc7b97553eb WHIRLPOOL 5c616f719827e5da7db23e89c761323cd4828b4779e79c3983d3ea429bce57ed40219982c478237b4dd728b77bae0a6447d912d96490ed1f5fc279ba5fd73bc6
 DIST binutils-2.28.tar.bz2 26556365 SHA256 6297433ee120b11b4b0a1c8f3512d7d73501753142ab9e2daa13c5a3edd32a72 SHA512 ede2e4e59a800260eea8c14eafbaee94e30abadafd5c419a3370f9f62213cf027d6400a1d4970b6958bd4d220e675dcd483a708107016e7abd5c99d7392ba8fd WHIRLPOOL 7fb876668c4fd8b10641fb8d831e7d23723ccb9b1051650c76a3a99696d37d120ef969e3c1cc144b0ffd765ef8e8698fe553c39cc65d0b9499a87d4886d6419d
 DIST binutils-2.29-patches-1.0.tar.xz 7548 SHA256 8ce4d1ea1224a305c4e36529e02dba87306075638ba0415b69ceeccedc77cd6e SHA512 5375bfb1b796b7692cf2adfc41bd2ae2e6dc19ff497db5f6beb35a456981b3adb8552ef14f32382faf655aa40da86c2d44177a658ec71e1c0e228dc27a4f2e18 WHIRLPOOL 73d2b78ea18e3427442bcb24440f671c1d35c0b559bf2141f30052b2bb8d6a8a6e29994cac741e4e50071c716d761f32b36358487a176d67e8cd226dfaaeafc2
+DIST binutils-2.29.1-patches-2.tar.xz 18528 SHA256 e50774626a1860a91aef58815cee187dd3206a2612f6e6315dee0d8c39128316 SHA512 b60a3af9cd6a681f32a59fc4a30602ee1290f75cc93c8ad38ab0de17a7f30538a751b801dbaf079e3d514b9671e34e91742c4c9c953a8c9794505b571b7e80f0 WHIRLPOOL be24896a10f90701ad3056477f8fc0df25b16a05cae5eda466a05a93b96e47c5809641b8f3af3720d8e8dea521c4b27c66c5d716d8f9c8a54dfb7c3dc87839e3
 DIST binutils-2.29.1.tar.bz2 29123355 SHA256 1509dff41369fb70aed23682351b663b56db894034773e6dbf7d5d6071fc55cc SHA512 4063d34555526922376ccceb3f14b43e287442e82a8038cf50f4f51ad97d438c672c0e310ca4b856c9aff5aa9911073e256e8298a7a3f1844eeb60b90d955592 WHIRLPOOL 55bf62434bb00b9a355f8d7138c97b6d984eed3a83d7eb37137cf3ab8efcc8e536415d68eba375ae0ab30743f5b3014a664f7d3c773ed55da40c8814691e04d8
 DIST binutils-2.29.tar.bz2 29073316 SHA256 29a29549869039aad75fdf507ac30366da5ad0b974fbff4a8e7148dbf4f40ebf SHA512 8148587d7e4f14ebcbcb3f984b116deaae5d4008228628acde14bc242a64a4b53faf1f6077a2c4ca4750e2f254b698ba506bd657f79e1202e87e7029b0069337 WHIRLPOOL 62b3e9ff6f85f8f4a13b71361f5abc4081a70de560931dcaaece1daef04c6bc7d3e0085cbacff0abbb750c4779863d45bc0d8d17273965472992c6b61b5cab20
 EBUILD binutils-hppa64-2.19.1.ebuild 495 SHA256 b6f389a66194d2d7cf4c3e3b808227105e75a804f5a80060d835edcc87143ffd SHA512 fc93f673e80fd0898f9ac6dec30b791a2d81d9ce7fed2d0fed4d268690c94428ced548598d008b48099d9c3e0e57b02f7f71f9f9a521930a5bbfaed1f11b5e04 WHIRLPOOL 5aba1ca54b0f30b6f6c3ab8d4f6d8c7fb09e0d4da158425f8524ca8340d21afd1efd2778cd67a268b3dd03a9cb632c01a7c4d5fc10e5caf84a25324d9cb9b960
@@ -34,6 +35,7 @@ EBUILD binutils-hppa64-2.26.1.ebuild 649 SHA256 29c3c14ceaa791c8d1906ffa6beff3b4
 EBUILD binutils-hppa64-2.27.ebuild 650 SHA256 cf187228624a7a4021c2d650ecbabf6c2fdb8234babe4ef957bd354305a833dd SHA512 bb28312060d697c45df0deba91c207c57a3ff88134fbfb7a666c3e41370b57004d1e48aca42f7df15e9c2c1f745f7a699b39e0e2a134690be9e24c29e0c9d724 WHIRLPOOL 3981a57df800a0251eb3db15b7f8f4f4b2c11c687b464177013cb1465d94fcf14c4e4331052c4cd161980fc528542ccf456f1e1e950f05d205cd077c5e32b13d
 EBUILD binutils-hppa64-2.28.1.ebuild 650 SHA256 64c2c403ea825148a68589cb1b423df4ad29534ac4ce8647f4e54356d91b9387 SHA512 7786209f9e2c4e1fa40ec08b8a4ff1c89d1471a2f438a7b750cb4067b19520a1a9b9be0c46396b2e0d0b9ad4c0f2d82cbacf4e77397661b04d49da45ebac70fa WHIRLPOOL f9532769d1cf8bf5e6e2579085902e0cb64e13d73098a4f95810ee1bfa5783e0be8def2a516f4a0e5fefb3ee26d13c674a986b09d4fa9c771fbc273e3b6d8379
 EBUILD binutils-hppa64-2.28.ebuild 650 SHA256 963169d390486f81228c5238ad2de254f6e6ca77dd5d944d299e394599f31f3b SHA512 b34d1385f1c9e1d607774ef073dcef0e0ee617e5f740459eb03fd2c007c7a168a690f763cd5332865a2b0aba22de59fad8950fffcdef2c6a79ab9ffdadf1b653 WHIRLPOOL 062b4a929ae52e2ca073c4a0d721af621dd6259bea32e2d0020ecb93f3cdb5451f6de21b42b85cf99dd40af503873c3b6e7df79e94a8f3a8fb045d90e60a927b
+EBUILD binutils-hppa64-2.29.1-r1.ebuild 648 SHA256 826a590e0c0e3b87626d205230e31272b932ffb2f613448e390ca8b17d0e7d35 SHA512 5b25534304fd7c04700f9de8b03121044955b8e45e99e589f06f91ff38b61fe2c693392646309efdde512cd070bf588d5c738827e98a0cc6dfc36815afe33975 WHIRLPOOL 0dc8e21810e9a5d532fbe0050081f66c18e8e7e341ca7fb7dc818b76b16db3f990b3cd20308be2b8abe06a02de8826475f379b097d1577a194f79a13ce901d2e
 EBUILD binutils-hppa64-2.29.1.ebuild 676 SHA256 df835f167896b08bca3d0e1cd5522de45c34ee50262abcde63d3c1e46d34ec33 SHA512 435494d643ec9d50aa584df181a44bb386a993c78e34152d931f435fb60df9868c5c87a16cdcd24d5556056351d114375cc0d8e2d46e1d1fac9b3b81da7a3db8 WHIRLPOOL 9c328f1c58140724e8d7c34012e285c0a6a1a68f53c0cc6f1f9de544893cb867f8a311247b135cb8956e39a9546529e8d0ef98bb12b1e6f71b15512ea8d84864
 EBUILD binutils-hppa64-2.29.ebuild 650 SHA256 64c2c403ea825148a68589cb1b423df4ad29534ac4ce8647f4e54356d91b9387 SHA512 7786209f9e2c4e1fa40ec08b8a4ff1c89d1471a2f438a7b750cb4067b19520a1a9b9be0c46396b2e0d0b9ad4c0f2d82cbacf4e77397661b04d49da45ebac70fa WHIRLPOOL f9532769d1cf8bf5e6e2579085902e0cb64e13d73098a4f95810ee1bfa5783e0be8def2a516f4a0e5fefb3ee26d13c674a986b09d4fa9c771fbc273e3b6d8379
 MISC ChangeLog 4696 SHA256 e3e4e56d735b36bc7871e096e2578384cef5661b4f3dfd65c65d954736873c75 SHA512 7e92e73f38b2a6ad6d77857b17ccfcb2a144a38cc4217f8b5f051cfe90d0c4680b0f772a5ca64ffcbc928c9ca4d18be08f550adc568d3fbad9df1f024cf3833d WHIRLPOOL e2ad7ea74ab62d7f05b67cd529f3d462951ceb560feb23547bf3247ecfb9016f5c609a7605e9aa9c9d85fff9a015880b694d00549acafec40889237b1a3937bf
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.29.1-r1.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.29.1-r1.ebuild
new file mode 100644
index 000000000000..1e3b4a3273a7
--- /dev/null
+++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.29.1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+export CTARGET=hppa64-${CHOST#*-}
+
+PATCHVER="2"
+ELF2FLT_VER=""
+inherit toolchain-binutils
+
+DESCRIPTION="binutils package for building 64bit kernels on HPPA"
+
+KEYWORDS="-* ~hppa"
+
+# 66_all_binutils-2.22-warn-textrel.patch fails to apply with
+# patch-2.5.9, so require a version that for sure works
+DEPEND+=" >=sys-devel/patch-2.6.1"
+
+src_install() {
+	toolchain-binutils_src_install
+
+	# tweak the default fake list a little bit
+	cd "${D}"/etc/env.d/binutils
+	sed -i '/FAKE_TARGETS=/s:"$: hppa64-linux":' ${CTARGET}-${BVER} || die
+}
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index 412e8bbcfcfd..28512a17a888 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -1,24 +1,12 @@
 AUX 40-gentoo.rules 365 SHA256 e11d66732dc0d629fdb8c06357db8be5339f2ecf28c2572c5af8637449f549ec SHA512 7554879eaeb12869a78835e4ac814b63c41ddd8715ff9b8d1b75e5b13edf697906371eb10d6c4f0a4c6cb9a44b21a4839985811a3357e18d3b8a842181666e0b WHIRLPOOL 54d962fa515255df5f37bc5c71a3774a909a809809138dba12ed22c6fda78ef336f4e98014f37dbc44289de1ba08f5f2ea31311e14b29a0bbe2cc3d6587d7425
-AUX eudev-exclude-MD.patch 2887 SHA256 3e9889862756ad7b683593e5a63316b4531a1836bec324c0dec647339f53cf53 SHA512 955013bcb849f156b8c3b17d99c52699ac371b05c0fa866a473b7db049c77cd86ef41192301bf78af97ea944e8e6d09e60288348198b73f340517fd2be19004b WHIRLPOOL 745b16d56a6000d88a2b711a21bbbfe1d96a9d33d8eb6d9e51491a26266924b5092cf8b8a4ffa5f0247887a3ef0a83b2ea4c8ee8ad620c601b9f7ae8e530c57a
-AUX eudev-fix-disk-by-id.patch 2381 SHA256 3f1e1bcbcfeb024b09f5e80210f24a89fd0bba254633f60856513c10a4af9579 SHA512 f5a6fdeaaebb64d4086c153ab0629cc826be961a3f8f7f5bbf4283617cb30b1f228e983ef76f023805ea00bff2b1f5c903a549c0d4675227b94c104f69e3fefe WHIRLPOOL 0e73e4c3b0e2b285c519eb12d6fa85f18f153b0a030803af07381cfece35beffb79e70d933c01ca28b1f0c4cad1f2bd650954ccd93260fe6272a48a70bec79e3
-AUX eudev-fix-selinux-headers.patch 788 SHA256 5845b7b5e337e7202fe9dede75d9f4c6b70ce5cb25252397bd16419e634981d5 SHA512 ee11d435bb40e64fa3f88799be3e803e30d779009389b5faecd6416fa8eebee36e55ec7e2d59c4894268881f838ea94ba56240a425694fdbfd9dc5fe297c1bcb WHIRLPOOL 14c086d5bc37933b7ac2e0b3b54d65cbe2c8a8afefe798c1ead516bb36196b783c4cbb13abf298be8918915bde3c4475a74545a793fed4393a93d67c719c773a
-AUX eudev-fix-selinux-linking.patch 919 SHA256 9d40fe52fa899334725e40b6cf56a92e7b1e276bfc15315026e8330a22125860 SHA512 27f15fb1ead796206cbbbd7296813303b01aaae35f67388dd7e126e1fab07231cad5735cb63d5a4bbade0d9736949af76c4cff9119be14f3bbeef8014e02daa1 WHIRLPOOL fb4a49beea0bdf8c91c78fbf314e8737ad7c2f26b374c921005a5171d34d672ffdeb5f0fa7198a9574ba822ac6cd59c321c9073149035d773c1c8f3331eabb20
+AUX eudev-include-sysmacros-header.patch 4516 SHA256 8ecf09b46d4162756e5221f211be9b558f4429364d6d35a179139c3d7e0fed22 SHA512 29633fca7e348ef7e69fae7f0fc47a2155b20956dd396205c06032d356ea58269f5ce8e0277ed36aa7108385d0e244a311b53b9490c418c9180986e4742d623f WHIRLPOOL 78099e261efef5af8a851f43fe20f025e676dd6997f95aec93d8f99a338bc18c2493ce40cca4bb82426ffb28440e12f3b32553a66e309b6877a958c3d95040de
 AUX udev-postmount 1208 SHA256 b0327069dbb57b39600079b87df80915dabb77c2fa298d6ae109ca04f8ba08b5 SHA512 8ef1b911843ab13acb1c1b9b7a0a5cd76659f395c3db9e579429556f23eacebb414507dc0231e2455e7589bc70054fa1e6b6dd93dd833f7101c0da0597aabf88 WHIRLPOOL d5263b61f1531822b9fd9f994d796c4328d7c4ccc0958bca27ca2c64b44549e5ca73334c94fd0e58aebc0f136ed8d60429736c2b8ee79d49572108525f362d45
-DIST eudev-1.10.tar.gz 1776717 SHA256 401eeb29147d3e24d87849a8006df62eadeb369d913484d59e9e35f3f73a20d1 SHA512 76ba9e3c732a6baad448500ef72368e985e0edf45b80d920e23432b5ee2da3e841c5faf2cc281af6432625758608c31eb441c6af9e2161d4e7264348e33e086f WHIRLPOOL d3251a1ef18e46e000a0941156ca4daa33b54a6147fece4cee6d863f86c98068e88bc11bc8a90f45c578ed62338218c5c8b4b06bb6132610e3d4a30bf79fe192
-DIST eudev-1.9.tar.gz 1762520 SHA256 8f17e92f1177ce9352bde00360e227a7cbb3b97ac8816174bee34be80e44cef0 SHA512 13bd7df42d686818f499856d260e5dfaf10425f06e05449bf4cc8318667b166e2ae9c5e8b519008285aeaab9284ec5fde1f9f19e536dd4bae09a5439c86336b3 WHIRLPOOL d0504f05e191e94229bf60a497cab82fe461f52072ba7ed2171654e684397e4ffa9ba47c8b18cd0cc6d0168701dcac3b7d4b6c73168382e2432c7c229b2d0293
-DIST eudev-3.1.2.tar.gz 1858004 SHA256 4393b69e93dd8117defde6519b199d479f9d051f52061157a1a7a41b8fe10273 SHA512 d9aeb37a163ce4a0c116f75a927b4b99f8445d06624fbb3c28ade18f3effd8c54af5a4a52477c31a0452822a3dc0901468263195256e9dbf79d2ef08cf46f2b6 WHIRLPOOL 2249128672d2adfa968c123a2538063331348bc8e8481ad9c25bf8d9fb4d2d3c8a05417439f155d9ababe657b19a595c18c6ba60ad0d5584a8ead86220b39577
 DIST eudev-3.1.5.tar.gz 1745524 SHA256 f75885a430cd50fe4b31732f808ba7f9b2adf0f26b53b8ba2957b0c1d84b6f2a SHA512 c5192e085ca4230aaac918e701989b712e5bda1558db31eb6ba635c17c4bdff398458d51cefbc5fb77a7c775ec1e04b1dbe019b8314cac3f43a5c1ae61521b5e WHIRLPOOL bc845c474101635c039515489e1316053156d3dd5f9c915c312324b9a1a6168f831e7476eeff834487fc83289e5d5eea2ba764c10bb6628b7c18d188de5f3846
-DIST eudev-3.2.2.tar.gz 1821812 SHA256 3e4c56ec2fc1854afd0a31f3affa48f922c62d40ee12a0c1a4b4f152ef5b0f63 SHA512 38465ba6a68c3a8756d750ac36dfde0e220c3b13d058a8fcb664ee628e95d2f83b4155cb080a7bd518a5435c7c502aa3fa785a99233ebb24dda406441a753f7a WHIRLPOOL bcebd850c5c9b0ffea21bbb3517feb15f2328f602366daa2fd13b62ce62b0834815b98618fbe80bbe9db9d27085a6ef917c4b1e597f6ad47182acf7386786bbb
 DIST eudev-3.2.4.tar.gz 1856432 SHA256 dddcf4c89b21f5f3210f7e4d3888c92cbfc657ff734ac21b6bdd3f5bcb146fed SHA512 1843a42d8c670379fec034e4401120202ae9383b74f81e52d93d83199a69016c27f7f7bf421e16abd3523dfa8158f9f28cd554f12f99a28e3004ece1c0342200 WHIRLPOOL 6856678fb37020f265f564fef31d2372655f8e7c7919f8124e1d50df41aae250a64f301ef200f8779b05c70c3b9b43b12ed464dc47a73b802e69f8e7720788c2
-EBUILD eudev-1.10-r2.ebuild 9129 SHA256 2184dad4a675c01575d819f8a6e45d1d9133db76ef933b8f508fc4aceceaf688 SHA512 4e5ad6d4f127ab487e901c881afc1793dd3daeb7bf0c9acef74073328c3aeefdfece4db6661306d645f5f02cacd371fb5bc3bfc3b5cf18f01ed8d307b063f635 WHIRLPOOL 67a6620cdb2464347fdf976110b2a15ca969ef00b449eb3323753b6fef221328d1e74d28ce9d12c746b0b53c6b89c9d7eb5b71dea2cfe97cfc0c2f799eb0c97b
-EBUILD eudev-1.9-r2.ebuild 9161 SHA256 51ba95509e938db6bea507fda1876ce2ce13c73fb2b9f70a7da26a0f8a755e6e SHA512 6ea5a209ce20b08c6b70744901deabde6ce77a5a7d8aede4998a76f68ec9fb632093e5621660e58f3560ce7f16013e5382885283bdb031c419c1cae350378aa7 WHIRLPOOL 0952090399764c202ea6841c3af3d69612cfd3e9c214965d8f9fd79f0a56ee004e38f1d69118a484150fd9f2987a922340a57a2d424035e05ed8aaac98723015
-EBUILD eudev-3.1.2.ebuild 7935 SHA256 980bee77592b21817f57399ab0afc8915eef49b5a54e8ef8e8dc0380f6f91989 SHA512 5c6e370e54856f5ed3c5c386b9dae42555afaaada6e21982f99fc4474b34ddf71f51c1f743da5386773bedaf36d8a2227521dfe418d09c6be5374a094b8a1641 WHIRLPOOL 3cd016033f92fb4235bcf9fc9524c3d7a86d2a7a994a37d2ff9825139fdf43afd22a05bcb46c841d82353022c2c053273f098b638c131106a60139e0092a4253
-EBUILD eudev-3.1.5.ebuild 7263 SHA256 61af8458c13d2136f3c9057459c774b4f50c23f2a67971cc2c3e850a8e5ded95 SHA512 78e671ad126858117926336debf2126278fec9f2175427f3d7ff045cba1d365c9c0eb4c04d1ebe2e99daf0d314993e163067aeb84ec560a5c6c5af2d243794b2 WHIRLPOOL 837352ec2981c2bae144acfaa3941adfdee60498d4de4945795a62c39a8a7befec485190eaa6d5c04cc7a53f8370668036bed250db7ab8acbf59a1cc9fa27a2f
-EBUILD eudev-3.2.2-r1.ebuild 7364 SHA256 f6edc879b8cc642fd2d7cfab45017782237ab6bdb779036184ba1751e1b20554 SHA512 f92aa71ccac9aed7038dff3cb75dbf2c849d61edd5b3eb86a56b467d3bb07881aa4057baba0163a7751fbbd15778ca6299ff6095614705bde9359e2c9647052c WHIRLPOOL c12effcd482129c862d751c6f7824872ff758e51f11313b1a4037c89c2179a766d6dc7de1afb5184c62ebc31b061b24f65a507e8aef9d34e78af760478f3e757
-EBUILD eudev-3.2.2.ebuild 7320 SHA256 d93fdc6bd53c6e493c704e7883b6b73ba4acf746602f5bb0ef61bec0b92b19bd SHA512 bb92bbad63ec770d8eae06d88ded85d96928a5a30e3c5b1ca022ea134b245022a73b1cf212e7d4dc149341b30db61f001b2f122d4e9d9ff152277c326c3989c5 WHIRLPOOL dbc9fdb961fafd462c4e543ab9d02bd1747fec0815b5149881fb21833cb18f8119bb28b59f47a950b6118e591790f3916543086ba84288354d12f4cdb5d7382c
-EBUILD eudev-3.2.4.ebuild 7314 SHA256 2f4d16e2e19ddcf7345489790c1e46136f6fcaa5ce5b60cbb9c796d317923101 SHA512 bba81dcce7562500933c7836a951ce1f7a71a7755b106c604189938b782697a837fd7d712cc5a0bedacb0eab6d260728a6a109c6a8876e48d4d4541341d34fef WHIRLPOOL 8f70e588d326573a58906eab1d72fd210fb840b69022a04b53245fe497a3a4edb87f2d1110a605fbbf4bd4bb5d8adf44c41394f516de0554a67525f66665bee0
+EBUILD eudev-3.1.5.ebuild 7324 SHA256 76f5f333c1d7d097b800582a64378923be708bce2c4cbb40cd40d86c37c54226 SHA512 caba559c00546389c4a8ae0cd62cd1926877939d89b97060e175e8bfc7ba3bc2d081e8400a34bf830a269d8a1102a2a56e00b19e2b23b75b98347fdcbec4908f WHIRLPOOL 6e8e30c612ce71deaa07ba429f2b719152f50d6b72ba4e364818027a8af0fd33230e9175cc8a347968521d65616e9bce240d09fa2014ffffcc597fe106a273db
+EBUILD eudev-3.2.4.ebuild 7374 SHA256 2dc36df9cbf1ab01a35aaa207f716ddc7ec2cfc2dccabf39cb6f5cfe9b937261 SHA512 1953a761499144642ef49552116d66aff1fdb2aeb56d86c8dcf9118040f0f2ecd160666ffe3281288a812228433b0f4c58c19be70cf9b2eca871d6fd627b95bd WHIRLPOOL 77b5c006ea4225261eb5623008754a833aa31097cc536066cc75a829bdbf69cf78222e7fad1282383bebd2c342511c2e649fd7fa61689793efd7d66d3ba79341
 EBUILD eudev-4.9999.ebuild 6604 SHA256 0e903c0c2fc7443195a50ec69b56b75d05dd7020411aeb382f2b33912ec718af SHA512 c5b231b5dc6406255b38e67e99b054e429f5c482614eb905f9a9c0c03af9c7107c30c29850f0a2566e6731f4d206e957b4d714ef59739c60835e80a0b6a3e4fd WHIRLPOOL 56b50f2ae709c994d14362d689db60c44e2a00d263e647a3b990d65fac88557941101bd62a55e25e5599006b7944c067c9081dec6ca1f683ff013f08be4e49b8
 EBUILD eudev-9999.ebuild 7314 SHA256 2f4d16e2e19ddcf7345489790c1e46136f6fcaa5ce5b60cbb9c796d317923101 SHA512 bba81dcce7562500933c7836a951ce1f7a71a7755b106c604189938b782697a837fd7d712cc5a0bedacb0eab6d260728a6a109c6a8876e48d4d4541341d34fef WHIRLPOOL 8f70e588d326573a58906eab1d72fd210fb840b69022a04b53245fe497a3a4edb87f2d1110a605fbbf4bd4bb5d8adf44c41394f516de0554a67525f66665bee0
 MISC ChangeLog 11021 SHA256 4bf9e16fe9607d25dad137eb30308233c3d3c2dd89fb68ee8008a11dfaa70a15 SHA512 b54c268eea07b0e60d4e0b88a2efc66295e001da6d0a0c4d26b77f7e81cab0a2df46b82b6aa9444c9838eb4c63f479dc655207c5f8b39395ba54509341f10dfe WHIRLPOOL 3873661dbaefc20ec3f9f77c7e73df6404b7d324de90166b69f279549022424dcef185d7b00dde172fa22036f5984947abae97ee28361c01e3912b5a16f54f47
 MISC ChangeLog-2015 24551 SHA256 1990a418a2339df1b5df0b00aa6acc102d84261ef33203913b443fea20991f29 SHA512 a4d91049fa4267605fa8eb994a1dbca226d54f440ab9126d0623c51aa9078b50a1e1988310b2a1a2fb73a7fb5af252c41feddce1dc1e0f634be0510cf2a31cbf WHIRLPOOL 6d6e506833f409c3b6dca123c967bfcc0665d000bb4eb182bfe0a0afe27ce883499e508055d21992b64557537efdf303bc79476fbd48e9ad6f1ae1d98a296f61
-MISC metadata.xml 1157 SHA256 ba03136f85c5709e7a5d6759ac8552626420aac0e192ea738a9d2846f97dfd13 SHA512 cff7201ebbe8f4d3de081755c7b2fab115cbde63f73dec4bb4d9a3e878ee62ff28559e4fed2ad0e571c5448029c4f3162466011dfcbc1efcb5296864d6f5ffcb WHIRLPOOL 9e7e177d3d73cd96b8c8de4f928045e2d92a41202ccfd1201f657e43efd5ed24399f412ccc2057aaef894fb6f928f2aadc252c1c16b39a6fa738edb5d7da5d8c
+MISC metadata.xml 858 SHA256 49ee3726e5c4ebd5189e9353962d6590ded44a36e589545c33df06702354c513 SHA512 bfffbea2229a0beabe8e979857b9f9761ade64faa0fc421a5f4d8ec1030aed60cce1505ff7d964f0128220773865d7f564db746fee1d68e611851c73406d1a79 WHIRLPOOL f03a317faa946f0475fd84c20f1b47e1a53f0231fbbd40ae152716bdc7de6c6b5c2e613ccda45b62bd33bb86cb6f85af0eccbd1faeb309f3b9e955fbce5b7981
diff --git a/sys-fs/eudev/eudev-1.10-r2.ebuild b/sys-fs/eudev/eudev-1.10-r2.ebuild
deleted file mode 100644
index da554bc8b022..000000000000
--- a/sys-fs/eudev/eudev-1.10-r2.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-KV_min=2.6.39
-
-inherit autotools eutils linux-info multilib multilib-minimal user
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/gentoo/eudev.git"
-	inherit git-2
-else
-	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm hppa ~mips ppc ppc64 x86"
-fi
-
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="https://github.com/gentoo/eudev"
-
-LICENSE="LGPL-2.1 MIT GPL-2"
-SLOT="0"
-IUSE="doc gudev +hwdb +kmod introspection +keymap +modutils +openrc +rule-generator selinux static-libs test"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.20
-	gudev? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.38 )
-	kmod? ( >=sys-apps/kmod-16 )
-	selinux? ( >=sys-libs/libselinux-2.1.9 )
-	!<sys-libs/glibc-2.11
-	!sys-apps/gentoo-systemd-integration
-	!sys-apps/systemd
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-DEPEND="${COMMON_DEPEND}
-	keymap? ( dev-util/gperf )
-	virtual/os-headers
-	virtual/pkgconfig
-	>=sys-devel/make-3.82-r4
-	>=sys-kernel/linux-headers-${KV_min}
-	doc? ( >=dev-util/gtk-doc-1.18 )
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=dev-util/intltool-0.50
-	test? ( app-text/tree dev-lang/perl )"
-
-RDEPEND="${COMMON_DEPEND}
-	!<sys-fs/lvm2-2.02.103
-	!<sec-policy/selinux-base-2.20120725-r10
-	!sys-fs/udev
-	!sys-apps/systemd
-	gudev? ( !dev-libs/libgudev )"
-
-PDEPEND="hwdb? ( >=sys-apps/hwids-20140304[udev] )
-	keymap? ( >=sys-apps/hwids-20140304[udev] )
-	openrc? ( >=sys-fs/udev-init-scripts-26 )"
-
-REQUIRED_USE="keymap? ( hwdb )"
-
-# The multilib-build.eclass doesn't handle situation where the installed headers
-# are different in ABIs. In this case, we install libgudev headers in native
-# ABI but not for non-native ABI.
-multilib_check_headers() { :; }
-
-pkg_pretend() {
-	if ! use rule-generator; then
-		ewarn
-		ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality,"
-		ewarn "as described in the URL below:"
-		ewarn "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
-		ewarn
-		ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing"
-		ewarn "between the default or user-modified choice of sys-fs/udev.  If you wish to disable"
-		ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules"
-		ewarn "exists:"
-		ewarn "\ttouch /etc/udev/rules.d/80-net-name-slot.rules"
-		ewarn
-		ewarn "We are working on a better solution for the next beta release."
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-	linux-info_pkg_setup
-	get_running_version
-
-	# These are required kernel options, but we don't error out on them
-	# because you can build under one kernel and run under another.
-	if kernel_is lt ${KV_min//./ }; then
-		ewarn
-		ewarn "Your current running kernel version ${KV_FULL} is too old to run ${P}."
-		ewarn "Make sure to run udev under kernel version ${KV_min} or above."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# change rules back to group uucp instead of dialout for now
-	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
-	|| die "failed to change group dialout to uucp"
-
-	# Bug #520684
-	epatch "${FILESDIR}"/${PN}-fix-selinux-headers.patch
-	epatch "${FILESDIR}"/${PN}-fix-selinux-linking.patch
-
-	epatch_user
-
-	if use doc; then
-		gtkdocize --docdir docs || die "gtkdocize failed"
-	else
-		echo 'EXTRA_DIST =' > docs/gtk-doc.make
-	fi
-	eautoreconf
-}
-
-multilib_src_configure() {
-	tc-export CC #463846
-	export cc_cv_CFLAGS__flto=no #502950
-
-	# Keep sorted by ./configure --help and only pass --disable flags
-	# when *required* to avoid external deps or unnecessary compile
-	local econf_args
-	econf_args=(
-		ac_cv_search_cap_init=
-		ac_cv_header_sys_capability_h=yes
-		DBUS_CFLAGS=' '
-		DBUS_LIBS=' '
-		--with-rootprefix=
-		--docdir=/usr/share/doc/${PF}
-		--libdir=/usr/$(get_libdir)
-		--with-rootlibexecdir=/lib/udev
-		--with-firmware-path="${EPREFIX}usr/lib/firmware/updates:${EPREFIX}usr/lib/firmware:${EPREFIX}lib/firmware/updates:${EPREFIX}lib/firmware"
-		--with-html-dir="/usr/share/doc/${PF}/html"
-		--enable-split-usr
-		--exec-prefix=/
-
-		$(use_enable gudev)
-	)
-
-	# Only build libudev for non-native_abi, and only install it to libdir,
-	# that means all options only apply to native_abi
-	if multilib_is_native_abi; then
-		econf_args+=(
-			--with-rootlibdir=/$(get_libdir)
-			$(use_enable doc gtk-doc)
-			$(use_enable introspection)
-			$(use_enable keymap)
-			$(use_enable kmod libkmod)
-			$(usex kmod --enable-modules $(use_enable modutils modules))
-			$(use_enable static-libs static)
-			$(use_enable selinux)
-			$(use_enable rule-generator)
-		)
-	else
-		econf_args+=(
-			--disable-static
-			--disable-gtk-doc
-			--disable-introspection
-			--disable-keymap
-			--disable-libkmod
-			--disable-modules
-			--disable-selinux
-			--disable-rule-generator
-		)
-	fi
-	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		emake -C src/shared
-		emake -C src/libudev
-		use gudev && emake -C src/gudev
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-	else
-		emake -C src/libudev DESTDIR="${D}" install
-		use gudev && emake -C src/gudev DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_test() {
-	# make sandbox get out of the way
-	# these are safe because there is a fake root filesystem put in place,
-	# but sandbox seems to evaluate the paths of the test i/o instead of the
-	# paths of the actual i/o that results.
-	# also only test for native abi
-	if multilib_is_native_abi; then
-		addread /sys
-		addwrite /dev
-		addwrite /run
-		default_src_test
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	rm -rf "${ED}"/usr/share/doc/${PF}/LICENSE.*
-
-	use rule-generator && use openrc && doinitd "${FILESDIR}"/udev-postmount
-
-	# drop distributed hwdb files, they override sys-apps/hwids
-	rm -f "${ED}"/etc/udev/hwdb.d/*.hwdb
-
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/40-gentoo.rules
-
-	insinto /usr/share/doc/${PF}/html/gudev
-	doins "${S}"/docs/gudev/html/*
-
-	insinto /usr/share/doc/${PF}/html/libudev
-	doins "${S}"/docs/libudev/html/*
-}
-
-pkg_preinst() {
-	local htmldir
-	for htmldir in gudev libudev; do
-		if [[ -d ${EROOT}usr/share/gtk-doc/html/${htmldir} ]]; then
-			rm -rf "${EROOT}"usr/share/gtk-doc/html/${htmldir}
-		fi
-		if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
-			dosym ../../doc/${PF}/html/${htmldir} \
-				/usr/share/gtk-doc/html/${htmldir}
-		fi
-	done
-}
-
-pkg_postinst() {
-	mkdir -p "${EROOT}"run
-
-	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
-	# So try to remove it here (will only work if empty).
-	rmdir "${EROOT}"dev/loop 2>/dev/null
-	if [[ -d ${EROOT}dev/loop ]]; then
-		ewarn "Please make sure your remove /dev/loop,"
-		ewarn "else losetup may be confused when looking for unused devices."
-	fi
-
-	# https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69
-	# https://bugs.gentoo.org/246847
-	# https://bugs.gentoo.org/514174
-	enewgroup input
-
-	# REPLACING_VERSIONS should only ever have zero or 1 values but in case it doesn't,
-	# process it as a list.  We only care about the zero case (new install) or the case where
-	# the same version is being re-emerged.  If there is a second version, allow it to abort.
-	local rv rvres=doitnew
-	for rv in ${REPLACING_VERSIONS} ; do
-		if [[ ${rvres} == doit* ]]; then
-			if [[ ${rv%-r*} == ${PV} ]]; then
-				rvres=doit
-			else
-				rvres=${rv}
-			fi
-		fi
-	done
-
-	if use hwdb && has_version 'sys-apps/hwids[udev]'; then
-		udevadm hwdb --update --root="${ROOT%/}"
-
-		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
-		# reload database after it has be rebuilt, but only if we are not upgrading
-		# also pass if we are -9999 since who knows what hwdb related changes there might be
-		if [[ ${rvres} == doit* ]] && [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then
-			udevadm control --reload
-		fi
-	fi
-	if [[ ${rvres} != doitnew ]]; then
-		ewarn
-		ewarn "You need to restart eudev as soon as possible to make the"
-		ewarn "upgrade go into effect:"
-		ewarn "\t/etc/init.d/udev --nodeps restart"
-	fi
-
-	if use rule-generator && use openrc && \
-	[[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then
-		ewarn
-		ewarn "Please add the udev-postmount init script to your default runlevel"
-		ewarn "to ensure the legacy rule-generator functionality works as reliably"
-		ewarn "as possible."
-		ewarn "\trc-update add udev-postmount default"
-	fi
-
-	elog
-	elog "For more information on eudev on Gentoo, writing udev rules, and"
-	elog "fixing known issues visit: https://wiki.gentoo.org/wiki/Eudev"
-}
diff --git a/sys-fs/eudev/eudev-1.9-r2.ebuild b/sys-fs/eudev/eudev-1.9-r2.ebuild
deleted file mode 100644
index 3a6dfbe8e4bc..000000000000
--- a/sys-fs/eudev/eudev-1.9-r2.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-KV_min=2.6.39
-
-inherit autotools eutils linux-info multilib multilib-minimal user
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/gentoo/eudev.git"
-	inherit git-2
-else
-	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm hppa ~mips ppc ppc64 x86"
-fi
-
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="https://github.com/gentoo/eudev"
-
-LICENSE="LGPL-2.1 MIT GPL-2"
-SLOT="0"
-IUSE="doc gudev +hwdb +kmod introspection +keymap +modutils +openrc +rule-generator selinux static-libs test"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.20
-	gudev? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
-	kmod? ( >=sys-apps/kmod-16 )
-	selinux? ( >=sys-libs/libselinux-2.1.9 )
-	!<sys-libs/glibc-2.11
-	!sys-apps/gentoo-systemd-integration
-	!sys-apps/systemd
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-DEPEND="${COMMON_DEPEND}
-	keymap? ( dev-util/gperf )
-	virtual/os-headers
-	virtual/pkgconfig
-	>=sys-devel/make-3.82-r4
-	>=sys-kernel/linux-headers-${KV_min}
-	doc? ( >=dev-util/gtk-doc-1.18 )
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=dev-util/intltool-0.50
-	test? ( app-text/tree dev-lang/perl )"
-
-RDEPEND="${COMMON_DEPEND}
-	!<sys-fs/lvm2-2.02.103
-	!<sec-policy/selinux-base-2.20120725-r10
-	!sys-fs/udev
-	!sys-apps/systemd
-	gudev? ( !dev-libs/libgudev )"
-
-PDEPEND="hwdb? ( >=sys-apps/hwids-20140304[udev] )
-	keymap? ( >=sys-apps/hwids-20140304[udev] )
-	openrc? ( >=sys-fs/udev-init-scripts-26 )"
-
-REQUIRED_USE="keymap? ( hwdb )"
-
-# The multilib-build.eclass doesn't handle situation where the installed headers
-# are different in ABIs. In this case, we install libgudev headers in native
-# ABI but not for non-native ABI.
-multilib_check_headers() { :; }
-
-pkg_pretend() {
-	if ! use rule-generator; then
-		ewarn
-		ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality,"
-		ewarn "as described in the URL below:"
-		ewarn "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
-		ewarn
-		ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing"
-		ewarn "between the default or user-modified choice of sys-fs/udev.  If you wish to disable"
-		ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules"
-		ewarn "exists:"
-		ewarn "\ttouch /etc/udev/rules.d/80-net-name-slot.rules"
-		ewarn
-		ewarn "We are working on a better solution for the next beta release."
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-	linux-info_pkg_setup
-	get_running_version
-
-	# These are required kernel options, but we don't error out on them
-	# because you can build under one kernel and run under another.
-	if kernel_is lt ${KV_min//./ }; then
-		ewarn
-		ewarn "Your current running kernel version ${KV_FULL} is too old to run ${P}."
-		ewarn "Make sure to run udev under kernel version ${KV_min} or above."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# change rules back to group uucp instead of dialout for now
-	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
-	|| die "failed to change group dialout to uucp"
-
-	# Exclude MD from block device ownership event locking, bug #517986
-	epatch "${FILESDIR}"/${PN}-exclude-MD.patch
-
-	epatch_user
-
-	if [[ ! -e configure ]]; then
-		if use doc; then
-			gtkdocize --docdir docs || die "gtkdocize failed"
-		else
-			echo 'EXTRA_DIST =' > docs/gtk-doc.make
-		fi
-		eautoreconf
-	else
-		elibtoolize
-	fi
-}
-
-multilib_src_configure() {
-	tc-export CC #463846
-	export cc_cv_CFLAGS__flto=no #502950
-
-	# Keep sorted by ./configure --help and only pass --disable flags
-	# when *required* to avoid external deps or unnecessary compile
-	local econf_args
-	econf_args=(
-		ac_cv_search_cap_init=
-		ac_cv_header_sys_capability_h=yes
-		DBUS_CFLAGS=' '
-		DBUS_LIBS=' '
-		--with-rootprefix=
-		--docdir=/usr/share/doc/${PF}
-		--libdir=/usr/$(get_libdir)
-		--with-rootlibexecdir=/lib/udev
-		--with-firmware-path="${EPREFIX}usr/lib/firmware/updates:${EPREFIX}usr/lib/firmware:${EPREFIX}lib/firmware/updates:${EPREFIX}lib/firmware"
-		--with-html-dir="/usr/share/doc/${PF}/html"
-		--enable-split-usr
-		--exec-prefix=/
-
-		$(use_enable gudev)
-	)
-
-	# Only build libudev for non-native_abi, and only install it to libdir,
-	# that means all options only apply to native_abi
-	if multilib_is_native_abi; then
-		econf_args+=(
-			--with-rootlibdir=/$(get_libdir)
-			$(use_enable doc gtk-doc)
-			$(use_enable introspection)
-			$(use_enable keymap)
-			$(use_enable kmod libkmod)
-			$(usex kmod --enable-modules $(use_enable modutils modules))
-			$(use_enable static-libs static)
-			$(use_enable selinux)
-			$(use_enable rule-generator)
-		)
-	else
-		econf_args+=(
-			--disable-static
-			--disable-gtk-doc
-			--disable-introspection
-			--disable-keymap
-			--disable-libkmod
-			--disable-modules
-			--disable-selinux
-			--disable-rule-generator
-		)
-	fi
-	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		emake -C src/libudev
-		use gudev && emake -C src/gudev
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-	else
-		emake -C src/libudev DESTDIR="${D}" install
-		use gudev && emake -C src/gudev DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_test() {
-	# make sandbox get out of the way
-	# these are safe because there is a fake root filesystem put in place,
-	# but sandbox seems to evaluate the paths of the test i/o instead of the
-	# paths of the actual i/o that results.
-	# also only test for native abi
-	if multilib_is_native_abi; then
-		addread /sys
-		addwrite /dev
-		addwrite /run
-		default_src_test
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	rm -rf "${ED}"/usr/share/doc/${PF}/LICENSE.*
-
-	use rule-generator && use openrc && doinitd "${FILESDIR}"/udev-postmount
-
-	# drop distributed hwdb files, they override sys-apps/hwids
-	rm -f "${ED}"/etc/udev/hwdb.d/*.hwdb
-
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/40-gentoo.rules
-
-	insinto /usr/share/doc/${PF}/html/gudev
-	doins "${S}"/docs/gudev/html/*
-
-	insinto /usr/share/doc/${PF}/html/libudev
-	doins "${S}"/docs/libudev/html/*
-}
-
-pkg_preinst() {
-	local htmldir
-	for htmldir in gudev libudev; do
-		if [[ -d ${EROOT}usr/share/gtk-doc/html/${htmldir} ]]; then
-			rm -rf "${EROOT}"usr/share/gtk-doc/html/${htmldir}
-		fi
-		if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
-			dosym ../../doc/${PF}/html/${htmldir} \
-				/usr/share/gtk-doc/html/${htmldir}
-		fi
-	done
-}
-
-pkg_postinst() {
-	mkdir -p "${EROOT}"run
-
-	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
-	# So try to remove it here (will only work if empty).
-	rmdir "${EROOT}"dev/loop 2>/dev/null
-	if [[ -d ${EROOT}dev/loop ]]; then
-		ewarn "Please make sure your remove /dev/loop,"
-		ewarn "else losetup may be confused when looking for unused devices."
-	fi
-
-	# https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69
-	# https://bugs.gentoo.org/246847
-	# https://bugs.gentoo.org/514174
-	enewgroup input
-
-	# REPLACING_VERSIONS should only ever have zero or 1 values but in case it doesn't,
-	# process it as a list.  We only care about the zero case (new install) or the case where
-	# the same version is being re-emerged.  If there is a second version, allow it to abort.
-	local rv rvres=doitnew
-	for rv in ${REPLACING_VERSIONS} ; do
-		if [[ ${rvres} == doit* ]]; then
-			if [[ ${rv%-r*} == ${PV} ]]; then
-				rvres=doit
-			else
-				rvres=${rv}
-			fi
-		fi
-	done
-
-	if use hwdb && has_version 'sys-apps/hwids[udev]'; then
-		udevadm hwdb --update --root="${ROOT%/}"
-
-		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
-		# reload database after it has be rebuilt, but only if we are not upgrading
-		# also pass if we are -9999 since who knows what hwdb related changes there might be
-		if [[ ${rvres} == doit* ]] && [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then
-			udevadm control --reload
-		fi
-	fi
-	if [[ ${rvres} != doitnew ]]; then
-		ewarn
-		ewarn "You need to restart eudev as soon as possible to make the"
-		ewarn "upgrade go into effect:"
-		ewarn "\t/etc/init.d/udev --nodeps restart"
-	fi
-
-	if use rule-generator && use openrc && \
-	[[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then
-		ewarn
-		ewarn "Please add the udev-postmount init script to your default runlevel"
-		ewarn "to ensure the legacy rule-generator functionality works as reliably"
-		ewarn "as possible."
-		ewarn "\trc-update add udev-postmount default"
-	fi
-
-	elog
-	elog "For more information on eudev on Gentoo, writing udev rules, and"
-	elog "fixing known issues visit: https://wiki.gentoo.org/wiki/Eudev"
-}
diff --git a/sys-fs/eudev/eudev-3.1.2.ebuild b/sys-fs/eudev/eudev-3.1.2.ebuild
deleted file mode 100644
index b80fcbbe4aa9..000000000000
--- a/sys-fs/eudev/eudev-3.1.2.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-KV_min=2.6.39
-
-inherit autotools eutils linux-info multilib multilib-minimal user
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/gentoo/eudev.git"
-	inherit git-2
-else
-	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
-fi
-
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="https://github.com/gentoo/eudev"
-
-LICENSE="LGPL-2.1 MIT GPL-2"
-SLOT="0"
-IUSE="doc gudev +hwdb +kmod introspection selinux static-libs test"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.20
-	gudev? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.38 )
-	kmod? ( >=sys-apps/kmod-16 )
-	selinux? ( >=sys-libs/libselinux-2.1.9 )
-	!<sys-libs/glibc-2.11
-	!sys-apps/gentoo-systemd-integration
-	!sys-apps/systemd
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gperf
-	virtual/os-headers
-	virtual/pkgconfig
-	>=sys-devel/make-3.82-r4
-	>=sys-kernel/linux-headers-${KV_min}
-	doc? ( >=dev-util/gtk-doc-1.18
-		app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)
-	>=dev-util/intltool-0.50
-	test? ( app-text/tree dev-lang/perl )"
-
-RDEPEND="${COMMON_DEPEND}
-	!<sys-fs/lvm2-2.02.103
-	!<sec-policy/selinux-base-2.20120725-r10
-	!sys-fs/udev
-	!sys-apps/systemd
-	gudev? ( !dev-libs/libgudev )"
-
-PDEPEND=">=sys-fs/udev-init-scripts-26
-	hwdb? ( >=sys-apps/hwids-20140304[udev] )"
-
-# The multilib-build.eclass doesn't handle situation where the installed headers
-# are different in ABIs. In this case, we install libgudev headers in native
-# ABI but not for non-native ABI.
-multilib_check_headers() { :; }
-
-pkg_pretend() {
-	ewarn
-	ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality,"
-	ewarn "as described in the URL below:"
-	ewarn "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
-	ewarn
-	ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing"
-	ewarn "between the default or user-modified choice of sys-fs/udev.  If you wish to disable"
-	ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules"
-	ewarn "exists: touch /etc/udev/rules.d/80-net-name-slot.rules"
-	ewarn
-}
-
-pkg_setup() {
-	CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-	linux-info_pkg_setup
-	get_running_version
-
-	# These are required kernel options, but we don't error out on them
-	# because you can build under one kernel and run under another.
-	if kernel_is lt ${KV_min//./ }; then
-		ewarn
-		ewarn "Your current running kernel version ${KV_FULL} is too old to run ${P}."
-		ewarn "Make sure to run udev under kernel version ${KV_min} or above."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# change rules back to group uucp instead of dialout for now
-	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
-	|| die "failed to change group dialout to uucp"
-
-	epatch_user
-
-	if use doc; then
-		gtkdocize --docdir docs || die "gtkdocize failed"
-	else
-		echo 'EXTRA_DIST =' > docs/gtk-doc.make
-	fi
-	eautoreconf
-}
-
-multilib_src_configure() {
-	tc-export CC #463846
-	export cc_cv_CFLAGS__flto=no #502950
-
-	# Keep sorted by ./configure --help and only pass --disable flags
-	# when *required* to avoid external deps or unnecessary compile
-	local econf_args
-	econf_args=(
-		ac_cv_search_cap_init=
-		ac_cv_header_sys_capability_h=yes
-		DBUS_CFLAGS=' '
-		DBUS_LIBS=' '
-		--with-rootprefix=
-		--with-rootrundir=/run
-		--docdir=/usr/share/doc/${PF}
-		--libdir=/usr/$(get_libdir)
-		--with-rootlibexecdir=/lib/udev
-		--with-html-dir="/usr/share/doc/${PF}/html"
-		--enable-split-usr
-		--enable-manpages
-		--disable-hwdb
-		--exec-prefix=/
-
-		$(use_enable gudev)
-	)
-
-	# Only build libudev for non-native_abi, and only install it to libdir,
-	# that means all options only apply to native_abi
-	if multilib_is_native_abi; then
-		econf_args+=(
-			--with-rootlibdir=/$(get_libdir)
-			$(use_enable doc gtk-doc)
-			$(use_enable introspection)
-			$(use_enable kmod)
-			$(use_enable static-libs static)
-			$(use_enable selinux)
-		)
-	else
-		econf_args+=(
-			--disable-static
-			--disable-gtk-doc
-			--disable-introspection
-			--disable-kmod
-			--disable-selinux
-		)
-	fi
-	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		emake -C src/shared
-		emake -C src/libudev
-		use gudev && emake -C src/gudev
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-	else
-		emake -C src/libudev DESTDIR="${D}" install
-		use gudev && emake -C src/gudev DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_test() {
-	# make sandbox get out of the way
-	# these are safe because there is a fake root filesystem put in place,
-	# but sandbox seems to evaluate the paths of the test i/o instead of the
-	# paths of the actual i/o that results.
-	# also only test for native abi
-	if multilib_is_native_abi; then
-		addread /sys
-		addwrite /dev
-		addwrite /run
-		default_src_test
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	rm -rf "${ED}"/usr/share/doc/${PF}/LICENSE.*
-
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/40-gentoo.rules
-
-	if ! [[ ${PV} = 9999* ]]; then
-		insinto /usr/share/doc/${PF}/html/gudev
-		doins "${S}"/docs/gudev/html/*
-
-		insinto /usr/share/doc/${PF}/html/libudev
-		doins "${S}"/docs/libudev/html/*
-	fi
-}
-
-pkg_preinst() {
-	local htmldir
-	for htmldir in gudev libudev; do
-		if [[ -d ${EROOT}usr/share/gtk-doc/html/${htmldir} ]]; then
-			rm -rf "${EROOT}"usr/share/gtk-doc/html/${htmldir}
-		fi
-		if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
-			dosym ../../doc/${PF}/html/${htmldir} \
-				/usr/share/gtk-doc/html/${htmldir}
-		fi
-	done
-}
-
-pkg_postinst() {
-	mkdir -p "${EROOT}"run
-
-	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
-	# So try to remove it here (will only work if empty).
-	rmdir "${EROOT}"dev/loop 2>/dev/null
-	if [[ -d ${EROOT}dev/loop ]]; then
-		ewarn "Please make sure your remove /dev/loop,"
-		ewarn "else losetup may be confused when looking for unused devices."
-	fi
-
-	# https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69
-	# https://bugs.gentoo.org/246847
-	# https://bugs.gentoo.org/514174
-	enewgroup input
-
-	# REPLACING_VERSIONS should only ever have zero or 1 values but in case it doesn't,
-	# process it as a list.  We only care about the zero case (new install) or the case where
-	# the same version is being re-emerged.  If there is a second version, allow it to abort.
-	local rv rvres=doitnew
-	for rv in ${REPLACING_VERSIONS} ; do
-		if [[ ${rvres} == doit* ]]; then
-			if [[ ${rv%-r*} == ${PV} ]]; then
-				rvres=doit
-			else
-				rvres=${rv}
-			fi
-		fi
-	done
-
-	if use hwdb && has_version 'sys-apps/hwids[udev]'; then
-		udevadm hwdb --update --root="${ROOT%/}"
-
-		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
-		# reload database after it has be rebuilt, but only if we are not upgrading
-		# also pass if we are -9999 since who knows what hwdb related changes there might be
-		if [[ ${rvres} == doit* ]] && [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then
-			udevadm control --reload
-		fi
-	fi
-	if [[ ${rvres} != doitnew ]]; then
-		ewarn
-		ewarn "You need to restart eudev as soon as possible to make the"
-		ewarn "upgrade go into effect:"
-		ewarn "\t/etc/init.d/udev --nodeps restart"
-	fi
-
-	elog
-	elog "For more information on eudev on Gentoo, writing udev rules, and"
-	elog "fixing known issues visit: https://wiki.gentoo.org/wiki/Eudev"
-}
diff --git a/sys-fs/eudev/eudev-3.1.5.ebuild b/sys-fs/eudev/eudev-3.1.5.ebuild
index c02a8b50c5ee..10b380fda54d 100644
--- a/sys-fs/eudev/eudev-3.1.5.ebuild
+++ b/sys-fs/eudev/eudev-3.1.5.ebuild
@@ -9,7 +9,7 @@ inherit autotools eutils linux-info multilib multilib-minimal user
 
 if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/gentoo/eudev.git"
-	inherit git-2
+	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
 	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
@@ -89,6 +89,8 @@ src_prepare() {
 	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
 	|| die "failed to change group dialout to uucp"
 
+	epatch "${FILESDIR}"/${PN}-include-sysmacros-header.patch
+
 	epatch_user
 	eautoreconf
 }
diff --git a/sys-fs/eudev/eudev-3.2.2-r1.ebuild b/sys-fs/eudev/eudev-3.2.2-r1.ebuild
deleted file mode 100644
index ea86f7733805..000000000000
--- a/sys-fs/eudev/eudev-3.2.2-r1.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-KV_min=2.6.39
-
-inherit autotools linux-info multilib multilib-minimal user
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/gentoo/eudev.git"
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="https://github.com/gentoo/eudev"
-
-LICENSE="LGPL-2.1 MIT GPL-2"
-SLOT="0"
-IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.20
-	introspection? ( >=dev-libs/gobject-introspection-1.38 )
-	kmod? ( >=sys-apps/kmod-16 )
-	selinux? ( >=sys-libs/libselinux-2.1.9 )
-	!<sys-libs/glibc-2.11
-	!sys-apps/gentoo-systemd-integration
-	!sys-apps/systemd
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gperf
-	virtual/os-headers
-	virtual/pkgconfig
-	>=sys-devel/make-3.82-r4
-	>=sys-kernel/linux-headers-${KV_min}
-	>=dev-util/intltool-0.50
-	test? ( app-text/tree dev-lang/perl )"
-
-RDEPEND="${COMMON_DEPEND}
-	!<sys-fs/lvm2-2.02.103
-	!<sec-policy/selinux-base-2.20120725-r10
-	!sys-fs/udev
-	!sys-apps/systemd"
-
-PDEPEND=">=sys-fs/udev-init-scripts-26
-	hwdb? ( >=sys-apps/hwids-20140304[udev] )"
-
-# The multilib-build.eclass doesn't handle situation where the installed headers
-# are different in ABIs. In this case, we install libgudev headers in native
-# ABI but not for non-native ABI.
-multilib_check_headers() { :; }
-
-pkg_pretend() {
-	ewarn
-	ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality,"
-	ewarn "as described in the URL below:"
-	ewarn "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
-	ewarn
-	ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing"
-	ewarn "between the default or user-modified choice of sys-fs/udev.  If you wish to disable"
-	ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules"
-	ewarn "exists: touch /etc/udev/rules.d/80-net-name-slot.rules"
-	ewarn
-}
-
-pkg_setup() {
-	CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-	linux-info_pkg_setup
-	get_running_version
-
-	# These are required kernel options, but we don't error out on them
-	# because you can build under one kernel and run under another.
-	if kernel_is lt ${KV_min//./ }; then
-		ewarn
-		ewarn "Your current running kernel version ${KV_FULL} is too old to run ${P}."
-		ewarn "Make sure to run udev under kernel version ${KV_min} or above."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# change rules back to group uucp instead of dialout for now
-	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
-	|| die "failed to change group dialout to uucp"
-
-	eapply "${FILESDIR}"/${PN}-fix-disk-by-id.patch
-
-	eapply_user
-	eautoreconf
-}
-
-multilib_src_configure() {
-	tc-export CC #463846
-	export cc_cv_CFLAGS__flto=no #502950
-
-	# Keep sorted by ./configure --help and only pass --disable flags
-	# when *required* to avoid external deps or unnecessary compile
-	local econf_args
-	econf_args=(
-		ac_cv_search_cap_init=
-		ac_cv_header_sys_capability_h=yes
-		DBUS_CFLAGS=' '
-		DBUS_LIBS=' '
-		--with-rootprefix=
-		--with-rootrundir=/run
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		--with-rootlibexecdir="${EPREFIX}"/lib/udev
-		--enable-split-usr
-		--enable-manpages
-		--disable-hwdb
-		--exec-prefix="${EPREFIX}"
-	)
-
-	# Only build libudev for non-native_abi, and only install it to libdir,
-	# that means all options only apply to native_abi
-	if multilib_is_native_abi; then
-		econf_args+=(
-			--with-rootlibdir="${EPREFIX}"/$(get_libdir)
-			$(use_enable introspection)
-			$(use_enable kmod)
-			$(use_enable static-libs static)
-			$(use_enable selinux)
-			$(use_enable rule-generator)
-		)
-	else
-		econf_args+=(
-			--disable-static
-			--disable-introspection
-			--disable-kmod
-			--disable-selinux
-			--disable-rule-generator
-		)
-	fi
-	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		emake -C src/shared
-		emake -C src/libudev
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-	else
-		emake -C src/libudev DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_test() {
-	# make sandbox get out of the way
-	# these are safe because there is a fake root filesystem put in place,
-	# but sandbox seems to evaluate the paths of the test i/o instead of the
-	# paths of the actual i/o that results.
-	# also only test for native abi
-	if multilib_is_native_abi; then
-		addread /sys
-		addwrite /dev
-		addwrite /run
-		default_src_test
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/40-gentoo.rules
-
-	use rule-generator && doinitd "${FILESDIR}"/udev-postmount
-}
-
-pkg_postinst() {
-	mkdir -p "${EROOT}"run
-
-	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
-	# So try to remove it here (will only work if empty).
-	rmdir "${EROOT}"dev/loop 2>/dev/null
-	if [[ -d ${EROOT}dev/loop ]]; then
-		ewarn "Please make sure your remove /dev/loop,"
-		ewarn "else losetup may be confused when looking for unused devices."
-	fi
-
-	# https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69
-	# https://bugs.gentoo.org/246847
-	# https://bugs.gentoo.org/514174
-	enewgroup input
-
-	# REPLACING_VERSIONS should only ever have zero or 1 values but in case it doesn't,
-	# process it as a list.  We only care about the zero case (new install) or the case where
-	# the same version is being re-emerged.  If there is a second version, allow it to abort.
-	local rv rvres=doitnew
-	for rv in ${REPLACING_VERSIONS} ; do
-		if [[ ${rvres} == doit* ]]; then
-			if [[ ${rv%-r*} == ${PV} ]]; then
-				rvres=doit
-			else
-				rvres=${rv}
-			fi
-		fi
-	done
-
-	if use hwdb && has_version 'sys-apps/hwids[udev]'; then
-		udevadm hwdb --update --root="${ROOT%/}"
-
-		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
-		# reload database after it has be rebuilt, but only if we are not upgrading
-		# also pass if we are -9999 since who knows what hwdb related changes there might be
-		if [[ ${rvres} == doit* ]] && [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then
-			udevadm control --reload
-		fi
-	fi
-	if [[ ${rvres} != doitnew ]]; then
-		ewarn
-		ewarn "You need to restart eudev as soon as possible to make the"
-		ewarn "upgrade go into effect:"
-		ewarn "\t/etc/init.d/udev --nodeps restart"
-	fi
-
-	if use rule-generator && \
-	[[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then
-		ewarn
-		ewarn "Please add the udev-postmount init script to your default runlevel"
-		ewarn "to ensure the legacy rule-generator functionality works as reliably"
-		ewarn "as possible."
-		ewarn "\trc-update add udev-postmount default"
-	fi
-
-	elog
-	elog "For more information on eudev on Gentoo, writing udev rules, and"
-	elog "fixing known issues visit: https://wiki.gentoo.org/wiki/Eudev"
-}
diff --git a/sys-fs/eudev/eudev-3.2.2.ebuild b/sys-fs/eudev/eudev-3.2.2.ebuild
deleted file mode 100644
index aab0ee8dc61e..000000000000
--- a/sys-fs/eudev/eudev-3.2.2.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-KV_min=2.6.39
-
-inherit autotools eutils linux-info multilib multilib-minimal user
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/gentoo/eudev.git"
-	inherit git-2
-else
-	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="https://github.com/gentoo/eudev"
-
-LICENSE="LGPL-2.1 MIT GPL-2"
-SLOT="0"
-IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.20
-	introspection? ( >=dev-libs/gobject-introspection-1.38 )
-	kmod? ( >=sys-apps/kmod-16 )
-	selinux? ( >=sys-libs/libselinux-2.1.9 )
-	!<sys-libs/glibc-2.11
-	!sys-apps/gentoo-systemd-integration
-	!sys-apps/systemd
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gperf
-	virtual/os-headers
-	virtual/pkgconfig
-	>=sys-devel/make-3.82-r4
-	>=sys-kernel/linux-headers-${KV_min}
-	>=dev-util/intltool-0.50
-	test? ( app-text/tree dev-lang/perl )"
-
-RDEPEND="${COMMON_DEPEND}
-	!<sys-fs/lvm2-2.02.103
-	!<sec-policy/selinux-base-2.20120725-r10
-	!sys-fs/udev
-	!sys-apps/systemd"
-
-PDEPEND=">=sys-fs/udev-init-scripts-26
-	hwdb? ( >=sys-apps/hwids-20140304[udev] )"
-
-# The multilib-build.eclass doesn't handle situation where the installed headers
-# are different in ABIs. In this case, we install libgudev headers in native
-# ABI but not for non-native ABI.
-multilib_check_headers() { :; }
-
-pkg_pretend() {
-	ewarn
-	ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality,"
-	ewarn "as described in the URL below:"
-	ewarn "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
-	ewarn
-	ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing"
-	ewarn "between the default or user-modified choice of sys-fs/udev.  If you wish to disable"
-	ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules"
-	ewarn "exists: touch /etc/udev/rules.d/80-net-name-slot.rules"
-	ewarn
-}
-
-pkg_setup() {
-	CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-	linux-info_pkg_setup
-	get_running_version
-
-	# These are required kernel options, but we don't error out on them
-	# because you can build under one kernel and run under another.
-	if kernel_is lt ${KV_min//./ }; then
-		ewarn
-		ewarn "Your current running kernel version ${KV_FULL} is too old to run ${P}."
-		ewarn "Make sure to run udev under kernel version ${KV_min} or above."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# change rules back to group uucp instead of dialout for now
-	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
-	|| die "failed to change group dialout to uucp"
-
-	epatch_user
-	eautoreconf
-}
-
-multilib_src_configure() {
-	tc-export CC #463846
-	export cc_cv_CFLAGS__flto=no #502950
-
-	# Keep sorted by ./configure --help and only pass --disable flags
-	# when *required* to avoid external deps or unnecessary compile
-	local econf_args
-	econf_args=(
-		ac_cv_search_cap_init=
-		ac_cv_header_sys_capability_h=yes
-		DBUS_CFLAGS=' '
-		DBUS_LIBS=' '
-		--with-rootprefix=
-		--with-rootrundir=/run
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		--with-rootlibexecdir="${EPREFIX}"/lib/udev
-		--enable-split-usr
-		--enable-manpages
-		--disable-hwdb
-		--exec-prefix="${EPREFIX}"
-	)
-
-	# Only build libudev for non-native_abi, and only install it to libdir,
-	# that means all options only apply to native_abi
-	if multilib_is_native_abi; then
-		econf_args+=(
-			--with-rootlibdir="${EPREFIX}"/$(get_libdir)
-			$(use_enable introspection)
-			$(use_enable kmod)
-			$(use_enable static-libs static)
-			$(use_enable selinux)
-			$(use_enable rule-generator)
-		)
-	else
-		econf_args+=(
-			--disable-static
-			--disable-introspection
-			--disable-kmod
-			--disable-selinux
-			--disable-rule-generator
-		)
-	fi
-	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		emake -C src/shared
-		emake -C src/libudev
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-	else
-		emake -C src/libudev DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_test() {
-	# make sandbox get out of the way
-	# these are safe because there is a fake root filesystem put in place,
-	# but sandbox seems to evaluate the paths of the test i/o instead of the
-	# paths of the actual i/o that results.
-	# also only test for native abi
-	if multilib_is_native_abi; then
-		addread /sys
-		addwrite /dev
-		addwrite /run
-		default_src_test
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/40-gentoo.rules
-
-	use rule-generator && doinitd "${FILESDIR}"/udev-postmount
-}
-
-pkg_postinst() {
-	mkdir -p "${EROOT}"run
-
-	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
-	# So try to remove it here (will only work if empty).
-	rmdir "${EROOT}"dev/loop 2>/dev/null
-	if [[ -d ${EROOT}dev/loop ]]; then
-		ewarn "Please make sure your remove /dev/loop,"
-		ewarn "else losetup may be confused when looking for unused devices."
-	fi
-
-	# https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69
-	# https://bugs.gentoo.org/246847
-	# https://bugs.gentoo.org/514174
-	enewgroup input
-
-	# REPLACING_VERSIONS should only ever have zero or 1 values but in case it doesn't,
-	# process it as a list.  We only care about the zero case (new install) or the case where
-	# the same version is being re-emerged.  If there is a second version, allow it to abort.
-	local rv rvres=doitnew
-	for rv in ${REPLACING_VERSIONS} ; do
-		if [[ ${rvres} == doit* ]]; then
-			if [[ ${rv%-r*} == ${PV} ]]; then
-				rvres=doit
-			else
-				rvres=${rv}
-			fi
-		fi
-	done
-
-	if use hwdb && has_version 'sys-apps/hwids[udev]'; then
-		udevadm hwdb --update --root="${ROOT%/}"
-
-		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
-		# reload database after it has be rebuilt, but only if we are not upgrading
-		# also pass if we are -9999 since who knows what hwdb related changes there might be
-		if [[ ${rvres} == doit* ]] && [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then
-			udevadm control --reload
-		fi
-	fi
-	if [[ ${rvres} != doitnew ]]; then
-		ewarn
-		ewarn "You need to restart eudev as soon as possible to make the"
-		ewarn "upgrade go into effect:"
-		ewarn "\t/etc/init.d/udev --nodeps restart"
-	fi
-
-	if use rule-generator && \
-	[[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then
-		ewarn
-		ewarn "Please add the udev-postmount init script to your default runlevel"
-		ewarn "to ensure the legacy rule-generator functionality works as reliably"
-		ewarn "as possible."
-		ewarn "\trc-update add udev-postmount default"
-	fi
-
-	elog
-	elog "For more information on eudev on Gentoo, writing udev rules, and"
-	elog "fixing known issues visit: https://wiki.gentoo.org/wiki/Eudev"
-}
diff --git a/sys-fs/eudev/eudev-3.2.4.ebuild b/sys-fs/eudev/eudev-3.2.4.ebuild
index a864deb766cc..5e4cf893273a 100644
--- a/sys-fs/eudev/eudev-3.2.4.ebuild
+++ b/sys-fs/eudev/eudev-3.2.4.ebuild
@@ -89,6 +89,8 @@ src_prepare() {
 	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
 	|| die "failed to change group dialout to uucp"
 
+	eapply "${FILESDIR}"/${PN}-include-sysmacros-header.patch
+
 	eapply_user
 	eautoreconf
 }
diff --git a/sys-fs/eudev/files/eudev-exclude-MD.patch b/sys-fs/eudev/files/eudev-exclude-MD.patch
deleted file mode 100644
index d56026168809..000000000000
--- a/sys-fs/eudev/files/eudev-exclude-MD.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 2e5b17d01347d3c3118be2b8ad63d20415dbb1f0 Mon Sep 17 00:00:00 2001
-From: Kay Sievers <kay@vrfy.org>
-Date: Thu, 24 Jul 2014 23:37:35 +0200
-Subject: [PATCH] udev: exclude MD from block device ownership event locking
-
-MD instantiates devices at open(). This is incomptible with the
-locking logic, as the "change" event emitted when stopping a
-device will bring it back.
----
- src/udev/udevd.c | 23 +++++++----------------
- 1 file changed, 7 insertions(+), 16 deletions(-)
-
-diff --git a/src/udev/udevd.c b/src/udev/udevd.c
-index a45d324..db935d6 100644
---- a/src/udev/udevd.c
-+++ b/src/udev/udevd.c
-@@ -285,26 +285,17 @@ static void worker_new(struct event *event)
-                                 udev_event->exec_delay = exec_delay;
- 
-                         /*
--                         * Take a "read lock" on the device node; this establishes
-+                         * Take a shared lock on the device node; this establishes
-                          * a concept of device "ownership" to serialize device
--                         * access. External processes holding a "write lock" will
-+                         * access. External processes holding an exclusive lock will
-                          * cause udev to skip the event handling; in the case udev
--                         * acquired the lock, the external process will block until
-+                         * acquired the lock, the external process can block until
-                          * udev has finished its event handling.
-                          */
--
--                        /*
--                         * <kabi_> since we make check - device seems unused - we try
--                         *         ioctl to deactivate - and device is found to be opened
--                         * <kay> sure, you try to take a write lock
--                         * <kay> if you get it udev is out
--                         * <kay> if you can't get it, udev is busy
--                         * <kabi_> we cannot deactivate openned device  (as it is in-use)
--                         * <kay> maybe we should just exclude dm from that thing entirely
--                         * <kabi_> IMHO this sounds like a good plan for this moment
--                         */
--                        if (streq_ptr("block", udev_device_get_subsystem(dev)) &&
--                            !startswith(udev_device_get_sysname(dev), "dm-")) {
-+                        if (!streq_ptr(udev_device_get_action(dev), "remove") &&
-+                            streq_ptr("block", udev_device_get_subsystem(dev)) &&
-+                            !startswith(udev_device_get_sysname(dev), "dm-") &&
-+                            !startswith(udev_device_get_sysname(dev), "md")) {
-                                 struct udev_device *d = dev;
- 
-                                 if (streq_ptr("partition", udev_device_get_devtype(d)))
--- 
-1.8.5.5
-
diff --git a/sys-fs/eudev/files/eudev-fix-disk-by-id.patch b/sys-fs/eudev/files/eudev-fix-disk-by-id.patch
deleted file mode 100644
index 07bc0c518c62..000000000000
--- a/sys-fs/eudev/files/eudev-fix-disk-by-id.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -ruN eudev-3.2.2-orig/rules/60-persistent-storage.rules eudev-3.2.2-new/rules/60-persistent-storage.rules
---- eudev-3.2.2-orig/rules/60-persistent-storage.rules	2016-12-11 16:41:58.000000000 +0100
-+++ eudev-3.2.2-new/rules/60-persistent-storage.rules	2017-04-26 23:14:04.197109882 +0200
-@@ -83,6 +83,9 @@
- # by-id (World Wide Name)
- ENV{DEVTYPE}=="disk", ENV{ID_WWN_WITH_EXTENSION}=="?*", SYMLINK+="disk/by-id/wwn-$env{ID_WWN_WITH_EXTENSION}"
- ENV{DEVTYPE}=="partition", ENV{ID_WWN_WITH_EXTENSION}=="?*", SYMLINK+="disk/by-id/wwn-$env{ID_WWN_WITH_EXTENSION}-part%n"
-+#(Temporary) Compatibility rule for old broken WWNs in case some uses them:
-+ENV{DEVTYPE}=="disk", ENV{ID_WWN_WITH_EXTENSION_REVERSED_DO_NOT_USE}=="?*", SYMLINK+="disk/by-id/wwn-$env{ID_WWN_WITH_EXTENSION_REVERSED_DO_NOT_USE}"
-+ENV{DEVTYPE}=="partition", ENV{ID_WWN_WITH_EXTENSION_REVERSED_DO_NOT_USE}=="?*", SYMLINK+="disk/by-id/wwn-$env{ID_WWN_WITH_EXTENSION_REVERSED_DO_NOT_USE}-part%n"
- 
- # by-partlabel/by-partuuid links (partition metadata)
- ENV{ID_PART_ENTRY_UUID}=="?*", SYMLINK+="disk/by-partuuid/$env{ID_PART_ENTRY_UUID}"
-diff -ruN eudev-3.2.2-orig/src/ata_id/ata_id.c eudev-3.2.2-new/src/ata_id/ata_id.c
---- eudev-3.2.2-orig/src/ata_id/ata_id.c	2016-11-17 22:14:19.000000000 +0100
-+++ eudev-3.2.2-new/src/ata_id/ata_id.c	2017-04-26 23:18:51.116127146 +0200
-@@ -645,10 +645,22 @@
-                  * All other values are reserved.
-                  */
-                 word = identify.wyde[108];
--                if ((word & 0xf000) == 0x5000)
--                        printf("ID_WWN=0x%1$"PRIu64"x\n"
--                               "ID_WWN_WITH_EXTENSION=0x%1$"PRIu64"x\n",
--                               identify.octa[108/4]);
-+                if ((word & 0xf000) == 0x5000){
-+			uint64_t wwn;
-+
-+			wwn = identify.wyde[108];
-+			wwn <<= 16;
-+			wwn |= identify.wyde[109];
-+			wwn <<= 16;
-+			wwn |= identify.wyde[110];
-+			wwn <<= 16;
-+			wwn |= identify.wyde[111]; /* Could possibly done nicer ? */ 
-+                        printf("ID_WWN=0x%1$" PRIx64 "\n"
-+                               "ID_WWN_WITH_EXTENSION=0x%1$" PRIx64 "\n",
-+                               wwn);
-+			printf("ID_WWN_WITH_EXTENSION_REVERSED_DO_NOT_USE=0x%" PRIu64 "x\n",
-+			       identify.octa[108/4]);
-+		}
- 
-                 /* from Linux's include/linux/ata.h */
-                 if (identify.wyde[0] == 0x848a ||
diff --git a/sys-fs/eudev/files/eudev-fix-selinux-headers.patch b/sys-fs/eudev/files/eudev-fix-selinux-headers.patch
deleted file mode 100644
index 1d1d8dcc236f..000000000000
--- a/sys-fs/eudev/files/eudev-fix-selinux-headers.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 361aa273d6fedda161c14b24302f009a58331693 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= <amade@asmblr.net>
-Date: Tue, 2 Sep 2014 21:20:24 +0200
-Subject: [PATCH] fix SELINUX build
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
----
- src/shared/label.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/shared/label.c b/src/shared/label.c
-index 3c6277a..e674241 100644
---- a/src/shared/label.c
-+++ b/src/shared/label.c
-@@ -23,6 +23,11 @@
- #include <sys/socket.h>
- #include <sys/un.h>
- 
-+#ifdef HAVE_SELINUX
-+#include <selinux/selinux.h>
-+#include <selinux/label.h>
-+#endif
-+
- #include "label.h"
- #include "util.h"
- #include "path-util.h"
--- 
-2.1.0
-
diff --git a/sys-fs/eudev/files/eudev-fix-selinux-linking.patch b/sys-fs/eudev/files/eudev-fix-selinux-linking.patch
deleted file mode 100644
index 6a5e05bcaf1e..000000000000
--- a/sys-fs/eudev/files/eudev-fix-selinux-linking.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From e7f7217b9b9dbb3304116eae2b0ad90c84ede034 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= <amade@asmblr.net>
-Date: Wed, 3 Sep 2014 11:01:31 +0200
-Subject: [PATCH] link libudev against SELINUX
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
----
- src/libudev/Makefile.am | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/libudev/Makefile.am b/src/libudev/Makefile.am
-index 868a9fc..72e43bc 100644
---- a/src/libudev/Makefile.am
-+++ b/src/libudev/Makefile.am
-@@ -54,7 +54,8 @@ libudev_la_LDFLAGS = \
- 	-Wl,--version-script=$(top_srcdir)/src/libudev/libudev.sym
- 
- libudev_la_LIBADD = \
--	$(top_builddir)/src/shared/libudev_shared.la
-+	$(top_builddir)/src/shared/libudev_shared.la \
-+	$(SELINUX_LIBS)
- 
- libudev_private_la_SOURCES = \
- 	$(libudev_la_SOURCES) \
--- 
-2.1.0
-
diff --git a/sys-fs/eudev/files/eudev-include-sysmacros-header.patch b/sys-fs/eudev/files/eudev-include-sysmacros-header.patch
new file mode 100644
index 000000000000..ca622bff5479
--- /dev/null
+++ b/sys-fs/eudev/files/eudev-include-sysmacros-header.patch
@@ -0,0 +1,121 @@
+diff -ruPN eudev-3.1.5.old/src/cdrom_id/cdrom_id.c eudev-3.1.5/src/cdrom_id/cdrom_id.c
+--- eudev-3.1.5.old/src/cdrom_id/cdrom_id.c	2015-09-11 14:54:26.000000000 -0400
++++ eudev-3.1.5/src/cdrom_id/cdrom_id.c	2017-10-11 21:45:10.929671748 -0400
+@@ -37,6 +37,7 @@
+ #include <sys/time.h>
+ #include <sys/ioctl.h>
+ #include <linux/cdrom.h>
++#include <sys/sysmacros.h>
+ 
+ #include "libudev.h"
+ #include "libudev-private.h"
+diff -ruPN eudev-3.1.5.old/src/libudev/libudev-device.c eudev-3.1.5/src/libudev/libudev-device.c
+--- eudev-3.1.5.old/src/libudev/libudev-device.c	2015-10-12 18:22:14.000000000 -0400
++++ eudev-3.1.5/src/libudev/libudev-device.c	2017-10-11 21:44:42.774672156 -0400
+@@ -32,6 +32,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <linux/sockios.h>
++#include <sys/sysmacros.h>
+ 
+ #include "libudev.h"
+ #include "libudev-private.h"
+diff -ruPN eudev-3.1.5.old/src/libudev/libudev-device-private.c eudev-3.1.5/src/libudev/libudev-device-private.c
+--- eudev-3.1.5.old/src/libudev/libudev-device-private.c	2015-09-11 14:54:26.000000000 -0400
++++ eudev-3.1.5/src/libudev/libudev-device-private.c	2017-10-11 21:44:39.445672204 -0400
+@@ -25,6 +25,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ 
+ #include "libudev.h"
+ #include "libudev-private.h"
+diff -ruPN eudev-3.1.5.old/src/libudev/libudev-enumerate.c eudev-3.1.5/src/libudev/libudev-enumerate.c
+--- eudev-3.1.5.old/src/libudev/libudev-enumerate.c	2015-09-11 14:54:26.000000000 -0400
++++ eudev-3.1.5/src/libudev/libudev-enumerate.c	2017-10-11 21:44:36.279672250 -0400
+@@ -28,6 +28,7 @@
+ #include <stdbool.h>
+ #include <sys/stat.h>
+ #include <sys/param.h>
++#include <sys/sysmacros.h>
+ 
+ #include "libudev.h"
+ #include "libudev-private.h"
+diff -ruPN eudev-3.1.5.old/src/scsi_id/scsi_serial.c eudev-3.1.5/src/scsi_id/scsi_serial.c
+--- eudev-3.1.5.old/src/scsi_id/scsi_serial.c	2015-09-11 14:54:26.000000000 -0400
++++ eudev-3.1.5/src/scsi_id/scsi_serial.c	2017-10-11 21:45:20.195671614 -0400
+@@ -36,6 +36,7 @@
+ #include <scsi/sg.h>
+ #include <linux/types.h>
+ #include <linux/bsg.h>
++#include <sys/sysmacros.h>
+ 
+ #include "libudev.h"
+ #include "libudev-private.h"
+diff -ruPN eudev-3.1.5.old/src/udev/udevadm-info.c eudev-3.1.5/src/udev/udevadm-info.c
+--- eudev-3.1.5.old/src/udev/udevadm-info.c	2015-09-11 14:54:26.000000000 -0400
++++ eudev-3.1.5/src/udev/udevadm-info.c	2017-10-11 21:44:33.032672297 -0400
+@@ -28,6 +28,7 @@
+ #include <fcntl.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ 
+ #include "udev.h"
+ #include "udev-util.h"
+diff -ruPN eudev-3.1.5.old/src/udev/udevd.c eudev-3.1.5/src/udev/udevd.c
+--- eudev-3.1.5.old/src/udev/udevd.c	2015-10-12 18:22:14.000000000 -0400
++++ eudev-3.1.5/src/udev/udevd.c	2017-10-11 21:44:59.791671910 -0400
+@@ -45,6 +45,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/inotify.h>
+ #include <sys/utsname.h>
++#include <sys/sysmacros.h>
+ 
+ #include "udev.h"
+ #include "udev-util.h"
+diff -ruPN eudev-3.1.5.old/src/udev/udev-event.c eudev-3.1.5/src/udev/udev-event.c
+--- eudev-3.1.5.old/src/udev/udev-event.c	2015-10-12 18:22:14.000000000 -0400
++++ eudev-3.1.5/src/udev/udev-event.c	2017-10-11 21:44:29.652672346 -0400
+@@ -33,6 +33,7 @@
+ #include <sys/socket.h>
+ #include <sys/signalfd.h>
+ #include <linux/sockios.h>
++#include <sys/sysmacros.h>
+ 
+ #include "udev.h"
+ 
+diff -ruPN eudev-3.1.5.old/src/udev/udev-node.c eudev-3.1.5/src/udev/udev-node.c
+--- eudev-3.1.5.old/src/udev/udev-node.c	2015-09-11 14:54:26.000000000 -0400
++++ eudev-3.1.5/src/udev/udev-node.c	2017-10-11 21:44:25.864672401 -0400
+@@ -28,6 +28,7 @@
+ #include <sys/time.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ 
+ #include "udev.h"
+ #include "smack-util.h"
+diff -ruPN eudev-3.1.5.old/src/udev/udev-rules.c eudev-3.1.5/src/udev/udev-rules.c
+--- eudev-3.1.5.old/src/udev/udev-rules.c	2015-10-12 18:22:14.000000000 -0400
++++ eudev-3.1.5/src/udev/udev-rules.c	2017-10-11 21:44:21.611672463 -0400
+@@ -28,6 +28,7 @@
+ #include <dirent.h>
+ #include <fnmatch.h>
+ #include <time.h>
++#include <sys/sysmacros.h>
+ 
+ #include "udev.h"
+ #include "path-util.h"
+diff -ruPN eudev-3.1.5.old/test/test-libudev.c eudev-3.1.5/test/test-libudev.c
+--- eudev-3.1.5.old/test/test-libudev.c	2015-09-11 14:54:26.000000000 -0400
++++ eudev-3.1.5/test/test-libudev.c	2017-10-11 21:45:27.782671504 -0400
+@@ -27,6 +27,7 @@
+ #include <getopt.h>
+ #include <fcntl.h>
+ #include <sys/epoll.h>
++#include <sys/sysmacros.h>
+ 
+ #include "libudev.h"
+ #include "udev-util.h"
diff --git a/sys-fs/eudev/metadata.xml b/sys-fs/eudev/metadata.xml
index 39ad39998e68..ccfc41779746 100644
--- a/sys-fs/eudev/metadata.xml
+++ b/sys-fs/eudev/metadata.xml
@@ -7,12 +7,8 @@
   <use>
     <flag name="blkid">enable blkid support</flag>
     <flag name="efi">enable EFI support</flag>
-    <flag name="gudev">enable libudev gobject interface</flag>
     <flag name="hwdb">read vendor/device string database and add it to udev database</flag>
-    <flag name="keymap">map custom hardware's multimedia keys</flag>
     <flag name="kmod">enable module loading through libkmod</flag>
-    <flag name="modutils">enable module loading support - use modutils calls if kmod not enabled</flag>
-    <flag name="openrc">install the OpenRC init scripts</flag>
     <flag name="smack">enable SMACK security model</flag>
     <flag name="rule-generator">install legacy rule generator rules and support scripts - note
     that the functionality within was dropped from sys-fs/udev as it is not stable in
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 6eed81cb9d9a..8d50acb10359 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -55,6 +55,9 @@ DIST genpatches-4.4-95.extras.tar.xz 16456 SHA256 7a0ab837e4b2fd039433040ebc4c9a
 DIST genpatches-4.4-96.base.tar.xz 1483460 SHA256 e610e66889abf7cfc0d65ce3381bf826f45de868eb68e5902d798f67a8e7fa37 SHA512 0cdf3e84e17961335ea807e48659c0def60ee3216a6a24b85264a3e7ea25c89950307280fda376ae8a9592b1f47d1781350fcec4bfd126bfe26c8bb598399a5a WHIRLPOOL 953398eb28a00d61704412fab5ee29646225b73737c2640ac91201fda23ef13dfc6c252a4916f00dcce2d632529a26c91cf46433c032c0cdb3eca3b72b66a0f1
 DIST genpatches-4.4-96.experimental.tar.xz 87772 SHA256 eea7fe4a84a9fb8ade8b355829f99296ae84b96826ae8e26a520a944cd41285b SHA512 e96f52e53416e078d790ff549964125b9ac968dce6d6a65a9cc1e56109665bd57f6e82b9c9593f8a18c5ea7f4506c26688128e0a49baeb7a3a5e8298eee86536 WHIRLPOOL a670296b526fbc6f3d9e674bd1bbbbed851133089a0e4fe5470065a3cadb1f5bc80379c0a1fbe6450bd50a266c97a5659cb2acfc5f3befa7c11b505534b47e43
 DIST genpatches-4.4-96.extras.tar.xz 16456 SHA256 7a0ab837e4b2fd039433040ebc4c9a136912f5e8c6b3aaa4b8a363866013bf5b SHA512 27a77ea8ccbb775f8f162645d301826f7c2c0c39a0d3aa67094d819902962965c8e54cb9b0ef5bb0e8285cdb0da4d7319b94dea0fdae45e09fc23092d6f3bb3b WHIRLPOOL 6e9c6f90af8c064aca180e1d2681e2c08eafb5b4eabf07a4bdeb3280b8966c853ddb81e6dd9b72496b83f304042b235f95bd00d9d2a00f13dce94bf39ec94972
+DIST genpatches-4.4-97.base.tar.xz 1489220 SHA256 8183380ddb1dd6e7dc982f6c423613005aa817a107403ec237ea8dab7005488c SHA512 0f092192823630652aa8e18c7cc9651b063470a2f475ff243aa28505145775630c6191795b39dac478589bd1455a7a7540eb54c0e4eae52dd1015f1639989702 WHIRLPOOL 51c9c8f328fe6a3e4d2b66e4248b9ae3c1241dec5b4005a2f13a7e50e8ad65f5df9d4ca6d23fcd5d5ebaa72d338560dcfc2f1ca37d089a4a8fd2c956d35f7f8c
+DIST genpatches-4.4-97.experimental.tar.xz 87764 SHA256 8dd04a7a4196ae912807fffdb7564397c50cd67de2113becb356c5f1ac4ade8f SHA512 586a48e09fe006202ee14e6342989ec679fbe6b56fa4c4c4f3c4936d6f451e88a542059230277cf96ee7a4ba57d69a9f772871899be5940aafe53e31ce619bdf WHIRLPOOL d597907b56f39ffbe390c659bcae82a71914331d310912719523f1d816eb1e5ab8ef93783c6ed8e1aba1c7b419a491c774caf26159e9997f7ae6a4c5f3a3634f
+DIST genpatches-4.4-97.extras.tar.xz 16456 SHA256 f04fa48da7dd79dbaa2e78ab307f31e6086e30b7e73d592a1eecbffe0636e4a9 SHA512 8296c314cfffbe8dff89a536e11fd676f95d5fb5f8fa36df73d5066a7da2dc46efc0e531d0eb5a721b1ebcce4e2dbc65e81acab717a9f7c4aac33d618a03a989 WHIRLPOOL c7ce2d0ca2128d4ced77cc955187cbbf64d6eeb2b2f18bba5839ac4777229c702de4a6af859f5d773bf3e8b4c5bcc0cf36736266b2079b350a51538c30977794
 DIST genpatches-4.9-51.base.tar.xz 1001928 SHA256 4a329d66dedfad74d8d03bb3d13b6aa2ef04d20ccf2520d39b72b0afab5cbfa9 SHA512 2ab0efa23c556547bd223f066acbebe250346064a3588ee866871e36e3b5b5533ca7a3add6a62b53339acf89dfc8539c42b3877b5a2055ca7e20bc25c5657ca5 WHIRLPOOL c73a7b7c12e399439b3f97061646aeadab5120aaab2c8f8852416ccdbb6a77949b4946a31c1abad910ee1fbc837bef3e86975fd9242a3b8649fbb77f0dddf7ca
 DIST genpatches-4.9-51.experimental.tar.xz 106416 SHA256 19a1d1355f4328e9703157b2a37acd97af98952e73c6d3d18b49f6a35a6064b3 SHA512 af7a00b9a3200a50341b9af607fbef362ead2e4f5ca35d58eec505de490c03d6366ab4645e35bbddd6903ac75396413d2902b6a9fc7e2c9d0d1d1254620cfdb3 WHIRLPOOL 23d8d92dadd653c1ef59d8aeab08f3e10246e3dc73ac8e106e1bb51b18c597324188eda0775095d3759829c6095cd06e9634431d86900ca3aca0ec6719ab2ef5
 DIST genpatches-4.9-51.extras.tar.xz 17356 SHA256 71d1693dc64d8473b41f5e80e7727b6cc0a74fb632511b3fec0b46a57c0dc26d SHA512 e05c44a5ad1b68afb04647a86efc6f67e03515861e670e39f960c0a02b87fbcb71194efa6773259ee2be5c8362794a5bb6512e876784d5a521d8890865b3ba0e WHIRLPOOL 50d19a31d7cea180980fefa87ef14d13d844539968a353a4c15e86c86913b66e2c8abb45fde999878afd96b78a4e9d81158716a1cbc0f7a6e5fd5c26b33b05b1
@@ -73,6 +76,9 @@ DIST genpatches-4.9-55.extras.tar.xz 17348 SHA256 70e1a8008adeb7bf207fd7f3194b4f
 DIST genpatches-4.9-58.base.tar.xz 1124000 SHA256 b2b5f906221d998661065f259d7fdc543f42ff2743ed192f26ee470405889b29 SHA512 c1dfb266b9a5dbdb92068061e49230a0a5b33df9e995212a62128cb54cefd1743f084ebffa3cb94bd1f335a90b97058464b3245ce2ad5580489e3d41b30b5e21 WHIRLPOOL ce5770b15cb82165ef676625c88b81f80eb079ad713b2a01b155aba2ac2136460f36704b2a40b229fea3202fd8d947e5c134525e886cdf6c8640a820d7420433
 DIST genpatches-4.9-58.experimental.tar.xz 106368 SHA256 52efe26871a034dd7559a27f336b5ac63788605dee9f01196b66d67e916502c1 SHA512 59a09e4a7df29092f51df45569dd86f806e3ebb80f397a0e44b237e6f23588e8c3e2de1d1d266b10b9227320763129daf0a3326f18f16aa18e9bd2ebbafdbbb4 WHIRLPOOL a792f351b9d4d2acb5be5c342e27ce65b2197fa19739462f1ed8d4b8b0d451bfc9b73ca512d3f9c460d0bc146292d882d5b0429241f398a13e8f84f6dc7d7125
 DIST genpatches-4.9-58.extras.tar.xz 17348 SHA256 538ec1d455e26781b6b898b172c324500e1ab185cc25fc115b65f4496857a16b SHA512 5caf5732004295541f61e4409f7ab02f324a73d9ae6fcfc0943b6e6c942f64374cd735ff1873d3e596c2628663d5ca9e7cfea2f6c55ba2d145a569b5bd07254e WHIRLPOOL abad1dfa83aaa41edfbadfeaa17715383391008ac1badf5f5a715714f4d7efed532c3ff5081d3407823a172a24606b9597302eafc286fd23dfa084be2b0b9154
+DIST genpatches-4.9-59.base.tar.xz 1133092 SHA256 691f9860aaa31ca2da288aaf9f808c506b39addc19772d6f84b57732d2a7679f SHA512 b1395a77963b2b2d73635a5b9a1d610cd7a7f9220d469e6a7f4fb02ff10cc9267fddd862d682e5bd4cffb0128d48c89dcb52ade45a56021b0133f483a26c9875 WHIRLPOOL 5ca080c8560eb62ef342fd036b4e6db12b25c827a1699f91d586444728425ae472632ade2fc175432a4fd8b49fc9bd18ac041ce9130a18ddade05a52cbfe9388
+DIST genpatches-4.9-59.experimental.tar.xz 106392 SHA256 ccf9f18a3dd28f69aad8cd34d513d2b5676cd726289d940d17b7278aa266f191 SHA512 eb8a1699a8c68a91e00bf65e0455c432ec3a6748080bb2df5fc7b6070e3626967927ecc8b64a4344bb2efd753f70c2fe4f69cc8e7de5ce337750dc908c4b5e4f WHIRLPOOL de3da93b251f43faa8b7a80aeb8a28c8f08b9578ce5dc56bee3f941efca3165b8301ffb403ac4f84521cc9a49682850b58e6ed73c0cea3b53edbebbaa60e8b00
+DIST genpatches-4.9-59.extras.tar.xz 17360 SHA256 be21758bdec50724d687d255b516bf8735d026c603f260644c7b08ec9352d624 SHA512 79a2c47aa6ee6191b5a6e4d17835dab90e747986b6b407a12afd4e343663a4ddb4066c752a65196b534dca102f3843f927b1952e21c3f04e04a28dbe30bef0fe WHIRLPOOL 07cf4232e3061a677317ef4444cd41dbdfbee3ecf6c870e55b291a1e2a6cc0e1bc2bb89cbeb3e1c910efede109fd766f852c2a52aada60f3e04db581ec39dfa0
 DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
 DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8
 DIST linux-4.12.tar.xz 99186576 SHA256 a45c3becd4d08ce411c14628a949d08e2433d8cdeca92036c7013980e93858ab SHA512 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728 WHIRLPOOL 3b97da251c2ba4ace4a27b708f2b1dcf94cb1b59aaeded6acb74bd98f0d3e33f1df83670665e4186d99a55daa84c88d539d93e20f0ff18a6d46ef326c48dd375
@@ -98,12 +104,14 @@ EBUILD gentoo-sources-4.4.89.ebuild 742 SHA256 ef03c103cf943eda72c589a9c7f1efae2
 EBUILD gentoo-sources-4.4.90.ebuild 742 SHA256 4bb407c08b03120f33100c2cb9641572d03aab5c0bb8a4d8684aefa67d18034d SHA512 a7455b19e7992fc8d52dc8772ac858ce191a1332806fce891b39ee540d61ad6e3a1fd331293ca799401c8f92b29c502ea3b52afaa2cf3e333f5c794a5f8f96d0 WHIRLPOOL 4febca3d0646e297c146b024ba605dd206e8d1fa9d1edfa90abb0981c7480e51e46f3cdf4da02fe591b3b0e76513cb625073db64c610392ddc67fb4c8b381b42
 EBUILD gentoo-sources-4.4.91.ebuild 742 SHA256 0920c1554031efb6f02bbe8bd6c5a42157f1f685ee26ff06cae7d7d1fe8b0f16 SHA512 826a1c1169d5ac8536520aac17a8b4ae27b6a96760ab07da79348c26249f0b229409e6cad196b075dd73982827f12d24eacdabc7e6bb5143cf276acab60380f5 WHIRLPOOL 030fecb5332192b547ebc37ff206e198e317cc09d84c41e8dec2bf171f1fb659a4c83536cbf17eef1064596c8b9e620b4631a08eae5cc9dd9dec3a927283511c
 EBUILD gentoo-sources-4.4.92.ebuild 742 SHA256 5055bfc5501b70793a33a66aed2f053fb64dd72ffbabd7c16acec6e182fbcca1 SHA512 f3823fe5da9480c9d24212a65ad160cdd9a488b07cdb8b0af56c1dc81fb40ebc277c31ab6759e8ddde0cb22e6a83765b5d84d37949bf265c58bfcfbe6d3d8fc7 WHIRLPOOL 5a3a28eb7b770b825e1dcf1b89c61b3f7b0256760a1f991c8ac4bb1c3ea058c8266cf9a3dadda04a85cea146470d18d8874e97da3d457ab30f03b5f1caed68a2
+EBUILD gentoo-sources-4.4.93.ebuild 742 SHA256 d835c77a1a026b9dad6b17e21cea18030e464f7760311eefbb8da59eb323de62 SHA512 ecfdb951ec13614d200d82ad62525d417cdf43b166bc0d1502ad338f977ee69b938633cb5b74c1498aa9cdf9ed80bb59e25536c4587238e888b2ac7b23b8c1a6 WHIRLPOOL b8ea3dd10e00966863f957f60764d8892862beb4b1c1dc5c5967ce8bb561f4c994237411683c6b96b6f5acf32da8aeec4053c302602daf0691a4c22a1bee1403
 EBUILD gentoo-sources-4.9.49-r1.ebuild 734 SHA256 f7ceb31c58ca9122d769c16048c309d77235f1df3d79cb844d3fe472114ab679 SHA512 8a42455eb119e89f3df16a675486efc5ba208a94ac255b0f4033cb699dea75b9ad7fe28acb1df044b73f16f1bb50c08bbc09bb59e541286893048190c5a74a8e WHIRLPOOL 2e971b3aaaa0c11d22072d3bb0dd1d5d8d1920952e32957a2f2a922c1f31283a25df2c369263d6aeaa1f8c0b00de5841644d59b25439b170101b6ad91536d8db
 EBUILD gentoo-sources-4.9.50.ebuild 742 SHA256 6e837c9cd4d83747e3deed86e297594cfc62d596eaaf62d21da2df0f44b05ee2 SHA512 1de3ede5c952108316375f8469a4664f229b385bfc022be6af33c194ecd85dbc7bf67bd485a3b6dde5d22cfa07dbd268fb0125350bc40dc443917a273a226218 WHIRLPOOL 9534317c2c20c9b2f05ef8e412d27b814790745ef5efe1ff8a11266bae0fe169dd9fbbd800e6184a6c15ef58d79c73fcc86f4910d3b06c1128b1a5f930f34c29
 EBUILD gentoo-sources-4.9.51.ebuild 742 SHA256 32e68c1e90570dad78f7eee898aee730a9b6e61103c55c34605379c5f550c312 SHA512 a3d3d7c0096d3c0eeeccfbab71c54ee074a40c7270b097de5e7c293e46733bddc2ea22eb5c4676e0b8edbb215491d8db1d6588053649069393b8af3c346bc712 WHIRLPOOL 2e630a2ba06fd45c6a3e8beff822b9183cf5b4c31dc677880c469617008baedc54de0077ff41a174fe8a5e9be57980d160eec8f94f3569b7ffc847c162279c16
 EBUILD gentoo-sources-4.9.52.ebuild 742 SHA256 03a63edd348351b09133c797da72a67d9ab044b1eb389b5dfefdd16608b7e3eb SHA512 da5c0f2eb5834283f8373891e29d695a3bde678f0fb14c33c116312daba4b746d377d896bb6541ebfd10bff8c5c5bb4f214cf54f4e165757255aca04dfa6d878 WHIRLPOOL 9385d35b241a3628a43e6172ed9c249b3f5917cf56ef78ef907ab8393b9d56741785899a22e264633ed0e4a7086a2a49e8e88e4d41a35f8ef89a2501dd3e7d6b
 EBUILD gentoo-sources-4.9.53.ebuild 742 SHA256 7db703016ce8b7afb9126814840b65a93afe5b187d79a5432f5ef7d6d7741df3 SHA512 07c99c36c6e4d84f5f35ece39709eff156dca8d4a39fe409ca592d02a79ab3b8f03adb23151ed7a19f2caf0336a9ae494ffa5dac00a0a17a9b1a50ca5c1f5925 WHIRLPOOL 6773f6850fcb94475dd6380d9cf28c5105689bee4ec8e364cd39906ab95df3132341b958518f7af436f199ddf27d6ca797fdbc7593b7b4ea107ba0b6849b7cc7
 EBUILD gentoo-sources-4.9.56.ebuild 742 SHA256 2d100d936fc3157723409a0880155cd47dacce8ef9aa5e27d1254e81c4ac0c22 SHA512 48ec0b2b025fd98104c70c911c336a3412c77caa9ba07d1892d97f0be369da11c3b9186b903ca53888e6335181c86205c3ffed1ca65cb2896858c164e811c249 WHIRLPOOL 4379b7430452f1759682280a4fe9f0512f68053f2b3fced58687e2e876178a6de31a00d6cd4504799cf42cdeaa06525f185f82540306cda6a3d8b042b18c7436
+EBUILD gentoo-sources-4.9.57.ebuild 742 SHA256 5a17712c78d3776a3c8a878a055107ddc2bdf78025b2c2035e5550151581df2d SHA512 8b69b0e059962d6e04c975b4e19d3accd18eb439f670e9261e2f5648b203c4f7e3b9fa1dbe79523d9f75e56509b91193897b73590900c0a003460444931882e6 WHIRLPOOL 7e7408447b07ca6f795f8f1834fa1a204becd2981ca2a6efb367ee9efb6b4329e1a82a74f700e87ba4b15608a4991a02f6c234e0f3a436536399573832b91e3e
 MISC ChangeLog 78395 SHA256 25a8f35819dcb65d5e904fbd015117ac25f35312cf6282d0cc9bceae99a47d7a SHA512 3434fc4e494e4463f11a32a940ae9f980c8b6450c8c0a03c05ae4f9b9d0656f2ef345334b2c8982ddf3326e0e259ec04abb2ad1b9ddc50ecf5b2d30fad4a8462 WHIRLPOOL e9977781dc07196c102e5883b0b60aa0ee0c71267e5c59f434e13732b33231dd2ca79c646cf60ddca8802af3a0db663c6ed01ea1f9fc14ab0585fdd542120abc
 MISC ChangeLog-2007 91971 SHA256 8c37498df2246749abb2fd1eca05c396257989b91ba5ec0f83cedb25488118a9 SHA512 2215a9856bc1706abe21ad51d0af6176fec226e85a56ad8f54664d20a041bbe076359347f473a87c47904df2d8d2006d56d1535528b2eb7aa756f96ad9554876 WHIRLPOOL dd881fa7bbfc42ca35a46a0fe01d751b3373ac8f4e2ce5626ff26f94244d729e107f57b1be43daf3b73c2f18b090ee896d8a5eb38888fa9ca01097d1cbd46da7
 MISC ChangeLog-2012 101665 SHA256 a60304f93fc4644cdf0b068e586f6036d4463ea4b21bd745a8aa926da71db6ec SHA512 892085806f4c87f64db78e04d3c215ae6bca8939ffeced8a3792fe4a2476e72d2cc9dbc8a3b906943971eb853c337847e6a8bf976f9496be9944e216fb983234 WHIRLPOOL 590f17b5a90f48fa1733959500ce06fd72f95524b64b6abf508653a616961af2c0ea04ca2dbfe5523ff9dcd3bc67b3b24bc368eb84326d091ca449e558555f46
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.93.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.93.ebuild
new file mode 100644
index 000000000000..40fc3a32e669
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.93.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="97"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.57.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.57.ebuild
new file mode 100644
index 000000000000..8b28edfce896
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.57.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="59"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index f3a96dac97fa..b203e1e021d4 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -9,19 +9,19 @@ DIST linux-4.9.tar.xz 93192404 SHA256 029098dcffab74875e086ae970e3828456838da6e0
 DIST patch-3.10.107.xz 1492988 SHA256 cc71150009ec821a2bdb45acca6243961dd51f207744bd4358219680c7920eb5 SHA512 209a2c659df3419578bb8248774b6d24dff1c233e8a2475c54a916df1f3bdcfb307b7342263ff97f04e42b30a277659c23675b658a602ec64cece40a899e7da8 WHIRLPOOL b815f57d4ed6b12d7997faeeb536f34bc8bdbb260472e39817725fc1a825cd016eebd964395fe203b817ef605cac46a0f3c8c312db4b1b96a4ea49e8106af474
 DIST patch-3.16.49.xz 1715976 SHA256 6cac095f27e2dc714d1fd17b904c600179b042f904f0586b3c07584788e54c88 SHA512 5a9fc04a1cf425dda839c8e289cb8ab0a73f98cb2de90b90d1b43251889edaf2fb418b1cad4b3fcaac4c94899781f66d1a8742db728792983d0fe65d32eef292 WHIRLPOOL 8769c085c8575d92a24f8bf38998dcc3e035b734915617bd4b1f24eb06cb042d0e0417fab4f4e310ef2f8a9650e321006d269abc416c2354c820cf892dc46abf
 DIST patch-3.2.94.xz 1789324 SHA256 67e6decb1358fe532b18021d019947530994e416d3b37d46d1dc1e1a588bc968 SHA512 969c94d9801eae41a279bb7792a4d81d9bfc65e7f3e700febbb1d36b733ec60f923054d84dbf19fff27aa3e3807b93cdb5a561216e0c4f361a491e939b61851b WHIRLPOOL 536a689a34499d9adb30501f706b0d5cd71467bd7feff9269cbca3df00eb5b24a530344454cf185cec91113f80afc6f78749ba68808e69dc11fed45037f6ded1
-DIST patch-4.1.44.xz 1171508 SHA256 e4af9c7bbcc7b8315ef59f8d5c950d330d387118ccee4e96049dc67b30ddc976 SHA512 8ab36ac700eaf4e54ed5aad56038c67de7127c72c107f7d3f86ba992ef770eb7869eddb581f0ff2e0435a9a4273144505256b0cf1ddf80ce3fff9d845bc560c4 WHIRLPOOL ac01a884cad4f10fe92b0203e618997107662ebe2d8e1335def112b108375353fbd4e4e8435178b0ab883694ebb136a75ffabed6fa905cdb9101b27f6b2ef8aa
+DIST patch-4.1.45.xz 1195980 SHA256 e5b3836fe1cc4669c4b1bf4f18e761929b46c5ac237c83286705950a44b14d86 SHA512 a676621313ad990ae27e01602eb6b9369427882f7404fc51ad964bb976d566e205620f054aab97163b60ecae58707767063ba994e4557ce39c7edc7890679f5d WHIRLPOOL c99e1492e96045086ef73eee8d2689b405fab3a60501d0f52a15227a974814061634d30504ab1cfb8248a46ff7625cf9e0190e3ea4e76b23d3829b206d5d3edf
 DIST patch-4.12.14.xz 237356 SHA256 999f3e0d97e1b9e7a09c8c0889f020ac9e342ec2391d0458521d4b8bff1cf945 SHA512 8bef19b2a87147b4ac7c5852d6cac0281c7df7deb84460c6462c981b9213d288061c19535bd9a4da03db73f8a9fd2fb76bf9c6d42b0b6ad1f30c97d5ee0964d1 WHIRLPOOL cd7c1173430eea9a33386fdfca10e1112ee90a5420180f30c0f375d7fb3ddfa657eae93cbae1a1d2b1a1a5d442eaf402e6565028ffeff79fc78a08b6334b1873
-DIST patch-4.13.7.xz 165784 SHA256 0fe89c96e956efbded576214eef0c8e43cabe41dfca245e3ebb79fff9bc8715d SHA512 4d96c655ca4c720b872e1a88ba9989a419880cb5fec2a4a9190077588066f205c5dce2591a76f26375f6f50001334ceb7631d489d3b24ca443d10e1e6879ed54 WHIRLPOOL fb192f3acb9d3a249a2ecaf6b7d6c6eca0ac684c17c01226ed1ca69f5aafefa782aeb80000bfae5753672e2d8bb93b07377e8d1c0ca66b5dbdb1332d77ae38a9
-DIST patch-4.4.92.xz 1376520 SHA256 198196ec8cfabdab83687535b7655796a78d05cf7dddf08f976226f2e191c640 SHA512 5f65d59d386dd7810f7f0309b38e5dbb9c8198c6f145a539ece4b48321a9f26cb7c7418dec566a1872cf8ffcf0ee1b233c3c344d0f7e4afdd8a05be6a99decff WHIRLPOOL 30ad8543adfe312bb66a1feef49a27f3810230cde88c5977c8818ef0280bdf17bb48ec667590d8491d2ad58bc5693e533675ec5989cbbb77649f48eace4b8a3e
-DIST patch-4.9.56.xz 1059840 SHA256 a63aacf1f75a2f02a1313658b7f86be922b7a0e4bab41dc377449dfc0b7c529f SHA512 9d926ac7e06ed3d4ae7e2747b06045e6e2dd61c279895067141e4c5abb252488252253398ac2bb87f297671c8d47402f2476f065b0cabf73d9c1c7dae9da8243 WHIRLPOOL 063d112999c912d50b95af8f3a068d4d2c0b9e319d690a2f0927dc21ca4926518f6fa6130d8f04fdef9b8ac702db6048b241e4dce62cc99e7f7fd6457300ee2f
+DIST patch-4.13.8.xz 179404 SHA256 3b2bcceb16acd75322e98d3e93967e82bd0e7499c748bf12bd46c7519dacc315 SHA512 b70b1a081155fa9a7082ad2771aa0a43a9f6458aa5f7f312729aaa3a71db71d28bcd1d1cac6ffaee134797359f37ee86de70537c1190ca60c016a8779268e880 WHIRLPOOL 82e9c91772c2ddd9c38fa7c7ad0cb34c8bb8faa1793f2d9fb1c22f04351ad5b5b4af201e5d521343b3df411cd07a003754009fc7993cf844477015e034d66577
+DIST patch-4.4.93.xz 1381652 SHA256 3c77d1eb0ba080919d8131505fc1851fb27a01480a2fec8376144da7d6f0025c SHA512 3a541b23252cf2b67c7ecbd0098aae79326df0bc9139209446b17cb8c1dece5e4c0547a2c8809f6c350145266b2f4197b3ca5d1eced9acfbde234aa25df79ea8 WHIRLPOOL 4030296ad2c0e1510312a47350f05452c0ac81777963ed3da6fa379dadca0c9f14f17d139e8823c402a0be4ea5b7ef355df0dbf6d2a1731f66253423f1e1f5c1
+DIST patch-4.9.57.xz 1067768 SHA256 26b7cce0abf8223269935ac62176216d0ebd2bef2fb91e15581ef2de1a032639 SHA512 7b60909d9e1e34077bbabf29d13a41e40cd1dfdb8c732755720a79d0d802376b96e126f1508d4f3fb5e8b1e502077f391f773b7701cbf32dd828242090f909f6 WHIRLPOOL 569e8656f40ff76e4e9ddd2c76671950b62d22e776c0558dede66ed0ca2aa536d2b3645f44d6e1a8ad95fe5a9fa84d4e6ab28946a35dfce70576e9231b313d6c
 EBUILD vanilla-sources-3.10.107.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
 EBUILD vanilla-sources-3.16.49.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
 EBUILD vanilla-sources-3.2.94.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
-EBUILD vanilla-sources-4.1.44.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
+EBUILD vanilla-sources-4.1.45.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
 EBUILD vanilla-sources-4.12.14.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
-EBUILD vanilla-sources-4.13.7.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
-EBUILD vanilla-sources-4.4.92.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
-EBUILD vanilla-sources-4.9.56.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
+EBUILD vanilla-sources-4.13.8.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
+EBUILD vanilla-sources-4.4.93.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
+EBUILD vanilla-sources-4.9.57.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
 MISC ChangeLog 48866 SHA256 5e96c40666532838415dc80201535a16e22c7513cce19c979effe9592694c294 SHA512 06ee49f4aa7730f7c92a4ca500f6fcc105591d6b4ab7431e77a77b29821b81d7b882852370ac800461d2ca2efa68519e64504367534ef2e94dcd0da21b2fd9a0 WHIRLPOOL 31715105c3f96167303a5884816f10983a03213fb66fd96e032eb4b0cfbfeb98ab1ac662c585143e60f7a0f85dd465554498b4b03ff35887e5061fd1f2b8be60
 MISC ChangeLog-2013 104895 SHA256 3ad2bcc0b59ccc0f293134875f35690751b160483a3f010b6c3b95174df96471 SHA512 35c725d7c676a1ae6ebac12647004988b0b1e2b87fb7cbce95c101b8ad7b1e9527cc23a6bbc4a27fe11c47813d3743ba35223dfb8b546dd1f204943939172c47 WHIRLPOOL b250875b50ea9f08f26f3f92c45960fc317e7495b70fbf053f9586e75924b6478eafbd2ba54a2cf1c983d49b0341e63a15b2d46ff135f8945c3b61e3e87eabc5
 MISC ChangeLog-2015 43787 SHA256 aae0d19a00913935885696dbc734946b05091c72d5c32e1f57925b76da4fc9fd SHA512 0a63afa2ce400c72c57c796c3dd4b8fe257d0d827b62b77cbeb1561a3cc99d7c04d9039ee9523edfe8bca8f4f197e91a58282b91909cb5b272685a9a4c5db8b0 WHIRLPOOL 6b940c705250ec86a7d0c0792f797279a88aa9fe0e63ae32d01bab9ad22ffc4a8f955aea6f0afad15ccfba945e70a3e8ed10ce46016c44da5691605ed098e97d
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.1.44.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.1.45.ebuild
index 20e2c109b44b..20e2c109b44b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.1.44.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.1.45.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.13.7.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.13.8.ebuild
index 20e2c109b44b..20e2c109b44b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.13.7.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.13.8.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.4.92.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.93.ebuild
index 20e2c109b44b..20e2c109b44b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.4.92.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.4.93.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.56.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.57.ebuild
index 20e2c109b44b..20e2c109b44b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.9.56.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.9.57.ebuild
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 1a2590d47cdf..242a9bc9769f 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -1,5 +1,4 @@
 AUX readline-5.0-no_rpath.patch 363 SHA256 59df6107772d1a93550bacc267a2c00f9dfd6d5380b8497d8fd756a7191b9e4b SHA512 c0344c5b831433ad3a8499a91d36615e849a9b520f8ca35cd9cae6d5bc55729adbf97d003e335d210cb3806b2f39af273b4b5f98380dac371dc184053e245bb2 WHIRLPOOL c0d2fe9d1d1f36cf89279f315c373a7385d255ebbeab8ebf1ede7b99196660611499c7db85554b036ad3df4f0b4375558b1d1ce7cbae5f5731172181f7d167ac
-AUX readline-5.2-no-ignore-shlib-errors.patch 688 SHA256 2c585c4e2d69d6b91157f378a3dd11cb49beefab808eef3350cf1b8357b2efc6 SHA512 23f88aee11a9ebe15406293695f3de2a7a6c52b8b138c199c64f9dbb9b59d9063f12f8693656e61611e72f6298f7d919016cd240434e78ea2232876690a8b738 WHIRLPOOL ae87d544fa32dbd2b6f27f164dd4e6d0e8a3f399d4a9bde81bcb631985c6e69db11705dc372c21a4f9d3a26cf4279023aeae97fd0d243ca8e1c0e547b59084a4
 AUX readline-6.2-rlfe-tgoto.patch 379 SHA256 6bd5db93cba1cdf751b424a25a1f08c87bae2b42ff59c6c0aa34d659115cbfc1 SHA512 1d2c3aafc949d92fdf6abbee60a60c80f0327f81694d5d8f3a166f1c24d37346caca3e72c9971106b96b2758a9a01269346954fe20bc381eb9da2e6a2737fc3c WHIRLPOOL daab79312136fa728ea77839d6ad663554055e2acd7acff036b8d168f4a0791d57503aa196be4f834caf32ba72ec73c3125adb9b11b5d6898bb796016e83175a
 AUX readline-6.3-fix-long-prompt-vi-search.patch 736 SHA256 42177ae7f747eeac432c60d67d31d6903edb919d0fd6bf31137ff4459061d99e SHA512 ad5bb44ba00f6f5e355b95078209e2e51f8d8ba9a924d00ef6aa3286e09c15fe0024efa0817f9e6d86b7aecb73150fcd69d0051a0f7fb37475921478f62ce0e0 WHIRLPOOL 117e007fa59669f73c69dd9acb02896231fb58524feab8bfeded9538dc9d4106ac678279e31c48cccb41a14c281aee9a94f5943d540fdddd99f768d53ee24a67
 AUX readline-6.3-read-eof.patch 1913 SHA256 508323403e752296a63619e9a3fe4fdcd233f368f0f9944ccdc2c6bd69eebc2c SHA512 99728e35d64b466e2bea570412eec719c70841d205a5190c0000bcae55cf3ac2d659ae18e57b4c332525261d83e160054800cd89f4009ce3c76d1c3b4ac27223 WHIRLPOOL beda5876ea05f69f0b2e8005c60dca8290cc7943475352b6c26ab656273290d06a07ae62f28e3fc21c3c31ae628c744a6e5a8ebbc5328fa896f215d419dea270
diff --git a/sys-libs/readline/files/readline-5.2-no-ignore-shlib-errors.patch b/sys-libs/readline/files/readline-5.2-no-ignore-shlib-errors.patch
deleted file mode 100644
index fc6349113167..000000000000
--- a/sys-libs/readline/files/readline-5.2-no-ignore-shlib-errors.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-dont ignore errors in the shlib subdir
-
-http://bugs.gentoo.org/216952
-
---- Makefile.in
-+++ Makefile.in
-@@ -194,7 +194,7 @@
- 
- shared:	force
- 	-test -d shlib || mkdir shlib
--	-( cd shlib ; ${MAKE} ${MFLAGS} all )
-+	( cd shlib ; ${MAKE} ${MFLAGS} all )
- 
- documentation: force
- 	-test -d doc || mkdir doc
-@@ -238,7 +238,7 @@
- 	-( cd shlib; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} uninstall )
- 
- install-shared: installdirs install-headers shared install-doc
--	-( cd shlib ; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} install )
-+	( cd shlib ; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} install )
- 	
- uninstall-shared: maybe-uninstall-headers
- 	-( cd shlib; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} uninstall )
diff --git a/www-apps/postfixadmin/Manifest b/www-apps/postfixadmin/Manifest
index 2256741bf1e9..451a63aa09b5 100644
--- a/www-apps/postfixadmin/Manifest
+++ b/www-apps/postfixadmin/Manifest
@@ -7,4 +7,4 @@ EBUILD postfixadmin-3.0.2.ebuild 2785 SHA256 4d6526359f167f7e982db63ecb1c273c137
 EBUILD postfixadmin-3.1.ebuild 2732 SHA256 dda1168d217b091832ef30db551d383ed705b2e6071b4eaf000602e61ca80e9d SHA512 0e0316387c1e3d7566bf3eb42b08e5630a738c68d2053b651251201bbe1503c09963df830a26d84a6b8935d30957f0e3fc37b50d24491d159a05ed305ac80cb1 WHIRLPOOL defe79c8713c75046e168875984e6c4d47d26ff78e9ee1ecff6fe0316dc26d4a44dc19311416ea7c6e88af6331cf42694efcce15bfd1f4b5f977922565e7eb3b
 MISC ChangeLog 3433 SHA256 acc392ce91ee4b52bc11cc300f115d527be8c4024460f0956aa377f5463ee041 SHA512 de3d5fc5b4fb83941fc56c3f2cbfa49089cf982e538c3fc38fefa85f2bf4e69576ff89937e6648c3ade50e805e8660801811bb285caee34bf8bdb2d4cdccb4cc WHIRLPOOL cc3c1f9fb6188b8a91723ca0f30e38b8c8643f3bb4265517a5e1e524b1006564a036628eee6e45c1410d2695d793f9bab68090d00cbfcb25e5cf0bfac5dd11c5
 MISC ChangeLog-2015 7093 SHA256 508c765b3d45a5a600361a345fa7e865294fec10f66c41a1aba5ea77e5bb8621 SHA512 dbb867f4b97f98fc3534fa0090dd460bc62516d932137e42d61389552e52290ff9c95308c39883ef63ab24fb622f1a4eb1d64bb5164087837084cc1c89d13d6d WHIRLPOOL 3a236c25c306afde25a0700a08f4397987161e3ef265644b677648413f0a6317711963e0cefb30a3ae4be4678260ffdeabe84f74d7ad3228af5ee4b58cb11a8f
-MISC metadata.xml 653 SHA256 36cc87c0e80a44ca9a9244eb37c23e6df34b62cad830b28fe7ba7a5d109b924a SHA512 fb272a65935706c463f34a5d93fd2b1dbff191cda0de0ecf2cf4f14fb73a288353ec03f264ddc3d3e5d45178e8e76d4c0348117d96c1a2b5f007a77161673199 WHIRLPOOL d047f8bb471cb514f82cc83c42eae2709fe11ef8cd6b620575868ec02c610ebbb570c33d90b2b212c34e2f7825fb22a0507b8c0996e68cc5e4ba3e78d18c4411
+MISC metadata.xml 536 SHA256 398c205a11750b6de35432c877b97c2e8a0e8486976be11165b44f7aaf649db1 SHA512 4657f3ae892ad55572ac39f23cebcef58480d4ff608150c75d2cf3f0046b5e0a2861f9bf8dfffd45aef580675feae11a05297a7a99f63997d43ab703372ddf4a WHIRLPOOL 70520f71f876d0bc8f1320d8e83f2ffcff1b16ce674870b8e1d26415ad4860427b878a799c49ba87dd9a0797605436cc6a0f0525022371ab3e974743c9cf8fa1
diff --git a/www-apps/postfixadmin/metadata.xml b/www-apps/postfixadmin/metadata.xml
index 024770a12b44..13951ac400b2 100644
--- a/www-apps/postfixadmin/metadata.xml
+++ b/www-apps/postfixadmin/metadata.xml
@@ -9,10 +9,6 @@
 		<email>web-apps@gentoo.org</email>
 		<name>Gentoo Webapps</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<use>
 		<flag name="vacation">Install vacation.pl script and dependencies</flag>
 	</use>
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 9d3428eb3355..512ddc2d1068 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -19,12 +19,10 @@ AUX chromium-sysroot-r1.patch 430 SHA256 c98fd9ebda7d008419b7e979391ba9806aacf6d
 AUX chromium-widevine-r1.patch 428 SHA256 c05800f823b3e9522be70645de6a9b482856030f43fd56273bb4f0bbc319d158 SHA512 fe6b912bd8b3993194f71bef229e57d4c24f9adcf697172eb3bc5ee8d38967bf5fe5b964e9d89d23960d25cd3a6e53ce7714f81f0df1881758b611a66375e32a WHIRLPOOL 2d2ff0b11c3062ef4c4873221d986dcd6018130d687d487cd32e4912e957332e12165114a69e8e86919338cfac2ad61dd521637fe4be6d7b3b3deed21b008365
 AUX chromium.default 148 SHA256 bdac1d32025d53158f96c8ad5bd71a58abdcf02f3a8759a43154e97e812fcdd1 SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739 WHIRLPOOL 2e51e864134426668cc73fc5081c35288677d8ce855b07dfbd3413397f9c43148a6d6096a9b7a617511388f87623a3ce7f3387103202db53876a74bccb9dbe6c
 AUX toolchain/BUILD.gn 799 SHA256 7b42f63ac928b7d1ff8e4d91cc620e944d581beb26c64fe7e1560f10a9c5ad94 SHA512 8da134d99f050ecdecb06d4ec34287747cd9ee57ccbf6fe334b034812fb95fdee3af8421b10be3ee4f71020ca4029de626cd2770865b1e527bfac966d6d8ea2d WHIRLPOOL 7d9b145da023b223eaf0a9c6907a42ece9f880b83abcc4ef45624436901bc21fefe5f4823e67350a07b60e2ea4718ee4bf21542264fd2c7d1f6ba6b8cbc3daa0
-DIST chromium-61.0.3163.100.tar.xz 556305252 SHA256 4135968cac6623c1d2b224494600cd274098cce41c298f8c3908b354a34c281b SHA512 4dfd3a493ceb7c605eeab6f387541273d529e8b935a6104927e34836469aedcfcbb4a1154591585621d5c2e842e68701d32328acba842f840a20498822165f78 WHIRLPOOL a02443375a59073ad350665a46c978b67e1026078822b3a34f9fb1099a1bc62933ec25c6135c107388ebf21362d0e6a04e394a60275dd1e30b31c145ee7f93e8
 DIST chromium-62.0.3202.62.tar.xz 517105788 SHA256 e8df3150386729ddcb4971636627e54815ad447be5f122201e310f5bb0bcc362 SHA512 26296ac1cddfe087e8984b12b4916b9a87b08fc75875900441c9e4abd8b562bb622ac1a34bc9fb2aecf22d5a424ef1247dc694b9e6bdd0ea8b32397f53794723 WHIRLPOOL f17df2fd505a961dcc3dc634243dd11a7af09543325a0e59e2f322488c877af678840652e8308f4ea6c75c3d77fa73156be423007be76feaa9291042bbc63614
 DIST chromium-63.0.3223.8.tar.xz 541587956 SHA256 bced462e16a28ff0a3896539e6c7f72e76cb7ba16640a6cac9a533ec4b8f5ee5 SHA512 6ca0efac47adee14b04cba312397b80aeaed1b0ce9bee427c508c44636ab9a1668f743bd3939d83417129d7e83c38c2f95b72c502c6d834056cf7477ef8b4de8 WHIRLPOOL b9f526eec3626b93f2541461b9b3a79bef283de62d99e30c209859e686db8e09ed327f90d0811703d699e9813cb86e0002be93fa42372e65afef1c96b8c91d35
 DIST chromium-63.0.3230.0.tar.xz 558852780 SHA256 97daa90a6f0ba7dc49a168cbf9c40896e621fb0352ab6de1d2fa428bb63ab64a SHA512 b0aa9a42df303bc7ff412dec30b3bfed292ae39cb5e0f705f28eeb7a60d6125b9cecef7e3ab7798b2ca091ec71215fa5639def6b867c9fdb7a9a85c9b42323b3 WHIRLPOOL 1b9e346018c7056fce3f844d37b69e98529c9dc3ae04bdf07378c7de568d295814a42aa133c463a3be8d22a39b5f62ec69f679ea5dca3fe7e37a15215932c794
-EBUILD chromium-61.0.3163.100.ebuild 20050 SHA256 69213cd5ea5a7549eaac19a8fedc721c6c00b89c770e5f78a128023034abe412 SHA512 d92643fbb49d549cb133f0854ea1b75468a1d7a5e412e21ad787af9abdb1930bed9482f784f382a6ff60847f642e4ce99b67493e1f260696299ccc8ae1a0f164 WHIRLPOOL df8b2cb86387848b31598e4adc5818a3269291c52e4652f233350e72b985e199fe94d437c06ce7e9c230dbbc2bd057d61f955784aa03bf0906c1734b0c47d621
-EBUILD chromium-62.0.3202.62.ebuild 19511 SHA256 5d50b83c2d89302307e83dd0d644ec713b3c685e4fd0fb6b348954680d13a56c SHA512 b0285c363adb1b36bec775ff69091b7c9a94b0d597e7954e1af8fc8a6b5c312d471c5ce75a1e1baab3f1eeed601f6dae4f0320fdc859dd1ad8d3f370af908ce3 WHIRLPOOL 059cea283125c08921bf343e7e5bac8408dfe2ce219abcc8cb4b83750a5a4442ea673eb9d3c2a2423f7a3f00b01e2a83f7db339bb9b4ebdf1451d43fdd3d9b15
+EBUILD chromium-62.0.3202.62.ebuild 19510 SHA256 57744a47ea2207e8146255b0c4c579d0a722883e562b6a16f5da16a3d17d3599 SHA512 6e7354e10e4489149ca84c05a07308beae10fe1fb1172302b0aec071878cf8cbce20ba75c8bab61a02aa87748a982dee81a077f7b11b987b5439626a0d773dab WHIRLPOOL bf74f474780002e8a7c62b9ff9639bd76c9bdb978f9cdf4ec38d3781690e2e1bbd3e7e0b4845ef09bd4a248c9a538c8fce04e09c93c14f44253ab7060d41ba1b
 EBUILD chromium-63.0.3223.8.ebuild 19488 SHA256 87be09e2139856c5233d2e74315f7549e79605da663c6ba2e8264dafd1e48720 SHA512 de8e2b69f2dcffd0edaddb4c3aaa5689c959bc9b74b68e0bacf40aa8d32295f116b3e55b389e648a368c692a366a8d6ec5926b0e4794dc41c7ff89408f2238ab WHIRLPOOL da731abfa0d5b286578bee83fd14eb39c0ae537911ad089150a6afdf149439ac1210c3f47f0ceef31fe30b5759b9fac34b358cc4b75948e3972dbf4bd0bcc6fd
 EBUILD chromium-63.0.3230.0.ebuild 19611 SHA256 8123136fa657757dc97e34d1528c8bdeb55be7e932d885ff8e108d2a74465cee SHA512 9104874627988e7d946ac804589399f0e688aa0101da0b00137cc46a3eb15f0b64f09157af8748a93170728672af6e839e2b84b3742d3820956a211f0856ce9c WHIRLPOOL 7ea8ab0400d15fa8721177aef8bc76ad99c08e8a2f4a1ca63fdf99db7b4f744753582663c9dd9fc854878d12906a98a3c1cd10c61e0275a638594c0fec485d9a
 MISC ChangeLog 61379 SHA256 6089c72a9ad011b043f45bf3057c79f999d2aad5f4ecf0f9f45f9ced5156a18c SHA512 05868a71dfe2cbabb32b664968939704ada3c56bdd70aee289dbc60c5708e07df8496090687bf9b4659810872f629d53530990820e0da57b792a31add93d1f19 WHIRLPOOL fb91699e99261a3128ac7d931cfa5ec34a8884682935cc0740a129119f0b8d18a2aa83652ee06e0e6900371007cffbaea46f4e5d450ff2817d12e96cc819cca9
diff --git a/www-client/chromium/chromium-61.0.3163.100.ebuild b/www-client/chromium/chromium-61.0.3163.100.ebuild
deleted file mode 100644
index 4dca1421f152..000000000000
--- a/www-client/chromium/chromium-61.0.3163.100.ebuild
+++ /dev/null
@@ -1,670 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator virtualx xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE="component-build cups gnome-keyring +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-
-# Native Client binaries are compiled with different set of flags, bug #452066.
-QA_FLAGS_IGNORED=".*\.nexe"
-
-# Native Client binaries may be stripped by the build system, which uses the
-# right tools for it, bug #469144 .
-QA_PRESTRIPPED=".*\.nexe"
-
-COMMON_DEPEND="
-	app-arch/bzip2:=
-	cups? ( >=net-print/cups-1.3.11:= )
-	dev-libs/expat:=
-	dev-libs/glib:2
-	system-icu? ( <dev-libs/icu-59:= )
-	dev-libs/libxslt:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.14.3:=
-	>=dev-libs/re2-0.2016.05.01:=
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	>=media-libs/harfbuzz-1.4.2:=[icu(-)]
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
-	>=media-libs/openh264-1.6.0:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? (
-		>=media-video/ffmpeg-3:=
-		|| (
-			media-video/ffmpeg[-samba]
-			>=net-fs/samba-4.5.10-r1[-debug(-)]
-		)
-		!=net-fs/samba-4.5.12
-		media-libs/opus:=
-	)
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3[X]
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXtst:=
-	x11-libs/pango:=
-	app-arch/snappy:=
-	media-libs/flac:=
-	>=media-libs/libwebp-0.4.0:=
-	sys-libs/zlib:=[minizip]
-	kerberos? ( virtual/krb5 )
-"
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND="${COMMON_DEPEND}
-	!=www-client/chromium-9999
-	!<www-plugins/chrome-binary-plugins-57
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
-	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
-"
-# dev-vcs/git - https://bugs.gentoo.org/593476
-# sys-apps/sandbox - https://crbug.com/586444
-DEPEND="${COMMON_DEPEND}
-	>=app-arch/gzip-1.7
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	>=dev-util/gperf-3.0.3
-	>=dev-util/ninja-1.7.2
-	>=net-libs/nodejs-4.6.1
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-	dev-vcs/git
-	$(python_gen_any_dep '
-		dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
-		>=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-	')
-"
-
-# Keep this in sync with the python_gen_any_dep call.
-python_check_deps() {
-	has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
-	has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/bitstream-cyberbit
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-widevine-r1.patch"
-	"${FILESDIR}/${PN}-FORTIFY_SOURCE-r2.patch"
-	"${FILESDIR}/${PN}-gcc-r1.patch"
-	"${FILESDIR}/${PN}-gn-bootstrap-r14.patch"
-	"${FILESDIR}/${PN}-atk-r1.patch"
-	"${FILESDIR}/${PN}-mojo-dep.patch"
-	"${FILESDIR}/${PN}-gcc5-r1.patch"
-)
-
-pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
-			# bugs: #601654
-			die "At least clang 3.9.1 is required"
-		fi
-		if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then
-			# bugs: #535730, #525374, #518668, #600288, #627356
-			die "At least gcc 5.0 is required"
-		fi
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
-	CHECKREQS_DISK_BUILD="5G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="25G"
-		if ! use component-build; then
-			CHECKREQS_MEMORY="16G"
-		fi
-	fi
-	eshopts_pop
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	pre_build_checks
-}
-
-pkg_setup() {
-	pre_build_checks
-
-	# Make sure the build system will use the right python, bug #344367.
-	python-any-r1_pkg_setup
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
-	default
-
-	mkdir -p third_party/node/linux/node-linux-x64/bin || die
-	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
-	local keeplibs=(
-		base/third_party/dmg_fp
-		base/third_party/dynamic_annotations
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/valgrind
-		base/third_party/xdg_mime
-		base/third_party/xdg_user_dirs
-		breakpad/src/third_party/curl
-		chrome/third_party/mozilla_security_manager
-		courgette/third_party
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		third_party/WebKit
-		third_party/analytics
-		third_party/angle
-		third_party/angle/src/common/third_party/base
-		third_party/angle/src/common/third_party/murmurhash
-		third_party/angle/src/third_party/compiler
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/trace_event
-		third_party/boringssl
-		third_party/brotli
-		third_party/cacheinvalidation
-		third_party/catapult
-		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/py_vulcanize
-		third_party/catapult/third_party/py_vulcanize/third_party/rcssmin
-		third_party/catapult/third_party/py_vulcanize/third_party/rjsmin
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/catapult/tracing/third_party/oboe
-		third_party/ced
-		third_party/cld_2
-		third_party/cld_3
-		third_party/cros_system_api
-		third_party/devscripts
-		third_party/dom_distiller_js
-		third_party/fips181
-		third_party/flatbuffers
-		third_party/flot
-		third_party/freetype
-		third_party/glslang-angle
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/googletest
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/inspector_protocol
-		third_party/jinja2
-		third_party/jstemplate
-		third_party/khronos
-		third_party/leveldatabase
-		third_party/libXNVCtrl
-		third_party/libaddressinput
-		third_party/libjingle
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libudev
-		third_party/libwebm
-		third_party/libxml
-		third_party/libyuv
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/markupsafe
-		third_party/mesa
-		third_party/modp_b64
-		third_party/mt19937ar
-		third_party/node
-		third_party/node/node_modules/vulcanize/third_party/UglifyJS2
-		third_party/openmax_dl
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/base
-		third_party/pdfium/third_party/build
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms2-2.6
-		third_party/pdfium/third_party/libopenjpeg20
-		third_party/pdfium/third_party/libpng16
-		third_party/pdfium/third_party/libtiff
-		third_party/ply
-		third_party/polymer
-		third_party/protobuf
-		third_party/protobuf/third_party/six
-		third_party/qcms
-		third_party/sfntly
-		third_party/skia
-		third_party/skia/third_party/vulkan
-		third_party/smhasher
-		third_party/spirv-headers
-		third_party/spirv-tools-angle
-		third_party/sqlite
-		third_party/swiftshader
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/subzero
-		third_party/usrsctp
-		third_party/vulkan
-		third_party/vulkan-validation-layers
-		third_party/web-animations-js
-		third_party/webdriver
-		third_party/webrtc
-		third_party/widevine
-		third_party/woff2
-		third_party/zlib/google
-		url/third_party/mozilla
-		v8/src/third_party/valgrind
-		v8/third_party/inspector_protocol
-
-		# gyp -> gn leftovers
-		base/third_party/libevent
-		third_party/adobe
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-		third_party/yasm/run_yasm.py
-	)
-	if ! use system-ffmpeg; then
-		keeplibs+=( third_party/ffmpeg third_party/opus )
-	fi
-	if ! use system-icu; then
-		keeplibs+=( third_party/icu )
-	fi
-	if ! use system-libvpx; then
-		keeplibs+=( third_party/libvpx )
-		keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
-	fi
-	if use tcmalloc; then
-		keeplibs+=( third_party/tcmalloc )
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-}
-
-bootstrap_gn() {
-	if tc-is-cross-compiler; then
-		local -x AR=${BUILD_AR}
-		local -x CC=${BUILD_CC}
-		local -x CXX=${BUILD_CXX}
-		local -x NM=${BUILD_NM}
-		local -x CFLAGS=${BUILD_CFLAGS}
-		local -x CXXFLAGS=${BUILD_CXXFLAGS}
-		local -x LDFLAGS=${BUILD_LDFLAGS}
-	fi
-	einfo "Building GN..."
-	set -- tools/gn/bootstrap/bootstrap.py -s -v --no-clean
-	echo "$@"
-	"$@" || die
-}
-
-src_configure() {
-	local myconf_gn=""
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# Component build isn't generally intended for use by end users. It's mostly useful
-	# for development and debugging.
-	myconf_gn+=" is_component_build=$(usex component-build true false)"
-
-	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: freetype (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: xml (bug #616818).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-
-	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries=(
-		flac
-		harfbuzz-ng
-		libdrm
-		libjpeg
-		libpng
-		libwebp
-		libxslt
-		openh264
-		re2
-		snappy
-		yasm
-		zlib
-	)
-	if use system-ffmpeg; then
-		gn_system_libraries+=( ffmpeg opus )
-	fi
-	if use system-icu; then
-		gn_system_libraries+=( icu )
-	fi
-	if use system-libvpx; then
-		gn_system_libraries+=( libvpx )
-	fi
-	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
-	# Optional dependencies.
-	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
-	myconf_gn+=" enable_widevine=$(usex widevine true false)"
-	myconf_gn+=" use_cups=$(usex cups true false)"
-	myconf_gn+=" use_gconf=false"
-	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
-	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-
-	# TODO: link_pulseaudio=true for GN.
-
-	myconf_gn+=" fieldtrial_testing_like_official_build=true"
-
-	if tc-is-clang; then
-		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-	else
-		myconf_gn+=" is_clang=false"
-	fi
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	# Trying to use gold results in linker crash.
-	myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	local google_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
-	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
-
-	local myarch="$(tc-arch)"
-	if [[ $myarch = amd64 ]] ; then
-		myconf_gn+=" target_cpu=\"x64\""
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		myconf_gn+=" target_cpu=\"x86\""
-		ffmpeg_target_arch=ia32
-	elif [[ $myarch = arm64 ]] ; then
-		myconf_gn+=" target_cpu=\"arm64\""
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = arm ]] ; then
-		myconf_gn+=" target_cpu=\"arm\""
-		ffmpeg_target_arch=$(usex neon arm-neon arm)
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gn+=" treat_warnings_as_errors=false"
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Prevent linker from running out of address space, bug #471810 .
-		if use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
-		fi
-	fi
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	# Define a custom toolchain for GN
-	myconf_gn+=" custom_toolchain=\"${FILESDIR}/toolchain:default\""
-
-	if tc-is-cross-compiler; then
-		tc-export BUILD_{AR,CC,CXX,NM}
-		myconf_gn+=" host_toolchain=\"${FILESDIR}/toolchain:host\""
-		myconf_gn+=" v8_snapshot_toolchain=\"${FILESDIR}/toolchain:host\""
-	else
-		myconf_gn+=" host_toolchain=\"${FILESDIR}/toolchain:default\""
-	fi
-
-	# https://bugs.gentoo.org/588596
-	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	if ! use system-ffmpeg; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gn.py || die
-		popd > /dev/null || die
-	fi
-
-	third_party/libaddressinput/chromium/tools/update-strings.py || die
-
-	touch chrome/test/data/webui/i18n_process_css_test.html || die
-
-	bootstrap_gn
-
-	einfo "Configuring Chromium..."
-	set -- out/Release/gn gen --args="${myconf_gn}" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	local ninja_targets="chrome chromedriver"
-	if use suid; then
-		ninja_targets+=" chrome_sandbox"
-	fi
-
-	# Build mksnapshot and pax-mark it.
-	if tc-is-cross-compiler; then
-		eninja -C out/Release host/mksnapshot || die
-		pax-mark m out/Release/host/mksnapshot
-	else
-		eninja -C out/Release mksnapshot || die
-		pax-mark m out/Release/mksnapshot
-	fi
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release ${ninja_targets} || die
-
-	pax-mark m out/Release/chrome
-}
-
-src_install() {
-	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-
-	if use suid; then
-		newexe out/Release/chrome_sandbox chrome-sandbox
-		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-	fi
-
-	doexe out/Release/chromedriver
-
-	# if ! use arm; then
-	#	doexe out/Release/nacl_helper{,_bootstrap} || die
-	#	insinto "${CHROMIUM_HOME}"
-	#	doins out/Release/nacl_irt_*.nexe || die
-	#	doins out/Release/libppGoogleNaClPluginChrome.so || die
-	# fi
-
-	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
-	# Allow users to override command-line options, bug #357629.
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default"
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	if use widevine; then
-		# These will be provided by chrome-binary-plugins
-		rm out/Release/libwidevinecdm*.so || die
-	fi
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin
-	doins out/Release/*.pak
-	doins out/Release/*.so
-
-	if ! use system-icu; then
-		doins out/Release/icudtl.dat
-	fi
-
-	doins -r out/Release/locales
-	doins -r out/Release/resources
-
-	insinto "${CHROMIUM_HOME}/swiftshader"
-	doins out/Release/swiftshader/*.so
-
-	newman out/Release/chrome.1 chromium.1
-	newman out/Release/chrome.1 chromium-browser.1
-
-	# Install icons and desktop entry.
-	local branding size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser.png
-	done
-
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	mime_types+="x-scheme-handler/ftp;" # bug #412185
-	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
-	make_desktop_entry \
-		chromium-browser \
-		"Chromium" \
-		chromium-browser \
-		"Network;WebBrowser" \
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
-	# Install GNOME default application entry (bug #303100).
-	insinto /usr/share/gnome-control-center/default-apps
-	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/chromium/chromium-62.0.3202.62.ebuild b/www-client/chromium/chromium-62.0.3202.62.ebuild
index 6efcf7ee0603..8dfe08788c76 100644
--- a/www-client/chromium/chromium-62.0.3202.62.ebuild
+++ b/www-client/chromium/chromium-62.0.3202.62.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="component-build cups gnome-keyring +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
 RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
 
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index b15cd65afb12..46de819e0771 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,7 +1,7 @@
-DIST opera-beta_49.0.2725.12_amd64.deb 50884946 SHA256 d5300ab8641a689703019ffd0f1bbeccbdddcae5749fcef2f0aed4d869a6e388 SHA512 d59b98f49678935331b91d1be664c9d75adeabb8a70cf8916ca0152af5fbd66087e752d467b638b2defe864a93a0bcbff4236acbf136d3d396c6b07171d71244 WHIRLPOOL 202f480be2f971b637b8888a590f9db078958f22665c117db530cd904ab3d4e95c34e43e8f2e8c272ace6a6a32dbbeef0cd787afe0cff59bf3aee25437c42c68
 DIST opera-beta_49.0.2725.18_amd64.deb 51398360 SHA256 f8dfe57b4d907d7742f536fa9b5420ddc81186dab650cb34ac9d98191efdae25 SHA512 ee40329b70cb14cfa91b11db3189f0a3748f481f6dbc9ecdf06cc72a13ccd589f56ae3445fc2b6ff4664f50360056c3376487bbecadc708756218fdbf9575a10 WHIRLPOOL 5729432593e5ec1251fcd06595ce2c2eb8d601c5653352370fef70fb012d33b973eb5594e7a42770368786446208eeb1856a293d5d10a9d81be878e5623f60dc
-EBUILD opera-beta-49.0.2725.12.ebuild 2044 SHA256 12fe2817818444a8a62ceb5086075db8ac174508472fcd6a48f15d9727184047 SHA512 1718c2b1b02ec4e58abb1c2f5a31be18fad6c58c0be82afdea0cd145b9a7078682ec1d62ab42d677a9283511c79db565cebe5d64513549d5cbefdd36c1a88e38 WHIRLPOOL 1c483ee9d738c86d0f8fd5c82e92f6384fdea1f1cc433bd9149631259d0f12853b2cb73ecae8eec1970e098a366d7fd3cc06e1f3e96ec1141625a3c1dd43b3cd
+DIST opera-beta_49.0.2725.23_amd64.deb 51405422 SHA256 df69ee3a7ba658303bcbbb793812129017c270a81d50c90448553ed524252ff2 SHA512 c55688edad0294e00181a4b0fb1475a103cb1fb1d4949a5c029e846d82cde13ee697c90ee7ce7bebdda03ee6b63a4b48413f383d33ddda17b8c941f62bd23a0b WHIRLPOOL 25125d4185f64dbedbcd1d2a5cef23759cacf96b540c94aee38f1c87101738db74e379ee85f022caeb12bed37858559557f1517dcc4350cbc61a2edbf129caba
 EBUILD opera-beta-49.0.2725.18.ebuild 2044 SHA256 12fe2817818444a8a62ceb5086075db8ac174508472fcd6a48f15d9727184047 SHA512 1718c2b1b02ec4e58abb1c2f5a31be18fad6c58c0be82afdea0cd145b9a7078682ec1d62ab42d677a9283511c79db565cebe5d64513549d5cbefdd36c1a88e38 WHIRLPOOL 1c483ee9d738c86d0f8fd5c82e92f6384fdea1f1cc433bd9149631259d0f12853b2cb73ecae8eec1970e098a366d7fd3cc06e1f3e96ec1141625a3c1dd43b3cd
+EBUILD opera-beta-49.0.2725.23.ebuild 2044 SHA256 12fe2817818444a8a62ceb5086075db8ac174508472fcd6a48f15d9727184047 SHA512 1718c2b1b02ec4e58abb1c2f5a31be18fad6c58c0be82afdea0cd145b9a7078682ec1d62ab42d677a9283511c79db565cebe5d64513549d5cbefdd36c1a88e38 WHIRLPOOL 1c483ee9d738c86d0f8fd5c82e92f6384fdea1f1cc433bd9149631259d0f12853b2cb73ecae8eec1970e098a366d7fd3cc06e1f3e96ec1141625a3c1dd43b3cd
 MISC ChangeLog 15103 SHA256 fa2792b312ef741fa92927cc59971a69072fe6805e76db02a06b8116dac44f00 SHA512 9affbf0fd1bdaba029e118a98a2ac3c5f15f93da18ba1c44432f4bb6340320183eb97794bc7ffebed6eb7c87075278aad19d81eab4e1049f7de0d10d53680cf3 WHIRLPOOL a375ffb483a8ef6f8654787d58fe831f6f1e44ff5fb152d0f113ee05801b3abaf64f5f7f039cc2c9960b425ea3b566a4023c79c2e72a11f8d2bd8a6730ea0054
 MISC ChangeLog-2015 5355 SHA256 609cd90fcfb8b6b7bf0d6a267d21eb0919244a066a84aa1c52d78bb7c314b758 SHA512 75aa0b1de69d27cd099c7d87ef45a694346cb2b45b8843db71fea4155f141122ff563813a0addc83132a548cf0f7251903abb32e3d659da225a6a25d009b4671 WHIRLPOOL da3039eaf919802faae87a7295089aff1a44c025431eb95277e0cfd10a6ab77849720eb380e8b0558d06bb69979308495f00919b2222474f39022843d8a6d9e1
 MISC metadata.xml 238 SHA256 bae0588f6a20ccebb0e76d3ad782fcb2adfd1ea5b9fc1433851379423a103b72 SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993 WHIRLPOOL ad8bdcb129ac41a2941e41186ec94e845858818fe21b95b69adc902ddbe0eb4c4bcce8f00d5f167981852184df07e355866a07f50dcdc8f7cd7edf20ed95ecee
diff --git a/www-client/opera-beta/opera-beta-49.0.2725.12.ebuild b/www-client/opera-beta/opera-beta-49.0.2725.23.ebuild
index c125ba2ec2ad..c125ba2ec2ad 100644
--- a/www-client/opera-beta/opera-beta-49.0.2725.12.ebuild
+++ b/www-client/opera-beta/opera-beta-49.0.2725.23.ebuild
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index a44238c40412..4b1e14a7d509 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -2,11 +2,11 @@ DIST opera-12.16-1860.amd64.freebsd.tar.xz 13312684 SHA256 ecc001605c45baa4acf60
 DIST opera-12.16-1860.i386.freebsd.tar.xz 13385696 SHA256 dcd80ea7a8f090a47007fc630495817feeb167220b9a9bbffbf349687f3e29d3 SHA512 0bb2c0548765ea476cdb8be6c84faf1d60dddb5a2c08b7312027f4cd17fa8ebd4fbc1a97657bbcb0ac07733e5f3b340b181a307a778c38543140adbfe7f8b844 WHIRLPOOL 5703b2c736694cf6ffcf808872e72585b81c7fed9d2263d5679ee54f667f4eb6b9d34a73b80c8efc0a8640daf03da60dafa0defe0c560d3ef78f2a8a68cbb960
 DIST opera-12.16-1860.i386.linux.tar.xz 13154668 SHA256 df640656a52b7c714faf25de92d84992116ce8f82b7a67afc1121eb3c428489d SHA512 a13ec53311e3e78f35103a9dd5337c0e9a555362860213080211ee9d21de88fbd6aae03bed20b7515874d5a09dfbab108954213745fb82175f5e48e555152613 WHIRLPOOL ae1af6858847fe51dcac8cb076a67099846ad66b734ecf92780e953daec963754c9e4352e979a636eac70e785a62bd94e084124080d7fe0f59b420a99a2133cc
 DIST opera-12.16-1860.x86_64.linux.tar.xz 14018800 SHA256 b3b5cada3829d2b3b0e2da25e9444ce9dff73dc6692586ce72cfd4f6431e639e SHA512 c1289f352ea5fc8133b105771f48fdc56ccd770920330b1a0ed939ff909abc68081447673572eabeb1aae6db5194b6ab35c93afad78a91d8f7a9a0f91e81ef8b WHIRLPOOL 539cdf43b4c8175c664fbf786b27ede1d33e58c44f75229a1a50612951136f526d646f3e0444b6cc69961259c3e3ef7dbf722b520abb4d4dbb98032c4de335d1
-DIST opera-stable_48.0.2685.35_amd64.deb 50261812 SHA256 3d2599085061a0362505df4fbd7efbe6a28879e0156fd4658739d9cdd27cb119 SHA512 2350fe08f2af8cbcd0e92101e122368f0b154e31eedb8cb632d6e36e2734a1d50e28113c6188d8e2b7a66f920a91a001cf46c46801e0b9ba9746eb9abffe0e90 WHIRLPOOL e7a55810c2065eb7ca5ce58005be2c3999cd9290d6c284060a1af1dc1b1aa474546b707c9cbd162f9aa8308975f29ae31c0b1d7caaee30366b0dde23a556360c
 DIST opera-stable_48.0.2685.39_amd64.deb 50196574 SHA256 e5b67f5cd19337edab6dc7e7c2660ff8d5e0fd88c1c255963903530ffb01b51e SHA512 e7a934a45fc0de8214431496766cb14d4b232f15b446c7d97df5088f0d92672c6583932f522b7bc82ffa979146351281a007c68eb2335d4744f2628d08f84832 WHIRLPOOL ef8d7381687e25ba46643ce39fd921e3667c3e6c0a288346caf4dd1f43e9bd98cbbe9fb142e4718cec30afa84c1656b715f6d42916cd92076bbc6ee9e101babd
+DIST opera-stable_48.0.2685.50_amd64.deb 50181884 SHA256 83c7ec7db3331de54200b7f4189acc6ca9a104b0908e05312549cd3b32ec8677 SHA512 f4e775d9e8fc1f589dda8c48e558fac93907300ff8054b9408ac656293982cf2bcbb9592279313d46efe88e2c977da6f8b39e6db8ecbe687f6135cdba2c61d5a WHIRLPOOL 56ce7a471cf9678cadad123920dcef99b1bd3349dc9576636826c679b467e2cb5ed1f7c64ccc13ff42b4d4412ed3cbdf96c5b3abae705a17ff7a9344e65733d8
 EBUILD opera-12.16_p1860-r1.ebuild 5987 SHA256 3f9a2e893b5204919f51ffb18dcc9b43370529d28122d0787d504fbf96d61869 SHA512 f0fe61c21d4a8180b5d0149aa0d4621bf60e4684803828f7743e73f894386e0c3945201ec46f16ea1fda4e780d0ea3447f32d55d985673a1643b2055efb12099 WHIRLPOOL 68a5f0263ff917476de41bf978ecf067a8ecb87191f7f404a040b0ceb0abb0af48cad027ebcecc99afe66cd0927889466220ef29b313efbc57857ee741d36d52
-EBUILD opera-48.0.2685.35.ebuild 1967 SHA256 e5d4eeeff889afc252f26da0838215c84472b634a78dab616cf4de6d8915a8cb SHA512 37762a3a3dad0eea0b673b1b402d82fa60a16352fdec1a780469709b11fb0a7061eb2ad8c9bbe2452585e77463502c6ee6a06d2acbc932709749b97fdbc4a8c6 WHIRLPOOL 6cd6d77bf5ef8aefdbbecadbf1972bd24beb5cbf0c74cf7f1076503ca56535c3f44a5086dd00aa29040b01847e3720483c8b7c5cf63d19dfd515883c04e45019
 EBUILD opera-48.0.2685.39.ebuild 1967 SHA256 e5d4eeeff889afc252f26da0838215c84472b634a78dab616cf4de6d8915a8cb SHA512 37762a3a3dad0eea0b673b1b402d82fa60a16352fdec1a780469709b11fb0a7061eb2ad8c9bbe2452585e77463502c6ee6a06d2acbc932709749b97fdbc4a8c6 WHIRLPOOL 6cd6d77bf5ef8aefdbbecadbf1972bd24beb5cbf0c74cf7f1076503ca56535c3f44a5086dd00aa29040b01847e3720483c8b7c5cf63d19dfd515883c04e45019
+EBUILD opera-48.0.2685.50.ebuild 1967 SHA256 e5d4eeeff889afc252f26da0838215c84472b634a78dab616cf4de6d8915a8cb SHA512 37762a3a3dad0eea0b673b1b402d82fa60a16352fdec1a780469709b11fb0a7061eb2ad8c9bbe2452585e77463502c6ee6a06d2acbc932709749b97fdbc4a8c6 WHIRLPOOL 6cd6d77bf5ef8aefdbbecadbf1972bd24beb5cbf0c74cf7f1076503ca56535c3f44a5086dd00aa29040b01847e3720483c8b7c5cf63d19dfd515883c04e45019
 MISC ChangeLog 11319 SHA256 b5dbbcac51e80d3bf3b17b6ec3bbd38e3aac7c88a0ede8fd1cbfbc4ed2f23ede SHA512 4beffc37f3a3014505181ee1483734aa9ac6f783e07a82a092e5c9a293e8c5270e447ee027becd1fc919cbd3d451ee60e49063703c0b9251646bb1f49a9f4e85 WHIRLPOOL c922aa713b0f04718e062b34adeb4f2d261904ecbe1695e15f1bbcc8bf737b2ea516c05a84ea1e3c0ec8e6da2d5fc9778053885e5ac0cf92d86183c517b6ca35
 MISC ChangeLog-2010 112299 SHA256 5c3b5c58119b4a6b1911d840892c42234f25dae57452287fb0a9e6cca78ed171 SHA512 9dc4dc7e7508bb1621c390837ec2e47d9e96075906b2060be419ee64e505c8f0da9e4d3a8bc7cc2de66c6efc383f026afb8fa5e886afa15da6349514a93c9edb WHIRLPOOL edaf1c2e810e91d37b2d90847640900374b447a12e2e0e927654966cc18c3a14f332ce6daa07c5a0049da06f5e89bfd0daddb5f73a4d79b334ded4397349cf7a
 MISC ChangeLog-2015 41138 SHA256 6209a7f61e8f513d7bd17f64d8c4d12e5e4318227d9033d7117427b1d241ac8b SHA512 2bbbd008b586cc177280674c2dcacf7464645ebd3ddd4b18fe86ecea30d9e9f973d286b4fcab65cd1f09d994938dc6449b28f606c2a190fbc07301a2f919e6ed WHIRLPOOL e6fca4beb9f81f9633c56b02c7e94d3f9cc46fd8ed0a66ab297f790b00b8c132c10048996d9c4427283048cebb76c74602d8e9ccb0e1edd2f68b7245d9fee092
diff --git a/www-client/opera/opera-48.0.2685.35.ebuild b/www-client/opera/opera-48.0.2685.50.ebuild
index 824ffea24a6f..824ffea24a6f 100644
--- a/www-client/opera/opera-48.0.2685.35.ebuild
+++ b/www-client/opera/opera-48.0.2685.50.ebuild
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 1bce63b8b7e5..4c74a7454a02 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -2,13 +2,13 @@ AUX 00-xhost 255 SHA256 780a53d697e5cdc8ae7cf24f97e554a9ff7b41d46f205774d7414cec
 AUX Xsession 2187 SHA256 bdf2cceaafb71762bc1c6491f9bd8cc24089dea7ef65b0a030acadf7f4aa4ab3 SHA512 a20e12f338ead48f4758268506fe899a0123c25babb1366678e643b4101ece8c913305b44c9395897a82e65ee0dd402edc0adf99adf74b3c6085bf39dd12f048 WHIRLPOOL 71669d591d60a6f5636f895471d94fee2dd1546c7561d3593e0d7b53211afed4860e4684d052e4f02913c7f98df1a11b9f64680fe85eb07daafc9263c0c3cddb
 AUX Xsession.desktop 229 SHA256 68cc432e350e4c6a94dc5b9d4e6659382a92d8a76b6b30851254d140373f41fe SHA512 2d2fea82972d77ac925e6edcd488c730b678dd74635cc3a06536413ec8bdff63be915161139f12636214023926dded9fa549f053f9a2b916ef905be79591093d WHIRLPOOL 472f41a4f695723f7bdf89a07f789269607fc4466fa3c060a63b6b50cb8b9e4a1b509f729eed1ad4d05a66fc7171e287fabf980570d7de54fa5a61209667a6c8
 AUX chooser.sh 1192 SHA256 1aceac55722a24593314c60e465a1e68982ccaf5fe0cf4d99d01e0a4d6f4cc63 SHA512 6149a5dc19104773d3500d2e89e8be5c9da49fad8b38148d511af237c6fef84c3223a94d4c0451296e7b27c86c513c5f4fd425a738d94c30d26f1ac888bbc255 WHIRLPOOL ec48a47f3647aff62a6dbe25a38c4b68cbb772c65062bf2978cd5558e128ab58aa1a34cf6081c110eb81a91e8dd047e030812c4342dc77d4947b601e972b1dc3
-AUX startDM.sh 950 SHA256 348c1c346fd4861c7cb08e07ce9ae0ca850f30fa5a54abd2d4a09de773cafe40 SHA512 4bb36cdcdb9c65a3956a003dd4c9c90ab64a41a24c5f26bfee6a0b2698e7f441e8343c76f1b13c501d5fe1f869024dd27b382bb5741e24341ec23c3a2cc38374 WHIRLPOOL a1eea734c3e14cba4502eb43ef135f56fe0d33ccf660e753dd6eb2beeac82873bf428eee36bf51816364a6a854de68aa24a99eadda01e0cb303f572e2106ad45
+AUX startDM.sh 818 SHA256 f343f87c5c89aa1b7112ec946c4df06b25e541d488405f4d98bedbeddd30bd32 SHA512 f3b3aa841edfbd23810d2da7c56e23e3f1c1eb650b1196feea2fc8dc6092ad5d4c2fba70943a1bc86d716d838ab4ebc0d93e8a2c2ccdf69b171c1fdc4989942c WHIRLPOOL f4ad1ac5b9b4bf271df814b549b3eb010489595e02591a91c0641c89943bc8cb110ab701c72fea9343e0186c9172a961f202b91e0049c33ee896fb5ca7de2759
 AUX xinit-1.3.3-gentoo-customizations.patch 1494 SHA256 8405f913acc9a6654a979d55555cb67187b3bee881ef6a452acf943b56cdc429 SHA512 810066a3af51fd31c177f1aa33d3020e63d1656bacc297fa2bb44e0f3745bfd27d466745ebb07343f7b95339a9f6c8821c6f117e0b2f99724e21a0869427228b WHIRLPOOL ed7d7d141c4c6a908f3f42cd6ae836b522b4e9a6598e2ec8a11b631d1d4f6494b9a54c60570b43ab55f10e67e52caff074f8f4848547666c33c3092476aa6b95
 AUX xinit-1.3.4-startx-current-vt.patch 808 SHA256 04e21eba179787b66e19c15ba11f7ddf5c7a07caa98b1b7dbbb805df7723e9b9 SHA512 48b16a9c521dfc83f215f25efbd4f7d433bd61e656608c20f69214ae5939f8f4a5e38d8985cc82bee871848827d53a0245940c76c7b75df4a4d907a1106ff4a9 WHIRLPOOL 83056b768075c35235e0cac451f037a499577db2ebbe47e021c8869e2aa4c86ed93e96e3617c08b1ed132a5f799bf24cb4c67c9515a52757b6b5680d964091fc
 AUX xserverrc 45 SHA256 86835010b5350c41035495b7b845db0eecf1e4b7eeaf152b12a881fa502e5387 SHA512 f86d96d76bcb340021e7904925f0029f8662e4dfc32489198b3a8695dca069da496539e2287249c763fe9c4d8d5d591fd18fe49a0bee822cbbd0eb712efbb89b WHIRLPOOL d6b68b3b63995688dff5a52d246164860091b3d30517b1cee5ac7c7d791e3a6f3356bf4d494f209b783ba8266f213aff6684190c2592e0f729017a8870e492f4
 AUX xserverrc.1 132 SHA256 5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f SHA512 3cc3b18cfc8076badcae62d098a0c3cc0b654ab691b9e7a64f456f5428f1afe1130c9c033b106cfa2e566de22cb75756d71368e3c0a7474b8a76f63c1f91a918 WHIRLPOOL 7e8fc7fd5c726f5cf4e80add93a97cfd48651db5383c2c5b02689ce3d49ead91579154320c77b7993f7d18b3b2718a9b90ad94c526f49fce5d8160bc4c62474c
 DIST xinit-1.3.4.tar.bz2 165881 SHA256 75d88d7397a07e01db253163b7c7a00b249b3d30e99489f2734cac9a0c7902b3 SHA512 ac31e4cac86fc5dd4c0e15cf37cb9ac470ef3ace4f86d0063c7e1091342fe64d41fcd12c1840bd8e1cef4cdd7f66bd2fa76bd4061641e9c70941d76d73d0df2e WHIRLPOOL 2362d69caffcaca6e6d284fcc7438fa6a81c36e79a20f23d32a67a5de9e6d64a9680d2f513e6718312d6e25117af90f28c17f70da0189595021198390eb12222
-EBUILD xinit-1.3.4-r2.ebuild 1947 SHA256 2473d322458cb9cce3ef5908c39cc87699f28834678188437acf3ee74cfc8116 SHA512 a89f374a0333147069e4a3bdded2f2ba71a0725aa3bd2c2295a1352f3ced106036ca54f7e32fdac238cbff28789fa194ef99a64b37a98192d2e3a4d7e49189ed WHIRLPOOL c17fdef20ca92169d7726e6b8ed107c31c33267494865fbc2eaeb9e7415b7979aa6b7e75b8411d063f3257ebc647ecfb9629a7540219ef778bc19ea21e8d30ab
+EBUILD xinit-1.3.4-r3.ebuild 1906 SHA256 b55cec06511d550ffdd1a33c70e7acf96a34bdf3573ef1eb75951cc6b5da1ce7 SHA512 38336aea02d1e427d5c32dbcdf6f9971c86c5aab16fc4906b586f42d97fd6738804f40a29d19741d35df39f5576d430af137dfcc24ae2e8967b1bd910a28a774 WHIRLPOOL fc69a6c402d76c77a5f3802e8acd9b592307e634d044ce4b38e88f7f0102afb5d739f257d5d08459374921dc936a27a7c047c5082d264e13a852878b19efd414
 MISC ChangeLog 4782 SHA256 47bc98791a0ab8faa1987f7fad293f2b3c936062b715afa1e28c9bcf69e0cead SHA512 bd57878dbe63bc6255c44b95cceceb2737667f2df8189bc7cff16b9df4e782f054e3cbc26943c79c7273bc9e3a50f7f82e48653d554699ebf1d31b089a9502ea WHIRLPOOL 2be90a677295553ac1c4e4991dcb66fe4b18b0c6b078e6a8a9f5447d7a9e577b854e7a0603c6d128f5774d0b6dcc7300c9008e8eb166c8fa9a985b1747e060d6
 MISC ChangeLog-2015 39710 SHA256 3f9ad1a503986b8cf8c85390e7cf95f2fcebfaf391c610e3875b01a993f2f01e SHA512 8b3f48beb02722d48166016432bf8e003b2468eb99fd914802b254d8945c0d894c63f714ef97a780e82e9de403f7ff3ebb59d3c36a16f0fd7eefe6f06b024b2d WHIRLPOOL 26e0e971f9adc58f392d3cf3bdaa0a78e2a519ee376bbd38ca8ef6927dc9ac059bb6788942e3a5c14d7f67de1bf67cdcd9d09d00eec31c52cae88f5df74d10a4
 MISC metadata.xml 480 SHA256 2f9b94f5a7ec3f0058e3e17aee941e528167c2ace77aef03f081dbd47a5e0093 SHA512 5dcfabd3eff26ffb33bd8ae8248cc3214c67a0fb10d5c214b2432fea7625b2555b29bb654d9712e8d55a081b25912da65ac367203fe529a860febc59fb91de55 WHIRLPOOL ce00934da5e14dc640184882aaae61d7071f9fdddf9545671de5ca1827cfe7c99316650dd744039536e28b13667793cb3fbbc1131acecb5464953575cd6f9f6f
diff --git a/x11-apps/xinit/files/startDM.sh b/x11-apps/xinit/files/startDM.sh
index 21fb452df1e3..66cceb3a68f5 100644
--- a/x11-apps/xinit/files/startDM.sh
+++ b/x11-apps/xinit/files/startDM.sh
@@ -1,17 +1,12 @@
 #!/bin/sh
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
 
 # We need to source /etc/profile for stuff like $LANG to work
 # bug #10190.
 . /etc/profile
 
-. /lib/gentoo/functions.sh
-
-# Bail out early if on a non-OpenRC system:
-if [ ! -d /run/openrc ]; then
-    eerror "$0 should only be used on OpenRC systems"
-fi
+. /etc/init.d/functions.sh
 
 # baselayout-1 compat
 if ! type get_options >/dev/null 2>/dev/null ; then
diff --git a/x11-apps/xinit/xinit-1.3.4-r2.ebuild b/x11-apps/xinit/xinit-1.3.4-r3.ebuild
index d07cc9662f8d..e2265f0596c3 100644
--- a/x11-apps/xinit/xinit-1.3.4-r2.ebuild
+++ b/x11-apps/xinit/xinit-1.3.4-r3.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
@@ -12,7 +12,6 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-f
 IUSE="+minimal systemd"
 
 RDEPEND="
-	!systemd? ( sys-apps/gentoo-functions )
 	!<x11-base/xorg-server-1.8.0
 	x11-apps/xauth
 	x11-libs/libX11
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 2395174cbe5c..9c619c5773b0 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -30,7 +30,7 @@ EBUILD xorg-server-1.18.4.ebuild 6269 SHA256 7e3b05dc5b6e07ccbe18050ea12105339c7
 EBUILD xorg-server-1.19.2.ebuild 6495 SHA256 78089c6a548396c89095fc6beec071f94689c3fb2bfa4f1156cf330fccac400a SHA512 db296b198e270909aa86aa10749031f63d906ebff0bb1f69893a41bb96c9a5b73b929a55815ab23ad0927c7a28d9a2e64e1c5c2ccb09a8f7cb8e340e270ca4a8 WHIRLPOOL f48f9b9d36708b482ddb9c8e9334dc727f5c2759a8ce0305704efe789a2156ce871bb5700648f7b4ba37b60dd9bbcaab0fc39fde615fca57c6ba684071b266a4
 EBUILD xorg-server-1.19.3.ebuild 6512 SHA256 2e83c66c00a67d4e9d9fcf34ec762519f3c9ada917b5762088675b5d0f0cc0fa SHA512 cffa1e80ce0c8f4435384a5f92d2bf2849e2118273ac13d1e7a9eb66bb679bb122861f2ad329f1fc92f9e3ba22dda3b2eb3b91f2f8ab1783ca8f2294d61b9f4e WHIRLPOOL ad0ae175db020297a0cf3d2f9e94402c08ba93265e746e16b9e7efc80b02898db3e628a9c3b8d82f1db3f840f490305cd5ad286fbf23d6d38d8703c6bddf1641
 EBUILD xorg-server-1.19.4.ebuild 6513 SHA256 630a9428b88a39bcbff856e9e925fa2d0c56c22bd9aa7c80bc62968c65b362dd SHA512 3190ae74ad11a042d63981a0393586299e8ebe08c2577725c43afee3d051598554ce44e1129f5e1bdbd89986a20601ce95b5fe60fb8c793466d8264ffcb8876f WHIRLPOOL 72a34fbbffbf7ee3bb8880d976bbd71840c3663d4b0d1e64010349c1da36773d605f0c398f941a71da23a2836e96d59a885b8263d1ed2f9a2354aec3a07531ed
-EBUILD xorg-server-1.19.5.ebuild 6522 SHA256 703c9acde6e89456841b7bbc2211a65b6a7827019b860a11ee4834272b57a4bc SHA512 b725fefe9016e2c39898a69bb6b71868596b1632dc3ebded75c0b598ff7c8f94dae5077eec0b513fe929d845c41e367f8574a020f06e9fe556e7c9d699c8442c WHIRLPOOL 6057505aad2390bca81289f85f39a0e84ce81ca42f9619c1fa54b18cd0eca1a70812f3f1983e398bb20686422823ce0f232353ac5ea4d2a6bbbd95ebd6c7b3f5
+EBUILD xorg-server-1.19.5.ebuild 6521 SHA256 0290086de3ed0fb8a8f7abc6dd2e4534a5e15be34bd95bd5a6cd2f87d683d6e8 SHA512 6ce2fbd53263500091c5187c8cecebe95019bbc26b5b2b2c7e9dc4c57e1b5927c18ebddcbb1cdbe49903125a3919e7c08a6269de12c372a8a4fa67a5d2852dd3 WHIRLPOOL 1dd0fe1aba0c06b182b73e08f70375f9cb8f5ca74282df96ad3cc2c3cab9ecbd0f57b28e00a732e2eab74a9a89b534e8c7b21407800d468c9a611e2b8b0a050a
 EBUILD xorg-server-9999.ebuild 6169 SHA256 182dba1e70540b652a44aae356d12c1c26064ed11b508ab540ad41b97d4d3817 SHA512 23d99ad15a01a4d36b0e25869f4c742d2c8138d54e166f46194901315e79953f61da89abfd130459dd18dd7a6a3fd37775fcf4edf429702b33d0989fb31d52c2 WHIRLPOOL c05149abc68024f65edec18f04ea0d78acc50c35737a3ff221862f54737f8ead8b3d245b9a0549d5d9e8a2b68a63b64a18c9147c59fb4e73a33ad74104c3e599
 MISC ChangeLog 13297 SHA256 1977bc55d2059999337eb7da74854d87df14c185e4385d94996bee3b873acde9 SHA512 71cec7ec907faed0cd6c6d17a1cfe7e239d3ab232886b283ba5d4e96d14ec4f72dab46aae948112cd9df86e5abe7db09ebca8b975dacc0576deff3be2f07c6a0 WHIRLPOOL 35bafac5f84bbb743de840b3019eb6e665925e001af2f8ae8086f9e715e868d554a99e91ed595edd648b4eba84c3ce8a31a1fe6bb8a659606b941ea548671a27
 MISC ChangeLog-2009 109242 SHA256 76119bd85f64b74b4f8129911eef944e8f1baa3ae38bbfb65bcd6197a6f58c88 SHA512 200b2a1f8d66bc4461de84a5b675ae9bdc1fd38ffea339cdc69afdb613d7a6d6ffe29175fba62b10c4f9d95e050035933f59e21172bf9c545d7a70137c8d04f4 WHIRLPOOL 1c084a461e803c1a6627986cb2444cd7a23743f409df5bb1ca5f55d1e7c3106670cfc2cd4f875a479e0c75513b7937ee35b591b4016b715f7fa45209e098cece
diff --git a/x11-base/xorg-server/xorg-server-1.19.5.ebuild b/x11-base/xorg-server/xorg-server-1.19.5.ebuild
index c02c16a4c417..f744e1738cb6 100644
--- a/x11-base/xorg-server/xorg-server-1.19.5.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.19.5.ebuild
@@ -9,7 +9,7 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git"
 
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
-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"
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} debug glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind xcsecurity"
diff --git a/x11-libs/libXfont/Manifest b/x11-libs/libXfont/Manifest
index dd83d74deb90..a41d31ba95aa 100644
--- a/x11-libs/libXfont/Manifest
+++ b/x11-libs/libXfont/Manifest
@@ -1,7 +1,9 @@
 DIST libXfont-1.4.9.tar.bz2 495464 SHA256 6c6b061a3aa44f0ac95785f9579f6427080c60ae6948b49bcc8d44f63942ad89 SHA512 d541dac1c8639578a122eaa61c3df1cd180f820609a02897baf1f1e45f49109b3a755a7f3b5f284716f5e6f494a829aa86be1c730156eb82db11b1551a320654 WHIRLPOOL 4c3e71025da5688ab594569557abcff714f423406409800e419a3d1b7898135ce36f6f9aa31f17613f82fe5cee9fe8e36da5b5a46529ff7203eeb5dfc07a25df
 DIST libXfont-1.5.2.tar.bz2 530367 SHA256 02945ea68da447102f3e6c2b896c1d2061fd115de99404facc2aca3ad7010d71 SHA512 6f2005eb07afe6ea39b0be035cebdf3492b60758b7b9bed9e226280e370c15883ce6e2f72d1faa006968a0d9b3b649d3b80fcdaa3f7e01a71abcae88d99c7a41 WHIRLPOOL 5175dae63b4bde3959cecc018daca94d42ff023d439d43a8470a5a8ade9eff60dd753fc18a0b6525fb6feb16d03f023abd0353ac12d6907d2c6672adc346b5a3
+DIST libXfont-1.5.3.tar.bz2 519793 SHA256 ab85c10fd2683481dfef672a77fe60e6a2039558cbc0e9bf56b5e1df471c93d0 SHA512 e7c8a09c4d174129e5d550194d3c3dc2b4abf797e52fe588c6002920727c52cf33b7db8d07fc69c2987e766d3af2d6ddda72f0c70eb21b135c691c97656a81b4 WHIRLPOOL 956af4caed82144124499f7d132a7dde21d738c3048e124b3007be65be6e093cb1247a4af24c36a1c6ef1cca52e96756c95d0b3db1940efd147fe8499378311b
 EBUILD libXfont-1.4.9.ebuild 825 SHA256 5b3dc24e49b3449c7619a7863ad375e71e3dd121deeb244a0a3d2435d066c37c SHA512 a55701a7daa83a3c66d0f81101e3ef0e2f90c13d9f21fd280ad8c202326b47e2837cba8eb3bb196b4d7f23d3b8df63be5629b64078cf46a1518a31a962abbff9 WHIRLPOOL ed29dae1a46755f17f1ef7456dbfb130427a608a468b1e29780905ea6151dcc1cc16b5ffaa2e100b647bf8fac5d82fc86380719e8691c01fd52fbeb9fa8ed549
 EBUILD libXfont-1.5.2.ebuild 868 SHA256 f3e12148c4cdcfe8ac3b01be33afe898f5f7bebc870fdf6378f6c92cd43265ad SHA512 bf29ce3df705a3ac6072722c520da24b838cc93577267a27491f1121ca2aa6bec548f1cdb50c92ceb93ffdc12b3914df92139a7839ca19a4ebd20cd8eaef698f WHIRLPOOL 7c85e7287508e208f32023d4fbf28eefc4751fc12d8af80926c9bcf05a125194c60e1bc5774f137fc6ada619a83e868caf2dd016613591cb50e35395dc2bf594
+EBUILD libXfont-1.5.3.ebuild 877 SHA256 cf90d1990f94a506592f13d873cdb16078071267bda48cbac116077be25febf2 SHA512 dfcef19b1f1422a1acd69df841010721613756cbd5051fc9032b1beb79ab4d4dea81fddf117e58ffeab5fd34764cde11010dad6983028d9a056828d1ac126cbd WHIRLPOOL 6f87c765b7c87900e50614a185082a60c0a08419f1cd4aee00b924a4b772e43b2fe796a86b4da35a80ab618a030acc8bc12a67fbdaed3024c6d100e939d61249
 MISC ChangeLog 2614 SHA256 e7d8991fdf45b22339592f5121acbf852bf6a2eb31d4e443daaf6530a37921db SHA512 e8c7e7b5a5401692b5d198a6780a0495af69a5bd491137230b22578055e5fcca53f0c92af6e69ced3b47df1278fcce61d45fef083b9baaed81d8cf027acaf3b8 WHIRLPOOL ddb4dcb927c51fbb194e603594f9c0743392a856b5e49f737a14101e2d56759860ce856ae92ce4ae6449994d14f4751e78f231fd13d44b6c6c4964ccee1ee8d5
 MISC ChangeLog-2015 30579 SHA256 79130e72d7d8d9d09b93e0bac7a7c13312b36bdc978ac00020c6c10c181fe223 SHA512 3558560f9a19d1ee228569baa41990709fb5230f9bb60ebf8709a1e344df8263d8274cd516e23ae3e62aa713cb341798bcaa36d33f99de2a6c3e11674248da4c WHIRLPOOL f2669a53caa00ada7cecbb7d64b15e0e5f50952cd812e93d03e24af49786db318935a768112472b6af37eac094899cf44b1d5eeb6e60c7f0c57e7e030391c606
 MISC metadata.xml 475 SHA256 a50b5ca3973b98cbe9bee0d84bf5dd9d6d582ac3f4db19330e42368809221109 SHA512 11c5f77e0ad6453c90b4403b7f336449ca7d72cd0f61bab37f14357710173bda280895736f098674ca0cb48b969bcd5d2a9c166161c1c717a036e09b777f7852 WHIRLPOOL 7bca65639e5c11e4310b9e4e702cb47ddfc5d769d235c586ec97110e2e960f11b4bdea448dd7e525f14ba809278fbad25270fcad15c367a7a7f390643358b124
diff --git a/x11-libs/libXfont/libXfont-1.5.3.ebuild b/x11-libs/libXfont/libXfont-1.5.3.ebuild
new file mode 100644
index 000000000000..30cc148e1931
--- /dev/null
+++ b/x11-libs/libXfont/libXfont-1.5.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_DOC=doc
+inherit xorg-2
+
+DESCRIPTION="X.Org Xfont library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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="bzip2 ipv6 truetype"
+
+RDEPEND="x11-libs/xtrans
+	x11-libs/libfontenc
+	sys-libs/zlib
+	truetype? ( >=media-libs/freetype-2 )
+	bzip2? ( app-arch/bzip2 )
+	x11-proto/xproto
+	>=x11-proto/fontsproto-2.1.3
+	!<x11-base/xorg-server-1.5.99.901"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_enable doc devel-docs)
+		$(use_with doc xmlto)
+		$(use_with bzip2)
+		$(use_enable truetype freetype)
+		--without-fop
+	)
+	xorg-2_src_configure
+}