From 07850bb3e7baf113e6432d24b931f383f0eb86bb Mon Sep 17 00:00:00 2001
From: root <root@sandbox.local.calculate.ru>
Date: Fri, 15 Jan 2016 11:04:34 +0300
Subject: [PATCH] Sync with portage [Fri Jan 15 11:04:34 MSK 2016].

---
 app-admin/ansible/Manifest                    |   1 +
 app-admin/ansible/ansible-2.0.0.2.ebuild      |  57 ++
 .../files/portage-utils-0.60-solaris.patch    |  48 ++
 .../portage-utils/portage-utils-0.60.ebuild   |   1 +
 app-text/blogc/Manifest                       |   2 +-
 .../{blogc-0.6.1.ebuild => blogc-0.7.ebuild}  |   0
 dev-go/godep/Manifest                         |   1 +
 dev-go/godep/godep-49.ebuild                  |  29 +
 dev-java/ant-antlr/ant-antlr-1.9.2-r1.ebuild  |   4 +-
 dev-java/ant-antlr/ant-antlr-1.9.2.ebuild     |  19 -
 dev-java/antlr/Manifest                       |   2 -
 dev-java/antlr/antlr-2.7.7-r5.ebuild          | 172 -----
 dev-java/antlr/antlr-2.7.7-r7.ebuild          |   4 +-
 dev-java/antlr/antlr-3.1.3-r3.ebuild          | 117 ----
 dev-java/antlr/antlr-3.2.ebuild               |   4 +-
 dev-java/antlr/metadata.xml                   |   1 -
 .../gnu-classpath-0.98-r3.ebuild              | 115 ----
 .../gnu-classpath-0.98-r5.ebuild              |   2 +-
 dev-java/jaxme/jaxme-0.5.2-r2.ebuild          |   6 +-
 dev-java/jaxme/jaxme-0.5.2.ebuild             |  92 ---
 .../netbeans-enterprise-8.0.2-r1.ebuild       |   4 +-
 .../netbeans-enterprise-8.0.2.ebuild          | 249 -------
 .../netbeans-java-8.0.2-r2.ebuild             | 252 -------
 .../netbeans-java-8.0.2-r4.ebuild             |   4 +-
 dev-java/stringtemplate/Manifest              |   1 -
 .../stringtemplate-3.1_beta1-javadoc.patch    |  19 -
 .../stringtemplate-3.2.1-r1.ebuild            |   4 +-
 .../stringtemplate/stringtemplate-3.2.ebuild  |  54 --
 .../werken-xpath-0.9.4_beta-r2.ebuild         |  60 --
 .../werken-xpath-0.9.4_beta-r4.ebuild         |   4 +-
 dev-lang/luajit/luajit-2.0.4.ebuild           |   2 +-
 dev-libs/elfutils/elfutils-0.165.ebuild       |   6 +-
 dev-libs/libnfc/Manifest                      |   1 +
 dev-libs/libnfc/libnfc-1.7.0-r1.ebuild        |   4 +-
 dev-libs/libnfc/libnfc-1.7.1.ebuild           |  44 ++
 .../Exception-Class-1.370.0-r1.ebuild         |  26 -
 dev-perl/Exception-Class/Manifest             |   1 -
 dev-perl/Expect/Expect-1.210.0-r1.ebuild      |  20 -
 dev-perl/Expect/Manifest                      |   1 -
 .../ExtUtils-Depends-0.308.0.ebuild           |  18 -
 dev-perl/ExtUtils-Depends/Manifest            |   1 -
 .../ExtUtils-F77-1.170.0-r1.ebuild            |  17 -
 dev-perl/ExtUtils-F77/Manifest                |   1 -
 .../File-MMagic/File-MMagic-1.270.0-r1.ebuild |  17 -
 dev-perl/File-MMagic/Manifest                 |   1 -
 .../File-MimeInfo-0.260.0.ebuild              |  30 -
 dev-perl/File-MimeInfo/Manifest               |   1 -
 .../File-Remove/File-Remove-1.550.0.ebuild    |  25 +
 dev-perl/File-Remove/Manifest                 |   1 +
 .../File-Scan-ClamAV-1.930.0.ebuild           |  23 +
 dev-perl/File-Scan-ClamAV/Manifest            |   1 +
 .../File-chdir/File-chdir-0.100.800-r1.ebuild |  20 -
 dev-perl/File-chdir/Manifest                  |   1 -
 .../File-chmod/File-chmod-0.360.0-r1.ebuild   |  15 -
 dev-perl/File-chmod/Manifest                  |   1 -
 dev-php/pecl-apcu_bc/Manifest                 |   1 +
 .../pecl-apcu_bc/pecl-apcu_bc-1.0.1.ebuild    |  24 +
 dev-php/pecl-mailparse/Manifest               |   1 +
 .../pecl-mailparse-3.0.0.ebuild               |  32 +
 dev-php/pecl-oauth/Manifest                   |   1 +
 dev-php/pecl-oauth/pecl-oauth-2.0.0.ebuild    |  29 +
 dev-php/pecl-rrd/Manifest                     |   1 +
 dev-php/pecl-rrd/pecl-rrd-2.0.0.ebuild        |  19 +
 dev-python/bsddb3/bsddb3-6.1.1.ebuild         |   2 +-
 ...5.5.1.ebuild => assistant-5.5.1-r1.ebuild} |  16 +-
 dev-qt/designer/designer-5.5.1.ebuild         |  41 --
 ....ebuild => linguist-tools-5.5.1-r1.ebuild} |   6 +-
 ...-5.5.1.ebuild => linguist-5.5.1-r1.ebuild} |  12 +-
 ...5.5.1.ebuild => pixeltool-5.5.1-r1.ebuild} |   8 +-
 ...bus-5.5.1.ebuild => qdbus-5.5.1-r1.ebuild} |   6 +-
 ...5.1.ebuild => qdbusviewer-5.5.1-r1.ebuild} |  10 +-
 ...5.1.ebuild => qtbluetooth-5.5.1-r1.ebuild} |  10 +-
 dev-qt/qtcore/qtcore-4.8.7.ebuild             |  89 ---
 ...1.ebuild => qtdeclarative-5.5.1-r1.ebuild} |  14 +-
 ...ag-5.5.1.ebuild => qtdiag-5.5.1-r1.ebuild} |   6 +-
 ...ild => qtgraphicaleffects-5.5.1-r1.ebuild} |   6 +-
 ...lp-5.5.1.ebuild => qthelp-5.5.1-r1.ebuild} |  12 +-
 ....ebuild => qtimageformats-5.5.1-r1.ebuild} |   4 +-
 ...s-5.5.1.ebuild => qtpaths-5.5.1-r1.ebuild} |   2 +-
 ...1.ebuild => qtpositioning-5.5.1-r1.ebuild} |   6 +-
 ...-5.5.1.ebuild => qtquick1-5.5.1-r1.ebuild} |  25 +-
 ...ebuild => qtquickcontrols-5.5.1-r1.ebuild} |  10 +-
 ...-5.5.1.ebuild => qtscript-5.5.1-r1.ebuild} |   6 +-
 ...5.5.1.ebuild => qtsensors-5.5.1-r1.ebuild} |   4 +-
 ....1.ebuild => qtserialport-5.5.1-r1.ebuild} |   2 +-
 ...svg-5.5.1.ebuild => qtsvg-5.5.1-r1.ebuild} |  10 +-
 ....ebuild => qttranslations-5.5.1-r1.ebuild} |   4 +-
 ...5.5.1.ebuild => qtwayland-5.5.1-r1.ebuild} |   6 +-
 ....1.ebuild => qtwebchannel-5.5.1-r1.ebuild} |   4 +-
 .../files/qtwebkit-5.5.1-disable-jit.patch    |  15 +
 dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild      | 106 +++
 ....1.ebuild => qtwebsockets-5.5.1-r1.ebuild} |   6 +-
 dev-qt/qtwidgets/qtwidgets-5.5.1.ebuild       |  43 --
 ...1.ebuild => qtxmlpatterns-5.5.1-r1.ebuild} |   4 +-
 dev-ruby/eventmachine/Manifest                |   2 +-
 .../eventmachine/eventmachine-1.0.3-r2.ebuild |  69 --
 ...0.7.ebuild => eventmachine-1.0.9.1.ebuild} |   4 +-
 dev-ruby/parser/Manifest                      |   1 +
 dev-ruby/parser/parser-2.3.0.1.ebuild         |  33 +
 dev-ruby/rubyzip/rubyzip-1.1.7-r1.ebuild      |   4 +-
 dev-ruby/selenium-webdriver/Manifest          |   4 +-
 .../selenium-webdriver-2.47.0.ebuild          |  40 --
 .../selenium-webdriver-2.48.0.ebuild          |  40 --
 ...build => selenium-webdriver-2.49.0.ebuild} |   4 +-
 dev-ruby/session/session-3.2.0.ebuild         |   4 +-
 dev-util/checkstyle/Manifest                  |   1 -
 dev-util/checkstyle/checkstyle-4.4.ebuild     |  96 ---
 dev-util/checkstyle/checkstyle-5.5-r1.ebuild  |   2 +-
 dev-util/cppcheck/Manifest                    |   1 +
 dev-util/cppcheck/cppcheck-1.69-r1.ebuild     |   2 +-
 dev-util/cppcheck/cppcheck-1.70.ebuild        |   2 +-
 dev-util/cppcheck/cppcheck-1.71.ebuild        |   2 +-
 dev-util/cppcheck/cppcheck-1.72.ebuild        | 105 +++
 .../files/cppcheck-1.72-tinyxml2.patch        |  66 ++
 .../sirius/files/sirius-0.8.0-format.patch    |  11 +
 games-board/sirius/sirius-0.8.0.ebuild        |   5 +-
 games-fps/doomsday/doomsday-1.15.7.ebuild     |   9 +-
 mail-client/roundcube/Manifest                |   1 +
 mail-client/roundcube/roundcube-1.1.4.ebuild  |  75 ++
 .../files/mpfc-1.3.8.1-fix-underlinking.patch |  32 +
 ...pfc-1.3.8.1-qa-implicit-declarations.patch | 193 ++++++
 media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild       |  58 ++
 metadata/dtd/timestamp.chk                    |   2 +-
 metadata/glsa/timestamp.chk                   |   2 +-
 metadata/md5-cache/app-admin/ansible-2.0.0.2  |  15 +
 .../md5-cache/app-portage/portage-utils-0.60  |   2 +-
 .../app-text/{blogc-0.6.1 => blogc-0.7}       |   2 +-
 metadata/md5-cache/dev-go/godep-49            |  11 +
 metadata/md5-cache/dev-java/ant-antlr-1.9.2   |  14 -
 .../md5-cache/dev-java/ant-antlr-1.9.2-r1     |   4 +-
 metadata/md5-cache/dev-java/antlr-2.7.7-r5    |  14 -
 metadata/md5-cache/dev-java/antlr-2.7.7-r7    |   4 +-
 metadata/md5-cache/dev-java/antlr-3.1.3-r3    |  13 -
 metadata/md5-cache/dev-java/antlr-3.2         |   4 +-
 .../md5-cache/dev-java/gnu-classpath-0.98-r3  |  13 -
 .../md5-cache/dev-java/gnu-classpath-0.98-r5  |   4 +-
 metadata/md5-cache/dev-java/jaxme-0.5.2       |  13 -
 metadata/md5-cache/dev-java/jaxme-0.5.2-r2    |   6 +-
 .../dev-java/netbeans-enterprise-8.0.2        |  13 -
 .../dev-java/netbeans-enterprise-8.0.2-r1     |   4 +-
 .../md5-cache/dev-java/netbeans-java-8.0.2-r2 |  13 -
 .../md5-cache/dev-java/netbeans-java-8.0.2-r4 |   4 +-
 .../md5-cache/dev-java/stringtemplate-3.2     |  13 -
 .../dev-java/stringtemplate-3.2.1-r1          |   4 +-
 .../dev-java/werken-xpath-0.9.4_beta-r2       |  13 -
 .../dev-java/werken-xpath-0.9.4_beta-r4       |   4 +-
 metadata/md5-cache/dev-lang/luajit-2.0.4      |   4 +-
 metadata/md5-cache/dev-libs/elfutils-0.165    |   8 +-
 metadata/md5-cache/dev-libs/libnfc-1.7.0-r1   |   6 +-
 metadata/md5-cache/dev-libs/libnfc-1.7.1      |  13 +
 .../dev-perl/Exception-Class-1.370.0-r1       |  12 -
 metadata/md5-cache/dev-perl/Expect-1.210.0-r1 |  12 -
 .../dev-perl/ExtUtils-Depends-0.308.0         |  12 -
 .../dev-perl/ExtUtils-F77-1.170.0-r1          |  12 -
 .../md5-cache/dev-perl/File-MMagic-1.270.0-r1 |  12 -
 .../md5-cache/dev-perl/File-MimeInfo-0.260.0  |  13 -
 .../md5-cache/dev-perl/File-Remove-1.550.0    |  13 +
 .../dev-perl/File-Scan-ClamAV-1.930.0         |  12 +
 .../dev-perl/File-chdir-0.100.800-r1          |  12 -
 .../md5-cache/dev-perl/File-chmod-0.360.0-r1  |  12 -
 metadata/md5-cache/dev-php/pecl-apcu_bc-1.0.1 |  14 +
 .../md5-cache/dev-php/pecl-mailparse-3.0.0    |  14 +
 metadata/md5-cache/dev-php/pecl-oauth-2.0.0   |  14 +
 metadata/md5-cache/dev-php/pecl-rrd-2.0.0     |  14 +
 metadata/md5-cache/dev-python/bsddb3-6.1.1    |   4 +-
 .../{assistant-5.5.1 => assistant-5.5.1-r1}   |   6 +-
 metadata/md5-cache/dev-qt/designer-5.5.1      |  14 -
 .../{linguist-5.5.1 => linguist-5.5.1-r1}     |   6 +-
 ...st-tools-5.5.1 => linguist-tools-5.5.1-r1} |   6 +-
 .../{pixeltool-5.5.1 => pixeltool-5.5.1-r1}   |   6 +-
 .../dev-qt/{qdbus-5.5.1 => qdbus-5.5.1-r1}    |   6 +-
 ...qdbusviewer-5.5.1 => qdbusviewer-5.5.1-r1} |   6 +-
 ...qtbluetooth-5.5.1 => qtbluetooth-5.5.1-r1} |   6 +-
 metadata/md5-cache/dev-qt/qtcore-4.8.7        |  14 -
 ...clarative-5.5.1 => qtdeclarative-5.5.1-r1} |   6 +-
 .../dev-qt/{qtdiag-5.5.1 => qtdiag-5.5.1-r1}  |   6 +-
 ...ects-5.5.1 => qtgraphicaleffects-5.5.1-r1} |   6 +-
 .../dev-qt/{qthelp-5.5.1 => qthelp-5.5.1-r1}  |   6 +-
 ...eformats-5.5.1 => qtimageformats-5.5.1-r1} |   6 +-
 .../{qtpaths-5.5.1 => qtpaths-5.5.1-r1}       |   6 +-
 ...sitioning-5.5.1 => qtpositioning-5.5.1-r1} |   6 +-
 metadata/md5-cache/dev-qt/qtquick1-5.5.1      |  14 -
 metadata/md5-cache/dev-qt/qtquick1-5.5.1-r1   |  14 +
 ...ontrols-5.5.1 => qtquickcontrols-5.5.1-r1} |   6 +-
 .../{qtscript-5.5.1 => qtscript-5.5.1-r1}     |   6 +-
 .../{qtsensors-5.5.1 => qtsensors-5.5.1-r1}   |   6 +-
 ...serialport-5.5.1 => qtserialport-5.5.1-r1} |   6 +-
 .../dev-qt/{qtsvg-5.5.1 => qtsvg-5.5.1-r1}    |   6 +-
 ...slations-5.5.1 => qttranslations-5.5.1-r1} |   4 +-
 metadata/md5-cache/dev-qt/qtwayland-5.5.1     |  14 -
 metadata/md5-cache/dev-qt/qtwayland-5.5.1-r1  |  14 +
 ...webchannel-5.5.1 => qtwebchannel-5.5.1-r1} |   6 +-
 metadata/md5-cache/dev-qt/qtwebkit-5.5.1-r1   |  15 +
 ...websockets-5.5.1 => qtwebsockets-5.5.1-r1} |   6 +-
 metadata/md5-cache/dev-qt/qtwidgets-5.5.1     |  14 -
 ...lpatterns-5.5.1 => qtxmlpatterns-5.5.1-r1} |   6 +-
 .../md5-cache/dev-ruby/eventmachine-1.0.3-r2  |  14 -
 .../md5-cache/dev-ruby/eventmachine-1.0.7     |  14 -
 .../md5-cache/dev-ruby/eventmachine-1.0.9.1   |  14 +
 metadata/md5-cache/dev-ruby/parser-2.3.0.1    |  14 +
 metadata/md5-cache/dev-ruby/rubyzip-1.1.7-r1  |  10 +-
 .../dev-ruby/selenium-webdriver-2.45.0        |  14 -
 .../dev-ruby/selenium-webdriver-2.47.0        |  14 -
 .../dev-ruby/selenium-webdriver-2.48.0        |  14 -
 .../dev-ruby/selenium-webdriver-2.49.0        |  14 +
 metadata/md5-cache/dev-ruby/session-3.2.0     |  10 +-
 metadata/md5-cache/dev-util/checkstyle-4.4    |  13 -
 metadata/md5-cache/dev-util/checkstyle-5.5-r1 |   4 +-
 metadata/md5-cache/dev-util/cppcheck-1.69-r1  |  10 +-
 metadata/md5-cache/dev-util/cppcheck-1.70     |  10 +-
 metadata/md5-cache/dev-util/cppcheck-1.71     |  10 +-
 metadata/md5-cache/dev-util/cppcheck-1.72     |  14 +
 metadata/md5-cache/games-board/sirius-0.8.0   |   2 +-
 metadata/md5-cache/games-fps/doomsday-1.15.7  |  13 +-
 .../md5-cache/mail-client/roundcube-1.1.4     |  14 +
 .../md5-cache/media-sound/mpfc-1.3.8.1-r2     |  13 +
 metadata/md5-cache/net-analyzer/nethogs-0.8.1 |  12 +
 metadata/md5-cache/net-ftp/atftp-0.7-r4       |  13 -
 metadata/md5-cache/net-ftp/atftp-0.7-r5       |  13 +
 metadata/md5-cache/net-irc/ngircd-23-r1       |  14 +
 metadata/md5-cache/net-irc/weechat-1.4        |  14 +
 metadata/md5-cache/net-irc/weechat-9999       |   8 +-
 metadata/md5-cache/net-libs/serf-1.3.8-r1     |  13 +
 metadata/md5-cache/net-mail/getmail-4.49.0    |  14 +
 metadata/md5-cache/net-mail/libpst-0.6.55     |  13 -
 metadata/md5-cache/net-mail/libpst-0.6.58     |  13 -
 metadata/md5-cache/net-mail/libpst-0.6.60     |  13 -
 metadata/md5-cache/net-mail/libpst-0.6.61     |  13 -
 metadata/md5-cache/net-mail/libpst-0.6.63     |  13 -
 metadata/md5-cache/net-mail/libpst-0.6.64     |   4 +-
 .../net-mail/{libpst-0.6.59 => libpst-0.6.66} |   6 +-
 metadata/md5-cache/net-misc/openssh-7.1_p1-r2 |   2 +-
 metadata/md5-cache/net-misc/openssh-7.1_p1-r3 |   4 +-
 metadata/md5-cache/net-misc/openssh-7.1_p2    |  14 +
 .../md5-cache/net-misc/youtube-dl-2016.01.14  |  14 +
 metadata/md5-cache/sci-mathematics/glpk-4.57  |  13 +
 .../sys-apps/{openrc-0.20.1 => openrc-0.20.2} |   2 +-
 metadata/md5-cache/sys-apps/sandbox-2.10-r1   |   4 +-
 .../md5-cache/sys-kernel/linux-headers-4.3    |   4 +-
 metadata/md5-cache/sys-libs/efivar-0.21       |   2 +-
 .../md5-cache/sys-process/cronbase-0.3.7-r1   |   4 +-
 ....106_p1 => google-chrome-47.0.2526.111_p1} |   4 +-
 ..._p1 => google-chrome-beta-48.0.2564.79_p1} |   4 +-
 ...a-34.0.2036.24 => opera-beta-35.0.2066.23} |   2 +-
 .../www-client/opera-developer-35.0.2064.0    |  13 -
 ...6.0.2072.0 => opera-developer-36.0.2106.0} |   2 +-
 ...=> chrome-binary-plugins-47.0.2526.111_p1} |   4 +-
 ... chrome-binary-plugins-48.0.2564.79_beta1} |   4 +-
 .../x11-drivers/ati-drivers-15.12-r1          |  15 +
 metadata/news/timestamp.chk                   |   2 +-
 metadata/projects.xml                         |  34 +
 metadata/timestamp                            |   2 +-
 metadata/timestamp.chk                        |   2 +-
 metadata/timestamp.x                          |   2 +-
 net-analyzer/nethogs/Manifest                 |   1 +
 net-analyzer/nethogs/nethogs-0.8.1.ebuild     |  33 +
 ...tftp-0.7-r4.ebuild => atftp-0.7-r5.ebuild} |  44 +-
 net-ftp/atftp/files/atftp-0.7-CFLAGS.patch    |  32 +
 net-ftp/atftp/files/atftp-0.7-illreply.patch  |   4 +-
 net-irc/ngircd/files/ngircd.init-r1.d         |  22 +
 net-irc/ngircd/ngircd-23-r1.ebuild            |  85 +++
 net-irc/weechat/Manifest                      |   1 +
 net-irc/weechat/weechat-1.4.ebuild            | 137 ++++
 net-irc/weechat/weechat-9999.ebuild           |  11 +-
 net-libs/serf/files/serf-1.3.8-openssl.patch  |  28 +
 .../serf/files/serf-1.3.8-static-lib.patch    |  49 ++
 net-libs/serf/serf-1.3.8-r1.ebuild            |  68 ++
 net-mail/getmail/Manifest                     |   1 +
 net-mail/getmail/getmail-4.49.0.ebuild        |  25 +
 net-mail/libpst/Manifest                      |   7 +-
 net-mail/libpst/libpst-0.6.55.ebuild          |  62 --
 net-mail/libpst/libpst-0.6.58.ebuild          |  63 --
 net-mail/libpst/libpst-0.6.60.ebuild          |  63 --
 net-mail/libpst/libpst-0.6.61.ebuild          |  63 --
 net-mail/libpst/libpst-0.6.63.ebuild          |  63 --
 net-mail/libpst/libpst-0.6.64.ebuild          |   2 +-
 ...pst-0.6.59.ebuild => libpst-0.6.66.ebuild} |   4 +-
 net-mail/libpst/metadata.xml                  |   2 +-
 net-misc/openssh/Manifest                     |   4 +
 .../openssh-7.1_p2-x509-hpn14v10-glue.patch   |  51 ++
 net-misc/openssh/openssh-7.1_p1-r2.ebuild     |   8 +-
 net-misc/openssh/openssh-7.1_p1-r3.ebuild     |  10 +-
 net-misc/openssh/openssh-7.1_p2.ebuild        | 327 +++++++++
 net-misc/youtube-dl/Manifest                  |   1 +
 .../youtube-dl/youtube-dl-2016.01.14.ebuild   |  87 +++
 profiles/base/package.use.mask                |   7 +
 profiles/package.mask                         |   4 +
 profiles/use.local.desc                       |   2 +-
 sci-mathematics/glpk/Manifest                 |   1 +
 .../glpk-4.57-debundle-system-libs.patch      |  88 +++
 sci-mathematics/glpk/glpk-4.57.ebuild         |  62 ++
 sys-apps/openrc/Manifest                      |   2 +-
 ...nrc-0.20.1.ebuild => openrc-0.20.2.ebuild} |   0
 sys-apps/sandbox/sandbox-2.10-r1.ebuild       |   2 +-
 sys-fs/btrfs-progs/metadata.xml               |   1 +
 .../linux-headers/linux-headers-4.3.ebuild    |   2 +-
 sys-libs/efivar/efivar-0.21.ebuild            |   4 +-
 sys-libs/efivar/files/0.21-nvme_ioctl.h.patch |  30 +
 sys-process/cronbase/cronbase-0.3.7-r1.ebuild |   2 +-
 www-client/google-chrome-beta/Manifest        |   4 +-
 ...google-chrome-beta-48.0.2564.79_p1.ebuild} |   2 +-
 www-client/google-chrome/Manifest             |   4 +-
 ... => google-chrome-47.0.2526.111_p1.ebuild} |   2 +-
 www-client/opera-beta/Manifest                |   2 +-
 ....ebuild => opera-beta-35.0.2066.23.ebuild} |   0
 www-client/opera-developer/Manifest           |   6 +-
 .../opera-developer-36.0.2072.0.ebuild        |  91 ---
 ...ild => opera-developer-36.0.2106.0.ebuild} |   0
 www-plugins/chrome-binary-plugins/Manifest    |   8 +-
 ...me-binary-plugins-47.0.2526.111_p1.ebuild} |   2 +-
 ...-binary-plugins-48.0.2564.79_beta1.ebuild} |   2 +-
 .../ati-drivers/ati-drivers-15.12-r1.ebuild   | 641 ++++++++++++++++++
 .../ati-drivers/files/15.12-xstate-fp.patch   |  26 +
 313 files changed, 3648 insertions(+), 2999 deletions(-)
 create mode 100644 app-admin/ansible/ansible-2.0.0.2.ebuild
 create mode 100644 app-portage/portage-utils/files/portage-utils-0.60-solaris.patch
 rename app-text/blogc/{blogc-0.6.1.ebuild => blogc-0.7.ebuild} (100%)
 create mode 100644 dev-go/godep/godep-49.ebuild
 delete mode 100644 dev-java/ant-antlr/ant-antlr-1.9.2.ebuild
 delete mode 100644 dev-java/antlr/antlr-2.7.7-r5.ebuild
 delete mode 100644 dev-java/antlr/antlr-3.1.3-r3.ebuild
 delete mode 100644 dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild
 delete mode 100644 dev-java/jaxme/jaxme-0.5.2.ebuild
 delete mode 100644 dev-java/netbeans-enterprise/netbeans-enterprise-8.0.2.ebuild
 delete mode 100644 dev-java/netbeans-java/netbeans-java-8.0.2-r2.ebuild
 delete mode 100644 dev-java/stringtemplate/files/stringtemplate-3.1_beta1-javadoc.patch
 delete mode 100644 dev-java/stringtemplate/stringtemplate-3.2.ebuild
 delete mode 100644 dev-java/werken-xpath/werken-xpath-0.9.4_beta-r2.ebuild
 create mode 100644 dev-libs/libnfc/libnfc-1.7.1.ebuild
 delete mode 100644 dev-perl/Exception-Class/Exception-Class-1.370.0-r1.ebuild
 delete mode 100644 dev-perl/Expect/Expect-1.210.0-r1.ebuild
 delete mode 100644 dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.308.0.ebuild
 delete mode 100644 dev-perl/ExtUtils-F77/ExtUtils-F77-1.170.0-r1.ebuild
 delete mode 100644 dev-perl/File-MMagic/File-MMagic-1.270.0-r1.ebuild
 delete mode 100644 dev-perl/File-MimeInfo/File-MimeInfo-0.260.0.ebuild
 create mode 100644 dev-perl/File-Remove/File-Remove-1.550.0.ebuild
 create mode 100644 dev-perl/File-Scan-ClamAV/File-Scan-ClamAV-1.930.0.ebuild
 delete mode 100644 dev-perl/File-chdir/File-chdir-0.100.800-r1.ebuild
 delete mode 100644 dev-perl/File-chmod/File-chmod-0.360.0-r1.ebuild
 create mode 100644 dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.1.ebuild
 create mode 100644 dev-php/pecl-mailparse/pecl-mailparse-3.0.0.ebuild
 create mode 100644 dev-php/pecl-oauth/pecl-oauth-2.0.0.ebuild
 create mode 100644 dev-php/pecl-rrd/pecl-rrd-2.0.0.ebuild
 rename dev-qt/assistant/{assistant-5.5.1.ebuild => assistant-5.5.1-r1.ebuild} (70%)
 delete mode 100644 dev-qt/designer/designer-5.5.1.ebuild
 rename dev-qt/linguist-tools/{linguist-tools-5.5.1.ebuild => linguist-tools-5.5.1-r1.ebuild} (86%)
 rename dev-qt/linguist/{linguist-5.5.1.ebuild => linguist-5.5.1-r1.ebuild} (71%)
 rename dev-qt/pixeltool/{pixeltool-5.5.1.ebuild => pixeltool-5.5.1-r1.ebuild} (77%)
 rename dev-qt/qdbus/{qdbus-5.5.1.ebuild => qdbus-5.5.1-r1.ebuild} (84%)
 rename dev-qt/qdbusviewer/{qdbusviewer-5.5.1.ebuild => qdbusviewer-5.5.1-r1.ebuild} (76%)
 rename dev-qt/qtbluetooth/{qtbluetooth-5.5.1.ebuild => qtbluetooth-5.5.1-r1.ebuild} (77%)
 delete mode 100644 dev-qt/qtcore/qtcore-4.8.7.ebuild
 rename dev-qt/qtdeclarative/{qtdeclarative-5.5.1.ebuild => qtdeclarative-5.5.1-r1.ebuild} (78%)
 rename dev-qt/qtdiag/{qtdiag-5.5.1.ebuild => qtdiag-5.5.1-r1.ebuild} (83%)
 rename dev-qt/qtgraphicaleffects/{qtgraphicaleffects-5.5.1.ebuild => qtgraphicaleffects-5.5.1-r1.ebuild} (82%)
 rename dev-qt/qthelp/{qthelp-5.5.1.ebuild => qthelp-5.5.1-r1.ebuild} (72%)
 rename dev-qt/qtimageformats/{qtimageformats-5.5.1.ebuild => qtimageformats-5.5.1-r1.ebuild} (89%)
 rename dev-qt/qtpaths/{qtpaths-5.5.1.ebuild => qtpaths-5.5.1-r1.ebuild} (93%)
 rename dev-qt/qtpositioning/{qtpositioning-5.5.1.ebuild => qtpositioning-5.5.1-r1.ebuild} (88%)
 rename dev-qt/qtquick1/{qtquick1-5.5.1.ebuild => qtquick1-5.5.1-r1.ebuild} (64%)
 rename dev-qt/qtquickcontrols/{qtquickcontrols-5.5.1.ebuild => qtquickcontrols-5.5.1-r1.ebuild} (78%)
 rename dev-qt/qtscript/{qtscript-5.5.1.ebuild => qtscript-5.5.1-r1.ebuild} (88%)
 rename dev-qt/qtsensors/{qtsensors-5.5.1.ebuild => qtsensors-5.5.1-r1.ebuild} (86%)
 rename dev-qt/qtserialport/{qtserialport-5.5.1.ebuild => qtserialport-5.5.1-r1.ebuild} (93%)
 rename dev-qt/qtsvg/{qtsvg-5.5.1.ebuild => qtsvg-5.5.1-r1.ebuild} (68%)
 rename dev-qt/qttranslations/{qttranslations-5.5.1.ebuild => qttranslations-5.5.1-r1.ebuild} (84%)
 rename dev-qt/qtwayland/{qtwayland-5.5.1.ebuild => qtwayland-5.5.1-r1.ebuild} (89%)
 rename dev-qt/qtwebchannel/{qtwebchannel-5.5.1.ebuild => qtwebchannel-5.5.1-r1.ebuild} (89%)
 create mode 100644 dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch
 create mode 100644 dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild
 rename dev-qt/qtwebsockets/{qtwebsockets-5.5.1.ebuild => qtwebsockets-5.5.1-r1.ebuild} (82%)
 delete mode 100644 dev-qt/qtwidgets/qtwidgets-5.5.1.ebuild
 rename dev-qt/qtxmlpatterns/{qtxmlpatterns-5.5.1.ebuild => qtxmlpatterns-5.5.1-r1.ebuild} (87%)
 delete mode 100644 dev-ruby/eventmachine/eventmachine-1.0.3-r2.ebuild
 rename dev-ruby/eventmachine/{eventmachine-1.0.7.ebuild => eventmachine-1.0.9.1.ebuild} (96%)
 create mode 100644 dev-ruby/parser/parser-2.3.0.1.ebuild
 delete mode 100644 dev-ruby/selenium-webdriver/selenium-webdriver-2.47.0.ebuild
 delete mode 100644 dev-ruby/selenium-webdriver/selenium-webdriver-2.48.0.ebuild
 rename dev-ruby/selenium-webdriver/{selenium-webdriver-2.45.0.ebuild => selenium-webdriver-2.49.0.ebuild} (93%)
 delete mode 100644 dev-util/checkstyle/checkstyle-4.4.ebuild
 create mode 100644 dev-util/cppcheck/cppcheck-1.72.ebuild
 create mode 100644 dev-util/cppcheck/files/cppcheck-1.72-tinyxml2.patch
 create mode 100644 games-board/sirius/files/sirius-0.8.0-format.patch
 create mode 100644 mail-client/roundcube/roundcube-1.1.4.ebuild
 create mode 100644 media-sound/mpfc/files/mpfc-1.3.8.1-fix-underlinking.patch
 create mode 100644 media-sound/mpfc/files/mpfc-1.3.8.1-qa-implicit-declarations.patch
 create mode 100644 media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild
 create mode 100644 metadata/md5-cache/app-admin/ansible-2.0.0.2
 rename metadata/md5-cache/app-text/{blogc-0.6.1 => blogc-0.7} (81%)
 create mode 100644 metadata/md5-cache/dev-go/godep-49
 delete mode 100644 metadata/md5-cache/dev-java/ant-antlr-1.9.2
 delete mode 100644 metadata/md5-cache/dev-java/antlr-2.7.7-r5
 delete mode 100644 metadata/md5-cache/dev-java/antlr-3.1.3-r3
 delete mode 100644 metadata/md5-cache/dev-java/gnu-classpath-0.98-r3
 delete mode 100644 metadata/md5-cache/dev-java/jaxme-0.5.2
 delete mode 100644 metadata/md5-cache/dev-java/netbeans-enterprise-8.0.2
 delete mode 100644 metadata/md5-cache/dev-java/netbeans-java-8.0.2-r2
 delete mode 100644 metadata/md5-cache/dev-java/stringtemplate-3.2
 delete mode 100644 metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r2
 create mode 100644 metadata/md5-cache/dev-libs/libnfc-1.7.1
 delete mode 100644 metadata/md5-cache/dev-perl/Exception-Class-1.370.0-r1
 delete mode 100644 metadata/md5-cache/dev-perl/Expect-1.210.0-r1
 delete mode 100644 metadata/md5-cache/dev-perl/ExtUtils-Depends-0.308.0
 delete mode 100644 metadata/md5-cache/dev-perl/ExtUtils-F77-1.170.0-r1
 delete mode 100644 metadata/md5-cache/dev-perl/File-MMagic-1.270.0-r1
 delete mode 100644 metadata/md5-cache/dev-perl/File-MimeInfo-0.260.0
 create mode 100644 metadata/md5-cache/dev-perl/File-Remove-1.550.0
 create mode 100644 metadata/md5-cache/dev-perl/File-Scan-ClamAV-1.930.0
 delete mode 100644 metadata/md5-cache/dev-perl/File-chdir-0.100.800-r1
 delete mode 100644 metadata/md5-cache/dev-perl/File-chmod-0.360.0-r1
 create mode 100644 metadata/md5-cache/dev-php/pecl-apcu_bc-1.0.1
 create mode 100644 metadata/md5-cache/dev-php/pecl-mailparse-3.0.0
 create mode 100644 metadata/md5-cache/dev-php/pecl-oauth-2.0.0
 create mode 100644 metadata/md5-cache/dev-php/pecl-rrd-2.0.0
 rename metadata/md5-cache/dev-qt/{assistant-5.5.1 => assistant-5.5.1-r1} (51%)
 delete mode 100644 metadata/md5-cache/dev-qt/designer-5.5.1
 rename metadata/md5-cache/dev-qt/{linguist-5.5.1 => linguist-5.5.1-r1} (56%)
 rename metadata/md5-cache/dev-qt/{linguist-tools-5.5.1 => linguist-tools-5.5.1-r1} (64%)
 rename metadata/md5-cache/dev-qt/{pixeltool-5.5.1 => pixeltool-5.5.1-r1} (61%)
 rename metadata/md5-cache/dev-qt/{qdbus-5.5.1 => qdbus-5.5.1-r1} (66%)
 rename metadata/md5-cache/dev-qt/{qdbusviewer-5.5.1 => qdbusviewer-5.5.1-r1} (61%)
 rename metadata/md5-cache/dev-qt/{qtbluetooth-5.5.1 => qtbluetooth-5.5.1-r1} (56%)
 delete mode 100644 metadata/md5-cache/dev-qt/qtcore-4.8.7
 rename metadata/md5-cache/dev-qt/{qtdeclarative-5.5.1 => qtdeclarative-5.5.1-r1} (51%)
 rename metadata/md5-cache/dev-qt/{qtdiag-5.5.1 => qtdiag-5.5.1-r1} (66%)
 rename metadata/md5-cache/dev-qt/{qtgraphicaleffects-5.5.1 => qtgraphicaleffects-5.5.1-r1} (67%)
 rename metadata/md5-cache/dev-qt/{qthelp-5.5.1 => qthelp-5.5.1-r1} (58%)
 rename metadata/md5-cache/dev-qt/{qtimageformats-5.5.1 => qtimageformats-5.5.1-r1} (60%)
 rename metadata/md5-cache/dev-qt/{qtpaths-5.5.1 => qtpaths-5.5.1-r1} (72%)
 rename metadata/md5-cache/dev-qt/{qtpositioning-5.5.1 => qtpositioning-5.5.1-r1} (59%)
 delete mode 100644 metadata/md5-cache/dev-qt/qtquick1-5.5.1
 create mode 100644 metadata/md5-cache/dev-qt/qtquick1-5.5.1-r1
 rename metadata/md5-cache/dev-qt/{qtquickcontrols-5.5.1 => qtquickcontrols-5.5.1-r1} (62%)
 rename metadata/md5-cache/dev-qt/{qtscript-5.5.1 => qtscript-5.5.1-r1} (65%)
 rename metadata/md5-cache/dev-qt/{qtsensors-5.5.1 => qtsensors-5.5.1-r1} (67%)
 rename metadata/md5-cache/dev-qt/{qtserialport-5.5.1 => qtserialport-5.5.1-r1} (71%)
 rename metadata/md5-cache/dev-qt/{qtsvg-5.5.1 => qtsvg-5.5.1-r1} (61%)
 rename metadata/md5-cache/dev-qt/{qttranslations-5.5.1 => qttranslations-5.5.1-r1} (75%)
 delete mode 100644 metadata/md5-cache/dev-qt/qtwayland-5.5.1
 create mode 100644 metadata/md5-cache/dev-qt/qtwayland-5.5.1-r1
 rename metadata/md5-cache/dev-qt/{qtwebchannel-5.5.1 => qtwebchannel-5.5.1-r1} (68%)
 create mode 100644 metadata/md5-cache/dev-qt/qtwebkit-5.5.1-r1
 rename metadata/md5-cache/dev-qt/{qtwebsockets-5.5.1 => qtwebsockets-5.5.1-r1} (64%)
 delete mode 100644 metadata/md5-cache/dev-qt/qtwidgets-5.5.1
 rename metadata/md5-cache/dev-qt/{qtxmlpatterns-5.5.1 => qtxmlpatterns-5.5.1-r1} (69%)
 delete mode 100644 metadata/md5-cache/dev-ruby/eventmachine-1.0.3-r2
 delete mode 100644 metadata/md5-cache/dev-ruby/eventmachine-1.0.7
 create mode 100644 metadata/md5-cache/dev-ruby/eventmachine-1.0.9.1
 create mode 100644 metadata/md5-cache/dev-ruby/parser-2.3.0.1
 delete mode 100644 metadata/md5-cache/dev-ruby/selenium-webdriver-2.45.0
 delete mode 100644 metadata/md5-cache/dev-ruby/selenium-webdriver-2.47.0
 delete mode 100644 metadata/md5-cache/dev-ruby/selenium-webdriver-2.48.0
 create mode 100644 metadata/md5-cache/dev-ruby/selenium-webdriver-2.49.0
 delete mode 100644 metadata/md5-cache/dev-util/checkstyle-4.4
 create mode 100644 metadata/md5-cache/dev-util/cppcheck-1.72
 create mode 100644 metadata/md5-cache/mail-client/roundcube-1.1.4
 create mode 100644 metadata/md5-cache/media-sound/mpfc-1.3.8.1-r2
 create mode 100644 metadata/md5-cache/net-analyzer/nethogs-0.8.1
 delete mode 100644 metadata/md5-cache/net-ftp/atftp-0.7-r4
 create mode 100644 metadata/md5-cache/net-ftp/atftp-0.7-r5
 create mode 100644 metadata/md5-cache/net-irc/ngircd-23-r1
 create mode 100644 metadata/md5-cache/net-irc/weechat-1.4
 create mode 100644 metadata/md5-cache/net-libs/serf-1.3.8-r1
 create mode 100644 metadata/md5-cache/net-mail/getmail-4.49.0
 delete mode 100644 metadata/md5-cache/net-mail/libpst-0.6.55
 delete mode 100644 metadata/md5-cache/net-mail/libpst-0.6.58
 delete mode 100644 metadata/md5-cache/net-mail/libpst-0.6.60
 delete mode 100644 metadata/md5-cache/net-mail/libpst-0.6.61
 delete mode 100644 metadata/md5-cache/net-mail/libpst-0.6.63
 rename metadata/md5-cache/net-mail/{libpst-0.6.59 => libpst-0.6.66} (89%)
 create mode 100644 metadata/md5-cache/net-misc/openssh-7.1_p2
 create mode 100644 metadata/md5-cache/net-misc/youtube-dl-2016.01.14
 create mode 100644 metadata/md5-cache/sci-mathematics/glpk-4.57
 rename metadata/md5-cache/sys-apps/{openrc-0.20.1 => openrc-0.20.2} (96%)
 rename metadata/md5-cache/www-client/{google-chrome-47.0.2526.106_p1 => google-chrome-47.0.2526.111_p1} (92%)
 rename metadata/md5-cache/www-client/{google-chrome-beta-48.0.2564.71_p1 => google-chrome-beta-48.0.2564.79_p1} (92%)
 rename metadata/md5-cache/www-client/{opera-beta-34.0.2036.24 => opera-beta-35.0.2066.23} (94%)
 delete mode 100644 metadata/md5-cache/www-client/opera-developer-35.0.2064.0
 rename metadata/md5-cache/www-client/{opera-developer-36.0.2072.0 => opera-developer-36.0.2106.0} (92%)
 rename metadata/md5-cache/www-plugins/{chrome-binary-plugins-47.0.2526.106_p1 => chrome-binary-plugins-47.0.2526.111_p1} (79%)
 rename metadata/md5-cache/www-plugins/{chrome-binary-plugins-48.0.2564.71_beta1 => chrome-binary-plugins-48.0.2564.79_beta1} (79%)
 create mode 100644 metadata/md5-cache/x11-drivers/ati-drivers-15.12-r1
 create mode 100644 net-analyzer/nethogs/nethogs-0.8.1.ebuild
 rename net-ftp/atftp/{atftp-0.7-r4.ebuild => atftp-0.7-r5.ebuild} (62%)
 create mode 100644 net-ftp/atftp/files/atftp-0.7-CFLAGS.patch
 create mode 100644 net-irc/ngircd/files/ngircd.init-r1.d
 create mode 100644 net-irc/ngircd/ngircd-23-r1.ebuild
 create mode 100644 net-irc/weechat/weechat-1.4.ebuild
 create mode 100644 net-libs/serf/files/serf-1.3.8-openssl.patch
 create mode 100644 net-libs/serf/files/serf-1.3.8-static-lib.patch
 create mode 100644 net-libs/serf/serf-1.3.8-r1.ebuild
 create mode 100644 net-mail/getmail/getmail-4.49.0.ebuild
 delete mode 100644 net-mail/libpst/libpst-0.6.55.ebuild
 delete mode 100644 net-mail/libpst/libpst-0.6.58.ebuild
 delete mode 100644 net-mail/libpst/libpst-0.6.60.ebuild
 delete mode 100644 net-mail/libpst/libpst-0.6.61.ebuild
 delete mode 100644 net-mail/libpst/libpst-0.6.63.ebuild
 rename net-mail/libpst/{libpst-0.6.59.ebuild => libpst-0.6.66.ebuild} (96%)
 create mode 100644 net-misc/openssh/files/openssh-7.1_p2-x509-hpn14v10-glue.patch
 create mode 100644 net-misc/openssh/openssh-7.1_p2.ebuild
 create mode 100644 net-misc/youtube-dl/youtube-dl-2016.01.14.ebuild
 create mode 100644 sci-mathematics/glpk/files/glpk-4.57-debundle-system-libs.patch
 create mode 100644 sci-mathematics/glpk/glpk-4.57.ebuild
 rename sys-apps/openrc/{openrc-0.20.1.ebuild => openrc-0.20.2.ebuild} (100%)
 create mode 100644 sys-libs/efivar/files/0.21-nvme_ioctl.h.patch
 rename www-client/google-chrome-beta/{google-chrome-beta-48.0.2564.71_p1.ebuild => google-chrome-beta-48.0.2564.79_p1.ebuild} (99%)
 rename www-client/google-chrome/{google-chrome-47.0.2526.106_p1.ebuild => google-chrome-47.0.2526.111_p1.ebuild} (98%)
 rename www-client/opera-beta/{opera-beta-34.0.2036.24.ebuild => opera-beta-35.0.2066.23.ebuild} (100%)
 delete mode 100644 www-client/opera-developer/opera-developer-36.0.2072.0.ebuild
 rename www-client/opera-developer/{opera-developer-35.0.2064.0.ebuild => opera-developer-36.0.2106.0.ebuild} (100%)
 rename www-plugins/chrome-binary-plugins/{chrome-binary-plugins-47.0.2526.106_p1.ebuild => chrome-binary-plugins-47.0.2526.111_p1.ebuild} (98%)
 rename www-plugins/chrome-binary-plugins/{chrome-binary-plugins-48.0.2564.71_beta1.ebuild => chrome-binary-plugins-48.0.2564.79_beta1.ebuild} (98%)
 create mode 100644 x11-drivers/ati-drivers/ati-drivers-15.12-r1.ebuild
 create mode 100644 x11-drivers/ati-drivers/files/15.12-xstate-fp.patch

diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 072aec89f2a0..fd6a560c9ee7 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,2 +1,3 @@
 DIST ansible-1.9.4.tar.gz 937120 SHA256 972c2face49f1577bd0ff7989440bfe2820e66fb10d7579915cc536bccfa6fe3 SHA512 53ef5b3390be620cedc92687c7c9853c42f38547494f9b77056d5ea48ccd8f43d193648a7f4569fcba5afad343a9202b123296ab47c8cd02eecfe455d83b9586 WHIRLPOOL 0b88a27f690ff940eae1969ff163d8f8c26df038d2e9aa76694bdba1448ac9cbe8123795d0787e528c6d22cf66cc01d6b89add8e3e97bbb107a3f1a96860fd8e
 DIST ansible-2.0.0.1.tar.gz 1524249 SHA256 1085c1fae3b59f8e55a64b949489f1ddcd811a0c32d9df8ac18abf44a430f3b5 SHA512 2823252a7922c417d8495709c53db85d33ae925120c3572acafe4e11c4d5ba5b9acdec72414606eb9ef4f66ca15db8fe52e0f14623ceef5165a30eb4e249d136 WHIRLPOOL 0b4ba3a632d40413c61b7bd14315f14b64e459cdebd450230ed75711f97bec04ee8a8cc4c4a79e42dfd62654e0f8ae5ffa0fdea40d3874f199a16e45d60c0937
+DIST ansible-2.0.0.2.tar.gz 1497944 SHA256 27db0b99113fab85b1430c361c7790a0aa7f5c614c9af13362e2adbba07e5828 SHA512 bf034384849d3f065ff77982e2e47a94727fc2982f0dac8d67efda2646dcdbd52ba9cc3ddfcdb9cd8210af0935f6f42946cc8ddc659d62cccd670e5d55c7dfa0 WHIRLPOOL bbf15cbdc50bfe2c33e22a4c9139663c9a622d70f59450953f85c088daa6fed88fbe4f46933c8998abdec20fed44846838a0e5a2ada76710c438f3c9769e15be
diff --git a/app-admin/ansible/ansible-2.0.0.2.ebuild b/app-admin/ansible/ansible-2.0.0.2.ebuild
new file mode 100644
index 000000000000..ddf6e660fb03
--- /dev/null
+++ b/app-admin/ansible/ansible-2.0.0.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="http://ansible.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="keyczar test"
+
+RDEPEND="
+	keyczar? ( dev-python/keyczar[${PYTHON_USEDEP}] )
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		<dev-python/mock-1.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	EXAMPLES=( examples )
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+}
diff --git a/app-portage/portage-utils/files/portage-utils-0.60-solaris.patch b/app-portage/portage-utils/files/portage-utils-0.60-solaris.patch
new file mode 100644
index 000000000000..c938844e8462
--- /dev/null
+++ b/app-portage/portage-utils/files/portage-utils-0.60-solaris.patch
@@ -0,0 +1,48 @@
+- remove non-compatible xasprintf wrapper (compared to statement
+  expression version in libq/xasprintf.c
+- work around missing d_type/DT_DIR
+
+--- qcache.c
++++ qcache.c
+@@ -750,13 +750,21 @@
+ 
+ 		xasprintf(&catpath, "%s/dep/%s", portedb, data->overlay);
+ 		dir = opendir(catpath);
+-		while ((de = readdir(dir)))
++		while ((de = readdir(dir))) {
++#ifndef DT_DIR
++			struct stat s;
++			if (stat(de->d_name, &s))
++				continue;
++			if (S_ISDIR(s.st_mode) && de->d_name[0] != '.') {
++#else
+ 			if (de->d_type == DT_DIR && de->d_name[0] != '.') {
++#endif
+ 				bool ok;
+ 				allcats = add_set_unique(de->d_name, allcats, &ok);
+ 				if (ok)
+ 					++numcat;
+ 			}
++		}
+ 		closedir(dir);
+ 		free(catpath);
+ 
+--- libq/compat.c
++++ libq/compat.c
+@@ -20,16 +20,6 @@
+ 	return(off == NULL ? off : (char*)(big + (off - b)));
+ }
+ 
+-#undef  xasprintf
+-#define xasprintf(strp, fmt, args...) \
+-	do { /* xasprintf() */ \
+-		char str[BUFSIZ]; \
+-		if ((snprintf(str, sizeof(str)-1, fmt , ## args)) == -1) \
+-			err("Out of stack space?"); \
+-		str[sizeof(str)-1] = '\0'; \
+-		*strp = xstrdup(str); \
+-	} while (0)
+-
+ #elif defined(__hpux__) || defined(__MINT__)
+ 	/* must not include both dir.h and dirent.h on hpux11..11 & FreeMiNT */
+ #elif defined(__linux__)
diff --git a/app-portage/portage-utils/portage-utils-0.60.ebuild b/app-portage/portage-utils/portage-utils-0.60.ebuild
index 4b100d0e1a38..ae43b8c86118 100644
--- a/app-portage/portage-utils/portage-utils-0.60.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.60.ebuild
@@ -22,6 +22,7 @@ DEPEND="${RDEPEND}
 	static? ( dev-libs/iniparser:0[static-libs] )"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-solaris.patch
 	epatch_user
 }
 
diff --git a/app-text/blogc/Manifest b/app-text/blogc/Manifest
index 4e4cceb9e7b4..332ace8df86c 100644
--- a/app-text/blogc/Manifest
+++ b/app-text/blogc/Manifest
@@ -1 +1 @@
-DIST blogc-0.6.1.tar.xz 261912 SHA256 4b647af442e3928a3f195e06e8d45db9659054419a4758ffe7e15d46470c38b4 SHA512 b19187dba2fa90c5126f46b3b7566f18f0816d85fd95164ec5a6741207ceb7d98c1adb71aa7eee749be6aac28a8ccf9763c47aa72d1e1768d191eec36a60211e WHIRLPOOL effdccf56ec9fe3953e31304e05654b744041705c22c369bc62fef708b8034b3c71eae9625871b37d53a0d09d9f0cb08a7b39a77fc9187fc38d187aff05d862b
+DIST blogc-0.7.tar.xz 262724 SHA256 6ac5e1cd481ebbb0b0a80d23b1d1e8730fed8bc0ae09ead14b37b49e314b0347 SHA512 645f8c3aa97c5837e12de5aa660268bed9cbaaad802134c87269f4be99c0006007706bf57a1310e35d34d5d22e3cc371befa365259505bad9f62810db1303efa WHIRLPOOL 5f6d7015df369bda182bf816ad270a835b5c8b9b280093717a19baa813d8d8b5e36e4d413bbeadc0bc4352893784cd9d40ffd36b3212a67b88326b6662775513
diff --git a/app-text/blogc/blogc-0.6.1.ebuild b/app-text/blogc/blogc-0.7.ebuild
similarity index 100%
rename from app-text/blogc/blogc-0.6.1.ebuild
rename to app-text/blogc/blogc-0.7.ebuild
diff --git a/dev-go/godep/Manifest b/dev-go/godep/Manifest
index 5308b703ba93..1de81c455434 100644
--- a/dev-go/godep/Manifest
+++ b/dev-go/godep/Manifest
@@ -1 +1,2 @@
 DIST godep-29.tar.gz 51852 SHA256 ca896c220f2995a50a5d9e63df929fa393c3cd1de9722210b5ef3684981bed2a SHA512 37fcfdbbba62cc942b077551953f45fda495b4db1ee5bafec69e4b3cc63c612785d3e97e8ff073825a532a74889c40b34e99cd592285ad255f64ccd3f8b76eff WHIRLPOOL 39f31d7562e3d8b3748d8958e1105578bbd8d799008d15aa6145eb71e4720985e7e71e0d927b32ba4e20195e2257b11a34748c7652454d1fae2d2df662beb146
+DIST godep-49.tar.gz 69944 SHA256 f1b498f585fbc420df8cb7a784edeea2c3993341a9501443de521c292ba67829 SHA512 d934a96a3ed6e69c8a3fdaccaa4f46df33b1e9df5c018c6dc7d22e992c1971d83029edd6172aad2116910c233495022007bcc24e9a30e8c517b2c20bd3d8d457 WHIRLPOOL faef37fa87f47e523ad5467a62490ccbfda98eded3ab6eea370dac416ac88117cf8d759637f8813f7a4c9cdffe873a949ae992c8e65b41f0d8c782293b557ec0
diff --git a/dev-go/godep/godep-49.ebuild b/dev-go/godep/godep-49.ebuild
new file mode 100644
index 000000000000..6f0bf647b8a3
--- /dev/null
+++ b/dev-go/godep/godep-49.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+EGO_PN=github.com/tools/godep
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT=v${PV}
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="dependency tool for go"
+HOMEPAGE="https://github.com/tools/godep"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+src_install() {
+	dobin godep
+dodoc src/${EGO_PN}/*.md
+}
diff --git a/dev-java/ant-antlr/ant-antlr-1.9.2-r1.ebuild b/dev-java/ant-antlr/ant-antlr-1.9.2-r1.ebuild
index af309973f7a9..1f6f33cd556d 100644
--- a/dev-java/ant-antlr/ant-antlr-1.9.2-r1.ebuild
+++ b/dev-java/ant-antlr/ant-antlr-1.9.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME=""
 inherit ant-tasks
 
 DESCRIPTION="Apache Ant's optional tasks for Antlr"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-java/antlr-2.7.7-r7:0"
 
diff --git a/dev-java/ant-antlr/ant-antlr-1.9.2.ebuild b/dev-java/ant-antlr/ant-antlr-1.9.2.ebuild
deleted file mode 100644
index 56e9bec8f5ca..000000000000
--- a/dev-java/ant-antlr/ant-antlr-1.9.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-ANT_TASK_DEPNAME=""
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional tasks for Antlr"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND=">=dev-java/antlr-2.7.5-r3:0[java]"
-
-src_install() {
-	ant-tasks_src_install
-	java-pkg_register-dependency antlr
-}
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index 2aa81bacbe11..42cc0486aa05 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -1,7 +1,5 @@
 DIST 4.4.zip 1107695 SHA256 68a79e4accae4dfd9d45a8292fe9b2812c6a3ec1d903412e205a06ead083b8ae SHA512 5e4a92b3d0bb8583f52cbed554ef68909412cd3e9de7589870eead3359a6f5efb492029c3bcce50d6a19a220c83c809824dbde3d08a6b39a42e9fbe3eaef8ce4 WHIRLPOOL 80cf60f9679cd5d3cb512b2e1a9c4987d34fb7994a976b42c95351fb4670944343dd8b8cf0e1738b94cc177122dcf635ee5d1a262290f6b89a8e38d06adc2077
 DIST antlr-2.7.7.tar.gz 1816180 SHA256 853aeb021aef7586bda29e74a6b03006bcb565a755c86b66032d8ec31b67dbb9 SHA512 faa72d2ddcba434ef1233e70c1549e63eba67c00793966322e821cf7f015cccb804448cb92d8fbef0429f59928fad65ec954f8ffbda0acbb8e983de0806d349d WHIRLPOOL def5ac0ddfe5a65f9f7d5489d039048c5d630b46cd5626593bd12e9b393d5ec26884f90b013bcdf58511e26abbf06e0d7b3789a11298b017f7e70af2ec8dde4a
-DIST antlr-3.1.3-generated.tar.bz2 47167 SHA256 ed326de0f1f92dd72e8d9644e8eaf59d02b9725b4b5218f5c54e12100f8d05f4 SHA512 4ea01ad0d5fc99607ffa445fb99ae424648b713dca293d05ff4ec064cac0a0fe5073df3834f9b6990e99f3cefc5cdd191a1ee3c3951d97615908b94630070bba WHIRLPOOL 61f7829811251a35528c322952830dc5a6e82e23e36f664af179b41955734e771aaad070298666a15be0f41982dbb8b19955b5967987582c6b666e602384d060
-DIST antlr-3.1.3.tar.gz 10743515 SHA256 1fca0fc7304140807e64ec263a58d93ef1b380cfb6407084e6909f8220bc1039 SHA512 6814b970740bd61e6727f81b1a2fb4249f8f029e756694d852224eee54e0231540f8e23d2fa8f78eef234d6497f5fa1411e76020ffaed737d8c1a5178321a062 WHIRLPOOL 9d9a1caf39595dbb9b300f730091cfa38a12ab10b8a59d58c7bdd9ba4674bce9f49bc21b5b170129216ff9d880dbf5f0bdb5bfe614b003a4ffe948948b5413c9
 DIST antlr-3.2.jar 1928009 SHA256 4c8737014e7ca0d2c85171edf37f5a26b2d8d8237c283357b81a3269b6848d38 SHA512 25a61404c4b41e48eeaed49d41122f9400092248a10eb776d75ce3513295870eca1acc4b06c74925284a27cc64ca0506e34de39fb91996f09727cc5cc72dd9a6 WHIRLPOOL 19d99c9f50339ee9ef31e9458ac3a44ce52aa89ed84f96be905d626e3a53d5e2bbdb2e8eb4c5ca16413e7493499b141f940dd200658f8e60e9ecbd777f83a84b
 DIST antlr-3.2.tar.gz 837320 SHA256 01548fa03ef1f0ed05a93f0749b65db8a35a191ad7ad34e1e6a6a2529ca2ef45 SHA512 8984221cd89253c033a4596dd56cd51b297393a53b4682f5ab401172745d343371bf0d45417fa286ce972add1b4e474f1f3091fa1345158dbfc040702d61607c WHIRLPOOL 40080efc13c88312aaa318cde097f240e711b477e264739ea71b6c246ede29ac48f42eccd55365af531eb428f1ca1d89386d7e5753b6bc35cad9bf937b70e6de
 DIST antlr-3.5.2-complete-no-st3.jar 1862097 SHA256 46531814ba9739cdf20c6c1789c252d3d95b68932813d79fb8bbfdf8d5840417 SHA512 227f56edfb8d1935fc0f5bd69a730a2230b173f38baa7837b6dac9b4a10c5d4a9b2eb806416b21bed2621bb0b8e0fb98a6f48da2660b326728326f078bc28ea9 WHIRLPOOL 5c5285894e2d4182650a8a573ae83996e1f463d6ce866ddcff43959b16cf1070c3042b21d80c9350865716a6719d15fcd42b7370b4af69b6eca863d26ffcc325
diff --git a/dev-java/antlr/antlr-2.7.7-r5.ebuild b/dev-java/antlr/antlr-2.7.7-r5.ebuild
deleted file mode 100644
index dad4b634104d..000000000000
--- a/dev-java/antlr/antlr-2.7.7-r5.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-DISTUTILS_OPTIONAL="y"
-DISTUTILS_SINGLE_IMPL="y"
-DISTUTILS_IN_SOURCE_BUILD="y"
-
-inherit base java-pkg-2 mono autotools distutils-r1 multilib toolchain-funcs versionator
-
-DESCRIPTION="A parser generator for C++, C#, Java, and Python"
-HOMEPAGE="http://www.antlr2.org/"
-SRC_URI="http://www.antlr2.org/download/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc debug examples mono +cxx +java python script source static-libs"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# TODO do we actually need jdk at runtime?
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	>=virtual/jdk-1.3
-	mono? ( dev-lang/mono )"
-DEPEND="${RDEPEND}
-	script? ( !dev-util/pccts )
-	source? ( app-arch/zip )"
-
-PATCHES=( "${FILESDIR}"/${PV}-{gcc-4.3,gcc-4.4,makefixes}.patch )
-
-make_shared_lib() {
-	local soname=$(basename "${1%.a}")$(get_libname $(get_major_version))
-	einfo "Making ${soname}"
-	[[ ${CHOST} == *-darwin* ]] \
-		&& make_shared_lib_macho "${soname}" "$1" "$2"\
-		|| make_shared_lib_elf "${soname}" "$1" "$2"
-}
-
-make_shared_lib_elf() {
-	local soname=$1 archive=$2 cc=$3
-	${cc:-$(tc-getCXX)} ${LDFLAGS} \
-		-shared -Wl,-soname="${soname}" \
-		-Wl,--whole-archive "${archive}" -Wl,--no-whole-archive \
-		-o $(dirname "${archive}")/"${soname}" || return 1
-}
-
-make_shared_lib_macho() {
-	local soname=$1 archive=$2 cc=$3
-	${cc:-$(tc-getCXX)} ${LDFLAGS} \
-		-dynamiclib -install_name "${EPREFIX}/usr/$(get_libdir)/${soname}" \
-		-force_load "${archive}" \
-		-o $(dirname "${archive}")/"${soname}" || return 1
-}
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	if use python ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	base_src_prepare
-
-	sed -i \
-		-e 's/install:.*this-install/install:/' \
-		lib/cpp/src/Makefile.in || die
-
-	use static-libs || epatch "${FILESDIR}/${PV}-static-libs-fix.patch"
-
-	# See bug #468540, this can be removed once bug #469150 is fixed.
-	sed -i 's/tlib lib ar/ar/' configure.in || die
-	eautoreconf
-}
-
-src_configure() {
-	# don't ask why, but this is needed for stuff to get built properly
-	# across the various JDKs
-	JAVACFLAGS="+ ${JAVACFLAGS}"
-
-	# mcs for https://bugs.gentoo.org/show_bug.cgi?id=172104
-	CSHARPC="mcs" econf $(use_enable java) \
-		$(use_enable python) \
-		$(use_enable mono csharp) \
-		$(use_enable debug) \
-		$(use_enable examples) \
-		$(use_enable cxx) \
-		--enable-verbose
-}
-
-src_compile() {
-	emake CXXFLAGS="${CXXFLAGS} -fPIC"
-	if use cxx; then
-		pushd lib/cpp/src > /dev/null
-		make_shared_lib libantlr.a || die
-		if use static-libs; then
-			make clean
-			emake
-		fi
-		popd > /dev/null
-	fi
-
-	if use python ; then
-		pushd "${S}"/lib/python > /dev/null
-		distutils-r1_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	dobin scripts/antlr-config
-
-	if use cxx ; then
-		pushd lib/cpp > /dev/null
-		einstall
-		dolib.so src/libantlr$(get_libname $(get_major_version))
-		dosym libantlr$(get_libname $(get_major_version)) \
-			/usr/$(get_libdir)/libantlr$(get_libname)
-		use static-libs && dolib.a src/libantlr.a
-		newdoc AUTHORS{,.cpp}
-		newdoc ChangeLog{,.cpp}
-		newdoc TODO{,.cpp}
-		popd > /dev/null
-	fi
-
-	if use java ; then
-		java-pkg_dojar antlr/antlr.jar
-		use script && java-pkg_dolauncher antlr --main antlr.Tool
-		use source && java-pkg_dosrc antlr
-		use doc && java-pkg_dohtml -r doc/*
-	fi
-
-	if use mono ; then
-		pushd lib > /dev/null
-		dodir /usr/$(get_libdir)/antlr/
-		insinto /usr/$(get_libdir)/antlr/
-		doins antlr.astframe.dll
-		doins antlr.runtime.dll
-		sed -e "s|@prefix@|${EPREFIX}/usr|" \
-			-e 's|@exec_prefix@|${prefix}|' \
-			-e "s|@libdir@|\$\{exec_prefix\}/$(get_libdir)/antlr|" \
-			-e 's|@libs@|-r:${libdir}/antlr.astframe.dll -r:${libdir}/antlr.runtime.dll|' \
-			-e "s|@VERSION@|${PV}|" \
-			"${FILESDIR}"/antlr.pc.in > antlr.pc
-		insinto /usr/$(get_libdir)/pkgconfig
-		doins antlr.pc
-		popd > /dev/null
-	fi
-
-	if use python ; then
-		pushd "${S}"/lib/python > /dev/null
-		distutils-r1_src_install
-		popd > /dev/null
-	fi
-
-	if use examples ; then
-		find "${S}"/examples -iname Makefile\* -exec rm \{\} \;
-		insinto /usr/share/doc/${PF}/examples
-		use cxx && doins -r "${S}"/examples/cpp
-		use java && doins -r "${S}"/examples/java
-		use mono && doins -r "${S}"/examples/csharp
-		use python && doins -r "${S}"/examples/python
-	fi
-
-	dodoc README.txt
-}
diff --git a/dev-java/antlr/antlr-2.7.7-r7.ebuild b/dev-java/antlr/antlr-2.7.7-r7.ebuild
index 70cf2fbd7ca3..dec6bd95bcfd 100644
--- a/dev-java/antlr/antlr-2.7.7-r7.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.antlr2.org/"
 SRC_URI="http://www.antlr2.org/download/${P}.tar.gz"
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples source"
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/antlr/antlr-3.1.3-r3.ebuild b/dev-java/antlr/antlr-3.1.3-r3.ebuild
deleted file mode 100644
index 8a8c83b10f8f..000000000000
--- a/dev-java/antlr/antlr-3.1.3-r3.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A parser generator for C++, C#, Java, and Python"
-HOMEPAGE="http://www.antlr.org/"
-# You need to generate v3 grammars so that boostrapping works
-SRC_URI="http://www.antlr.org/download/${P}.tar.gz
-	mirror://gentoo/${P}-generated.tar.bz2"
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="gunit"
-
-COMMON_DEPEND=">=dev-java/stringtemplate-3.2:0
-	 >=dev-java/antlr-2.7.7:0[java]
-	 gunit? ( dev-java/junit:4 )"
-
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEPEND}"
-
-DEPEND="${RDEPEND}
-	>=virtual/jdk-1.5"
-
-java_prepare() {
-	epatch "${FILESDIR}"/${P}-jdk-8.patch || die
-
-	rm -v lib/*.jar lib/.*.jar || die
-	rm -v runtime/ActionScript/project/lib/*.jar || die
-	# We must bundle this as we can't depend on ourselves
-	cp -v "${WORKDIR}"/*.java tool/src/main/antlr/org/antlr/grammar/v3 || die
-	local version="${PV} $(date '+%B %d, %Y %T')"
-	local propertyfile="tool/src/main/resources/org/antlr/antlr.properties"
-	[[ $(egrep "^[^#]" ${propertyfile} | wc -l) != 1 ]] \
-		&& die "Unknown property found"
-	sed -i "s/^\(antlr.version\)=.*$/\1=${version}/" ${propertyfile} || die
-}
-
-antlr2() {
-	java -cp $(java-pkg_getjars antlr) antlr.Tool "${@}" || die "antlr2 failed"
-}
-
-antlr3() {
-	local cp="${S}/bootstrap:${S}/tool/src/main/resources/"
-	java -cp "${cp}":$(java-pkg_getjars antlr,stringtemplate) \
-		org.antlr.Tool "${@}" || die "building v3 grammars failed"
-}
-
-build_antlr() {
-	cd "${S}"
-	local dest="${1}"
-	# runtime
-	find runtime -name "*.java" > "${T}/sources" || die
-	# tool
-	find tool/src/main -name "*.java" >> "${T}/sources" || die
-	ejavac -d "${dest}" -cp $(java-pkg_getjars antlr,stringtemplate) "@${T}/sources"
-}
-
-# Uses maven so let's just do things manully for now
-# when bumping use jardiff and apicheck to make sure
-# produced jars are good
-src_compile() {
-	einfo "Bootstrapping antlr3 with bundled sources"
-	cd tool/src/main/antlr2/org/antlr/grammar/v2/ || die
-	# the command line only takes one at a time
-	for grammar in *.g; do
-		antlr2 ${grammar} || die
-	done
-
-	cd "${S}" || die
-	mkdir bootstrap || die
-	build_antlr bootstrap
-
-	einfo "Building v3 grammars with boostrapped antlr"
-	local v3dir=tool/src/main/antlr/org/antlr/grammar/v3/
-	rm -v "${v3dir}"/*.java || die
-	antlr3 "${v3dir}"/*.g
-
-	mkdir build || die
-	cp -r "${S}"/tool/src/main/resources/* build || die
-	build_antlr build
-
-	if use gunit; then
-		einfo "building gunit"
-		antlr3 gunit/src/main/antlr3/org/antlr/gunit/*.g
-
-		find gunit -name "*.java" > "${T}/gunit" || die
-		ejavac -d build -cp $(java-pkg_getjars stringtemplate,junit-4):build \
-			"@${T}/gunit"
-
-		cp -vr gunit/src/main/resources/org build || die
-	fi
-
-	# jar things up
-	cd build
-	find -type f >> "${T}/classes" || die
-	jar cf ${PN}3.jar "@${T}/classes" || die "jar failed"
-}
-
-src_install() {
-	# Single jar like upstream
-	java-pkg_dojar build/antlr3.jar
-	java-pkg_dolauncher antlr3 --main org.antlr.Tool
-	use gunit && java-pkg_dolauncher gunit --main org.antlr.gunit.Interp
-
-	use source && java-pkg_dosrc tool/src/main/org \
-		runtime/Java/src/main/java/org/
-}
-
-pkg_postinst() {
-	elog "Currently the ebuild only has support for the Java backend."
-}
diff --git a/dev-java/antlr/antlr-3.2.ebuild b/dev-java/antlr/antlr-3.2.ebuild
index 13b76231f16d..5d9561d94df5 100644
--- a/dev-java/antlr/antlr-3.2.ebuild
+++ b/dev-java/antlr/antlr-3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.antlr3.org/download/${P}.tar.gz
 	http://www.antlr3.org/download/${P}.jar" # Prebuilt version needed.
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 CDEPEND=">=dev-java/antlr-2.7.7-r7:0
diff --git a/dev-java/antlr/metadata.xml b/dev-java/antlr/metadata.xml
index b73c834d5599..e00adfd1a91e 100644
--- a/dev-java/antlr/metadata.xml
+++ b/dev-java/antlr/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 	<herd>java</herd>
 	<use>
-		<flag name="script">Install a script to run antlr</flag>
 		<flag name="gunit" restrict="&gt;=dev-java/antlr-3.1.3-r1">
 		  gUnit is a "Unit Test" framework for ANTLR grammars
 	  </flag>
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild
deleted file mode 100644
index 38638c0f85f3..000000000000
--- a/dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils java-pkg-2 multilib
-
-MY_P=${P/gnu-/}
-DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the Java language"
-SRC_URI="mirror://gnu/classpath/${MY_P}.tar.gz"
-HOMEPAGE="https://www.gnu.org/software/classpath"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0.98"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="alsa debug doc dssi examples gconf gjdoc gmp gtk gstreamer qt4 xml"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-		doc? ( >=dev-java/gjdoc-0.7.9-r2 )
-		dssi? ( >=media-libs/dssi-0.9 )
-		gconf? ( gnome-base/gconf )
-		gjdoc? ( >=dev-java/antlr-2.7.1:0 )
-		gmp? ( >=dev-libs/gmp-4.2.4 )
-		gstreamer? (
-			>=media-libs/gstreamer-0.10.10:0.10
-			>=media-libs/gst-plugins-base-0.10.10:0.10
-			x11-libs/gtk+:2
-		)
-		gtk? (
-				>=x11-libs/gtk+-2.8:2
-				>=dev-libs/glib-2.0
-				media-libs/freetype
-				>=x11-libs/cairo-1.1.9
-				x11-libs/libICE
-				x11-libs/libSM
-				x11-libs/libX11
-				x11-libs/libXrandr
-				x11-libs/libXrender
-				x11-libs/libXtst
-				x11-libs/pango
-		)
-		qt4? ( dev-qt/qtgui:4 )
-		xml? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )"
-
-# java-config >2.1.11 needed for ecj version globbing
-# We should make the build not pickup the wrong antlr binary from pccts
-DEPEND="app-arch/zip
-		dev-java/eclipse-ecj
-		>=dev-java/java-config-2.1.11
-		gjdoc? ( !!dev-util/pccts )
-		gtk? (
-			x11-libs/libXrender
-			|| ( >=x11-libs/libXtst-1.1.0 <x11-proto/xextproto-7.1 )
-			x11-proto/xproto
-		)
-		>=virtual/jdk-1.5
-		${RDEPEND}"
-
-RDEPEND=">=virtual/jre-1.5
-	${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-java_prepare() {
-	epatch "${FILESDIR}"/${PF}-freetype-2.5.3-support.patch
-}
-
-src_configure() {
-	# We require ecj anyway, so force it to avoid problems with bad versions of javac
-	export JAVAC="${EPREFIX}/usr/bin/ecj"
-	export JAVA="${EPREFIX}/usr/bin/java"
-	# build takes care of them itself, duplicate -source -target kills ecj
-	export JAVACFLAGS="-nowarn"
-	# build system is passing -J-Xmx768M which ecj however ignores
-	# this will make the ecj launcher do it (seen case where default was not enough heap)
-	export gjl_java_args="-Xmx768M"
-
-	# don't use econf, because it ends up putting things under /usr, which may
-	# collide with other slots of classpath
-	local myconf
-	if use gjdoc; then
-		local antlr=$(java-pkg_getjar antlr antlr.jar)
-		myconf="--with-antlr-jar=${antlr}"
-	fi
-
-	ANTLR= ./configure \
-		$(use_enable alsa) \
-		$(use_enable debug ) \
-		$(use_enable examples) \
-		$(use_enable gconf gconf-peer) \
-		$(use_enable gjdoc) \
-		$(use_enable gmp) \
-		$(use_enable gtk gtk-peer) \
-		$(use_enable gstreamer gstreamer-peer) \
-		$(use_enable qt4 qt-peer) \
-		$(use_enable xml xmlj) \
-		$(use_enable dssi ) \
-		$(use_with doc gjdoc) \
-		--enable-jni \
-		--disable-dependency-tracking \
-		--disable-plugin \
-		--host=${CHOST} \
-		--prefix="${EPREFIX}"/usr/${PN}-${SLOT} \
-		--with-ecj-jar=$(java-pkg_getjar --build-only eclipse-ecj-* ecj.jar) \
-		--disable-Werror \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO
-	java-pkg_regjar /usr/${P}/share/classpath/glibj.zip
-}
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98-r5.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.98-r5.ebuild
index 7db6dd61f4b5..e252411ddb06 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.98-r5.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.98-r5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnu.org/software/classpath"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0.98"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="alsa debug doc dssi examples gconf +gjdoc gmp gtk gstreamer qt4 xml"
 REQUIRED_USE="doc? ( gjdoc )"
diff --git a/dev-java/jaxme/jaxme-0.5.2-r2.ebuild b/dev-java/jaxme/jaxme-0.5.2-r2.ebuild
index 63bb8da8737a..c7a12df9db19 100644
--- a/dev-java/jaxme/jaxme-0.5.2-r2.ebuild
+++ b/dev-java/jaxme/jaxme-0.5.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,13 +10,13 @@ inherit java-pkg-2 java-ant-2 eutils
 
 MY_PN=ws-${PN}
 MY_P=${MY_PN}-${PV}
-DESCRIPTION="JaxMe 2 is an open source implementation of JAXB, the specification for Java/XML binding"
+DESCRIPTION="An open source implementation of JAXB, the specification for Java/XML binding"
 HOMEPAGE="http://ws.apache.org/jaxme/index.html"
 SRC_URI="mirror://apache/ws/${PN}/source/${MY_P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 COMMON_DEP=">=dev-java/antlr-2.7.7-r7:0
diff --git a/dev-java/jaxme/jaxme-0.5.2.ebuild b/dev-java/jaxme/jaxme-0.5.2.ebuild
deleted file mode 100644
index c6f0acc53b2c..000000000000
--- a/dev-java/jaxme/jaxme-0.5.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_PN=ws-${PN}
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="JaxMe 2 is an open source implementation of JAXB, the specification for Java/XML binding"
-HOMEPAGE="http://ws.apache.org/jaxme/index.html"
-SRC_URI="mirror://apache/ws/${PN}/source/${MY_P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-COMMON_DEP="dev-java/antlr:0[java]
-	>=dev-java/xerces-2.7
-	=dev-java/junit-3.8*
-	>=dev-java/log4j-1.2.8
-	dev-java/xmldb:0"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	dev-db/hsqldb:0
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}"
-
-# We do it later
-JAVA_PKG_BSFIX="off"
-
-java_prepare() {
-	cd "${S}/prerequisites"
-	rm *.jar
-	java-pkg_jarfrom antlr
-	java-pkg_jarfrom junit
-	java-pkg_jarfrom log4j log4j.jar log4j-1.2.8.jar
-	java-pkg_jarfrom xerces-2
-	java-pkg_jarfrom xmldb xmldb-api.jar xmldb-api-20021118.jar
-	java-pkg_jarfrom xmldb xmldb-api-sdk.jar xmldb-api-sdk-20021118.jar
-	java-pkg_jarfrom --build-only ant-core ant.jar ant-1.5.4.jar
-	java-pkg_jarfrom --build-only ant-core ant.jar ant.jar
-	# no linking to it, should be used for tests only but used to generate stuff during build anyway
-	java-pkg_jarfrom --build-only hsqldb hsqldb.jar hsqldb-1.7.1.jar
-
-	# Special case: jaxme uses ant/*.xml files, so rewriting them by hand
-	# is better:
-	cd "${S}"
-	for i in build.xml ant/*.xml src/webapp/build.xml src/test/jaxb/build.xml; do
-		java-ant_bsfix_one "${i}"
-	done
-
-	# Patch marshal classes to be abstract for build to succeed
-	epatch "${FILESDIR}/${P}-fix_marshallers.patch"
-}
-
-EANT_TEST_ANT_TASKS="hsqldb"
-
-src_compile() {
-	local ant_target="all"
-	local ant_args=""
-	if use doc; then
-		ant_args="-Dbuild.apidocs=dist/doc/api"
-		# The javadoc target depends on all so it is enough. Passing both results in two builds,
-		# where the second pass fails due to hsqldb lock - bug #310311.
-		ant_target="javadoc"
-	fi
-
-	eant ${ant_args} ${ant_target}
-}
-
-src_install() {
-	pushd dist > /dev/null
-	for jar in *.jar; do
-		java-pkg_newjar ${jar} ${jar/-${PV}/}
-	done
-	popd > /dev/null
-
-	dodoc NOTICE || die
-
-	if use doc; then
-		java-pkg_dojavadoc dist/doc/api
-		dohtml -r src/documentation/manual
-	fi
-	use source && java-pkg_dosrc src/{pm,jaxme,js,api,webapp,xs}/*
-}
diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-8.0.2-r1.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-8.0.2-r1.ebuild
index a6b5a3438e89..9a8bda48a612 100644
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-8.0.2-r1.ebuild
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-8.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -44,7 +44,7 @@ SRC_URI="${SOURCE_URL}
 	http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip
 	http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 S="${WORKDIR}"
 
diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-8.0.2.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-8.0.2.ebuild
deleted file mode 100644
index 05422b0bcf87..000000000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-8.0.2.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Enterprise cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="8.0"
-SOURCE_URL="http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar
-	http://hg.netbeans.org/binaries/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar
-	http://hg.netbeans.org/binaries/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar
-	http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar
-	http://hg.netbeans.org/binaries/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar
-	http://hg.netbeans.org/binaries/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar
-	http://hg.netbeans.org/binaries/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar
-	http://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar
-	http://hg.netbeans.org/binaries/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar
-	http://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar
-	http://hg.netbeans.org/binaries/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar
-	http://hg.netbeans.org/binaries/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar
-	http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar
-	http://hg.netbeans.org/binaries/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar
-	http://hg.netbeans.org/binaries/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar
-	http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar
-	http://hg.netbeans.org/binaries/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar
-	http://hg.netbeans.org/binaries/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip
-	http://hg.netbeans.org/binaries/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar
-	http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip
-	http://hg.netbeans.org/binaries/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip
-	http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip
-	http://hg.netbeans.org/binaries/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar
-	http://hg.netbeans.org/binaries/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar
-	http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip
-	http://hg.netbeans.org/binaries/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip
-	http://hg.netbeans.org/binaries/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar
-	http://hg.netbeans.org/binaries/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar
-	http://hg.netbeans.org/binaries/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip
-	http://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip
-	http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip
-	http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="amd64 x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-profiler-${PV}
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-webcommon-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/commons-codec:0
-	dev-java/commons-fileupload:0
-	dev-java/commons-logging:0
-	dev-java/glassfish-deployment-api:1.2"
-DEPEND="virtual/jdk:1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0
-	dev-java/jsr181:0
-	>=dev-java/junit-4.4:4
-	dev-java/tomcat-servlet-api:2.3"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}
-	dev-java/antlr:0[java]
-	dev-java/bsf:2.3
-	dev-java/commons-beanutils:1.7
-	dev-java/commons-collections:0
-	dev-java/commons-digester:0
-	dev-java/commons-io:1
-	dev-java/commons-validator:0
-	dev-java/jakarta-oro:2.0"
-#	dev-java/commons-chain:1.1 in overlay
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.enterprise -Dext.binaries.downloaded=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-8.0.2-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar libs.amazon/external/aws-java-sdk-1.2.1.jar || die
-	ln -s "${DISTDIR}"/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar libs.elimpl/external/el-impl.jar || die
-	ln -s "${DISTDIR}"/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar web.jspparser/external/glassfish-jspparser-4.0.jar || die
-	ln -s "${DISTDIR}"/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar libs.glassfish_logging/external/glassfish-logging-2.0.jar || die
-	ln -s "${DISTDIR}"/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar libs.glassfish.sdk/external/glassfish-tooling-sdk-0.3-b054-246345.jar || die
-	ln -s "${DISTDIR}"/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar libs.amazon/external/httpclient-4.1.1.jar || die
-	ln -s "${DISTDIR}"/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar libs.amazon/external/httpcore-4.1.jar || die
-	ln -s "${DISTDIR}"/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar javaee.api/external/javaee-api-6.0.jar || die
-	ln -s "${DISTDIR}"/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar javaee7.api/external/javaee-api-7.0.jar || die
-	ln -s "${DISTDIR}"/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar javaee.api/external/javaee-web-api-6.0.jar || die
-	ln -s "${DISTDIR}"/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar javaee7.api/external/javaee-web-api-7.0.jar || die
-	ln -s "${DISTDIR}"/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar j2ee.platform/external/javaee-doc-api.jar || die
-	ln -s "${DISTDIR}"/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar javaee.api/external/javax.annotation.jar || die
-	ln -s "${DISTDIR}"/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar javaee7.api/external/javax.annotation-api.jar || die
-	ln -s "${DISTDIR}"/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar javaee7.api/external/javax.xml.soap-api.jar || die
-	ln -s "${DISTDIR}"/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar javaee.api/external/jaxb-api-osgi.jar || die
-	ln -s "${DISTDIR}"/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar javaee7.api/external/jaxb-api-osgi.jar || die
-	ln -s "${DISTDIR}"/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip websvc.restlib/external/jaxrs-ri-2.5.1.zip || die
-	ln -s "${DISTDIR}"/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar javaee7.api/external/jaxws-api.jar || die
-	ln -s "${DISTDIR}"/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip web.jsf12/external/jsf-1.2.zip || die
-	ln -s "${DISTDIR}"/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip web.jsf20/external/jsf-2.2.zip || die
-	ln -s "${DISTDIR}"/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip web.jsf.editor/external/jsf-api-docs.zip || die
-	ln -s "${DISTDIR}"/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar libs.jstl/external/jstl-api.jar || die
-	ln -s "${DISTDIR}"/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar libs.jstl/external/jstl-impl.jar || die
-	ln -s "${DISTDIR}"/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip websvc.metro.lib/external/metro-1.4-doc.zip || die
-	ln -s "${DISTDIR}"/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip websvc.metro.lib/external/metro-2.0.zip || die
-	ln -s "${DISTDIR}"/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar web.primefaces/external/primefaces-5.0.jar || die
-	ln -s "${DISTDIR}"/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar servletjspapi/external/servlet3.1-jsp2.3-api.jar || die
-	ln -s "${DISTDIR}"/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip web.struts/external/struts-1.3.10-javadoc.zip || die
-	ln -s "${DISTDIR}"/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip web.struts/external/struts-1.3.10-lib.zip || die
-	ln -s "${DISTDIR}"/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip web.core.syntax/external/syntaxref20.zip || die
-	ln -s "${DISTDIR}"/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar javaee.api/external/webservices-api-osgi.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-8.0.2-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS80_PATCHES_DIR}" -a -d "${NETBEANS80_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS80_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into j2eeapis/external glassfish-deployment-api-1.2 glassfish-deployment-api.jar jsr88javax.jar
-	java-pkg_jar-from --into libs.amazon/external commons-codec commons-codec.jar commons-codec-1.3.jar
-	java-pkg_jar-from --into libs.amazon/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
-	java-pkg_jar-from --into libs.commons_fileupload/external commons-fileupload commons-fileupload.jar commons-fileupload-1.3.jar
-	java-pkg_jar-from --build-only --into javaee7.api/external jsr181 jsr181.jar jsr181-api.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.10.jar
-	java-pkg_jar-from --build-only --into web.monitor/external tomcat-servlet-api-2.3 servlet.jar servlet-2.3.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
-	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.profiler.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-webcommon-${SLOT} webcommon || die
-	cat /usr/share/netbeans-webcommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.webcommon.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/enterprise >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/enterprise$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm commons-fileupload-1.3.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.3.jar || die
-	rm jsr88javax.jar && dosym /usr/share/glassfish-deployment-api-1.2/lib/glassfish-deployment-api.jar ${instdir}/jsr88javax.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/aws-sdk
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm commons-codec-1.3.jar && dosym /usr/share/commons-codec/lib/commons-codec.jar ${instdir}/commons-codec-1.3.jar || die
-	rm commons-logging-1.1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.1.1.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/jsf-1_2
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm commons-beanutils.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils.jar || die
-	rm commons-collections.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections.jar || die
-	rm commons-digester.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester.jar || die
-	rm commons-logging.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/struts
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm antlr-2.7.2.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.2.jar || die
-	rm bsf-2.3.0.jar && dosym /usr/share/bsf-2.3/lib/bsf.jar ${instdir}/bsf-2.3.0.jar || die
-	rm commons-beanutils-1.8.0.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils-1.8.0.jar || die
-	rm commons-digester-1.8.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester-1.8.jar || die
-	rm commons-fileupload-1.1.1.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.1.1.jar || die
-	rm commons-io-1.1.jar && dosym /usr/share/commons-io-1/lib/commons-io.jar ${instdir}/commons-io-1.1.jar || die
-	rm commons-logging-1.0.4.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.0.4.jar || die
-	rm commons-validator-1.3.1.jar && dosym /usr/share/commons-validator/lib/commons-validator.jar ${instdir}/commons-validator-1.3.1.jar || die
-	rm oro-2.0.8.jar && dosym /usr/share/jakarta-oro-2.0/lib/jakarta-oro.jar ${instdir}/oro-2.0.8.jar || die
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/enterprise
-}
diff --git a/dev-java/netbeans-java/netbeans-java-8.0.2-r2.ebuild b/dev-java/netbeans-java/netbeans-java-8.0.2-r2.ebuild
deleted file mode 100644
index 275950f12fb4..000000000000
--- a/dev-java/netbeans-java/netbeans-java-8.0.2-r2.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
-
-DESCRIPTION="Netbeans Java Cluster"
-HOMEPAGE="http://netbeans.org/projects/java"
-SLOT="8.0"
-SOURCE_URL="http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip
-	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
-	http://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar
-	http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip
-	http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar
-	http://hg.netbeans.org/binaries/2B9EAB164D8748F9793F6A0D29B6463E97B284DA-indexer-core-5.1.1.jar
-	http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar
-	http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar
-	http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip
-	http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip
-	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
-	http://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip
-	http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar
-	http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar
-	http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar
-	http://hg.netbeans.org/binaries/E5579EF3B0C1EF2F43562DD0C3B32F8E1F603B49-nb-javac-api.jar
-	http://hg.netbeans.org/binaries/8BDE88C9512D8783E64788F32A50E4CCBC48485E-nb-javac-impl.jar
-	http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
-	http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
-	http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
-	http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="amd64 x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/beansbinding:0
-	dev-java/cglib:3
-	dev-java/jdom:1.0"
-DEPEND="virtual/jdk:1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0
-	dev-java/json-simple:0
-	dev-java/junit:4"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}
-	dev-java/absolutelayout:0
-	dev-java/antlr:0[java]
-	dev-java/c3p0:0
-	dev-java/commons-collections:0
-	dev-java/dom4j:1
-	dev-java/fastinfoset:0
-	dev-java/glassfish-transaction-api:0
-	dev-java/javassist:3
-	dev-java/jboss-logging:0
-	dev-java/jsr67:0
-	dev-java/jsr181:0
-	dev-java/jtidy:0
-	dev-java/log4j:0
-	dev-java/mimepull:0
-	dev-java/saaj:0
-	dev-java/stax-ex:0
-	dev-java/xmlstreambuffer:0"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-pkg_pretend() {
-	local die_now=""
-
-	if [ -d /usr/share/netbeans-java-${SLOT}/ant ]; then
-		if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
-			eerror "Please remove following symlinks and run emerge again:"
-			find /usr/share/netbeans-java-${SLOT}/ant -type l
-			die_now="1"
-		fi
-	fi
-
-	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
-		if [ -z "${die_now}" ]; then
-			eerror "Please remove following symlinks and run emerge again:"
-		fi
-
-		echo "/usr/share/netbeans-java-${SLOT}/maven"
-		die_now="1"
-	fi
-
-	if [ -n "${die_now}" ]; then
-		die "Symlinks exist"
-	fi
-}
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-8.0.2-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip maven.embedder/external/apache-maven-3.0.5-bin.zip || die
-	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
-	ln -s "${DISTDIR}"/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar j2ee.eclipselink/external/eclipselink.jar || die
-	ln -s "${DISTDIR}"/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip hibernate4lib/external/hibernate-release-4.3.1-lib.zip || die
-	ln -s "${DISTDIR}"/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar maven.indexer/external/indexer-artifact-5.1.1.jar || die
-	ln -s "${DISTDIR}"/2B9EAB164D8748F9793F6A0D29B6463E97B284DA-indexer-core-5.1.1.jar maven.indexer/external/indexer-core-5.1.1.jar || die
-	ln -s "${DISTDIR}"/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar maven/external/jarjar-1.4.jar || die
-	ln -s "${DISTDIR}"/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar j2ee.eclipselink/external/javax.persistence_2.1.0.v201304241213.jar || die
-	ln -s "${DISTDIR}"/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip websvc.jaxws21/external/jaxws-2.2.6.zip || die
-	ln -s "${DISTDIR}"/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip websvc.jaxws21api/external/jaxws-2.2.6-api.zip || die
-	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
-	ln -s "${DISTDIR}"/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip j2ee.eclipselink/external/JPAjavadocs04032013.zip || die
-	ln -s "${DISTDIR}"/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar maven.indexer/external/lucene-core-3.6.2.jar || die
-	ln -s "${DISTDIR}"/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar maven.indexer/external/lucene-highlighter-3.6.2.jar || die
-	ln -s "${DISTDIR}"/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar maven.embedder/external/maven-dependency-tree-2.0.jar || die
-	ln -s "${DISTDIR}"/E5579EF3B0C1EF2F43562DD0C3B32F8E1F603B49-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
-	ln -s "${DISTDIR}"/8BDE88C9512D8783E64788F32A50E4CCBC48485E-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
-	ln -s "${DISTDIR}"/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar || die
-	ln -s "${DISTDIR}"/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar || die
-	ln -s "${DISTDIR}"/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip libs.springframework/external/spring-framework-3.2.7.RELEASE.zip || die
-	ln -s "${DISTDIR}"/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip libs.springframework/external/spring-framework-4.0.1.RELEASE.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-8.0.2-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS80_PATCHES_DIR}" -a -d "${NETBEANS80_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS80_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.cglib/external cglib-3 cglib.jar cglib-2.2.jar
-	java-pkg_jar-from --build-only --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.10.jar
-	java-pkg_jar-from --into maven.embedder/external jdom-1.0 jdom.jar jdom-1.0.jar
-	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/java >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
-	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
-
-	popd >/dev/null || die
-
-	local instdir=/${INSTALL_DIR}/modules/ext
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
-	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
-	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/hibernate4
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm antlr-2.7.7.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.7.jar || die
-	rm c3p0-0.9.2.1.jar && dosym /usr/share/c3p0/lib/c3p0.jar ${instdir}/c3p0-0.9.2.1.jar || die
-	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
-	rm commons-collections-3.2.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-3.2.1.jar || die
-	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
-	rm javassist-3.18.1-GA.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist-3.18.1-GA.jar || die
-	rm jboss-logging-3.1.3.GA.jar && dosym /usr/share/jboss-logging/lib/jboss-logging.jar ${instdir}/jboss-logging-3.1.3.GA.jar || die
-	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && dosym /usr/share/glassfish-transaction-api/lib/jta.jar ${instdir}/jboss-transaction-api_1.2_spec-1.0.0.Final.jar || die
-	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die
-	rm log4j-1.2.12.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.12.jar || die
-	popd >/dev/null || die
-
-	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
-	rm mimepull.jar && dosym /usr/share/mimepull/lib/mimepull.jar ${instdir}/mimepull.jar || die
-	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
-	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
-	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/xmlstreambuffer.jar ${instdir}/streambuffer.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
-	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/maven
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm jdom-1.0.jar && dosym /usr/share/jdom-1.0/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
-}
diff --git a/dev-java/netbeans-java/netbeans-java-8.0.2-r4.ebuild b/dev-java/netbeans-java/netbeans-java-8.0.2-r4.ebuild
index af538c775485..71d61ba94b85 100644
--- a/dev-java/netbeans-java/netbeans-java-8.0.2-r4.ebuild
+++ b/dev-java/netbeans-java/netbeans-java-8.0.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -35,7 +35,7 @@ SRC_URI="${SOURCE_URL}
 	http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
 	http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 S="${WORKDIR}"
 
diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest
index 8c8cf129b969..f5234a39560b 100644
--- a/dev-java/stringtemplate/Manifest
+++ b/dev-java/stringtemplate/Manifest
@@ -1,4 +1,3 @@
 DIST antlr-3.5.2-complete.jar 2456317 SHA256 26ca659f47d77384f518cf2b6463892fcd4f0b0d4d8c0de2addf697e63e7326b SHA512 560f208e38759b5e626de56816e1fce9c191c526c04ca782513859d468ac444d1e8e62c03870a68f8f9d8daee0f45fca465150e2bbfc71b46e46b952519044b1 WHIRLPOOL bdbbb081bf0aab83fa26a4a75f7f42487da688a5e3c765ea4cbd7b8c1bcb80b66e8b98bf95ee8bcd2acd60b4eacb6745f879cb899b672ea7fc4489d651a6f2e0
 DIST stringtemplate-3.2.1.tar.gz 1039803 SHA256 3a0adbb7510c2822ca515c635e1ff1469b3ac78f6d2072e48478876b9191de20 SHA512 fe4c50584dd3695514034845ba7b8fa300cf582b6b302797afadce990f2665759323f6a29ece1bc07dfab244cc00455b4106fe3ad6851165edbb8736ad7ec714 WHIRLPOOL be77636384fdc680d856e8840abf0f629d5115c67f2085db044767847a480b3e2be70bae1d3984172561d14661ae325c677017b55183ff7d2e10ae4c9f83b40e
-DIST stringtemplate-3.2.tar.gz 741708 SHA256 de85449fca6c11bf2efff73fa2c852ccf84b0db1e129a6948748659952f6825e SHA512 23b657fe15fd37ccbacea3f8d7ab4ef4a7870b6bafed73cfb2ffb44b3d8ee1f473aa57d39f864017d74c97f4ee431d776eaf0439065c6d1b94d4d5a2fec5d226 WHIRLPOOL eff58073d8c4773fb75dfa25fb76b5973297dd329c451c1fda1f1d53f3e620119382ffe3986e5b941473b4089807cfc7807bb17545c66dc9d4cfa6575ccc9446
 DIST stringtemplate-4.0.8.tar.gz 147305 SHA256 07013e36d16968b514092b1e33cbe53f811a70a12c96e2e56c2e97a4304431df SHA512 21e4936356a6d374bf92645f09351a495a5900a408ead8dce1903ed81d7fc70eb4b44b206b587b05ed87edb2d4792c1cf72907a9cb527e18373ba2e5f31b5724 WHIRLPOOL 61562310995301cd005eb6a553f973304e166bca0b10d59a7d0877d73599a3bd26a2abf4cc7cb0ff98b61a1ef869c08f2d6933833217cac67f92d992a9a6d53d
diff --git a/dev-java/stringtemplate/files/stringtemplate-3.1_beta1-javadoc.patch b/dev-java/stringtemplate/files/stringtemplate-3.1_beta1-javadoc.patch
deleted file mode 100644
index c4fbbf119f12..000000000000
--- a/dev-java/stringtemplate/files/stringtemplate-3.1_beta1-javadoc.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- build.xml	2007-05-25 23:07:06.000000000 +0200
-+++ build.xml	2007-05-25 23:07:31.000000000 +0200
-@@ -189,7 +189,7 @@
-   <!-- =================================================================== -->
-   <target name="javadocs" depends="init,prepare-sources">
-     <mkdir dir="${build.javadocs}"/>
--    <javadoc packagenames="${packages}"
-+    <javadoc
-       sourcepath="${build.src}"
-       destdir="${build.javadocs}"
-       author="true"
-@@ -197,7 +197,6 @@
-       windowtitle="${Name} API"
-       doctitle="${Name} API Documentation"
-       bottom="Copyright &#169; ${copyright}"
--      additionalparam="${javadocs.additionalparam}"
-       />
-   </target>
- 
diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild b/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
index 1179a5b450f4..f2df14fd5f45 100644
--- a/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.stringtemplate.org/"
 SRC_URI="https://github.com/antlr/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 CDEPEND=">=dev-java/antlr-2.7.7-r7:0"
diff --git a/dev-java/stringtemplate/stringtemplate-3.2.ebuild b/dev-java/stringtemplate/stringtemplate-3.2.ebuild
deleted file mode 100644
index 7ff3a2357e4b..000000000000
--- a/dev-java/stringtemplate/stringtemplate-3.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-JAVA_PKG_IUSE="doc source"
-WANT_ANT_TASKS="ant-antlr"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PV="${PV/_beta/b}"
-S_PV="${PV/_beta/.b}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="A Java template engine"
-HOMEPAGE="http://www.stringtemplate.org/"
-SRC_URI="http://www.stringtemplate.org/download/${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-# no junit targets in build.xml, but unconditional compile and jar of test
-# classes, oh well
-COMMON_DEPEND=">=dev-java/antlr-2.7.7:0[java]
-	dev-java/junit:0"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEPEND}"
-
-S="${WORKDIR}/${PN}-${S_PV}"
-
-java_prepare() {
-	# fix <javadoc> call
-	epatch "${FILESDIR}/${PN}-3.1_beta1-javadoc.patch"
-	java-ant_rewrite-classpath
-	rm -v lib/*.jar || die
-	# force regeneration with our antlr2
-	touch src/org/antlr/stringtemplate/language/*.g || die
-}
-
-EANT_GENTOO_CLASSPATH="antlr,junit"
-EANT_DOC_TARGET="javadocs"
-
-src_install() {
-	java-pkg_dojar build/${PN}.jar
-
-	dodoc README.txt CHANGES.txt || die
-	use doc && java-pkg_dojavadoc docs/api
-	use source && java-pkg_dosrc src/org
-}
diff --git a/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r2.ebuild b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r2.ebuild
deleted file mode 100644
index 9eebae77cecd..000000000000
--- a/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-WANT_ANT_TASKS="ant-antlr"
-
-inherit java-pkg-2 java-ant-2 eutils versionator
-
-MY_PN=${PN/-/.}
-MY_PV=$(replace_version_separator 3 '-')
-MY_P=${MY_PN}-${MY_PV}
-
-DESCRIPTION="W3C XPath-Rec implementation for DOM4J"
-HOMEPAGE="http://sourceforge.net/projects/werken-xpath/"
-SRC_URI="mirror://gentoo/${MY_P}-src.tar.gz"
-# This tarball was acquired from jpackage's src rpm of the package by the same name
-
-LICENSE="JDOM"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-
-COMMON_DEP="
-	dev-java/jdom:1.0
-	>=dev-java/antlr-2.7.7:0[java]"
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-
-S=${WORKDIR}/${MY_PN}
-
-EANT_BUILD_TARGET="package"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="antlr,jdom-1.0"
-
-java_prepare() {
-	# Courtesy of JPackages :)
-	epatch "${FILESDIR}"/${P}-jpp-compile.patch
-	epatch "${FILESDIR}"/${P}-jpp-jdom.patch
-	epatch "${FILESDIR}"/${P}-jpp-tests.patch
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-
-	# API updates to support jdom:1.0
-	epatch "${FILESDIR}"/${P}-jdom-1.0.patch
-
-	cd "${S}"/lib
-	# In here we have ant starter scripts
-	rm -fr bin
-	rm -f *.jar
-}
-
-src_install() {
-	java-pkg_newjar build/${MY_PN}.jar
-
-	dodoc README TODO LIMITATIONS
-	use doc && java-pkg_dojavadoc build/apidocs
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild
index 7a8d9b9e4cf5..df192a873c15 100644
--- a/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild
+++ b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,7 +19,7 @@ SRC_URI="mirror://gentoo/${MY_P}-src.tar.gz"
 
 LICENSE="JDOM"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 
 COMMON_DEP="
 	dev-java/jdom:0
diff --git a/dev-lang/luajit/luajit-2.0.4.ebuild b/dev-lang/luajit/luajit-2.0.4.ebuild
index 0c2d1d371934..ed954241d1f7 100644
--- a/dev-lang/luajit/luajit-2.0.4.ebuild
+++ b/dev-lang/luajit/luajit-2.0.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="http://luajit.org/download/${MY_P}.tar.gz
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
 SLOT="2"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="lua52compat"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/elfutils/elfutils-0.165.ebuild b/dev-libs/elfutils/elfutils-0.165.ebuild
index 3ba03eb71714..5bf686f9c88a 100644
--- a/dev-libs/elfutils/elfutils-0.165.ebuild
+++ b/dev-libs/elfutils/elfutils-0.165.ebuild
@@ -13,12 +13,12 @@ SRC_URI="https://fedorahosted.org/releases/e/l/${PN}/${PV}/${P}.tar.bz2"
 LICENSE="GPL-2-with-exceptions"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="bzip2 lzma nls static-libs test +threads +utils zlib"
+IUSE="bzip2 lzma nls static-libs test +threads +utils"
 
 # This pkg does not actually seem to compile currently in a uClibc
 # environment (xrealloc errs), but we need to ensure that glibc never
 # gets pulled in as a dep since this package does not respect virtual/libc
-RDEPEND="zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
 	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
 	!dev-libs/libelf
@@ -51,7 +51,7 @@ multilib_src_configure() {
 		$(use_enable nls) \
 		$(use_enable threads thread-safety) \
 		--program-prefix="eu-" \
-		$(use_with zlib) \
+		--with-zlib \
 		$(use_with bzip2 bzlib) \
 		$(use_with lzma)
 }
diff --git a/dev-libs/libnfc/Manifest b/dev-libs/libnfc/Manifest
index af5d01760a3d..70a7a2d7959c 100644
--- a/dev-libs/libnfc/Manifest
+++ b/dev-libs/libnfc/Manifest
@@ -2,3 +2,4 @@ DIST libnfc-1.4.2.tar.gz 487310 SHA256 295ad8a0dc0e4469d9f10589449a9a04eed284a2e
 DIST libnfc-1.5.0.tar.gz 502506 SHA256 fae2910645ac71a0b7707d693d1521f210019fdf3437203b3d779951ddcb7e85 SHA512 d144d54b55fc67717c8b62f176e69d4e77163ecdf17fb4cffce8034ac1dc3ef26307e35e9e24f48d12d96a65619b635161f773d84a4c14d19ee4576d7b876375 WHIRLPOOL 03966d896a826099be0c780281c9a9c76b7f4fd5834b557a2f1e1caf3d9ecc50c733feff14db3fa4ef858a09cd053de93685efb2176c4523e55787fa52fffb33
 DIST libnfc-1.5.1.tar.gz 534349 SHA256 5c0f33465051704a67c63f6ca9782d69b0d7ac4962ea5f996829834d1327f4f7 SHA512 1b496b9368f0a19f5286c63c17ddf9c8afa3bae5106c8a85d89bbb8bb700948782722c30d9703d4348b45f362b47f5d63cbc0d7b4a4fe7d31dbbaedfa3354533 WHIRLPOOL 4b5ec3d59254c1e5bfbb92a64b81031eb03e6dc8c296eaf3d477e0ef985872f896b8a2a297d8f9ba6ae0561c59a91d4f05e1c54e1a613347ae5f3de7778f337b
 DIST libnfc-1.7.0.tar.bz2 472209 SHA256 f14df0727c301f9149608dc6e1fbad81ec48372dcd7a364ac1cb805a7a2b2b8b SHA512 f5a07b2f1438030f43715f402b756a6c8d07749866004fa74e473dbd302cb64d278413c18c7e93e80be093d2d1322d85b9df868aa640be27b6367245ab7365d5 WHIRLPOOL 4f56a3a71e7151710c19ba0debdd998e36c4fbae2a7451ccd92fe498bd346333fe63b68aedf427f948f70d8ed7ce706d302cb975c1ab899d911e87060d5a4243
+DIST libnfc-1.7.1.tar.bz2 484309 SHA256 945e74d8e27683f9b8a6f6e529557b305d120df347a960a6a7ead6cb388f4072 SHA512 6a03d197c450c0ab8f2d16ae8c1f80e206fa909ece84a32dbb962acd0f7ef693a419608cdaa4c2207a1d2593599e44479520d7413eace7fca19d3230442e506c WHIRLPOOL 005b88b81ed4ca1e6a6a3af3ad713804979b60bde0c440537f555ab973d3654101d6d5aceaf92d75f0f839008b6b722f4610d041b3ea89f88ca9526ac8707573
diff --git a/dev-libs/libnfc/libnfc-1.7.0-r1.ebuild b/dev-libs/libnfc/libnfc-1.7.0-r1.ebuild
index fb08e9faae3d..8f91f478ca6e 100644
--- a/dev-libs/libnfc/libnfc-1.7.0-r1.ebuild
+++ b/dev-libs/libnfc/libnfc-1.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE="doc pcsc-lite readline static-libs usb"
 
 RDEPEND="pcsc-lite? ( sys-apps/pcsc-lite )
-	readline? ( sys-libs/readline )
+	readline? ( sys-libs/readline:0 )
 	usb? ( virtual/libusb:0 )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
diff --git a/dev-libs/libnfc/libnfc-1.7.1.ebuild b/dev-libs/libnfc/libnfc-1.7.1.ebuild
new file mode 100644
index 000000000000..1fcdb5bcce31
--- /dev/null
+++ b/dev-libs/libnfc/libnfc-1.7.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Near Field Communications (NFC) library"
+HOMEPAGE="http://www.libnfc.org/"
+SRC_URI="https://github.com/nfc-tools/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc pcsc-lite readline static-libs usb"
+
+RDEPEND="pcsc-lite? ( sys-apps/pcsc-lite )
+	readline? ( sys-libs/readline:0 )
+	usb? ( virtual/libusb:0 )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+src_configure() {
+	local drivers="arygon,pn532_uart,pn532_spi,pn532_i2c,acr122s"
+	use pcsc-lite && drivers+=",acr122_pcsc"
+	use usb && drivers+=",pn53x_usb,acr122_usb"
+	econf \
+		--with-drivers="${drivers}" \
+		$(use_enable doc) \
+		$(use_with readline) \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	default
+	use doc && doxygen
+}
+
+src_install() {
+	default
+	use static-libs || find "${ED}" -name 'lib*.la' -delete
+	use doc && dohtml "${S}"/doc/html/*
+}
diff --git a/dev-perl/Exception-Class/Exception-Class-1.370.0-r1.ebuild b/dev-perl/Exception-Class/Exception-Class-1.370.0-r1.ebuild
deleted file mode 100644
index fae2702f8256..000000000000
--- a/dev-perl/Exception-Class/Exception-Class-1.370.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=DROLSKY
-MODULE_VERSION=1.37
-inherit perl-module
-
-DESCRIPTION="A module that allows you to declare real exception classes in Perl"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND="
-	>=dev-perl/Class-Data-Inheritable-0.20.0
-	>=dev-perl/Devel-StackTrace-1.200.0
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.310.0
-"
-
-SRC_TEST="do"
diff --git a/dev-perl/Exception-Class/Manifest b/dev-perl/Exception-Class/Manifest
index c1659ee71a10..0bbaf9c37b40 100644
--- a/dev-perl/Exception-Class/Manifest
+++ b/dev-perl/Exception-Class/Manifest
@@ -1,2 +1 @@
-DIST Exception-Class-1.37.tar.gz 26457 SHA256 838b93c90a0bbd73d819dc7d3d854559880120b6878976fe2ab90a141d10cedc SHA512 611895065102e4dfb40667841af0aaec436128deba8b52627b50320ddfcc191ca1c83a5084f7c4de582137790b1527791bbcfea93b24bc5095f1150a9d6bae3e WHIRLPOOL a7ee68032f1f691053cc1eb5d7b710f4e528b1f3ba994fdd5cf3e8a3bd958bbb39fdd1ad2de7924c2a85e3a08044e1df43fca009d8297af578b4c649a9e46afe
 DIST Exception-Class-1.39.tar.gz 38936 SHA256 819c756a69a6d1e31f396eca6a508b07b0a522a035b904cd1d432353cc362083 SHA512 c290a0b87b7a5e288c6c954f7ab834204184edc81089f871f1eb994d1445e3938170c1e87119fd952177dd43a3a228522188282fb0151ae33ba3a55b29a28b50 WHIRLPOOL 35bdb9adbb2565703b42d91897d5c698b1d1d378fa7ae11547cccfa844a251644667947403994158b02bdc6e32b830d7d02c4b7d6f154e7fb0125b8030bd3d52
diff --git a/dev-perl/Expect/Expect-1.210.0-r1.ebuild b/dev-perl/Expect/Expect-1.210.0-r1.ebuild
deleted file mode 100644
index 6e355eaa429c..000000000000
--- a/dev-perl/Expect/Expect-1.210.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=RGIERSIG
-MODULE_VERSION=1.21
-inherit perl-module
-
-DESCRIPTION="Expect for Perl"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-perl/IO-Tty-1.03"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/Expect/Manifest b/dev-perl/Expect/Manifest
index 7d8aa3cd1f10..1abc4a2860b5 100644
--- a/dev-perl/Expect/Manifest
+++ b/dev-perl/Expect/Manifest
@@ -1,2 +1 @@
-DIST Expect-1.21.tar.gz 53881 SHA256 e5509307b8e330a3bc07dd4ab1d28e5451116449cc9c3bdabb1235f66ce62267 SHA512 496716b9e6544e9d6809b7f704df8199291d18ec9ec9ebb4fd2b7b341aa10d9b03989335c1f22d1faddbff0974ceba5b2823685fa08ce6a75e2f3ccaeb944e74 WHIRLPOOL d749b06519afc243af06a0d17610be6acb522a00982df7afe0a9122f18d11daadf222414f7171f86bb19f1f150512d32ccca94c45dac85f29eca605a1bda8c2c
 DIST Expect-1.32.tar.gz 61592 SHA256 d1f96842a5c7dd8516b202b530d87a70b65e7054d3bf975c34f6a42084e54e25 SHA512 0281d1662a902b99b5131c017b50b0456c3461c176bf4485b4bb383cab009973605514256540c5ddc2e274b5dd92ece5555719f5527d3fb8c35e83f8dc038147 WHIRLPOOL acd78f455507947fc8953cc3b2fc10a33f7b1926ecbebb61ae69812b57ae7273dc8294035f08fa4d248e046d6f79a81ff694c069ffbe3479608bbb32e1cd0734
diff --git a/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.308.0.ebuild b/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.308.0.ebuild
deleted file mode 100644
index 9586c64af1ee..000000000000
--- a/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.308.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN=ExtUtils-Depends
-MODULE_AUTHOR=XAOC
-MODULE_VERSION=0.308
-inherit perl-module
-
-DESCRIPTION="Easily build XS extensions that depend on XS extensions"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/ExtUtils-Depends/Manifest b/dev-perl/ExtUtils-Depends/Manifest
index 88bb07883edd..4bf4ca1190eb 100644
--- a/dev-perl/ExtUtils-Depends/Manifest
+++ b/dev-perl/ExtUtils-Depends/Manifest
@@ -1,3 +1,2 @@
-DIST ExtUtils-Depends-0.308.tar.gz 13917 SHA256 81f92f15d769dc77697fdceb7d3aad961768b0c00fac87099a5b9f2d1d82e3e6 SHA512 56d9dbdfe51fb13e47891b13518dac85e5a775a23aebda0df785bdeb6c81683f0f89d04c7b038c39d5463067df21e889fd9d002dd7bb1814f589121db2f97f85 WHIRLPOOL 6f845ac65872da7bcc99ee5839719431be49310a7cd994375e0469fbc1b9a99d77ea71cb3d7906ae6e1c4910abe22afcaffb6b1b901c8184cac609ee25933be7
 DIST ExtUtils-Depends-0.404.tar.gz 18207 SHA256 8bec0a8f67ac7cf5c7bc48aff4b7cf8a771ef97f0ea7894bcdd0e9079ba24fec SHA512 b316309eadca551c5302b20b28b1ec2e2264a47524fc9a1a9763b59517dfbe84d22e86a76235fa0d0190c3348f49b913c40da60076ac6d01c51a98f7c0c5b783 WHIRLPOOL 43333f6defca49074afa491f2eb18975f80d4dc003a0bc2cd70dfa43be3ed01e5bc98ba96208049a019d4c6adc104aa4c77d867f30dccd387888ee735f549385
 DIST ExtUtils-Depends-0.405.tar.gz 18122 SHA256 8ad6401ad7559b03ceda1fe4b191c95f417bdec7c542a984761a4656715a8a2c SHA512 b9983ad763ff0cb81c899bc24f3152f13c69e608304b6e4446bd07b9b13d039650f3f87544c0bdd29c67246ea2973f04a1ce0fccbffb566fe89fdbe0bb03f11b WHIRLPOOL 0a5274d34e0a436a153257a4bfb608401180aef957f83a2f5ed2a2435d540a4cc7f17bace54817cde06a0a1350df7d682253b33e982e3948379f8391f58a8756
diff --git a/dev-perl/ExtUtils-F77/ExtUtils-F77-1.170.0-r1.ebuild b/dev-perl/ExtUtils-F77/ExtUtils-F77-1.170.0-r1.ebuild
deleted file mode 100644
index 6f933c488d77..000000000000
--- a/dev-perl/ExtUtils-F77/ExtUtils-F77-1.170.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=KGB
-MODULE_VERSION=1.17
-inherit perl-module
-
-DESCRIPTION="Facilitate use of FORTRAN from Perl/XS code"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/ExtUtils-F77/Manifest b/dev-perl/ExtUtils-F77/Manifest
index 4ce01475edff..2d69d0437e42 100644
--- a/dev-perl/ExtUtils-F77/Manifest
+++ b/dev-perl/ExtUtils-F77/Manifest
@@ -1,3 +1,2 @@
-DIST ExtUtils-F77-1.17.tar.gz 11225 SHA256 b3919200443174ff348ed5567d461335e289fba047cb17432f31dea5a26cad3f SHA512 25f9046fa39aca3e6ecebccf78e2bd8a116e5db815f086431ee5600068f34a08a7658697b9d5e6d530837f0f98d6a143295a76ae78044e4628d57896f65cb550 WHIRLPOOL 037b9189364c115c83acc92575b0028c62ccf3931988144c69790db513008eebc58deceb765aae819ffbaa3bf22d3caadc0adcdace521a43d783e3c37d15fd0f
 DIST ExtUtils-F77-1.18.tar.gz 11614 SHA256 6b1fbeb38f092b399f46d58f8699917f71c098dff131a3c7b72ccccadbc953b4 SHA512 dba56108f2b59582780c03d1cf965d276d73cee1452f9f563b6b513ac4fab24007003b45b86d2c11c05b5d55ac9d1837a76ed14bdbd4738db5ec3a6632f7edcc WHIRLPOOL 993d14bbf0fd7fbbe22cdee27e73b0b25f0038092de74496190838aadee6db6c9b723c3045956ccb28f21f35c31e9e7b6a5548e556eb27de3745b5b1ab3ed977
 DIST ExtUtils-F77-1.19.tar.gz 12057 SHA256 09cec663fe1cfee57951b46f6433d6b4255a57ec4a1ae8cf5c81099cae84afa5 SHA512 f103c94d8074fc3ca6f6afecc394608a61f08949f3d19e40ea66db2ddc7af4e17f429783e8ac9c8a76ebe98863b7295df8a7f9ba3f8eb967e4f19a168d5a7d81 WHIRLPOOL 44c3553aeab53575053275f461e4e340cdfb48bffcd56d9782e48d19bdf96fb676509afcf857165336261c5872cc151d26f06fa809d7770629909036b8e95c68
diff --git a/dev-perl/File-MMagic/File-MMagic-1.270.0-r1.ebuild b/dev-perl/File-MMagic/File-MMagic-1.270.0-r1.ebuild
deleted file mode 100644
index 28276d214b30..000000000000
--- a/dev-perl/File-MMagic/File-MMagic-1.270.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=KNOK
-MODULE_VERSION=1.27
-inherit perl-module
-
-DESCRIPTION="The Perl Image-Info Module"
-SRC_TEST="do"
-
-SLOT="0"
-LICENSE="File-MMagic"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
diff --git a/dev-perl/File-MMagic/Manifest b/dev-perl/File-MMagic/Manifest
index 477696022077..17bc1ba612eb 100644
--- a/dev-perl/File-MMagic/Manifest
+++ b/dev-perl/File-MMagic/Manifest
@@ -1,2 +1 @@
-DIST File-MMagic-1.27.tar.gz 21332 SHA256 d82d4f07c7a321641f304460d4878303cb2241d2401a3544eed904199ae83d6a SHA512 b8236ced589614203f57dd50d4fea0885803b1cf3b9abf37b0632ab95146c237c68932b8d03047bb2f4a7bb55e3941799a01869903c910fcbce57bfd75938ef0 WHIRLPOOL ad326ee02887cababf5151d72badb7ede70b46d73bcf264e81ed91a19eea08800d90b78f05c4ece994633602c720bad8386440478dbab9ef89d9de671475dc02
 DIST File-MMagic-1.30.tar.gz 22346 SHA256 cf0c1b1eb29705c02d97c2913648009c0be42ce93ec24b36c696bf2d4f5ebd7e SHA512 4013fc1178cdf9c1a141652290e091f296b9bef54b9f4301926d9ed0a5262bbf67213773774e41aab8630bed20c2c9441befe55db9ca04a56d07099061b50e25 WHIRLPOOL 2352de876aeed6e73fcce20f29958c40cc4dd22d2429db35fd738f05f82f1a040ad4849d7e5b1a83504a61db0884009032879342b00ee83fc6dd1e9b561c2588
diff --git a/dev-perl/File-MimeInfo/File-MimeInfo-0.260.0.ebuild b/dev-perl/File-MimeInfo/File-MimeInfo-0.260.0.ebuild
deleted file mode 100644
index 89c0e82ce63d..000000000000
--- a/dev-perl/File-MimeInfo/File-MimeInfo-0.260.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=MICHIELB
-MODULE_VERSION=0.26
-inherit perl-module
-
-DESCRIPTION="Determine file type"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
-IUSE="test"
-
-RDEPEND="
-	>=dev-perl/File-BaseDir-0.03
-	>=dev-perl/File-DesktopEntry-0.04
-	x11-misc/shared-mime-info
-"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-	test? (
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage
-	)
-"
-
-SRC_TEST="do"
diff --git a/dev-perl/File-MimeInfo/Manifest b/dev-perl/File-MimeInfo/Manifest
index ee1ebfbf45cc..162128cca260 100644
--- a/dev-perl/File-MimeInfo/Manifest
+++ b/dev-perl/File-MimeInfo/Manifest
@@ -1,3 +1,2 @@
 DIST File-MimeInfo-0.21.tar.gz 31334 SHA256 40409cc35cdea0a09b47f410113eb247dfe96fd4530a5fea2dee294914a1f58e SHA512 6e8d911744ebd1dac30eff0b5b1f266743e5539d7b176832e7af2d6988813b1eda757938d1b240b0bc6cc0e358b986ca9ad35d81ecb59afb8de63f6565c1ee2d WHIRLPOOL ff01773664b10a4d9010474c2655cfa3d0a3196c6edb569887cc5faa11c1c1752c6d7ce29922a1f780f3e52abb13a2a36da9eca9226ebb4768193c77f35f0164
-DIST File-MimeInfo-0.26.tar.gz 32492 SHA256 544f58631a383460754a233a1cb00572c57caa04cc3c11fa7c242caf5f89ceb3 SHA512 ac63d16a1c5761f853e639a020f38cdebb861ea60a6868e6279c15bc2447fd6f7042396e77f116d00c7c858fe265ac84809bf24e8f5c355253442ef21fd40368 WHIRLPOOL 3659e3c5b474a9192023dbe5243b48856d88add0349c4dfa31d6acdf5e9e9744d41d9afc5119e1842683f277beeae4b8ea3283529b4a73ba19b0e60eea7d1138
 DIST File-MimeInfo-0.27.tar.gz 30814 SHA256 579cf826fed7fe276636531a53291550c9ac36781dcd9e07e52ee7e784667234 SHA512 0be5b23d96291f792ac3190e38183021b0905870185979f11edc27ebb6fd0fb4726e3fde129cd92e42305978e15acf745eed9d7d203851b7ee2392c7f1e9a5c2 WHIRLPOOL 714f52fcd03518b8448da714157839a6fee2c47111c7c4416de6bd48b3534d8234ab7da3af0b82f4c4dafb49726891085a5e79aa863292e80a80a5dceb215fea
diff --git a/dev-perl/File-Remove/File-Remove-1.550.0.ebuild b/dev-perl/File-Remove/File-Remove-1.550.0.ebuild
new file mode 100644
index 000000000000..072c0fb55604
--- /dev/null
+++ b/dev-perl/File-Remove/File-Remove-1.550.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=SHLOMIF
+DIST_VERSION=1.55
+inherit perl-module
+
+DESCRIPTION="Remove files and directories"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-File-Path
+	>=virtual/perl-File-Spec-3.290.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-File-Temp
+	>=dev-perl/Module-Build-0.280.0
+	test? ( virtual/perl-Test-Simple )
+"
diff --git a/dev-perl/File-Remove/Manifest b/dev-perl/File-Remove/Manifest
index f95e16c1a1e2..b6b238620c13 100644
--- a/dev-perl/File-Remove/Manifest
+++ b/dev-perl/File-Remove/Manifest
@@ -1 +1,2 @@
 DIST File-Remove-1.52.tar.gz 38230 SHA256 4154dc574b8a9a3a555d323f152ac742363c6a69c1f61de15b72728813550bdd SHA512 6651de14d8fccee9bfeb83bd794c399135aee91733beb7a8a30e6611b4f514ad1989df2459bc72b2d17c9ded57d018d95ade36da2ee24fcf8a22a9659ecdeb5b WHIRLPOOL 638239e511fc3ca6b37ab482cb8eae04f68f79c68613ee1b409d0de74b8d69d85fead8167205b88b631fc7cc3213c8ddc4a5cadbc95e1bc6b3fa33a6a87171f1
+DIST File-Remove-1.55.tar.gz 22052 SHA256 4c3ebbdcf879036cebe121d585f85a601d8088347ec342192e51fcecd7e5a91f SHA512 93745d8019420907ac6dc00097ca18ea4112f2c7e035956cbaa86256776ee1ca9aa14b7cd1887cad02a4a08eda0ab58290505fbca445b18670df2c8820c74cfc WHIRLPOOL f38daec37535c03a488ca619c7d80b2e9b5e1c7e13f64629be78cf092e0e4254feaa3425c5addd137f7a94202317e0d38e580c1f0bcbf5f8137d86104aeaa8fb
diff --git a/dev-perl/File-Scan-ClamAV/File-Scan-ClamAV-1.930.0.ebuild b/dev-perl/File-Scan-ClamAV/File-Scan-ClamAV-1.930.0.ebuild
new file mode 100644
index 000000000000..6522713c41f7
--- /dev/null
+++ b/dev-perl/File-Scan-ClamAV/File-Scan-ClamAV-1.930.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=ESAYM
+DIST_VERSION=1.93
+inherit perl-module
+
+DESCRIPTION="Connect to a local Clam Anti-Virus clamd service and send commands"
+
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="app-antivirus/clamav"
+DEPEND="${DEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+
+DIST_TEST=skip
+# tests require clamav to be configured, which we can't guarantee here
diff --git a/dev-perl/File-Scan-ClamAV/Manifest b/dev-perl/File-Scan-ClamAV/Manifest
index e5f8ef617cc2..8f3f7bb15ee5 100644
--- a/dev-perl/File-Scan-ClamAV/Manifest
+++ b/dev-perl/File-Scan-ClamAV/Manifest
@@ -1 +1,2 @@
 DIST File-Scan-ClamAV-1.91.tar.gz 7048 SHA256 f9f265acfac680e590dc81c0d9f3e4eb4aaa833cf4910c7e21f881e1a4784b7e SHA512 f47751f16095caa5faed2eaab2dc8f204bc11ab8869231a231b04655669fbd67df61a1ec96ce660ab05ef66f766742fb5c5ff00ebac425304e3daa3830679805 WHIRLPOOL 6158cc38c317f2ee76eab608e43c48a4f609cab4400b12a6989a14eae0994c48b9340f2ffd6d20413e174cf5e07b43b3bf6f18cbd638cdd838fdf1a84b960c23
+DIST File-Scan-ClamAV-1.93.tar.gz 8358 SHA256 d2b01ad2b1fce58023bd38876c89c27b41d7890ecbb28991e7b4669687bb4d18 SHA512 61fbd3851c5cd03ab39844ba3d5f0226ab5daa252b226427486fad0cda9f3aa6469a6638dd53e4a68075bb6133b76cabff36a132daf5dcdc1d19d8a3dafdd770 WHIRLPOOL c824042acc480bc4ed2ad29c07286af2a4c6b9341ca1e7848aa92e1d9324f95fdc61a22fd0177ff13dedf2906b241cd4d8926389d050fecfdd6e5fa8aa6d931c
diff --git a/dev-perl/File-chdir/File-chdir-0.100.800-r1.ebuild b/dev-perl/File-chdir/File-chdir-0.100.800-r1.ebuild
deleted file mode 100644
index 3f2f41497ab7..000000000000
--- a/dev-perl/File-chdir/File-chdir-0.100.800-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=DAGOLDEN
-MODULE_VERSION=0.1008
-inherit perl-module
-
-DESCRIPTION="An alternative to File::Spec and CWD"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND=">=virtual/perl-File-Spec-3.27"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/File-chdir/Manifest b/dev-perl/File-chdir/Manifest
index 3d8039e4aa06..48c84360311d 100644
--- a/dev-perl/File-chdir/Manifest
+++ b/dev-perl/File-chdir/Manifest
@@ -1,2 +1 @@
-DIST File-chdir-0.1008.tar.gz 21595 SHA256 993af084c4bd02369169e6dac20c414d5b589c53247b66bb837acce700fa0d59 SHA512 06647553823aa4e060d652ae40052924d6a5844d4f94de03d64a0e664944322c9e0784d1e2391a755a0261d0cdb0a7ab75287414d85d6d6b100f4102cc7c918f WHIRLPOOL cd6bcc3d0f1af7124208bd4eca6b719a6b62a902361cb78b43f96043dc6f19ffea33b9aa4b976afb087cb4a0824de73588bab83239b6f193479c4fa59953b20e
 DIST File-chdir-0.1010.tar.gz 24761 SHA256 efc121f40bd7a0f62f8ec9b8bc70f7f5409d81cd705e37008596c8efc4452b01 SHA512 0a9390b48d49c2ac0e2f8b409396a6a2ea3518823d1b6d8c23bbf19a438b92d1e784dcf3bc7c0d43b0365b0620557aea1f8d9ef224b68ca9c472fefa8fe1adab WHIRLPOOL d3aaa5b80472a81245f4592d6c71f1be8f6520eb9175685aa7660e4d0d332ae8429433659c5c82899d7768b6569d875846528c367d98328d750314682154371e
diff --git a/dev-perl/File-chmod/File-chmod-0.360.0-r1.ebuild b/dev-perl/File-chmod/File-chmod-0.360.0-r1.ebuild
deleted file mode 100644
index 834a1fdd440a..000000000000
--- a/dev-perl/File-chmod/File-chmod-0.360.0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=XENO
-MODULE_VERSION=0.36
-inherit perl-module
-
-DESCRIPTION="Implements symbolic and ls chmod modes"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-IUSE=""
diff --git a/dev-perl/File-chmod/Manifest b/dev-perl/File-chmod/Manifest
index 3d324bd954c9..dedb181d64a2 100644
--- a/dev-perl/File-chmod/Manifest
+++ b/dev-perl/File-chmod/Manifest
@@ -1,2 +1 @@
-DIST File-chmod-0.36.tar.gz 19223 SHA256 ffaff6e790736be820268787637488919e15199893c4f9f0c08ce679c2561ddd SHA512 7fa57c24c18f73fe6be00f4ece31dab54f21e23e20d08f5c4fea488b279ff27417283f63de2175f56b0b09142c39a2fb32e0a26b35597f0e9f593deaa427c431 WHIRLPOOL 08df99f5aa03b7636e67efa5530c6eccaaeeec4db8ddbc3c4003ea88e470b6a89bdd40594c98a91874087a73f33a3ace2138819ba00cc79e6afd5162aace7ad7
 DIST File-chmod-0.42.tar.gz 24940 SHA256 6cafafff68bc84215168b55ede0d191dcb57f9a3201b51d61edb2858a2407795 SHA512 1b6bc41c43434914c0cb160a063f4cc6cbdfef85233b962c5a6885a23aebd7cafe05eb2d59253c7dc7f1cd323cdd3888d82a6ce19a9b7a00aaa8212d40c064d8 WHIRLPOOL e79d618350a1d57e27b5290d34de48202862a6f21f1f00bcf35d25dbe1f74033f19d26ec52c270c4f0279ff9c02c97b267921af715dc27d16ba53fae831648d6
diff --git a/dev-php/pecl-apcu_bc/Manifest b/dev-php/pecl-apcu_bc/Manifest
index a8f7905880d6..39589b0492cc 100644
--- a/dev-php/pecl-apcu_bc/Manifest
+++ b/dev-php/pecl-apcu_bc/Manifest
@@ -1 +1,2 @@
 DIST apcu_bc-1.0.0.tgz 5893 SHA256 3e683aa5c284075e16bc2603849c11e8ed51d2c1da213b877f429b44af91500c SHA512 eb7946692a1f3aa11a23031226e0d99bc68eee92972a359ce27714ea35fcb2a225c8da09b860b891b7c291d57cbf1b858a05adfdb99731307b484b0096014e5c WHIRLPOOL 3cf77319f3086892836592d9c2e1fe5ae5dca7b95462ef2d60e4cb055872f3a30212e751f363901f0e1781c89c0ca222d9879970e787a06bb8c7bbc2b818c65b
+DIST apcu_bc-1.0.1.tgz 6500 SHA256 512674d891104d6da91811dbb89d28ab3faa356ee0ab4cbeae9bba9cf3e971cb SHA512 336f8b132f421cb9e4ec2fce2b1af7394f8f74965669e4e87b380f5a988b39ba4abec68a4e915d09bb041a6194a0cc5822445246a068efebda0cbeca943df95b WHIRLPOOL 1dfdbf291cf568d9addce51232607d839cb7b3d20ea0472bb12bad9503da607ba230280a4ef98bf684c177a244dd8bb98c2de3821a79b16f8a4966e4ec90cedf
diff --git a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.1.ebuild b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.1.ebuild
new file mode 100644
index 000000000000..5c135d048eee
--- /dev/null
+++ b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PHP_EXT_NAME="apc"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS="README.md"
+
+USE_PHP="php7-0"
+
+inherit php-ext-pecl-r2
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Provides APC backwards compatibility functions via APCu"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-php/pecl-apcu[php_targets_php7-0]"
+RDEPEND="${DEPEND}"
diff --git a/dev-php/pecl-mailparse/Manifest b/dev-php/pecl-mailparse/Manifest
index 55432e8c6fa7..3d70c47b1ba4 100644
--- a/dev-php/pecl-mailparse/Manifest
+++ b/dev-php/pecl-mailparse/Manifest
@@ -1 +1,2 @@
 DIST mailparse-2.1.6.tgz 36538 SHA256 73705197d2b2ee782efa5477eb2a21432f592c2cb05a72c3a037bbe39e02b5cc SHA512 a7337dd2e99a953a55b38c236da95a6bd2950c2bca16fc0ddfec39be8b0ffe01007353fc7b562d0509e0bb1623c3d2b03935d1c98a07dcd9f0b14bb508bce374 WHIRLPOOL 238f209a45d83eb9b91cf34f1398ff85c538e8273f73791d4736b15e21de3d48395fd0b838e927cd9dd247bff265782c3e96c87b1d90e73bffc1e6b04beea1ba
+DIST mailparse-3.0.0.tgz 37878 SHA256 92a80f7d2cda597ca75186531006b802fa278f33d1b3b854420f48832e5bc7da SHA512 2aef70edc5400c7c45847ca57e733897d7fe844fa7550d3091bbc75b1ef459dff2a48f438ca04330379b57e62ed96081ea1fbea9e13ac0e873e906f4d92c1d9f WHIRLPOOL 26114676026dc7890d476db78e67447b28b3d037e55e6402c6e220dff2a410e91ddd0cf2579536143db67ad5155cdd3893c3b1059cc067c1c1338be51e5c94fb
diff --git a/dev-php/pecl-mailparse/pecl-mailparse-3.0.0.ebuild b/dev-php/pecl-mailparse/pecl-mailparse-3.0.0.ebuild
new file mode 100644
index 000000000000..688047638df4
--- /dev/null
+++ b/dev-php/pecl-mailparse/pecl-mailparse-3.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PHP_EXT_NAME="mailparse"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS="README"
+
+USE_PHP="php7-0"
+
+inherit php-ext-pecl-r2
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="PHP extension for parsing and working with RFC822 and MIME compliant messages"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE=""
+
+for target in ${USE_PHP}; do
+	phpslot=${target/php}
+	phpslot=${phpslot/-/.}
+	PHPUSEDEPEND="${PHPUSEDEPEND}
+	php_targets_${target}? ( dev-lang/php:${phpslot}[unicode] )"
+done
+
+RDEPEND="${PHPUSEDEPEND}"
+DEPEND="${RDEPEND}
+	dev-util/re2c"
diff --git a/dev-php/pecl-oauth/Manifest b/dev-php/pecl-oauth/Manifest
index 9f1fb3cf5070..d35b4752ca54 100644
--- a/dev-php/pecl-oauth/Manifest
+++ b/dev-php/pecl-oauth/Manifest
@@ -1 +1,2 @@
 DIST oauth-1.2.3.tgz 45531 SHA256 86bb5ee37afe672d4532ad784c7f711855c79f0dabf0acacafd5344ab6cf0195 SHA512 ca61dbec8fa51679accb31eab90b8699c7780f2d60a83566ce05667148ee44b7dc70fd8235414d6a3a996b252ad4a236b3e8a549685fd7e890e0874029c455e1 WHIRLPOOL 20969ea78c25152ac8e32d0c726bd112bdc5cb2b8d2fc59401d2c43f3d8990ed51702235afb07f0b8af604a5cf7264661caff1a8fc6bc7db25e71d682583a69c
+DIST oauth-2.0.0.tgz 49031 SHA256 f223a166e82ea51a241c229c5788e19dcafd8a1886ce2b7635cae29cb33c4f0e SHA512 9d14297012a2e6c679e3377955b5d06e180c4d81926c1db6ec8cf503661b61e3290edcc9f5903c7e31e2316e98457f4758e3d0744dc2e0d3d1b26c6888e78cc2 WHIRLPOOL 072a8a495e27f2eb2ca308aa5e63c54c42ad19b487abb93860aeadb608f5237e7ae374543f7f8d78573d854b93262f39a9aad25728b811b2f9ab02c65510956b
diff --git a/dev-php/pecl-oauth/pecl-oauth-2.0.0.ebuild b/dev-php/pecl-oauth/pecl-oauth-2.0.0.ebuild
new file mode 100644
index 000000000000..a384846b54f6
--- /dev/null
+++ b/dev-php/pecl-oauth/pecl-oauth-2.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PHP_EXT_NAME="oauth"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php7-0"
+
+inherit php-ext-pecl-r2
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="OAuth is an authorization protocol built on top of HTTP"
+LICENSE="BSD"
+SLOT="0"
+IUSE="examples"
+
+for target in ${USE_PHP}; do
+	slot=${target/php}
+	slot=${slot/-/.}
+	PHPUSEDEPEND="${PHPUSEDEPEND}
+	php_targets_${target}? ( dev-lang/php:${slot}[hash] )"
+done
+
+DEPEND="${PHPUSEDEPEND}"
+RDEPEND="${DEPEND}"
diff --git a/dev-php/pecl-rrd/Manifest b/dev-php/pecl-rrd/Manifest
index a75dc739c8aa..52d0e4fc270c 100644
--- a/dev-php/pecl-rrd/Manifest
+++ b/dev-php/pecl-rrd/Manifest
@@ -1,2 +1,3 @@
 DIST rrd-1.1.0.tgz 18639 SHA256 3c31c9e07da55a57978a1e2801051ebfcad4a35fd1664e9bea63ecdfca0fcfdb SHA512 5d6887fbe5e9f5589ab3876ecb187159b10727f4cd64d4aaaf98442c737aaa9e43394d7795b1eb06d62dc253bb98d4c40ab37520ccf54850b3306ef14225619a WHIRLPOOL 4a7fab06d295cc4f0ebe96cd5bf68b12a889bd0048619ea9ad82639cb3ad08f4a9046102a164cd9c812f6e1c709998d4366fc94f2cb88ea465eac1c1769ebf0c
 DIST rrd-1.1.3.tgz 19229 SHA256 0415ac51e09fe2e7a999d155d10d6af42ddf40ab0b4847a63ed1f9458533858e SHA512 356264de1b967af0f78e25e3c0afcbec704dd3e49d828e08d21d744d5fcdc46f4cd7f7c118b4e283c20bcaf2a4c29e0ac9437c7f66ca0d260a76fddf7b9d3242 WHIRLPOOL dbb3317985e47130ee03c4ba6284428d38e25849a8da9a3ada2437f4e5b276e79a104131a64aad0e244fe5b63d5d310d81bbbb090517efcd3b8a6e18992c1d6f
+DIST rrd-2.0.0.tgz 19212 SHA256 b6dd68414cd9ce73fc487873b3feeecd4aac8f1b5bebece91c33fa3023a80ffd SHA512 288965167f01ce5f3b2e1b1e4c223093a2fdae594104ee69163c0c71d7cc72c8bfbcc46a1bb5c21d165884929eeb4f7b0be083b9118ba543c2f4b8769f429117 WHIRLPOOL be51b42ccbb5346fe253eb89c20074ba330f4e122288b92dd91ceff5eb77b1e09c1234ce2bacf08fe83e82a0428e181f88b1aa2a1301d2b9ab08d57daf33da21
diff --git a/dev-php/pecl-rrd/pecl-rrd-2.0.0.ebuild b/dev-php/pecl-rrd/pecl-rrd-2.0.0.ebuild
new file mode 100644
index 000000000000..b649c43d3001
--- /dev/null
+++ b/dev-php/pecl-rrd/pecl-rrd-2.0.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_PHP="php7-0"
+
+inherit php-ext-pecl-r2
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="RRDtool bindings for PHP"
+LICENSE="BSD"
+
+SLOT="0"
+
+DEPEND=">=net-analyzer/rrdtool-1.4.5-r1[graph]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/bsddb3/bsddb3-6.1.1.ebuild b/dev-python/bsddb3/bsddb3-6.1.1.ebuild
index f94fc38e2de2..9b9995d288cf 100644
--- a/dev-python/bsddb3/bsddb3-6.1.1.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-qt/assistant/assistant-5.5.1.ebuild b/dev-qt/assistant/assistant-5.5.1-r1.ebuild
similarity index 70%
rename from dev-qt/assistant/assistant-5.5.1.ebuild
rename to dev-qt/assistant/assistant-5.5.1-r1.ebuild
index da3f3e978fbd..7505c992a44f 100644
--- a/dev-qt/assistant/assistant-5.5.1.ebuild
+++ b/dev-qt/assistant/assistant-5.5.1-r1.ebuild
@@ -15,14 +15,14 @@ fi
 IUSE="webkit"
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5
-	>=dev-qt/qtgui-${PV}:5
-	>=dev-qt/qthelp-${PV}:5
-	>=dev-qt/qtnetwork-${PV}:5
-	>=dev-qt/qtprintsupport-${PV}:5
-	>=dev-qt/qtsql-${PV}:5[sqlite]
-	>=dev-qt/qtwidgets-${PV}:5
-	webkit? ( >=dev-qt/qtwebkit-${PV}:5 )
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qthelp-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtprintsupport-${PV}
+	~dev-qt/qtsql-${PV}[sqlite]
+	~dev-qt/qtwidgets-${PV}
+	webkit? ( ~dev-qt/qtwebkit-${PV} )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/designer/designer-5.5.1.ebuild b/dev-qt/designer/designer-5.5.1.ebuild
deleted file mode 100644
index 253b61ffb99a..000000000000
--- a/dev-qt/designer/designer-5.5.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
-fi
-
-IUSE="declarative webkit"
-
-DEPEND="
-	>=dev-qt/qtcore-${PV}:5
-	>=dev-qt/qtgui-${PV}:5
-	>=dev-qt/qtnetwork-${PV}:5
-	>=dev-qt/qtprintsupport-${PV}:5
-	>=dev-qt/qtwidgets-${PV}:5
-	>=dev-qt/qtxml-${PV}:5
-	declarative? ( >=dev-qt/qtdeclarative-${PV}:5[widgets] )
-	webkit? ( >=dev-qt/qtwebkit-${PV}:5 )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/designer
-)
-
-src_prepare() {
-	qt_use_disable_mod declarative quickwidgets \
-		src/designer/src/plugins/plugins.pro
-
-	qt_use_disable_mod webkit webkitwidgets \
-		src/designer/src/plugins/plugins.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/linguist-tools/linguist-tools-5.5.1.ebuild b/dev-qt/linguist-tools/linguist-tools-5.5.1-r1.ebuild
similarity index 86%
rename from dev-qt/linguist-tools/linguist-tools-5.5.1.ebuild
rename to dev-qt/linguist-tools/linguist-tools-5.5.1-r1.ebuild
index 3ff0b4ab9543..3132acf5ca07 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.5.1.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.5.1-r1.ebuild
@@ -15,9 +15,9 @@ fi
 IUSE="qml"
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5
-	>=dev-qt/qtxml-${PV}:5
-	qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtxml-${PV}
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/linguist/linguist-5.5.1.ebuild b/dev-qt/linguist/linguist-5.5.1-r1.ebuild
similarity index 71%
rename from dev-qt/linguist/linguist-5.5.1.ebuild
rename to dev-qt/linguist/linguist-5.5.1-r1.ebuild
index 51ac0b44ca0c..5cf33cd753a2 100644
--- a/dev-qt/linguist/linguist-5.5.1.ebuild
+++ b/dev-qt/linguist/linguist-5.5.1-r1.ebuild
@@ -15,12 +15,12 @@ fi
 IUSE=""
 
 DEPEND="
-	>=dev-qt/designer-${PV}:5
-	>=dev-qt/qtcore-${PV}:5
-	>=dev-qt/qtgui-${PV}:5
-	>=dev-qt/qtprintsupport-${PV}:5
-	>=dev-qt/qtwidgets-${PV}:5
-	>=dev-qt/qtxml-${PV}:5
+	~dev-qt/designer-${PV}
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtprintsupport-${PV}
+	~dev-qt/qtwidgets-${PV}
+	~dev-qt/qtxml-${PV}
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/pixeltool/pixeltool-5.5.1.ebuild b/dev-qt/pixeltool/pixeltool-5.5.1-r1.ebuild
similarity index 77%
rename from dev-qt/pixeltool/pixeltool-5.5.1.ebuild
rename to dev-qt/pixeltool/pixeltool-5.5.1-r1.ebuild
index f1a9f732cb29..6b58bdd293b4 100644
--- a/dev-qt/pixeltool/pixeltool-5.5.1.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.5.1-r1.ebuild
@@ -15,10 +15,10 @@ fi
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5
-	>=dev-qt/qtgui-${PV}:5
-	>=dev-qt/qtnetwork-${PV}:5
-	>=dev-qt/qtwidgets-${PV}:5
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtwidgets-${PV}
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qdbus/qdbus-5.5.1.ebuild b/dev-qt/qdbus/qdbus-5.5.1-r1.ebuild
similarity index 84%
rename from dev-qt/qdbus/qdbus-5.5.1.ebuild
rename to dev-qt/qdbus/qdbus-5.5.1-r1.ebuild
index 17e425aca903..ebe5d79c1d0f 100644
--- a/dev-qt/qdbus/qdbus-5.5.1.ebuild
+++ b/dev-qt/qdbus/qdbus-5.5.1-r1.ebuild
@@ -15,9 +15,9 @@ fi
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5
-	>=dev-qt/qtdbus-${PV}:5
-	>=dev-qt/qtxml-${PV}:5
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdbus-${PV}
+	~dev-qt/qtxml-${PV}
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.5.1.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.5.1-r1.ebuild
similarity index 76%
rename from dev-qt/qdbusviewer/qdbusviewer-5.5.1.ebuild
rename to dev-qt/qdbusviewer/qdbusviewer-5.5.1-r1.ebuild
index 5c5f0ab659c9..1e3cb4fcdd3b 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-5.5.1.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.5.1-r1.ebuild
@@ -15,11 +15,11 @@ fi
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5
-	>=dev-qt/qtdbus-${PV}:5
-	>=dev-qt/qtgui-${PV}:5
-	>=dev-qt/qtwidgets-${PV}:5
-	>=dev-qt/qtxml-${PV}:5
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdbus-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtwidgets-${PV}
+	~dev-qt/qtxml-${PV}
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.5.1.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.5.1-r1.ebuild
similarity index 77%
rename from dev-qt/qtbluetooth/qtbluetooth-5.5.1.ebuild
rename to dev-qt/qtbluetooth/qtbluetooth-5.5.1-r1.ebuild
index c7cdd6581fe1..34e81f683189 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.5.1.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.5.1-r1.ebuild
@@ -15,14 +15,14 @@ fi
 IUSE="qml"
 
 RDEPEND="
-	>=dev-qt/qtconcurrent-${PV}:5
-	>=dev-qt/qtcore-${PV}:5
-	>=dev-qt/qtdbus-${PV}:5
+	~dev-qt/qtconcurrent-${PV}
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdbus-${PV}
 	>=net-wireless/bluez-5
-	qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
 "
 DEPEND="${RDEPEND}
-	>=dev-qt/qtnetwork-${PV}:5
+	~dev-qt/qtnetwork-${PV}
 	virtual/pkgconfig
 "
 
diff --git a/dev-qt/qtcore/qtcore-4.8.7.ebuild b/dev-qt/qtcore/qtcore-4.8.7.ebuild
deleted file mode 100644
index d266f1ffe9b7..000000000000
--- a/dev-qt/qtcore/qtcore-4.8.7.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit qt4-build-multilib
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE="+glib iconv icu qt3support ssl"
-
-DEPEND="
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
-	iconv? ( >=virtual/libiconv-0-r2[${MULTILIB_USEDEP}] )
-	icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
-	ssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-PDEPEND="
-	~dev-qt/qttranslations-${PV}
-	qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support,${MULTILIB_USEDEP}] )
-"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/qt4/Qt/qconfig.h
-	/usr/include/qt4/QtCore/qconfig.h
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.8.5-moc-boost-lexical-cast.patch"
-	"${FILESDIR}/${PN}-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch" # bug 514968
-	"${FILESDIR}/${PN}-4.8.5-qeventdispatcher-recursive.patch" # bug 514968
-)
-
-QT4_TARGET_DIRECTORIES="
-	src/tools/bootstrap
-	src/tools/moc
-	src/tools/rcc
-	src/tools/uic
-	src/corelib
-	src/network
-	src/xml
-	src/plugins/codecs/cn
-	src/plugins/codecs/jp
-	src/plugins/codecs/kr
-	src/plugins/codecs/tw
-	tools/linguist/lconvert
-	tools/linguist/lrelease
-	tools/linguist/lupdate"
-
-QCONFIG_DEFINE="QT_ZLIB"
-
-src_prepare() {
-	qt4-build-multilib_src_prepare
-
-	# bug 172219
-	sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
-		-e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
-		qmake/Makefile.unix || die "sed qmake/Makefile.unix failed"
-
-	# bug 427782
-	sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \
-		qmake/Makefile.unix || die "sed CPPFLAGS in qmake/Makefile.unix failed"
-	sed -i -e 's/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/' \
-		-e 's/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/' \
-		configure || die "sed configure setBootstrapVariable failed"
-}
-
-multilib_src_configure() {
-	local myconf=(
-		-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
-		-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
-		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
-		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg
-		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
-		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
-		$(qt_use glib)
-		$(qt_use iconv)
-		$(qt_use icu)
-		$(use ssl && echo -openssl-linked || echo -no-openssl)
-		$(qt_use qt3support)
-	)
-	qt4_multilib_src_configure
-}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.5.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.5.1-r1.ebuild
similarity index 78%
rename from dev-qt/qtdeclarative/qtdeclarative-5.5.1.ebuild
rename to dev-qt/qtdeclarative/qtdeclarative-5.5.1-r1.ebuild
index d6202e6ed3a3..840bcfc3b072 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.5.1.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.5.1-r1.ebuild
@@ -15,13 +15,13 @@ IUSE="gles2 +jit localstorage +widgets xml"
 
 # qtgui[gles2=] is needed because of bug 504322
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5
-	>=dev-qt/qtgui-${PV}:5[gles2=]
-	>=dev-qt/qtnetwork-${PV}:5
-	>=dev-qt/qttest-${PV}:5
-	localstorage? ( >=dev-qt/qtsql-${PV}:5 )
-	widgets? ( >=dev-qt/qtwidgets-${PV}:5[gles2=] )
-	xml? ( >=dev-qt/qtxmlpatterns-${PV}:5 )
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qttest-${PV}
+	localstorage? ( ~dev-qt/qtsql-${PV} )
+	widgets? ( ~dev-qt/qtwidgets-${PV}[gles2=] )
+	xml? ( ~dev-qt/qtxmlpatterns-${PV} )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtdiag/qtdiag-5.5.1.ebuild b/dev-qt/qtdiag/qtdiag-5.5.1-r1.ebuild
similarity index 83%
rename from dev-qt/qtdiag/qtdiag-5.5.1.ebuild
rename to dev-qt/qtdiag/qtdiag-5.5.1-r1.ebuild
index c07bccc9175e..0c7acc2aea68 100644
--- a/dev-qt/qtdiag/qtdiag-5.5.1.ebuild
+++ b/dev-qt/qtdiag/qtdiag-5.5.1-r1.ebuild
@@ -15,9 +15,9 @@ fi
 IUSE="+ssl"
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5
-	>=dev-qt/qtgui-${PV}:5
-	>=dev-qt/qtnetwork-${PV}:5[ssl=]
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtnetwork-${PV}[ssl=]
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.5.1.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.5.1-r1.ebuild
similarity index 82%
rename from dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.5.1.ebuild
rename to dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.5.1-r1.ebuild
index d83bc28e8bfe..158ba6d99b6b 100644
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.5.1.ebuild
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.5.1-r1.ebuild
@@ -14,11 +14,11 @@ fi
 IUSE=""
 
 RDEPEND="
-	>=dev-qt/qtcore-${PV}:5
-	>=dev-qt/qtdeclarative-${PV}:5
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
 "
 DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtgui-${PV}:5 )
+	test? ( ~dev-qt/qtgui-${PV} )
 "
 
 src_test() {
diff --git a/dev-qt/qthelp/qthelp-5.5.1.ebuild b/dev-qt/qthelp/qthelp-5.5.1-r1.ebuild
similarity index 72%
rename from dev-qt/qthelp/qthelp-5.5.1.ebuild
rename to dev-qt/qthelp/qthelp-5.5.1-r1.ebuild
index 03559acb3c0a..5181181f4449 100644
--- a/dev-qt/qthelp/qthelp-5.5.1.ebuild
+++ b/dev-qt/qthelp/qthelp-5.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,11 +15,11 @@ fi
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5
-	>=dev-qt/qtgui-${PV}:5
-	>=dev-qt/qtnetwork-${PV}:5
-	>=dev-qt/qtsql-${PV}:5[sqlite]
-	>=dev-qt/qtwidgets-${PV}:5
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtsql-${PV}[sqlite]
+	~dev-qt/qtwidgets-${PV}
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtimageformats/qtimageformats-5.5.1.ebuild b/dev-qt/qtimageformats/qtimageformats-5.5.1-r1.ebuild
similarity index 89%
rename from dev-qt/qtimageformats/qtimageformats-5.5.1.ebuild
rename to dev-qt/qtimageformats/qtimageformats-5.5.1-r1.ebuild
index df2e85f7da3d..d36e8f54fea4 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.5.1.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.5.1-r1.ebuild
@@ -14,8 +14,8 @@ fi
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5
-	>=dev-qt/qtgui-${PV}:5
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
 	media-libs/jasper
 	media-libs/libmng:=
 	media-libs/libwebp:=
diff --git a/dev-qt/qtpaths/qtpaths-5.5.1.ebuild b/dev-qt/qtpaths/qtpaths-5.5.1-r1.ebuild
similarity index 93%
rename from dev-qt/qtpaths/qtpaths-5.5.1.ebuild
rename to dev-qt/qtpaths/qtpaths-5.5.1-r1.ebuild
index 017dd584962e..51d6f5770a02 100644
--- a/dev-qt/qtpaths/qtpaths-5.5.1.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.5.1-r1.ebuild
@@ -15,7 +15,7 @@ fi
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5
+	~dev-qt/qtcore-${PV}
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtpositioning/qtpositioning-5.5.1.ebuild b/dev-qt/qtpositioning/qtpositioning-5.5.1-r1.ebuild
similarity index 88%
rename from dev-qt/qtpositioning/qtpositioning-5.5.1.ebuild
rename to dev-qt/qtpositioning/qtpositioning-5.5.1-r1.ebuild
index 6f3f8002e140..2eb27c697b6a 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.5.1.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.5.1-r1.ebuild
@@ -16,14 +16,14 @@ fi
 IUSE="geoclue qml"
 
 RDEPEND="
-	>=dev-qt/qtcore-${PV}:5
+	~dev-qt/qtcore-${PV}
 	geoclue? (
 		app-misc/geoclue:0
 		dev-libs/glib:2
 	)
 	qml? (
-		>=dev-qt/qtdeclarative-${PV}:5
-		>=dev-qt/qtnetwork-${PV}:5
+		~dev-qt/qtdeclarative-${PV}
+		~dev-qt/qtnetwork-${PV}
 	)
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtquick1/qtquick1-5.5.1.ebuild b/dev-qt/qtquick1/qtquick1-5.5.1-r1.ebuild
similarity index 64%
rename from dev-qt/qtquick1/qtquick1-5.5.1.ebuild
rename to dev-qt/qtquick1/qtquick1-5.5.1-r1.ebuild
index 527e5522bfb8..4993e3999c7d 100644
--- a/dev-qt/qtquick1/qtquick1-5.5.1.ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,24 +13,23 @@ fi
 
 IUSE="designer gles2 opengl webkit xml"
 
-# see bug 542698 for pinned dev-qt/designer dependency
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5
-	>=dev-qt/qtgui-${PV}:5
-	>=dev-qt/qtnetwork-${PV}:5
-	>=dev-qt/qtscript-${PV}:5
-	>=dev-qt/qtsql-${PV}:5
-	>=dev-qt/qtwidgets-${PV}:5
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtscript-${PV}
+	~dev-qt/qtsql-${PV}
+	~dev-qt/qtwidgets-${PV}
 	designer? (
 		~dev-qt/designer-${PV}
-		>=dev-qt/qtdeclarative-${PV}:5
+		~dev-qt/qtdeclarative-${PV}
 	)
 	opengl? (
-		>=dev-qt/qtgui-${PV}:5[gles2=]
-		>=dev-qt/qtopengl-${PV}:5
+		~dev-qt/qtgui-${PV}[gles2=]
+		~dev-qt/qtopengl-${PV}
 	)
-	webkit? ( >=dev-qt/qtwebkit-${PV}:5 )
-	xml? ( >=dev-qt/qtxmlpatterns-${PV}:5 )
+	webkit? ( ~dev-qt/qtwebkit-${PV} )
+	xml? ( ~dev-qt/qtxmlpatterns-${PV} )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.5.1.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.5.1-r1.ebuild
similarity index 78%
rename from dev-qt/qtquickcontrols/qtquickcontrols-5.5.1.ebuild
rename to dev-qt/qtquickcontrols/qtquickcontrols-5.5.1-r1.ebuild
index cba8705dca2e..3bc33b467020 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.5.1.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,10 +14,10 @@ fi
 IUSE="+widgets"
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5
-	>=dev-qt/qtdeclarative-${PV}:5
-	>=dev-qt/qtgui-${PV}:5
-	widgets? ( >=dev-qt/qtwidgets-${PV}:5 )
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	widgets? ( ~dev-qt/qtwidgets-${PV} )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtscript/qtscript-5.5.1.ebuild b/dev-qt/qtscript/qtscript-5.5.1-r1.ebuild
similarity index 88%
rename from dev-qt/qtscript/qtscript-5.5.1.ebuild
rename to dev-qt/qtscript/qtscript-5.5.1-r1.ebuild
index 2eadc8c8dd35..1431ee915579 100644
--- a/dev-qt/qtscript/qtscript-5.5.1.ebuild
+++ b/dev-qt/qtscript/qtscript-5.5.1-r1.ebuild
@@ -14,10 +14,10 @@ fi
 IUSE="+jit scripttools"
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5
+	~dev-qt/qtcore-${PV}
 	scripttools? (
-		>=dev-qt/qtgui-${PV}:5
-		>=dev-qt/qtwidgets-${PV}:5
+		~dev-qt/qtgui-${PV}
+		~dev-qt/qtwidgets-${PV}
 	)
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtsensors/qtsensors-5.5.1.ebuild b/dev-qt/qtsensors/qtsensors-5.5.1-r1.ebuild
similarity index 86%
rename from dev-qt/qtsensors/qtsensors-5.5.1.ebuild
rename to dev-qt/qtsensors/qtsensors-5.5.1-r1.ebuild
index 8b6fd4a1955c..69c9d75b649d 100644
--- a/dev-qt/qtsensors/qtsensors-5.5.1.ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.5.1-r1.ebuild
@@ -14,8 +14,8 @@ fi
 IUSE="qml"
 
 RDEPEND="
-	>=dev-qt/qtcore-${PV}:5
-	qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+	~dev-qt/qtcore-${PV}
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
 "
 DEPEND="${RDEPEND}"
 
diff --git a/dev-qt/qtserialport/qtserialport-5.5.1.ebuild b/dev-qt/qtserialport/qtserialport-5.5.1-r1.ebuild
similarity index 93%
rename from dev-qt/qtserialport/qtserialport-5.5.1.ebuild
rename to dev-qt/qtserialport/qtserialport-5.5.1-r1.ebuild
index 8acbb4671015..3d01ca940fe7 100644
--- a/dev-qt/qtserialport/qtserialport-5.5.1.ebuild
+++ b/dev-qt/qtserialport/qtserialport-5.5.1-r1.ebuild
@@ -14,7 +14,7 @@ fi
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5
+	~dev-qt/qtcore-${PV}
 	virtual/udev
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtsvg/qtsvg-5.5.1.ebuild b/dev-qt/qtsvg/qtsvg-5.5.1-r1.ebuild
similarity index 68%
rename from dev-qt/qtsvg/qtsvg-5.5.1.ebuild
rename to dev-qt/qtsvg/qtsvg-5.5.1-r1.ebuild
index 43abaeeb978f..66ded4554346 100644
--- a/dev-qt/qtsvg/qtsvg-5.5.1.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,11 +14,11 @@ fi
 IUSE=""
 
 RDEPEND="
-	>=dev-qt/qtcore-${PV}:5
-	>=dev-qt/qtgui-${PV}:5
-	>=dev-qt/qtwidgets-${PV}:5
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtwidgets-${PV}
 	>=sys-libs/zlib-1.2.5
 "
 DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtxml-${PV}:5 )
+	test? ( ~dev-qt/qtxml-${PV} )
 "
diff --git a/dev-qt/qttranslations/qttranslations-5.5.1.ebuild b/dev-qt/qttranslations/qttranslations-5.5.1-r1.ebuild
similarity index 84%
rename from dev-qt/qttranslations/qttranslations-5.5.1.ebuild
rename to dev-qt/qttranslations/qttranslations-5.5.1-r1.ebuild
index e8c2c9b6cf20..27d5c55d2f41 100644
--- a/dev-qt/qttranslations/qttranslations-5.5.1.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.5.1-r1.ebuild
@@ -14,7 +14,7 @@ fi
 IUSE=""
 
 DEPEND="
-	>=dev-qt/linguist-tools-${PV}:5
-	>=dev-qt/qtcore-${PV}:5
+	~dev-qt/linguist-tools-${PV}
+	~dev-qt/qtcore-${PV}
 "
 RDEPEND=""
diff --git a/dev-qt/qtwayland/qtwayland-5.5.1.ebuild b/dev-qt/qtwayland/qtwayland-5.5.1-r1.ebuild
similarity index 89%
rename from dev-qt/qtwayland/qtwayland-5.5.1.ebuild
rename to dev-qt/qtwayland/qtwayland-5.5.1-r1.ebuild
index 42f300b2ac14..3d7782fc0910 100644
--- a/dev-qt/qtwayland/qtwayland-5.5.1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.5.1-r1.ebuild
@@ -15,12 +15,12 @@ IUSE="egl qml wayland-compositor xcomposite"
 
 DEPEND="
 	>=dev-libs/wayland-1.4.0
-	>=dev-qt/qtcore-${PV}:5
-	>=dev-qt/qtgui-${PV}:5[egl=]
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[egl=]
 	media-libs/mesa[egl?]
 	>=x11-libs/libxkbcommon-0.2.0
 	wayland-compositor? (
-		qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+		qml? ( ~dev-qt/qtdeclarative-${PV} )
 	)
 	xcomposite? (
 		x11-libs/libX11
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.5.1.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.5.1-r1.ebuild
similarity index 89%
rename from dev-qt/qtwebchannel/qtwebchannel-5.5.1.ebuild
rename to dev-qt/qtwebchannel/qtwebchannel-5.5.1-r1.ebuild
index 3e523daf5659..f343adca2535 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.5.1.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.5.1-r1.ebuild
@@ -14,8 +14,8 @@ fi
 IUSE="qml"
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5
-	qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+	~dev-qt/qtcore-${PV}
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch b/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch
new file mode 100644
index 000000000000..40e58f0d0dec
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch
@@ -0,0 +1,15 @@
+Allow disabling JIT for hardened.
+
+Author: Magnus Granberg <zorry@gentoo.org>
+Gentoo-bug: 562396
+
+--- a/Tools/qmake/mkspecs/features/features.pri
++++ b/Tools/qmake/mkspecs/features/features.pri
+@@ -70,6 +70,7 @@ FEATURE_DEFAULTS = \
+     ENABLE_INPUT_TYPE_WEEK=0 \
+     ENABLE_INSPECTOR=1 \
+     ENABLE_INSPECTOR_SERVER=1 \
++    ENABLE_JIT=0 \
+     ENABLE_JAVASCRIPT_DEBUGGER=1 \
+     ENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 \
+     ENABLE_LEGACY_NOTIFICATIONS=1 \
diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild
new file mode 100644
index 000000000000..7153b721a872
--- /dev/null
+++ b/dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 qt5-build
+
+DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+# TODO: qttestlib
+
+IUSE="geolocation gstreamer gstreamer010 +jit multimedia opengl orientation printsupport qml webchannel webp"
+REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
+
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/icu:=
+	>=dev-libs/leveldb-1.18-r1
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	~dev-qt/qtcore-${PV}[icu]
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtsql-${PV}
+	~dev-qt/qtwidgets-${PV}
+	media-libs/fontconfig:1.0
+	media-libs/libpng:0=
+	>=sys-libs/zlib-1.2.5
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXrender
+	geolocation? ( ~dev-qt/qtpositioning-${PV} )
+	gstreamer? (
+		dev-libs/glib:2
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gstreamer010? (
+		dev-libs/glib:2
+		media-libs/gstreamer:0.10
+		media-libs/gst-plugins-base:0.10
+	)
+	multimedia? ( ~dev-qt/qtmultimedia-${PV}[widgets] )
+	opengl? ( ~dev-qt/qtopengl-${PV} )
+	orientation? ( ~dev-qt/qtsensors-${PV} )
+	printsupport? ( ~dev-qt/qtprintsupport-${PV} )
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+	webchannel? ( ~dev-qt/qtwebchannel-${PV} )
+	webp? ( media-libs/libwebp:0= )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-lang/ruby
+	dev-util/gperf
+	sys-devel/bison
+	sys-devel/flex
+	virtual/rubygems
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.4.2-system-leveldb.patch"
+)
+
+src_prepare() {
+	# ensure bundled library cannot be used
+	rm -r Source/ThirdParty/leveldb || die
+
+	# bug 466216
+	sed -i -e '/CONFIG +=/s/rpath//' \
+		Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \
+		Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf \
+		|| die
+
+	qt_use_disable_mod geolocation positioning Tools/qmake/mkspecs/features/features.prf
+	qt_use_disable_mod multimedia multimediawidgets Tools/qmake/mkspecs/features/features.prf
+	qt_use_disable_mod orientation sensors Tools/qmake/mkspecs/features/features.prf
+	qt_use_disable_mod printsupport printsupport Tools/qmake/mkspecs/features/features.prf
+	qt_use_disable_mod qml quick Tools/qmake/mkspecs/features/features.prf
+	qt_use_disable_mod webchannel webchannel Source/WebKit2/WebKit2.pri
+
+	if use gstreamer010; then
+		epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"
+	elif ! use gstreamer; then
+		epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
+	fi
+
+	use opengl       || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \
+		Tools/qmake/mkspecs/features/features.prf || die
+	use webp         || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \
+		Tools/qmake/mkspecs/features/features.prf || die
+
+	# bug 458222
+	sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
+
+	# bug 562396
+	use jit || epatch "${FILESDIR}/${PN}-5.5.1-disable-jit.patch"
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.5.1.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.5.1-r1.ebuild
similarity index 82%
rename from dev-qt/qtwebsockets/qtwebsockets-5.5.1.ebuild
rename to dev-qt/qtwebsockets/qtwebsockets-5.5.1-r1.ebuild
index be842d81b23a..5dc250ac5df9 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.5.1.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.5.1-r1.ebuild
@@ -14,9 +14,9 @@ fi
 IUSE="qml"
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5
-	>=dev-qt/qtnetwork-${PV}:5
-	qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtnetwork-${PV}
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
 
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtwidgets/qtwidgets-5.5.1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.5.1.ebuild
deleted file mode 100644
index 6ecaaf10db9d..000000000000
--- a/dev-qt/qtwidgets/qtwidgets-5.5.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
-fi
-
-# keep IUSE defaults in sync with qtgui
-IUSE="gles2 gtkstyle +png +xcb"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=,gtkstyle=,png=,xcb?]
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/uic
-	src/widgets
-)
-
-QT5_GENTOO_CONFIG=(
-	!:no-widgets:
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use gtkstyle)
-		-opengl $(usex gles2 es2 desktop)
-		$(qt_use png libpng system)
-		$(qt_use xcb xcb system)
-		$(qt_use xcb xkbcommon system)
-		$(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.5.1.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.5.1-r1.ebuild
similarity index 87%
rename from dev-qt/qtxmlpatterns/qtxmlpatterns-5.5.1.ebuild
rename to dev-qt/qtxmlpatterns/qtxmlpatterns-5.5.1-r1.ebuild
index 7f447f537a23..51b8facee86b 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.5.1.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.5.1-r1.ebuild
@@ -14,7 +14,7 @@ fi
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5
-	>=dev-qt/qtnetwork-${PV}:5
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtnetwork-${PV}
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ruby/eventmachine/Manifest b/dev-ruby/eventmachine/Manifest
index edbd3cf04112..49c7bb014ea0 100644
--- a/dev-ruby/eventmachine/Manifest
+++ b/dev-ruby/eventmachine/Manifest
@@ -1,3 +1,3 @@
 DIST eventmachine-1.0.3.gem 225792 SHA256 34424c87fc517f70ba137fe2281d16b53ce9c13f5cbfc2dda3ada56e96a65827 SHA512 ea4f0b1a2580d14e564641c49f0e3ac2a9c86d916dd2c5e938df22d1d105c00811154d8bfa7a0f9a8ce32783f5398524c70458c161eab2f0591c690e1e6a5573 WHIRLPOOL 52159101a59ba3d9eff28bedbc2baea46c867049de596f72da4d4a5784e79542f291275c61639d3dc6f062150d4819f7343d12e71bae8fc8954956d6d6db36e2
-DIST eventmachine-1.0.7.gem 231424 SHA256 342b7dfa2bc1d43f9b58c4481d81cc9eb5f7c92a5d0eb39739459fcbdd579d4c SHA512 e119de503d41b34f70060f7735f8d047c139aa14c343cc43c34074196f560dfd64e9f274bb7e44556bf8ded112e5476214196b0ec8635a169f8a050771619ffd WHIRLPOOL 3026f0d9e4ffa791487f657bba0db920c3192d97cbab0447e426ee55b176e4ada87079248fd657278cdaa4556ba8f7da7cce4a106c88c4af45d680c2a6f088e1
 DIST eventmachine-1.0.8.gem 232960 SHA256 57ba18d8f76fb43f8842dd17cc3cebc46eea06a5d5033b3131ac8f73c7bc3bbb SHA512 55bfb8a22149495ca70913e6df6b9861cf0e10a512cdd25579064a816eb7e365bd0a03a1219ed23ed99772b9b312e3ce137781cb0890e31fbb5e5f542ba5ef70 WHIRLPOOL e4c295ebb6f931a0773b9fd9618598e56a7e5ec07908159aac4bdfb148b42ef0ee18d10e5f01008d2c435b008565b6d874a6776ab43d3171f372b6c855afbfaa
+DIST eventmachine-1.0.9.1.gem 235008 SHA256 9f4cb30b3bce0c2a90da875a81534f12cbf6f1174f80d64c32efbda1140b599e SHA512 5cbc178c604fe9a21850c298f7a5b6f904573f5e1db9e07fee599c5700841c52ec0311a6e50192eff9c1bb45cf30a9dd81d2150fe9d04cabd24cc7c9c32c5df0 WHIRLPOOL 9b46ec04930ff0d54b27cace94b9fe65118e122c96c15b5aed0a7ac7c4ff9e5e4bbf73c8325af2e50db7e7e4014cbfadd5b3dc287fe144bb5fc5610f7f9969e7
diff --git a/dev-ruby/eventmachine/eventmachine-1.0.3-r2.ebuild b/dev-ruby/eventmachine/eventmachine-1.0.3-r2.ebuild
deleted file mode 100644
index 6ae97789d9ef..000000000000
--- a/dev-ruby/eventmachine/eventmachine-1.0.3-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-# ruby22 - code does not compile
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC="yard"
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="docs/*.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="EventMachine is a fast, simple event-processing library for Ruby programs"
-HOMEPAGE="http://rubyeventmachine.com"
-
-LICENSE="|| ( GPL-2 Ruby )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="${DEPEND}
-	dev-libs/openssl:0"
-RDEPEND="${RDEPEND}
-	dev-libs/openssl:0"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
-all_ruby_prepare() {
-	# Remove package tasks to avoid dependency on rake-compiler.
-	rm rakelib/package.rake || die
-
-	# fix test issue - upstream b96b736b39261f7d74f013633cc7cd619afa20c4
-	sed -i -e 's/DEBUG/BROADCAST/g' tests/test_set_sock_opt.rb || die
-
-	# Remove the resolver tests since they require network access and
-	# the localhost test fails with an IPv6 localhost.
-	rm tests/test_resolver.rb || die
-}
-
-each_ruby_configure() {
-	for extdir in ext ext/fastfilereader; do
-		pushd $extdir
-		${RUBY} extconf.rb || die "extconf.rb failed for ${extdir}"
-		popd
-	done
-}
-
-each_ruby_compile() {
-	for extdir in ext ext/fastfilereader; do
-		pushd $extdir
-		# both extensions use C++, so use the CXXFLAGS not the CFLAGS
-		emake V=1 CFLAGS="${CXXFLAGS} -fPIC" archflag="${LDFLAGS}" || die "emake failed for ${extdir}"
-		popd
-		cp $extdir/*.so lib/ || die "Unable to copy extensions for ${extdir}"
-	done
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib -S testrb tests/test_*.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}/
-	doins -r examples || die "Failed to install examples"
-}
diff --git a/dev-ruby/eventmachine/eventmachine-1.0.7.ebuild b/dev-ruby/eventmachine/eventmachine-1.0.9.1.ebuild
similarity index 96%
rename from dev-ruby/eventmachine/eventmachine-1.0.7.ebuild
rename to dev-ruby/eventmachine/eventmachine-1.0.9.1.ebuild
index 9ee7dd7c81b3..086b3d52fac9 100644
--- a/dev-ruby/eventmachine/eventmachine-1.0.7.ebuild
+++ b/dev-ruby/eventmachine/eventmachine-1.0.9.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_DOC="yard"
 RUBY_FAKEGEM_DOCDIR="rdoc"
diff --git a/dev-ruby/parser/Manifest b/dev-ruby/parser/Manifest
index 8f3f92ec9040..fd855fd6f252 100644
--- a/dev-ruby/parser/Manifest
+++ b/dev-ruby/parser/Manifest
@@ -1,2 +1,3 @@
 DIST parser-2.2.2.6.gem 370176 SHA256 1016f97e594d9abc92936e8b9ac0444438cf91df46afcf1fe607415cb227b066 SHA512 cdc9ac96e894b2cbcd26affceda8d0a327efde45b5562b9446739e9791b0f484c03bdcefa9405cc738d088b5e43d56ef58a9ffac8052908b5c82fcd8f2205668 WHIRLPOOL 8cb73c12540fbebe69f865c3ba51fbb14054773023852ee87242ee7034f3da3be23a646a325dd9bec3f18ae66d7dbc280844911f05a9ae51bb96c1495d262eb2
 DIST parser-2.2.3.0.gem 456704 SHA256 4cb1cf8b34f8d331c9f4a02e4b2f8068cde73b1c957c9c6f24401251d503ab91 SHA512 8f3c20417fd2c788573f0a0068f03c8bca80f3f3e49b0a2516b5f976e896453707fee50e248968a1f65294cb86f771749decd71d9a56588c1ef5cff9dd048cea WHIRLPOOL 8427e10f57128457a7490b807272fc6d09c6b36d91e8d28a493a429ada2d4a5526b3fa7dcfc3c06013b07e4fcddefdbdacdb8a0a578fefbc701ec8294d727582
+DIST parser-2.3.0.1.gem 505344 SHA256 536e8e5549927a118900608a05550ad77e5baff828c185f2a7211a9e5a0590c2 SHA512 277b2133e2e9c009018aedacf9e64fa163114ce4e5359c9cb9b2887afffbb3d90ebddd158d2c57abf7f3f95cb51386efee5a6147273aeef63844235d2a1a7236 WHIRLPOOL 7db2fa2e180ef11d7a0e6e0f5df0c4fe1bff973a0a9704b82c870996e21d7bcb54ab3a140f08338bf9df715594b7945f29ac2ed2537b3826df8abfdf0528da29
diff --git a/dev-ruby/parser/parser-2.3.0.1.ebuild b/dev-ruby/parser/parser-2.3.0.1.ebuild
new file mode 100644
index 000000000000..5ac9378e1ae1
--- /dev/null
+++ b/dev-ruby/parser/parser-2.3.0.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_TASK_TEST="test"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_VERSION="${PV/_pre/.pre.}"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A production-ready Ruby parser written in pure Ruby"
+HOMEPAGE="https://github.com/whitequark/parser"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitest:5
+	dev-ruby/racc
+	dev-ruby/cliver )"
+ruby_add_rdepend ">=dev-ruby/ast-2.2:0"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	sed -i -e "/simplecov/,+35d" test/helper.rb || die
+}
diff --git a/dev-ruby/rubyzip/rubyzip-1.1.7-r1.ebuild b/dev-ruby/rubyzip/rubyzip-1.1.7-r1.ebuild
index de94bdeb7b29..299c073d4f14 100644
--- a/dev-ruby/rubyzip/rubyzip-1.1.7-r1.ebuild
+++ b/dev-ruby/rubyzip/rubyzip-1.1.7-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md TODO"
diff --git a/dev-ruby/selenium-webdriver/Manifest b/dev-ruby/selenium-webdriver/Manifest
index 396ce27c0df0..bcaff3dfd73b 100644
--- a/dev-ruby/selenium-webdriver/Manifest
+++ b/dev-ruby/selenium-webdriver/Manifest
@@ -1,6 +1,4 @@
-DIST selenium-webdriver-2.45.0.gem 2918912 SHA256 907efd8f8605fe5947ca21c58e13e939f59c9d3afafd8f18b563ec669308d4cc SHA512 dfde3601fb34f343b91ebe5f7e077b0430d022ec9f6da326096d1e45622ce00ffab10e3daf91b1ebeb57d5b960dcabdcc44bf46f55efcf667bc99f2c86b70aa0 WHIRLPOOL 234e5709e2d04942625ab62d3dcde12302a4d54d72d02e0dda3ffca5d005d1ca82875d287e435d59d32510c44a307c5cdd4150382e7be5c973667e11920e1814
 DIST selenium-webdriver-2.46.2.gem 2919424 SHA256 cb6575396f62f86f015c4905970d48da546c59109ed0aa318af061468d19a85c SHA512 b19bd428090381a12b577d82678ea8dfd2eec64c41e7c070c066ad8e9f106c3821a476038132f49862e1e01a5e940fa4e7a15f3655493753303dcedcccc55943 WHIRLPOOL e2413479641c6a4e687a824016af023f76286a0b89af3733e421d103d38e4dd73c8fcbc30b72135699c178060bfa2978ad15941864715c90f5a65311ae10b016
-DIST selenium-webdriver-2.47.0.gem 2871808 SHA256 78dd73ab91fbaec770aec43e2366f8c8afeb4536367f8fd06de665fae722d09b SHA512 386f6485e346e570588fe533f8a2dd6927268fa5a438fd2fac6ec8ac064ba8f4b43a085acccbe8a94ed09c2bed52e0b799ea5eb7fb080d4a139dd5622a46e301 WHIRLPOOL b05364e972821eac7bc4bc498508457b6343e2a666f33420faf058b920a74c33c6d0cbe6d1b620ca1c4a2d77de05a7f59bbb77c2ec0498b02b9ed4f3edfcb1de
 DIST selenium-webdriver-2.47.1.gem 2872832 SHA256 0140306e064fc40eb2dc632a88fd47dabe786ec2b29f7c59ee425d58113f7b86 SHA512 2973983dfca3ae1c97f55edc9db9480a7595676439c57ae58ec8af18ae6c5e210e2a2efcab630036079c4fed0513ce2e961b36dec3501b41e787a92ebf8cca98 WHIRLPOOL 137327e3066f9cdd52fc41ef1a36ee7a1ebb669b0a5dcbb9aafe7f49d180d2b41850b60089592b2ae9db8c9127764db2108543a173853b1ba4edf16131e8858c
-DIST selenium-webdriver-2.48.0.gem 884736 SHA256 8a67d2ca76bd20a6b2b3d63923756fad04c60bd86d95ca276cc256d12996ebef SHA512 1c270c7ab4176f38a776c000be57366b7143ca33b4ac34e3406710a5f5fb787fd70c77e4bca4d586be855ee7248a0b1d14fa7e0cab8b43f81f497468451d52a4 WHIRLPOOL b677111b1c0e2bcf823b186165d9c93aa3fe2d73e4be462053cd03a0757b1c6eb8d4006423266b95ea558c8d02a9a08d41e495640d0ee7e5bd9f1c78a5ce8a55
 DIST selenium-webdriver-2.48.1.gem 884736 SHA256 b804174665cbc2086c24a98f5331dcc6e1ab313db0852849c6a4d0779deb2484 SHA512 b78e20f382210e73bee24e6ea6cf9ff1bcae6bc77e5ed23ccc0ce9db307f4974140e47b29896850eaaa4c315100e50b3dc2756856defb447405a8c8a509ae966 WHIRLPOOL 7b89a4ad412bdd80fe956af413b75d45144597c6cb0d2bba1d7ec599b3d8f63dab06ac416a276df2ab9293263c22023fb092b8cf0c9848b02765edc9430e7480
+DIST selenium-webdriver-2.49.0.gem 887808 SHA256 c3ceba30bcecfb2e6d0f53bed34ac046f740793871ebfd011c339860f79d4bc8 SHA512 bad495b5d5d97d7f3d7133dd47bc5a2b1695634f18b5b565b17effcd894f18006c015e975be89883ac583cf9b531af7130985fc555d40c9e97bac808461d6a4d WHIRLPOOL 3272fd223fd7eaca858663b52f92a3fd622a2a3707c9f005e871efe4aa40c7cdf2f95921a5ce9d94de30f2185a8ba310e7020905daaa1eb1c855c3c06487e86d
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-2.47.0.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-2.47.0.ebuild
deleted file mode 100644
index 6c67ddbfd8c3..000000000000
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-2.47.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-# NOTE: this package contains precompiled code. It appears that all
-# source code can be found at https://code.google.com/p/selenium/ but the
-# repository is not organized in a way so that we can easily rebuild the
-# suited shared object. We'll just try our luck with the precompiled
-# objects for now.
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_QA_ALLOWED_LIBS="x_ignore_nofocus.so"
-QA_PREBUILT="*/x_ignore_nofocus.so"
-
-inherit ruby-fakegem
-
-DESCRIPTION="This gem provides Ruby bindings for WebDriver"
-HOMEPAGE="http://gemcutter.org/gems/selenium-webdriver"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/childprocess-0.5.0
-	>=dev-ruby/multi_json-1.0.4
-	dev-ruby/rubyzip:1"
-
-all_ruby_prepare() {
-	# Make websocket a development dependency since it is only needed
-	# for the safari driver which we don't support on Gentoo.
-	sed -i -e '/websocket/,/version_requirements/ s/runtime/development/' ../metadata || die
-}
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-2.48.0.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-2.48.0.ebuild
deleted file mode 100644
index 6c67ddbfd8c3..000000000000
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-2.48.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-# NOTE: this package contains precompiled code. It appears that all
-# source code can be found at https://code.google.com/p/selenium/ but the
-# repository is not organized in a way so that we can easily rebuild the
-# suited shared object. We'll just try our luck with the precompiled
-# objects for now.
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_QA_ALLOWED_LIBS="x_ignore_nofocus.so"
-QA_PREBUILT="*/x_ignore_nofocus.so"
-
-inherit ruby-fakegem
-
-DESCRIPTION="This gem provides Ruby bindings for WebDriver"
-HOMEPAGE="http://gemcutter.org/gems/selenium-webdriver"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/childprocess-0.5.0
-	>=dev-ruby/multi_json-1.0.4
-	dev-ruby/rubyzip:1"
-
-all_ruby_prepare() {
-	# Make websocket a development dependency since it is only needed
-	# for the safari driver which we don't support on Gentoo.
-	sed -i -e '/websocket/,/version_requirements/ s/runtime/development/' ../metadata || die
-}
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-2.45.0.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-2.49.0.ebuild
similarity index 93%
rename from dev-ruby/selenium-webdriver/selenium-webdriver-2.45.0.ebuild
rename to dev-ruby/selenium-webdriver/selenium-webdriver-2.49.0.ebuild
index 00b51c046695..dffb511bdbba 100644
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-2.45.0.ebuild
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-2.49.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 # NOTE: this package contains precompiled code. It appears that all
 # source code can be found at https://code.google.com/p/selenium/ but the
diff --git a/dev-ruby/session/session-3.2.0.ebuild b/dev-ruby/session/session-3.2.0.ebuild
index 049c6ad94235..e0d34b968e00 100644
--- a/dev-ruby/session/session-3.2.0.ebuild
+++ b/dev-ruby/session/session-3.2.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-util/checkstyle/Manifest b/dev-util/checkstyle/Manifest
index acc6d1434354..0e0d068feaa3 100644
--- a/dev-util/checkstyle/Manifest
+++ b/dev-util/checkstyle/Manifest
@@ -1,3 +1,2 @@
 DIST checkstyle-5.4-maven-build.xml.tar.bz2 3236 SHA256 4b286857c265b765fcf71deb8684cdd1bb7d1264fd0ee45a924d91031652d590 SHA512 23cfcb519984fd9d7a59d8534c712d69c02aabc28e9f6eb7abff948728361cc208bf84d19f30dc81ae8870f6b361ca0382be60c4ab7b7b0298e59a175197138e WHIRLPOOL 32992aa00d228be5f0819e856f13752eba9694cf46e98b3c9229c5ef45a7c37c1c6367a1457487ec5ab63f9d808b1470727f44e5b7d194961520a34b55253f72
 DIST checkstyle-5.5-src.tar.gz 744584 SHA256 0de571f2769b4ded9c681c9b1e51c7f783aca7fb7f47467f1f39c38bd1717aa1 SHA512 2327e14fc6fe9516d9518e4cbccb2e0f41e50bf891b7a3655dd29601b5eb3d2895d7df841f394d08d7dfac7ab774a01e22f98226259dc28a210d478699ea5c9a WHIRLPOOL e29303b656090a2f617850d2edb7f3f41db912399d334d6d8a7f7c50a96c7cfdb8134e46b65cec762ce565b1709de98a870880cdd8e18af03f594b9a2141609a
-DIST checkstyle-src-4.4.tar.gz 2567907 SHA256 7081074124e2dde062b06cbb489a1338e04623b986094e9b63f31c50be2f9f38 SHA512 4cce16b70e901bdcee0d3ac864f51cef54965d37223a11e59b7b9d34603b404da0cc8207431481feb5f0e649b5f55a5ef05aebfceeb37f938246f8722867174d WHIRLPOOL ae3b1f3161caac22235d20b018b035b4bf1e042f5fb930b620b6eae8692a1825fe382649a3d360794a8cb3d48135ea1e3e8597865ed10c0e868d9440e9287240
diff --git a/dev-util/checkstyle/checkstyle-4.4.ebuild b/dev-util/checkstyle/checkstyle-4.4.ebuild
deleted file mode 100644
index 08c1e5018608..000000000000
--- a/dev-util/checkstyle/checkstyle-4.4.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-WANT_ANT_TASKS="ant-antlr ant-nodeps"
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}-src-${PV}"
-DESCRIPTION="A development tool to help programmers write Java code that adheres to a coding standard"
-HOMEPAGE="http://checkstyle.sourceforge.net"
-SRC_URI="mirror://sourceforge/checkstyle/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-COMMON_DEP=">=dev-java/antlr-2.7.7:0[java]
-	dev-java/commons-beanutils:1.7
-	dev-java/commons-cli:1
-	dev-java/commons-logging:0
-	dev-java/commons-collections:0"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-
-DEPEND="!test? ( >=virtual/jdk-1.4 )
-	test? ( >=virtual/jdk-1.5 )
-	${COMMON_DEP}
-	test? (
-		dev-java/ant-junit
-		dev-java/ant-trax
-		dev-java/emma:0
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-# So that we can generate 1.4 bytecode for dist
-# and 1.5 for tests
-JAVA_PKG_BSFIX="off"
-
-java_prepare() {
-	cd "${S}/lib"
-	rm -v *.jar || die
-	java-pkg_jar-from antlr
-	java-pkg_jar-from commons-beanutils-1.7
-	java-pkg_jar-from commons-cli-1
-	java-pkg_jar-from commons-logging
-	java-pkg_jar-from commons-collections
-}
-
-src_compile() {
-	eant compile.checkstyle $(use_doc)
-	jar cfm ${PN}.jar config/manifest.mf -C target/checkstyle . || die "jar failed"
-}
-
-src_test() {
-	java-pkg_jar-from --build-only --into lib junit
-	java-pkg_jar-from --build-only --into lib emma
-	ANT_TASKS="emma ant-nodeps ant-junit ant-trax" eant run.tests
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-
-	dodoc README RIGHTS.antlr || die
-	use doc && java-pkg_dojavadoc target/docs/api
-	use source && java-pkg_dosrc src/${PN}/com
-
-	# Install check files
-	insinto /usr/share/checkstyle/checks
-	for file in *.xml; do
-		[[ "${file}" != build.xml ]] && doins ${file}
-	done
-
-	# Install extra files
-	insinto  /usr/share/checkstyle/contrib
-	doins -r contrib/*
-
-	java-pkg_dolauncher ${PN} \
-		--main com.puppycrawl.tools.checkstyle.Main
-
-	java-pkg_dolauncher ${PN}-gui \
-		--main com.puppycrawl.tools.checkstyle.gui.Main
-
-	# Make the ant tasks available to ant
-	java-pkg_register-ant-task
-}
-
-pkg_postinst() {
-	elog "Checkstyle is located at /usr/bin/checkstyle"
-	elog "Check files are located in /usr/share/checkstyle/checks/"
-}
diff --git a/dev-util/checkstyle/checkstyle-5.5-r1.ebuild b/dev-util/checkstyle/checkstyle-5.5-r1.ebuild
index 93a4a647c7fb..23c5a2362cbb 100644
--- a/dev-util/checkstyle/checkstyle-5.5-r1.ebuild
+++ b/dev-util/checkstyle/checkstyle-5.5-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/checkstyle/${P}-src.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 COMMON_DEP="
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 4c36b9726b34..d17bc3fed2d6 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,3 +1,4 @@
 DIST cppcheck-1.69.tar.bz2 1052984 SHA256 4bd5c8031258ef29764a4c92666384238a625beecbb2aceeb7065ec388c7532e SHA512 30f239bcdf4cb1fcc254271bf55f3fdc1ec22e7d26f0704218390cfce1d4cf3ef41f385f4e463ede1a1a401e87d81b1d66a462c7b07e045d46aebd2354384a01 WHIRLPOOL e341c8b8f133fd19188700d53d6f02ab5deffc10fdfedbc9474931596850c10027a91e445998a3884f8f30908581e428fe4c629397b14660a0fe7b852e48b3a4
 DIST cppcheck-1.70.tar.bz2 1111291 SHA256 c6aaafd41b4c2050f3fb96a4aa159507007403a163d05361bd9544e5baf18f39 SHA512 c2223edce22739e555eca114bc39d8f66229ec26fb122c976e3dcf88957bfd6b37c170e183f22611ea2d17ac22b33da78440f820c044f6099ac901bd6c4f1b8d WHIRLPOOL 0b6c52d13ff8c9c8dfdf383e419edd311a484a89d695dbf9409f1ea608c1dc5bbc20fcb03bc0469495a35b61a43a90ccf1e76cd191cf28326f929020d66083b6
 DIST cppcheck-1.71.tar.bz2 1128689 SHA256 0114d29e5c49c8ff0030798f4fa02f9ef4c1d64d09697a3ea4b19aa5b67b4afe SHA512 ff56909ca566f9a48623822d78119930f0f55961a8011b0bce92178b25f82649847612157fa24f3b21f0aad6da81aa8387d08f7af4127df1d5a75b20ced67af9 WHIRLPOOL 2d1ff247c85354329bc645a8d74ae16119e6a246a282cb47e119a956d7d65bb4ea9fd3964a228b45a11cfa5efacc6fc8ae4602c29256f237c687d35da8c154c5
+DIST cppcheck-1.72.tar.bz2 1125775 SHA256 9460b184ff2d8dd15344f3e2f42f634c86e4dd3303e1e9b3f13dc67536aab420 SHA512 13b2348c97a3777feaad579f8620f18d90f6f934f92f5db712c7190af1f40042527500aefa4c8ccd348f7691b1c0d5f32115085c9385dec55460d5ba0804a410 WHIRLPOOL 790514f4b5b9c539a30daa691d268c6c5f1077743cde1af8834248eb4213224275e9f72cea46f3b378119a3d0944d7e8d63270c0cd47517c7f382c683a1938fe
diff --git a/dev-util/cppcheck/cppcheck-1.69-r1.ebuild b/dev-util/cppcheck/cppcheck-1.69-r1.ebuild
index 6c4e7d61a9e8..d5d903e527f0 100644
--- a/dev-util/cppcheck/cppcheck-1.69-r1.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.69-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 inherit distutils-r1 eutils flag-o-matic qt4-r2 toolchain-funcs
 
diff --git a/dev-util/cppcheck/cppcheck-1.70.ebuild b/dev-util/cppcheck/cppcheck-1.70.ebuild
index 74b0df922b61..8ffd554ba423 100644
--- a/dev-util/cppcheck/cppcheck-1.70.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.70.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 inherit distutils-r1 eutils flag-o-matic qt4-r2 toolchain-funcs
 
diff --git a/dev-util/cppcheck/cppcheck-1.71.ebuild b/dev-util/cppcheck/cppcheck-1.71.ebuild
index f126c41158cf..fd66a88c68ec 100644
--- a/dev-util/cppcheck/cppcheck-1.71.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.71.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 inherit distutils-r1 eutils flag-o-matic qt4-r2 toolchain-funcs
 
diff --git a/dev-util/cppcheck/cppcheck-1.72.ebuild b/dev-util/cppcheck/cppcheck-1.72.ebuild
new file mode 100644
index 000000000000..e42c03caa92f
--- /dev/null
+++ b/dev-util/cppcheck/cppcheck-1.72.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit distutils-r1 eutils qt4-r2 toolchain-funcs flag-o-matic
+
+DESCRIPTION="static analyzer of C/C++ code"
+HOMEPAGE="http://cppcheck.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="htmlreport pcre qt4"
+
+RDEPEND="htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
+	>=dev-libs/tinyxml2-2
+	qt4? ( dev-qt/qtgui:4 )
+	pcre? ( dev-libs/libpcre )"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig"
+
+src_prepare() {
+	append-cxxflags -std=c++0x
+
+	# Drop bundled libs, patch Makefile generator and re-run it
+	rm -r externals || die
+	epatch "${FILESDIR}"/${PN}-1.72-tinyxml2.patch
+	tc-export CXX
+	emake dmake
+	./dmake || die
+
+	epatch_user
+}
+
+src_configure() {
+	if use pcre ; then
+		sed -e '/HAVE_RULES=/s:=no:=yes:' \
+			-i Makefile
+	fi
+	if use qt4 ; then
+		pushd gui
+		qt4-r2_src_configure
+		popd
+	fi
+}
+
+src_compile() {
+	export LIBS="$(pkg-config --libs tinyxml2)"
+	emake ${PN} man \
+		CFGDIR="${EROOT}usr/share/${PN}/cfg" \
+		DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
+
+	if use qt4 ; then
+		pushd gui
+		qt4-r2_src_compile
+		popd
+	fi
+	if use htmlreport ; then
+		pushd htmlreport
+		distutils-r1_src_compile
+		popd
+	fi
+}
+
+src_test() {
+	# safe final version
+	mv -v ${PN}{,.final}
+	mv -v lib/library.o{,.final}
+	mv -v cli/cppcheckexecutor.o{,.final}
+	#trigger recompile with CFGDIR inside ${S}
+	emake check CFGDIR="${S}/cfg"
+	# restore
+	mv -v ${PN}{.final,}
+	mv -v lib/library.o{.final,}
+	mv -v cli/cppcheckexecutor.o{.final,}
+}
+
+src_install() {
+	# it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
+	emake install DESTDIR="${ED}"
+
+	insinto "/usr/share/${PN}/cfg"
+	doins cfg/*.cfg
+	if use qt4 ; then
+		dobin gui/${PN}-gui
+		dodoc gui/{projectfile.txt,gui.${PN}}
+	fi
+	if use htmlreport ; then
+		pushd htmlreport
+		distutils-r1_src_install
+		popd
+		find "${D}" -name "*.egg-info" -delete
+	else
+		rm "${ED}/usr/bin/cppcheck-htmlreport" || die
+	fi
+	doman ${PN}.1
+	dodoc -r triage
+}
diff --git a/dev-util/cppcheck/files/cppcheck-1.72-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-1.72-tinyxml2.patch
new file mode 100644
index 000000000000..478f1feed167
--- /dev/null
+++ b/dev-util/cppcheck/files/cppcheck-1.72-tinyxml2.patch
@@ -0,0 +1,66 @@
+--- cppcheck-1.71/gui/gui.pro
++++ cppcheck-1.71/gui/gui.pro
+@@ -14,7 +14,7 @@
+     LIBS += -l../bin/cppcheck-core
+     DEFINES += CPPCHECKLIB_IMPORT
+ }
+-LIBS += -L$$PWD/../externals
++LIBS += `pkg-config --libs tinyxml2`
+ 
+ DESTDIR = .
+ RCC_DIR = temp
+--- cppcheck-1.72/tools/dmake.cpp
++++ cppcheck-1.72/tools/dmake.cpp
+@@ -174,7 +174,6 @@
+     }
+ 
+     std::vector<std::string> externalfiles;
+-    getCppFiles(externalfiles, "externals/", true);
+ 
+ 
+     // QMAKE - lib/lib.pri
+@@ -183,8 +182,7 @@
+         if (fout1.is_open()) {
+             fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
+             fout1 << "include($$PWD/pcrerules.pri)\n";
+-            fout1 << "include($$PWD/../externals/tinyxml/tinyxml.pri)\n";
+-            fout1 << "INCLUDEPATH += $$PWD $$PWD/../externals/tinyxml\n";
++            fout1 << "INCLUDEPATH += $$PWD\n";
+             fout1 << "HEADERS += $${PWD}/check.h \\\n";
+             for (unsigned int i = 0; i < libfiles.size(); ++i) {
+                 std::string fname(libfiles[i].substr(4));
+@@ -210,7 +208,6 @@
+         std::ofstream fout1("test/testfiles.pri");
+         if (fout1.is_open()) {
+             fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
+-            fout1 << "INCLUDEPATH += ../externals/tinyxml\n";
+             fout1 << "\n\nSOURCES += ";
+             for (unsigned int i = 0; i < testfiles.size(); ++i) {
+                 const std::string filename(testfiles[i].substr(5));
+@@ -375,9 +372,9 @@
+          << "endif\n\n";
+ 
+     makeConditionalVariable(fout, "PREFIX", "/usr");
+-    makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -Iexternals/tinyxml");
+-    makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -Iexternals/tinyxml");
+-    makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -Iexternals/tinyxml");
++    makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib");
++    makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib");
++    makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli");
+ 
+     fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n";
+     fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux\n";
+@@ -418,10 +415,10 @@
+     fout << "\t$(CXX) $(CXXFLAGS) -o dmake tools/dmake.o cli/filelister.o cli/pathmatch.o lib/path.o -Ilib $(LDFLAGS)\n\n";
+     fout << "run-dmake: dmake\n";
+     fout << "\t./dmake\n\n";
+-    fout << "reduce:\ttools/reduce.o externals/tinyxml/tinyxml2.o $(LIBOBJ)\n";
+-    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -g -o reduce tools/reduce.o -Ilib -Iexternals/tinyxml $(LIBOBJ) $(LIBS) externals/tinyxml/tinyxml2.o $(LDFLAGS) $(RDYNAMIC)\n\n";
++    fout << "reduce:\ttools/reduce.o $(LIBOBJ)\n";
++    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o reduce tools/reduce.o -Ilib $(LIBOBJ) $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n";
+     fout << "clean:\n";
+-    fout << "\trm -f build/*.o lib/*.o cli/*.o test/*.o tools/*.o externals/tinyxml/*.o testrunner reduce dmake cppcheck cppcheck.1\n\n";
++    fout << "\trm -f build/*.o lib/*.o cli/*.o test/*.o tools/*.o testrunner reduce dmake cppcheck cppcheck.1\n\n";
+     fout << "man:\tman/cppcheck.1\n\n";
+     fout << "man/cppcheck.1:\t$(MAN_SOURCE)\n\n";
+     fout << "\t$(XP) $(DB2MAN) $(MAN_SOURCE)\n\n";
diff --git a/games-board/sirius/files/sirius-0.8.0-format.patch b/games-board/sirius/files/sirius-0.8.0-format.patch
new file mode 100644
index 000000000000..dccf6e244323
--- /dev/null
+++ b/games-board/sirius/files/sirius-0.8.0-format.patch
@@ -0,0 +1,11 @@
+--- src/sirius.c.old	2016-01-14 21:22:53.946900371 +0100
++++ src/sirius.c	2016-01-14 21:24:08.240507669 +0100
+@@ -180,7 +180,7 @@
+ 
+ 	paus = 1;
+ 
+-	box = gtk_message_dialog_new (GTK_WINDOW (window), GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, message);
++	box = gtk_message_dialog_new (GTK_WINDOW (window), GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "%s", message);
+ 	gtk_dialog_run (GTK_DIALOG(box));
+ 	gtk_widget_destroy(box);
+ 
diff --git a/games-board/sirius/sirius-0.8.0.ebuild b/games-board/sirius/sirius-0.8.0.ebuild
index 1396a940df92..cccde9906ce9 100644
--- a/games-board/sirius/sirius-0.8.0.ebuild
+++ b/games-board/sirius/sirius-0.8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-inherit autotools games
+inherit autotools eutils games
 
 DESCRIPTION="A program for playing the game of othello/reversi"
 HOMEPAGE="http://sirius.bitvis.nu/"
@@ -29,6 +29,7 @@ src_prepare() {
 		-e '/Categories/s/Application;//' \
 		sirius.desktop.in || die
 	mv configure.in configure.ac || die
+	epatch "${FILESDIR}"/${P}-format.patch
 	eautoreconf
 }
 
diff --git a/games-fps/doomsday/doomsday-1.15.7.ebuild b/games-fps/doomsday/doomsday-1.15.7.ebuild
index b45373023b05..1b11b67fc503 100644
--- a/games-fps/doomsday/doomsday-1.15.7.ebuild
+++ b/games-fps/doomsday/doomsday-1.15.7.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
-inherit python-r1 eutils qt5-build games
+inherit python-r1 eutils qmake-utils games
 
 DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen"
 HOMEPAGE="http://www.dengine.net/"
@@ -95,8 +95,6 @@ src_prepare() {
 		use openal && echo "CONFIG += deng_openal"
 
 	} > config_user.pri || die
-
-	qt5-build_src_prepare
 }
 
 #Usage: doom_make_wrapper <name> <game> <icon> <desktop entry title> [args]
@@ -108,12 +106,11 @@ doom_make_wrapper() {
 }
 
 src_configure() {
-	qt5-build_src_configure
+	eqmake5 doomsday.pro
 }
 
 src_install() {
-	qt5-build_src_install
-
+	emake INSTALL_ROOT="${D}" install
 	dodoc "${S}"/../README.md
 
 	mv "${D}/${GAMES_DATADIR}"/{${PN}/data/jdoom,doom-data} || die
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 0dd26c6c7289..be138205b840 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -1,3 +1,4 @@
 DIST roundcubemail-1.0.5.tar.gz 4056852 SHA256 22af84480f2c543884b17c9b0196ed105d2ea7f429bfcc34a6fb7c96dd712792 SHA512 28016a8b05bdf4777486c63d95a91a22022006252e61e4e93320d81448cbc630ed5a04a1388d8576a40617d8e0630b90290341fcd3fed4f5080ab250fb568c6c WHIRLPOOL f0e48173e0fe07a8f3a00a49ad1091c33f76dbeb153941e32c35684f4eb41e04f805f63ec9623e3664c165c6e88407db3665f1e60a01c2076a3c60bc96c4a122
 DIST roundcubemail-1.0.6.tar.gz 4057804 SHA256 76e600183c91fa598823bb97208f81485c73f354ea05f4e82d56e91003e0df49 SHA512 1aa2f652fe88c3fa22d1181105733a6bf0bdd5439b7abc051a4b00030310c923936487e6aa5d5f62179fae010c79b818d6b5e37afca749dcf1738be8930c7709 WHIRLPOOL e9581f4707daf1bdf9c11316ed60e457a367ba94ff46b92e72fea38eec09df86858f5af55ce4626016fe54552dbea155466fed62fe5a27539b46e89d1714f9b4
 DIST roundcubemail-1.1.3.tar.gz 3208502 SHA256 343d3981067da44e9f3eaee94c2c86247a4341ebe7268bba8bff67d9906aaf34 SHA512 be5d64a8d52aa623de614bc1b137ae2f74250de050de086a510114121bcb760b973f8319884395827f324371542b741b80054b90031d8814752bb018dcda2096 WHIRLPOOL 9bdf316b27153c0ad5eacbeb4d4ecf4dd958b430d2ea3115ba04b67db9d1004482cb57046faa031b93fc0d7b18c93c081e7501cbb7d485383c7d611a1af1fcae
+DIST roundcubemail-1.1.4.tar.gz 3209549 SHA256 539a11ed38838b221f8139b193d9762638f155c7b0ea9391315865896be16852 SHA512 18c2422d65292cd13bc4ce592e8490cc0a9d3e9551ac4d188db93eb989525af7ccf519642dd2e68a7380ab0d0d4ad4f999af2b7e99da75d88274743949b42f8a WHIRLPOOL c3e310ddb4dc50b46ff28566d030865029364f69db5a3f39be0d37f165c83486a979b4d3ab7d42835baa7ea9506df8947381612403355a628864ecbde1238d02
diff --git a/mail-client/roundcube/roundcube-1.1.4.ebuild b/mail-client/roundcube/roundcube-1.1.4.ebuild
new file mode 100644
index 000000000000..f5a9e432d864
--- /dev/null
+++ b/mail-client/roundcube/roundcube-1.1.4.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit webapp
+
+MY_PN=${PN}mail
+MY_P=${MY_PN}-${PV/_/-}
+
+DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
+HOMEPAGE="http://roundcube.net"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
+
+# roundcube is GPL-licensed, the rest of the licenses here are
+# for bundled PEAR components, googiespell and utf8.class.php
+LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="enigma ldap managesieve mysql postgres sqlite ssl spell"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+# this function only sets DEPEND so we need to include that in RDEPEND
+need_httpd_cgi
+
+RDEPEND="
+	${DEPEND}
+	>=dev-lang/php-5.3.7[crypt,filter,gd,iconv,json,ldap?,pdo,postgres?,session,sockets,sqlite?,ssl?,unicode,xml]
+	>=dev-php/PEAR-Auth_SASL-1.0.6
+	>=dev-php/PEAR-Mail_Mime-1.8.9
+	>=dev-php/PEAR-Mail_mimeDecode-1.5.5
+	>=dev-php/PEAR-Net_IDNA2-0.1.1
+	>=dev-php/PEAR-Net_SMTP-1.6.2
+	virtual/httpd-php
+	enigma? ( >=dev-php/PEAR-Crypt_GPG-1.2.0 app-crypt/gnupg )
+	ldap? ( >=dev-php/PEAR-Net_LDAP2-2.0.12 )
+	managesieve? ( >=dev-php/PEAR-Net_Sieve-1.3.2 )
+	mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) )
+	spell? ( dev-lang/php[curl,spell] )
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_install() {
+	webapp_src_preinst
+	dodoc CHANGELOG INSTALL README.md UPGRADING
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r [[:lower:]]* SQL
+	doins .htaccess
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/logs
+	webapp_serverowned "${MY_HTDOCSDIR}"/temp
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config/defaults.inc.php
+	webapp_postupgrade_txt en "${FILESDIR}/POST-UPGRADE.txt"
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	ewarn
+	ewarn "When upgrading from <= 0.9, note that the old configuration files"
+	ewarn "named main.inc.php and db.inc.php are deprecated and should be"
+	ewarn "replaced with one single config.inc.php file."
+	ewarn
+	ewarn "Run the ./bin/update.sh script to convert those"
+	ewarn "or manually merge the files."
+	ewarn
+	ewarn "The new config.inc.php should only contain options that"
+	ewarn "differ from the ones listed in defaults.inc.php."
+	ewarn
+}
diff --git a/media-sound/mpfc/files/mpfc-1.3.8.1-fix-underlinking.patch b/media-sound/mpfc/files/mpfc-1.3.8.1-fix-underlinking.patch
new file mode 100644
index 000000000000..0fb96ae1ff00
--- /dev/null
+++ b/media-sound/mpfc/files/mpfc-1.3.8.1-fix-underlinking.patch
@@ -0,0 +1,32 @@
+Fix libm (and ncurses) underlinking issues.
+https://bugs.gentoo.org/show_bug.cgi?id=529490
+
+--- mpfc-1.3.8.1/configure.ac
++++ mpfc-1.3.8.1/configure.ac
+@@ -13,13 +13,13 @@
+ COMMON_LIBS=""
+ AC_SUBST(COMMON_LIBS)
+ 
++dnl Check for libm for rintf()
++AC_SEARCH_LIBS([rintf], [m], [], [
++	AC_MSG_ERROR([unable to find the rintf() function])
++])
++
+ # Check for ncurses
+-LIBS_save=$LIBS
+-AC_CHECK_HEADERS([curses.h],,[AC_MSG_ERROR(*** Can't find curses.h ***)])
+-AC_CHECK_LIB(ncursesw, waddch,,[AC_MSG_ERROR(*** Can't find ncurses library ***)])
+-CURSES_LIBS="-lncursesw"
+-AC_SUBST(CURSES_LIBS)
+-LIBS=$LIBS_save
++PKG_CHECK_MODULES([CURSES], [ncursesw])
+ 
+ # Check for pthread
+ LIBS_save=$LIBS
+--- mpfc-1.3.8.1/libmpfcwnd/Makefile.am
++++ mpfc-1.3.8.1/libmpfcwnd/Makefile.am
+@@ -1,3 +1,4 @@
++AM_CPPFLAGS = @CURSES_CFLAGS@
+ lib_LTLIBRARIES = libmpfcwnd.la
+ libmpfcwndhdrdir = $(includedir)/mpfc/libmpfcwnd
+ libmpfcwndhdr_HEADERS = wnd.h wnd_print.h wnd_msg.h wnd_kbd.h \
diff --git a/media-sound/mpfc/files/mpfc-1.3.8.1-qa-implicit-declarations.patch b/media-sound/mpfc/files/mpfc-1.3.8.1-qa-implicit-declarations.patch
new file mode 100644
index 000000000000..31958582e90d
--- /dev/null
+++ b/media-sound/mpfc/files/mpfc-1.3.8.1-qa-implicit-declarations.patch
@@ -0,0 +1,193 @@
+Fix QA warnings caused by implicit declarations, such as
+
+* QA Notice: Package triggers severe warnings which indicate that it
+*            may exhibit random runtime failures.
+* wnd.c:1081:4: warning: implicit declaration of function ‘add_wch’ [-Wimplicit-function-declaration]
+
+--- mpfc-1.3.8.1/libmpfc/file_http.c
++++ mpfc-1.3.8.1/libmpfc/file_http.c
+@@ -35,6 +35,7 @@
+ #include "file.h"
+ #include "file_http.h"
+ #include "mystring.h"
++#include "util.h"
+ 
+ /* Get file data */
+ #define FHTTP_GET_DATA(data, file) \
+--- mpfc-1.3.8.1/libmpfc/id3.c
++++ mpfc-1.3.8.1/libmpfc/id3.c
+@@ -26,6 +26,7 @@
+ #include <unicode/ucnv.h>
+ #include "types.h"
+ #include "myid3.h"
++#include "util.h"
+ 
+ /* Create a new empty tag */
+ id3_tag_t *id3_new( void )
+--- mpfc-1.3.8.1/libmpfc/logger.c
++++ mpfc-1.3.8.1/libmpfc/logger.c
+@@ -28,6 +28,8 @@
+ #include "cfg.h"
+ #include "logger.h"
+ 
++int logger_get_level( logger_t *log );
++
+ /* Initialize logger */
+ logger_t *logger_new( cfg_node_t *cfg_list, char *file_name )
+ {
+--- mpfc-1.3.8.1/libmpfcwnd/wnd.h
++++ mpfc-1.3.8.1/libmpfcwnd/wnd.h
+@@ -23,7 +23,6 @@
+ #ifndef __SG_MPFC_WND_H__
+ #define __SG_MPFC_WND_H__
+ 
+-#define _XOPEN_SOURCE_EXTENDED
+ #include <curses.h>
+ #include "types.h"
+ #include "cfg.h"
+--- mpfc-1.3.8.1/libmpfcwnd/wnd.c
++++ mpfc-1.3.8.1/libmpfcwnd/wnd.c
+@@ -29,6 +29,8 @@
+ #include "logger.h"
+ #include "wnd.h"
+ #include "wnd_root.h"
++#include "util.h"
++#include <curses.h>
+ 
+ /* Initialize window system and create root window */
+ wnd_t *wnd_init( cfg_node_t *cfg_list, logger_t *log )
+--- mpfc-1.3.8.1/libmpfcwnd/wnd_combobox.c
++++ mpfc-1.3.8.1/libmpfcwnd/wnd_combobox.c
+@@ -28,6 +28,8 @@
+ #include "wnd_dlgitem.h"
+ #include "wnd_editbox.h"
+ #include "wnd_hbox.h"
++#include "wnd_label.h"
++#include "util.h"
+ 
+ /* Create a new combo box */
+ combo_t *combo_new( wnd_t *parent, char *id, char *text, char letter, 
+--- mpfc-1.3.8.1/libmpfcwnd/wnd_filebox.c
++++ mpfc-1.3.8.1/libmpfcwnd/wnd_filebox.c
+@@ -24,7 +24,6 @@
+ #include <fnmatch.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-#define __USE_GNU
+ #include <string.h>
+ #include <unistd.h>
+ #include "types.h"
+@@ -33,6 +32,8 @@
+ #include "wnd_editbox.h"
+ #include "wnd_filebox.h"
+ #include "wnd_hbox.h"
++#include "wnd_label.h"
++#include "util.h"
+ 
+ /* Create a new file box */
+ filebox_t *filebox_new( wnd_t *parent, char *id, char *text, char letter,
+--- mpfc-1.3.8.1/libmpfcwnd/wnd_mouse.c
++++ mpfc-1.3.8.1/libmpfcwnd/wnd_mouse.c
+@@ -27,6 +27,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include "wnd.h"
++#include "util.h"
+ 
+ /* Initialize mouse */
+ wnd_mouse_data_t *wnd_mouse_init( wnd_global_data_t *global )
+--- mpfc-1.3.8.1/libmpfcwnd/wnd_print.c
++++ mpfc-1.3.8.1/libmpfcwnd/wnd_print.c
+@@ -32,6 +32,7 @@
+ #include "types.h"
+ #include "wnd.h"
+ #include "wnd_print.h"
++#include "util.h"
+ 
+ /* Move cursor to a specified position */
+ void wnd_move( wnd_t *wnd, wnd_move_style_t style, int x, int y )
+--- mpfc-1.3.8.1/libmpfcwnd/wnd_repval.c
++++ mpfc-1.3.8.1/libmpfcwnd/wnd_repval.c
+@@ -25,6 +25,7 @@
+ #include "wnd_dialog.h"
+ #include "wnd_editbox.h"
+ #include "wnd_repval.h"
++#include "wnd_label.h"
+ 
+ /* Create a repeat value dialog */
+ dialog_t *wnd_repval_new( wnd_t *parent, void *on_ok, int dig )
+--- mpfc-1.3.8.1/src/browser.c
++++ mpfc-1.3.8.1/src/browser.c
+@@ -24,6 +24,7 @@
+ #include <glob.h>
+ #include <string.h>
+ #include <sys/types.h>
++#include <fnmatch.h>
+ #include "types.h"
+ #include "browser.h"
+ #include "help_screen.h"
+--- mpfc-1.3.8.1/src/info_rw_thread.c
++++ mpfc-1.3.8.1/src/info_rw_thread.c
+@@ -27,6 +27,7 @@
+ #include "info_rw_thread.h"
+ #include "player.h"
+ #include "song.h"
++#include "util.h"
+ 
+ /* Thread queue */
+ irw_queue_t *irw_head, *irw_tail;
+--- mpfc-1.3.8.1/src/player.c
++++ mpfc-1.3.8.1/src/player.c
+@@ -35,6 +35,7 @@
+ #include "command.h"
+ #include "eqwnd.h"
+ #include "file.h"
++#include "genp.h"
+ #include "help_screen.h"
+ #include "logger.h"
+ #include "logger_view.h"
+@@ -57,8 +58,13 @@
+ #include "wnd_listbox.h"
+ #include "wnd_multiview_dialog.h"
+ #include "wnd_radio.h"
++#include "wnd_repval.h"
+ #include "wnd_root.h"
+ #include "xconvert.h"
++#include "info_rw_thread.h"
++
++void pmng_hook( pmng_t *pmng, char *hook );
++void outp_set_mixer_type( out_plugin_t *p, plugin_mixer_type_t type );
+ 
+ /*****
+  *
+--- mpfc-1.3.8.1/src/plist.c
++++ mpfc-1.3.8.1/src/plist.c
+@@ -36,6 +36,7 @@
+ #include "util.h"
+ #include "undo.h"
+ #include "wnd.h"
++#include "info_rw_thread.h"
+ 
+ extern void pmng_hook( pmng_t *pmng, char *hook );
+ 
+--- mpfc-1.3.8.1/src/util.h
++++ mpfc-1.3.8.1/src/util.h
+@@ -26,6 +26,8 @@
+ #include <stdio.h>
+ #include "types.h"
+ 
++int mbslen( char *str );
++
+ /* Write message to log file */
+ void util_log( char *format, ... );
+ 
+--- mpfc-1.3.8.1/src/vfs.h
++++ mpfc-1.3.8.1/src/vfs.h
+@@ -36,6 +36,7 @@
+ } vfs_t;
+ 
+ /* Check that input plugin uses VFS */
++dword inp_get_flags( in_plugin_t *p );
+ #define VFS_INP_HAS(inp)	(inp_get_flags(inp) & INP_VFS)
+ 
+ /* Get logger object */
diff --git a/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild b/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild
new file mode 100644
index 000000000000..e92361e1fbdc
--- /dev/null
+++ b/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools eutils
+
+DESCRIPTION="Music Player For Console"
+HOMEPAGE="http://mpfc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa cdda flac gpm mad nls oss static-libs vorbis wav"
+
+RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0 )
+	flac? ( media-libs/flac )
+	gpm? ( >=sys-libs/gpm-1.19.3 )
+	mad? ( media-libs/libmad )
+	vorbis? ( media-libs/libvorbis )
+	sys-libs/ncurses:0=[unicode]
+	dev-libs/icu:="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-underlinking.patch"
+	"${FILESDIR}/${P}-qa-implicit-declarations.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable alsa) \
+		$(use_enable cdda audiocd) \
+		$(use_enable flac) \
+		$(use_enable gpm) \
+		$(use_enable mad mp3) \
+		$(use_enable nls) \
+		$(use_enable oss) \
+		$(use_enable static-libs static) \
+		$(use_enable vorbis ogg) \
+		$(use_enable wav)
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	doins mpfcrc
+
+	prune_libtool_files --all
+}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 6a1106996ace..6debda0ec895 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 14 Jan 2016 18:14:00 +0000
+Fri, 15 Jan 2016 07:43:50 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 6a1106996ace..a6408375ddcc 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 14 Jan 2016 18:14:00 +0000
+Fri, 15 Jan 2016 07:43:51 +0000
diff --git a/metadata/md5-cache/app-admin/ansible-2.0.0.2 b/metadata/md5-cache/app-admin/ansible-2.0.0.2
new file mode 100644
index 000000000000..3b39825ddb2b
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-2.0.0.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( keyczar? ( dev-python/keyczar[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/mock-1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/passlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/coverage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/unittest2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/git ) 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(-)]
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=5
+HOMEPAGE=http://ansible.com/
+IUSE=keyczar test python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=keyczar? ( dev-python/keyczar[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/sshpass virtual/ssh 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(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/a/ansible/ansible-2.0.0.2.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=edd28525b0499a207a709d41016feaf9
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.60 b/metadata/md5-cache/app-portage/portage-utils-0.60
index 25d09b992f45..43e0e839c057 100644
--- a/metadata/md5-cache/app-portage/portage-utils-0.60
+++ b/metadata/md5-cache/app-portage/portage-utils-0.60
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/iniparser:0
 SLOT=0
 SRC_URI=mirror://gentoo/portage-utils-0.60.tar.xz https://dev.gentoo.org/~vapier/dist/portage-utils-0.60.tar.xz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=a2a312c190c652329e5233184e2bb3fc
+_md5_=b04bb5d2d7cdd8e5fadf199b115795af
diff --git a/metadata/md5-cache/app-text/blogc-0.6.1 b/metadata/md5-cache/app-text/blogc-0.7
similarity index 81%
rename from metadata/md5-cache/app-text/blogc-0.6.1
rename to metadata/md5-cache/app-text/blogc-0.7
index f8f09f83f5c7..15f29fd9ea65 100644
--- a/metadata/md5-cache/app-text/blogc-0.6.1
+++ b/metadata/md5-cache/app-text/blogc-0.7
@@ -7,6 +7,6 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
-SRC_URI=https://github.com/blogc/blogc/releases/download/v0.6.1/blogc-0.6.1.tar.xz
+SRC_URI=https://github.com/blogc/blogc/releases/download/v0.7/blogc-0.7.tar.xz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
 _md5_=014fd6d4cf670f2c422e6e25774136ed
diff --git a/metadata/md5-cache/dev-go/godep-49 b/metadata/md5-cache/dev-go/godep-49
new file mode 100644
index 000000000000..d45a9c55b567
--- /dev/null
+++ b/metadata/md5-cache/dev-go/godep-49
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.4.2:=
+DESCRIPTION=dependency tool for go
+EAPI=5
+HOMEPAGE=https://github.com/tools/godep
+KEYWORDS=~amd64
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/tools/godep/archive/v49.tar.gz -> godep-49.tar.gz
+_eclasses_=golang-base	59e300a2d8836a6e8d508276da0d570f	golang-build	1b49258a68ba3972a575490adf3b7b4c	golang-vcs-snapshot	b10a39b036bc9a2dbefc6e168689b5fd
+_md5_=ec10db13e3107af10716d7f1c78b3bdb
diff --git a/metadata/md5-cache/dev-java/ant-antlr-1.9.2 b/metadata/md5-cache/dev-java/ant-antlr-1.9.2
deleted file mode 100644
index 80277d05a530..000000000000
--- a/metadata/md5-cache/dev-java/ant-antlr-1.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-java/java-config-2.2.0 >=dev-java/javatoolkit-0.3.0-r2 ~dev-java/ant-core-1.9.2:0 >=virtual/jdk-1.5 !dev-java/ant-tasks
-DESCRIPTION=Apache Ant's optional tasks for Antlr
-EAPI=5
-HOMEPAGE=http://ant.apache.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=dev-java/antlr-2.7.5-r3:0[java] >=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c16cb3f1f79f5138bf6ea589d460b041
diff --git a/metadata/md5-cache/dev-java/ant-antlr-1.9.2-r1 b/metadata/md5-cache/dev-java/ant-antlr-1.9.2-r1
index aae25e1bab31..591fcec48bd7 100644
--- a/metadata/md5-cache/dev-java/ant-antlr-1.9.2-r1
+++ b/metadata/md5-cache/dev-java/ant-antlr-1.9.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Apache Ant's optional tasks for Antlr
 EAPI=5
 HOMEPAGE=http://ant.apache.org/
 IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=dev-java/antlr-2.7.7-r7:0 >=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
 _eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6919eb00c6c31a91dd64b151f2b946ba
+_md5_=a0dffe4a71a62adf28e87959647bd2fc
diff --git a/metadata/md5-cache/dev-java/antlr-2.7.7-r5 b/metadata/md5-cache/dev-java/antlr-2.7.7-r5
deleted file mode 100644
index 6de39de88d42..000000000000
--- a/metadata/md5-cache/dev-java/antlr-2.7.7-r5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] ) >=virtual/jdk-1.3 mono? ( dev-lang/mono ) script? ( !dev-util/pccts ) source? ( app-arch/zip ) >=dev-java/java-config-2.2.0 !<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 parser generator for C++, C#, Java, and Python
-EAPI=5
-HOMEPAGE=http://www.antlr2.org/
-IUSE=doc debug examples mono +cxx +java python script source static-libs elibc_FreeBSD python_targets_python2_7
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=public-domain
-RDEPEND=python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] ) >=virtual/jdk-1.3 mono? ( dev-lang/mono ) >=dev-java/java-config-2.2.0
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://www.antlr2.org/download/antlr-2.7.7.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	libtool	b75230758539a7da029e24afdb693960	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7682480e219f2c5dfef14baf8b44481e
diff --git a/metadata/md5-cache/dev-java/antlr-2.7.7-r7 b/metadata/md5-cache/dev-java/antlr-2.7.7-r7
index 5bad4fdb8588..d0d570439746 100644
--- a/metadata/md5-cache/dev-java/antlr-2.7.7-r7
+++ b/metadata/md5-cache/dev-java/antlr-2.7.7-r7
@@ -4,10 +4,10 @@ DESCRIPTION=A parser generator for many languages
 EAPI=5
 HOMEPAGE=http://www.antlr2.org/
 IUSE=examples source elibc_FreeBSD doc elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.antlr2.org/download/antlr-2.7.7.tar.gz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=28f580127842800402e3fdaae8af939f
+_md5_=f3e64b4ac1612c635e0c6cff4e2d1b8a
diff --git a/metadata/md5-cache/dev-java/antlr-3.1.3-r3 b/metadata/md5-cache/dev-java/antlr-3.1.3-r3
deleted file mode 100644
index 034aaf9cb7e5..000000000000
--- a/metadata/md5-cache/dev-java/antlr-3.1.3-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=>=virtual/jre-1.5 >=dev-java/stringtemplate-3.2:0 >=dev-java/antlr-2.7.7:0[java] gunit? ( dev-java/junit:4 ) >=virtual/jdk-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A parser generator for C++, C#, Java, and Python
-EAPI=2
-HOMEPAGE=http://www.antlr.org/
-IUSE=gunit elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.5 >=dev-java/stringtemplate-3.2:0 >=dev-java/antlr-2.7.7:0[java] gunit? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=3
-SRC_URI=http://www.antlr.org/download/antlr-3.1.3.tar.gz mirror://gentoo/antlr-3.1.3-generated.tar.bz2
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=45ea3b6b9262a0439e2b6d741b4fe8f9
diff --git a/metadata/md5-cache/dev-java/antlr-3.2 b/metadata/md5-cache/dev-java/antlr-3.2
index a02618e9a90d..55cbb744bb71 100644
--- a/metadata/md5-cache/dev-java/antlr-3.2
+++ b/metadata/md5-cache/dev-java/antlr-3.2
@@ -4,10 +4,10 @@ DESCRIPTION=A parser generator for many languages
 EAPI=5
 HOMEPAGE=http://www.antlr3.org/
 IUSE=doc test elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=dev-java/antlr-2.7.7-r7:0 dev-java/stringtemplate:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=3
 SRC_URI=http://www.antlr3.org/download/antlr-3.2.tar.gz http://www.antlr3.org/download/antlr-3.2.jar
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d61ca5f0530b2e30cc7acac8e13a93cf
+_md5_=16fedd289c6df8679c4cd1ada64af14e
diff --git a/metadata/md5-cache/dev-java/gnu-classpath-0.98-r3 b/metadata/md5-cache/dev-java/gnu-classpath-0.98-r3
deleted file mode 100644
index 0050cdddf756..000000000000
--- a/metadata/md5-cache/dev-java/gnu-classpath-0.98-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=app-arch/zip dev-java/eclipse-ecj >=dev-java/java-config-2.1.11 gjdoc? ( !!dev-util/pccts ) gtk? ( x11-libs/libXrender || ( >=x11-libs/libXtst-1.1.0 <x11-proto/xextproto-7.1 ) x11-proto/xproto ) >=virtual/jdk-1.5 alsa? ( media-libs/alsa-lib ) doc? ( >=dev-java/gjdoc-0.7.9-r2 ) dssi? ( >=media-libs/dssi-0.9 ) gconf? ( gnome-base/gconf ) gjdoc? ( >=dev-java/antlr-2.7.1:0 ) gmp? ( >=dev-libs/gmp-4.2.4 ) gstreamer? ( >=media-libs/gstreamer-0.10.10:0.10 >=media-libs/gst-plugins-base-0.10.10:0.10 x11-libs/gtk+:2 ) gtk? ( >=x11-libs/gtk+-2.8:2 >=dev-libs/glib-2.0 media-libs/freetype >=x11-libs/cairo-1.1.9 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango ) qt4? ( dev-qt/qtgui:4 ) xml? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 ) >=dev-java/java-config-2.2.0
-DESCRIPTION=Free core class libraries for use with virtual machines and compilers for the Java language
-EAPI=4
-HOMEPAGE=https://www.gnu.org/software/classpath
-IUSE=alsa debug doc dssi examples gconf gjdoc gmp gtk gstreamer qt4 xml elibc_FreeBSD
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-2-with-linking-exception
-RDEPEND=>=virtual/jre-1.5 alsa? ( media-libs/alsa-lib ) doc? ( >=dev-java/gjdoc-0.7.9-r2 ) dssi? ( >=media-libs/dssi-0.9 ) gconf? ( gnome-base/gconf ) gjdoc? ( >=dev-java/antlr-2.7.1:0 ) gmp? ( >=dev-libs/gmp-4.2.4 ) gstreamer? ( >=media-libs/gstreamer-0.10.10:0.10 >=media-libs/gst-plugins-base-0.10.10:0.10 x11-libs/gtk+:2 ) gtk? ( >=x11-libs/gtk+-2.8:2 >=dev-libs/glib-2.0 media-libs/freetype >=x11-libs/cairo-1.1.9 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango ) qt4? ( dev-qt/qtgui:4 ) xml? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 ) >=dev-java/java-config-2.2.0
-SLOT=0.98
-SRC_URI=mirror://gnu/classpath/classpath-0.98.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ec4e4171dffc38f5798277648824dfea
diff --git a/metadata/md5-cache/dev-java/gnu-classpath-0.98-r5 b/metadata/md5-cache/dev-java/gnu-classpath-0.98-r5
index 1adb7cfdd986..e321de8dc5b4 100644
--- a/metadata/md5-cache/dev-java/gnu-classpath-0.98-r5
+++ b/metadata/md5-cache/dev-java/gnu-classpath-0.98-r5
@@ -4,11 +4,11 @@ DESCRIPTION=Free core class libraries for use with Java VMs and compilers
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/classpath
 IUSE=alsa debug doc dssi examples gconf +gjdoc gmp gtk gstreamer qt4 xml elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.5 alsa? ( media-libs/alsa-lib ) dssi? ( >=media-libs/dssi-0.9 ) gconf? ( gnome-base/gconf:2= ) gjdoc? ( >=dev-java/antlr-2.7.7-r7:0 ) gmp? ( >=dev-libs/gmp-4.2.4:0= ) gstreamer? ( >=media-libs/gstreamer-0.10.10:0.10= >=media-libs/gst-plugins-base-0.10.10:0.10= x11-libs/gtk+:2= ) gtk? ( >=x11-libs/gtk+-2.8:2= dev-libs/glib:2= media-libs/freetype:2= >=x11-libs/cairo-1.1.9:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango ) qt4? ( dev-qt/qtgui:4= ) xml? ( >=dev-libs/libxml2-2.6.8:2= >=dev-libs/libxslt-1.1.11 ) >=dev-java/java-config-2.2.0
 REQUIRED_USE=doc? ( gjdoc )
 SLOT=0.98
 SRC_URI=mirror://gnu/classpath/classpath-0.98.tar.gz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6b99e77970e7244bc9d3b9848369c388
+_md5_=b10ba5d4f58df2c471bc42823fc1d3fe
diff --git a/metadata/md5-cache/dev-java/jaxme-0.5.2 b/metadata/md5-cache/dev-java/jaxme-0.5.2
deleted file mode 100644
index a7c4ad5bb76a..000000000000
--- a/metadata/md5-cache/dev-java/jaxme-0.5.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 dev-db/hsqldb:0 dev-java/antlr:0[java] >=dev-java/xerces-2.7 =dev-java/junit-3.8* >=dev-java/log4j-1.2.8 dev-java/xmldb:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JaxMe 2 is an open source implementation of JAXB, the specification for Java/XML binding
-EAPI=2
-HOMEPAGE=http://ws.apache.org/jaxme/index.html
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.5 dev-java/antlr:0[java] >=dev-java/xerces-2.7 =dev-java/junit-3.8* >=dev-java/log4j-1.2.8 dev-java/xmldb:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/ws/jaxme/source/ws-jaxme-0.5.2-src.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7c1f552cdc5a862793c98bd5c692c07c
diff --git a/metadata/md5-cache/dev-java/jaxme-0.5.2-r2 b/metadata/md5-cache/dev-java/jaxme-0.5.2-r2
index 8de437f4f091..50f220828a08 100644
--- a/metadata/md5-cache/dev-java/jaxme-0.5.2-r2
+++ b/metadata/md5-cache/dev-java/jaxme-0.5.2-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install preinst prepare setup
 DEPEND=>=virtual/jdk-1.6 dev-db/hsqldb:0 >=dev-java/antlr-2.7.7-r7:0 >=dev-java/log4j-1.2.8:0 dev-java/junit:0 dev-java/xmldb:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JaxMe 2 is an open source implementation of JAXB, the specification for Java/XML binding
+DESCRIPTION=An open source implementation of JAXB, the specification for Java/XML binding
 EAPI=5
 HOMEPAGE=http://ws.apache.org/jaxme/index.html
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/xerces:2 >=dev-java/antlr-2.7.7-r7:0 >=dev-java/log4j-1.2.8:0 dev-java/junit:0 dev-java/xmldb:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/ws/jaxme/source/ws-jaxme-0.5.2-src.tar.gz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7371e4a14992b99e623eff673a953a29
+_md5_=3afbcdc321bd68cdd2e13efe2b3d4aa0
diff --git a/metadata/md5-cache/dev-java/netbeans-enterprise-8.0.2 b/metadata/md5-cache/dev-java/netbeans-enterprise-8.0.2
deleted file mode 100644
index 5f3b052c3ea3..000000000000
--- a/metadata/md5-cache/dev-java/netbeans-enterprise-8.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=virtual/jdk:1.7 app-arch/unzip ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-harness-8.0.2 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-java-8.0.2 ~dev-java/netbeans-profiler-8.0.2 ~dev-java/netbeans-platform-8.0.2 ~dev-java/netbeans-webcommon-8.0.2 ~dev-java/netbeans-websvccommon-8.0.2 dev-java/commons-codec:0 dev-java/commons-fileupload:0 dev-java/commons-logging:0 dev-java/glassfish-deployment-api:1.2 dev-java/javahelp:0 dev-java/jsr181:0 >=dev-java/junit-4.4:4 dev-java/tomcat-servlet-api:2.3 >=dev-java/java-config-2.2.0 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Netbeans Enterprise cluster
-EAPI=4
-HOMEPAGE=http://netbeans.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=|| ( CDDL GPL-2-with-linking-exception )
-RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-harness-8.0.2 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-java-8.0.2 ~dev-java/netbeans-profiler-8.0.2 ~dev-java/netbeans-platform-8.0.2 ~dev-java/netbeans-webcommon-8.0.2 ~dev-java/netbeans-websvccommon-8.0.2 dev-java/commons-codec:0 dev-java/commons-fileupload:0 dev-java/commons-logging:0 dev-java/glassfish-deployment-api:1.2 dev-java/antlr:0[java] dev-java/bsf:2.3 dev-java/commons-beanutils:1.7 dev-java/commons-collections:0 dev-java/commons-digester:0 dev-java/commons-io:1 dev-java/commons-validator:0 dev-java/jakarta-oro:2.0 >=dev-java/java-config-2.2.0
-SLOT=8.0
-SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar http://hg.netbeans.org/binaries/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar http://hg.netbeans.org/binaries/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar http://hg.netbeans.org/binaries/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar http://hg.netbeans.org/binaries/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar http://hg.netbeans.org/binaries/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar http://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar http://hg.netbeans.org/binaries/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar http://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar http://hg.netbeans.org/binaries/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar http://hg.netbeans.org/binaries/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar http://hg.netbeans.org/binaries/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar http://hg.netbeans.org/binaries/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar http://hg.netbeans.org/binaries/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar http://hg.netbeans.org/binaries/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip http://hg.netbeans.org/binaries/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip http://hg.netbeans.org/binaries/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip http://hg.netbeans.org/binaries/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar http://hg.netbeans.org/binaries/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip http://hg.netbeans.org/binaries/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip http://hg.netbeans.org/binaries/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar http://hg.netbeans.org/binaries/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar http://hg.netbeans.org/binaries/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip http://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=92467ef616b0ede45cee102b1305383f
diff --git a/metadata/md5-cache/dev-java/netbeans-enterprise-8.0.2-r1 b/metadata/md5-cache/dev-java/netbeans-enterprise-8.0.2-r1
index 886a945d7d32..96e4b6395df7 100644
--- a/metadata/md5-cache/dev-java/netbeans-enterprise-8.0.2-r1
+++ b/metadata/md5-cache/dev-java/netbeans-enterprise-8.0.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Netbeans Enterprise cluster
 EAPI=4
 HOMEPAGE=http://netbeans.org/
 IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-harness-8.0.2 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-java-8.0.2 ~dev-java/netbeans-profiler-8.0.2 ~dev-java/netbeans-platform-8.0.2 ~dev-java/netbeans-webcommon-8.0.2 ~dev-java/netbeans-websvccommon-8.0.2 dev-java/commons-codec:0 dev-java/commons-fileupload:0 dev-java/commons-logging:0 dev-java/glassfish-deployment-api:1.2 dev-java/antlr:0[java(+)] dev-java/bsf:2.3 dev-java/commons-beanutils:1.7 dev-java/commons-collections:0 dev-java/commons-digester:0 dev-java/commons-io:1 dev-java/commons-validator:0 dev-java/jakarta-oro:2.0 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar http://hg.netbeans.org/binaries/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar http://hg.netbeans.org/binaries/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar http://hg.netbeans.org/binaries/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar http://hg.netbeans.org/binaries/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar http://hg.netbeans.org/binaries/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar http://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar http://hg.netbeans.org/binaries/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar http://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar http://hg.netbeans.org/binaries/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar http://hg.netbeans.org/binaries/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar http://hg.netbeans.org/binaries/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar http://hg.netbeans.org/binaries/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar http://hg.netbeans.org/binaries/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar http://hg.netbeans.org/binaries/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip http://hg.netbeans.org/binaries/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip http://hg.netbeans.org/binaries/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip http://hg.netbeans.org/binaries/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar http://hg.netbeans.org/binaries/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip http://hg.netbeans.org/binaries/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip http://hg.netbeans.org/binaries/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar http://hg.netbeans.org/binaries/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar http://hg.netbeans.org/binaries/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip http://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=32e8c249573f1c55fe2419e4ae573837
+_md5_=12d5885bd38cb4d81baea4dab3d469a6
diff --git a/metadata/md5-cache/dev-java/netbeans-java-8.0.2-r2 b/metadata/md5-cache/dev-java/netbeans-java-8.0.2-r2
deleted file mode 100644
index c36cb7dd226d..000000000000
--- a/metadata/md5-cache/dev-java/netbeans-java-8.0.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend setup unpack
-DEPEND=virtual/jdk:1.7 app-arch/unzip ~dev-java/netbeans-platform-8.0.2 ~dev-java/netbeans-extide-8.0.2 ~dev-java/netbeans-harness-8.0.2 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-websvccommon-8.0.2 dev-java/beansbinding:0 dev-java/cglib:3 dev-java/jdom:1.0 dev-java/javahelp:0 dev-java/json-simple:0 dev-java/junit:4 >=dev-java/java-config-2.2.0 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Netbeans Java Cluster
-EAPI=4
-HOMEPAGE=http://netbeans.org/projects/java
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=|| ( CDDL GPL-2-with-linking-exception )
-RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-platform-8.0.2 ~dev-java/netbeans-extide-8.0.2 ~dev-java/netbeans-harness-8.0.2 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-websvccommon-8.0.2 dev-java/beansbinding:0 dev-java/cglib:3 dev-java/jdom:1.0 dev-java/absolutelayout:0 dev-java/antlr:0[java] dev-java/c3p0:0 dev-java/commons-collections:0 dev-java/dom4j:1 dev-java/fastinfoset:0 dev-java/glassfish-transaction-api:0 dev-java/javassist:3 dev-java/jboss-logging:0 dev-java/jsr67:0 dev-java/jsr181:0 dev-java/jtidy:0 dev-java/log4j:0 dev-java/mimepull:0 dev-java/saaj:0 dev-java/stax-ex:0 dev-java/xmlstreambuffer:0 >=dev-java/java-config-2.2.0
-SLOT=8.0
-SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip http://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar http://hg.netbeans.org/binaries/2B9EAB164D8748F9793F6A0D29B6463E97B284DA-indexer-core-5.1.1.jar http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip http://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar http://hg.netbeans.org/binaries/E5579EF3B0C1EF2F43562DD0C3B32F8E1F603B49-nb-javac-api.jar http://hg.netbeans.org/binaries/8BDE88C9512D8783E64788F32A50E4CCBC48485E-nb-javac-impl.jar http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5bc9bdb09ba80dc8a2b3db2a10a2d1ae
diff --git a/metadata/md5-cache/dev-java/netbeans-java-8.0.2-r4 b/metadata/md5-cache/dev-java/netbeans-java-8.0.2-r4
index 08f60a69b924..08d4c21ab3e7 100644
--- a/metadata/md5-cache/dev-java/netbeans-java-8.0.2-r4
+++ b/metadata/md5-cache/dev-java/netbeans-java-8.0.2-r4
@@ -4,10 +4,10 @@ DESCRIPTION=Netbeans Java Cluster
 EAPI=4
 HOMEPAGE=http://netbeans.org/projects/java
 IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-platform-8.0.2 ~dev-java/netbeans-extide-8.0.2 ~dev-java/netbeans-harness-8.0.2 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-websvccommon-8.0.2 dev-java/beansbinding:0 dev-java/cglib:3 dev-java/jdom:0 dev-java/absolutelayout:0 dev-java/antlr:0[java(+)] dev-java/c3p0:0 dev-java/commons-collections:0 dev-java/dom4j:1 dev-java/fastinfoset:0 dev-java/glassfish-transaction-api:0 dev-java/javassist:3 dev-java/jboss-logging:0 dev-java/jsr67:0 dev-java/jsr181:0 dev-java/jtidy:0 dev-java/log4j:0 dev-java/mimepull:0 dev-java/saaj:0 dev-java/stax-ex:0 dev-java/xmlstreambuffer:0 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip http://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar http://hg.netbeans.org/binaries/2B9EAB164D8748F9793F6A0D29B6463E97B284DA-indexer-core-5.1.1.jar http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip http://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar http://hg.netbeans.org/binaries/E5579EF3B0C1EF2F43562DD0C3B32F8E1F603B49-nb-javac-api.jar http://hg.netbeans.org/binaries/8BDE88C9512D8783E64788F32A50E4CCBC48485E-nb-javac-impl.jar http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=23361515099c5e59cf79499d810dc1a5
+_md5_=2a670dd9b81ca5e9af72d88c45d47ec3
diff --git a/metadata/md5-cache/dev-java/stringtemplate-3.2 b/metadata/md5-cache/dev-java/stringtemplate-3.2
deleted file mode 100644
index e8fe8d5e7fa2..000000000000
--- a/metadata/md5-cache/dev-java/stringtemplate-3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 >=dev-java/antlr-2.7.7:0[java] dev-java/junit:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/ant-antlr >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A Java template engine
-EAPI=2
-HOMEPAGE=http://www.stringtemplate.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.4 >=dev-java/antlr-2.7.7:0[java] dev-java/junit:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.stringtemplate.org/download/stringtemplate-3.2.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d81697def9dd637c87b8964e44f94aa3
diff --git a/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r1 b/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r1
index c5af4a76d667..bcbfbce1d86e 100644
--- a/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r1
+++ b/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A Java template engine
 EAPI=5
 HOMEPAGE=http://www.stringtemplate.org/
 IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=dev-java/antlr-2.7.7-r7:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/antlr/stringtemplate3/archive/3.2.1.tar.gz -> stringtemplate-3.2.1.tar.gz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=10904dca62e37b5c656e2ff7cb6bbe13
+_md5_=58e70832b2d0483bec38a50a618b1aca
diff --git a/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r2 b/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r2
deleted file mode 100644
index 0d9a59800ce3..000000000000
--- a/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 dev-java/jdom:1.0 >=dev-java/antlr-2.7.7:0[java] >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/ant-antlr >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=W3C XPath-Rec implementation for DOM4J
-EAPI=5
-HOMEPAGE=http://sourceforge.net/projects/werken-xpath/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc x86 ~x86-fbsd
-LICENSE=JDOM
-RDEPEND=>=virtual/jre-1.4 dev-java/jdom:1.0 >=dev-java/antlr-2.7.7:0[java] >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/werken.xpath-0.9.4-beta-src.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e5ebffa7e388293d926cb743f58a6e4b
diff --git a/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r4 b/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r4
index 46e7b78821bd..d4485f7c0cd4 100644
--- a/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r4
+++ b/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r4
@@ -4,10 +4,10 @@ DESCRIPTION=W3C XPath-Rec implementation for DOM4J
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/werken-xpath/
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ppc x86 ~x86-fbsd
 LICENSE=JDOM
 RDEPEND=>=virtual/jre-1.4 dev-java/jdom:0 >=dev-java/antlr-2.7.7-r7:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/werken.xpath-0.9.4-beta-src.tar.gz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5e3556fb4a5fa934edcc472a5b1b47c2
+_md5_=d84d14b535d4f69e81f09b6bf80abe04
diff --git a/metadata/md5-cache/dev-lang/luajit-2.0.4 b/metadata/md5-cache/dev-lang/luajit-2.0.4
index 2e4f19e9de97..2430b4bdd7d2 100644
--- a/metadata/md5-cache/dev-lang/luajit-2.0.4
+++ b/metadata/md5-cache/dev-lang/luajit-2.0.4
@@ -3,9 +3,9 @@ DESCRIPTION=Just-In-Time Compiler for the Lua programming language
 EAPI=5
 HOMEPAGE=http://luajit.org/
 IUSE=lua52compat
-KEYWORDS=amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 SLOT=2
 SRC_URI=http://luajit.org/download/LuaJIT-2.0.4.tar.gz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6bcf5e9ef32b4d2896f7eb4ed2b72ef0
+_md5_=65c7a428379a4b01609ec748cfebf950
diff --git a/metadata/md5-cache/dev-libs/elfutils-0.165 b/metadata/md5-cache/dev-libs/elfutils-0.165
index ccbe99dc995f..157a606a9d3d 100644
--- a/metadata/md5-cache/dev-libs/elfutils-0.165
+++ b/metadata/md5-cache/dev-libs/elfutils-0.165
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=zlib? ( >=sys-libs/zlib-1.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(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) !dev-libs/libelf abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r11 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !<sys-libs/glibc-2.22 nls? ( sys-devel/gettext ) >=sys-devel/flex-2.5.4a sys-devel/m4
+DEPEND=>=sys-libs/zlib-1.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(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) !dev-libs/libelf abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r11 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !<sys-libs/glibc-2.22 nls? ( sys-devel/gettext ) >=sys-devel/flex-2.5.4a sys-devel/m4
 DESCRIPTION=Libraries/utilities to handle ELF objects (drop in replacement for libelf)
 EAPI=5
 HOMEPAGE=https://fedorahosted.org/elfutils/
-IUSE=bzip2 lzma nls static-libs test +threads +utils zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+IUSE=bzip2 lzma nls static-libs test +threads +utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2-with-exceptions
-RDEPEND=zlib? ( >=sys-libs/zlib-1.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(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) !dev-libs/libelf abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r11 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+RDEPEND=>=sys-libs/zlib-1.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(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) !dev-libs/libelf abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r11 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/e/l/elfutils/0.165/elfutils-0.165.tar.bz2
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=f5730d236859b1da90ec31c709a8adb3
+_md5_=ec747001e3f22688a748c057cc36690f
diff --git a/metadata/md5-cache/dev-libs/libnfc-1.7.0-r1 b/metadata/md5-cache/dev-libs/libnfc-1.7.0-r1
index 6df62d346a6a..a8af099f8eda 100644
--- a/metadata/md5-cache/dev-libs/libnfc-1.7.0-r1
+++ b/metadata/md5-cache/dev-libs/libnfc-1.7.0-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install
-DEPEND=pcsc-lite? ( sys-apps/pcsc-lite ) readline? ( sys-libs/readline ) usb? ( virtual/libusb:0 ) doc? ( app-doc/doxygen )
+DEPEND=pcsc-lite? ( sys-apps/pcsc-lite ) readline? ( sys-libs/readline:0 ) usb? ( virtual/libusb:0 ) doc? ( app-doc/doxygen )
 DESCRIPTION=Near Field Communications (NFC) library
 EAPI=5
 HOMEPAGE=http://www.libnfc.org/
 IUSE=doc pcsc-lite readline static-libs usb
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=LGPL-3
-RDEPEND=pcsc-lite? ( sys-apps/pcsc-lite ) readline? ( sys-libs/readline ) usb? ( virtual/libusb:0 )
+RDEPEND=pcsc-lite? ( sys-apps/pcsc-lite ) readline? ( sys-libs/readline:0 ) usb? ( virtual/libusb:0 )
 SLOT=0
 SRC_URI=https://libnfc.googlecode.com/files/libnfc-1.7.0.tar.bz2
 _eclasses_=multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=8b02f06036aa74f206c9a2b6789be839
+_md5_=c4287e5106b22fc02a4d1e692eb31fc4
diff --git a/metadata/md5-cache/dev-libs/libnfc-1.7.1 b/metadata/md5-cache/dev-libs/libnfc-1.7.1
new file mode 100644
index 000000000000..31fd584ff510
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libnfc-1.7.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install
+DEPEND=pcsc-lite? ( sys-apps/pcsc-lite ) readline? ( sys-libs/readline:0 ) usb? ( virtual/libusb:0 ) doc? ( app-doc/doxygen )
+DESCRIPTION=Near Field Communications (NFC) library
+EAPI=5
+HOMEPAGE=http://www.libnfc.org/
+IUSE=doc pcsc-lite readline static-libs usb
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-3
+RDEPEND=pcsc-lite? ( sys-apps/pcsc-lite ) readline? ( sys-libs/readline:0 ) usb? ( virtual/libusb:0 )
+SLOT=0
+SRC_URI=https://github.com/nfc-tools/libnfc/releases/download/libnfc-1.7.1/libnfc-1.7.1.tar.bz2
+_eclasses_=multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=61e899a8ac34a40142c913f25b566bfd
diff --git a/metadata/md5-cache/dev-perl/Exception-Class-1.370.0-r1 b/metadata/md5-cache/dev-perl/Exception-Class-1.370.0-r1
deleted file mode 100644
index b7052e62e652..000000000000
--- a/metadata/md5-cache/dev-perl/Exception-Class-1.370.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/Class-Data-Inheritable-0.20.0 >=dev-perl/Devel-StackTrace-1.200.0 >=virtual/perl-ExtUtils-MakeMaker-6.310.0 dev-lang/perl:=[-build(-)]
-DESCRIPTION=A module that allows you to declare real exception classes in Perl
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Exception-Class/
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos
-LICENSE=Artistic-2
-RDEPEND=>=dev-perl/Class-Data-Inheritable-0.20.0 >=dev-perl/Devel-StackTrace-1.200.0 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Exception-Class-1.37.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=2326ffd7d564158cfc85e9e5db0d63b5
diff --git a/metadata/md5-cache/dev-perl/Expect-1.210.0-r1 b/metadata/md5-cache/dev-perl/Expect-1.210.0-r1
deleted file mode 100644
index 675499d74b88..000000000000
--- a/metadata/md5-cache/dev-perl/Expect-1.210.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/IO-Tty-1.03 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Expect for Perl
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Expect/
-KEYWORDS=amd64 ~arm ppc ~ppc64 sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/IO-Tty-1.03 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RG/RGIERSIG/Expect-1.21.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=37ba65222618f013b55e93b7668ed4c8
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-Depends-0.308.0 b/metadata/md5-cache/dev-perl/ExtUtils-Depends-0.308.0
deleted file mode 100644
index 98f7060990c2..000000000000
--- a/metadata/md5-cache/dev-perl/ExtUtils-Depends-0.308.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Easily build XS extensions that depend on XS extensions
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/ExtUtils-Depends/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-Depends-0.308.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=bd1e289c5fd6a2c57d223e5ef02f080a
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-F77-1.170.0-r1 b/metadata/md5-cache/dev-perl/ExtUtils-F77-1.170.0-r1
deleted file mode 100644
index 6e527ff68911..000000000000
--- a/metadata/md5-cache/dev-perl/ExtUtils-F77-1.170.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Facilitate use of FORTRAN from Perl/XS code
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/ExtUtils-F77/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc s390 sh sparc x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/K/KG/KGB/ExtUtils-F77-1.17.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=3dc9138bd7c0d80f06e082146ed9831f
diff --git a/metadata/md5-cache/dev-perl/File-MMagic-1.270.0-r1 b/metadata/md5-cache/dev-perl/File-MMagic-1.270.0-r1
deleted file mode 100644
index ad6c958918a5..000000000000
--- a/metadata/md5-cache/dev-perl/File-MMagic-1.270.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=The Perl Image-Info Module
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/File-MMagic/
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=File-MMagic
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/K/KN/KNOK/File-MMagic-1.27.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=4dfe8adccc3f6d6b6c26dd37499a9706
diff --git a/metadata/md5-cache/dev-perl/File-MimeInfo-0.260.0 b/metadata/md5-cache/dev-perl/File-MimeInfo-0.260.0
deleted file mode 100644
index 20233d9c556d..000000000000
--- a/metadata/md5-cache/dev-perl/File-MimeInfo-0.260.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/File-BaseDir-0.03 >=dev-perl/File-DesktopEntry-0.04 x11-misc/shared-mime-info dev-perl/Module-Build test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Determine file type
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/File-MimeInfo/
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/File-BaseDir-0.03 >=dev-perl/File-DesktopEntry-0.04 x11-misc/shared-mime-info dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MI/MICHIELB/File-MimeInfo-0.26.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=94097246370c9b4f6073379b7c6160cd
diff --git a/metadata/md5-cache/dev-perl/File-Remove-1.550.0 b/metadata/md5-cache/dev-perl/File-Remove-1.550.0
new file mode 100644
index 000000000000..d11209f4688c
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/File-Remove-1.550.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-File-Path >=virtual/perl-File-Spec-3.290.0 virtual/perl-File-Temp >=dev-perl/Module-Build-0.280.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl:=
+DESCRIPTION=Remove files and directories
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/File-Remove/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-File-Path >=virtual/perl-File-Spec-3.290.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/File-Remove-1.55.tar.gz
+_eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c
+_md5_=e03bd563985dc8273428d136422fa382
diff --git a/metadata/md5-cache/dev-perl/File-Scan-ClamAV-1.930.0 b/metadata/md5-cache/dev-perl/File-Scan-ClamAV-1.930.0
new file mode 100644
index 000000000000..3e4844d5c487
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/File-Scan-ClamAV-1.930.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+DESCRIPTION=Connect to a local Clam Anti-Virus clamd service and send commands
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/File-Scan-ClamAV/
+KEYWORDS=~amd64 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=app-antivirus/clamav dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/ES/ESAYM/File-Scan-ClamAV-1.93.tar.gz
+_eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c
+_md5_=b8671f09e45db5e5ea96e1abd6dcb025
diff --git a/metadata/md5-cache/dev-perl/File-chdir-0.100.800-r1 b/metadata/md5-cache/dev-perl/File-chdir-0.100.800-r1
deleted file mode 100644
index e99b4b72323e..000000000000
--- a/metadata/md5-cache/dev-perl/File-chdir-0.100.800-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=virtual/perl-File-Spec-3.27 dev-lang/perl:=[-build(-)]
-DESCRIPTION=An alternative to File::Spec and CWD
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/File-chdir/
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=virtual/perl-File-Spec-3.27 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/File-chdir-0.1008.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=ce7a2c4a9ce2cd95124a4a4c3475335c
diff --git a/metadata/md5-cache/dev-perl/File-chmod-0.360.0-r1 b/metadata/md5-cache/dev-perl/File-chmod-0.360.0-r1
deleted file mode 100644
index 653c70477a6e..000000000000
--- a/metadata/md5-cache/dev-perl/File-chmod-0.360.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Implements symbolic and ls chmod modes
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/File-chmod/
-KEYWORDS=alpha amd64 hppa ia64 ppc sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/X/XE/XENO/File-chmod-0.36.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=cb5e140360bea3cd937f1cefd8e15b0c
diff --git a/metadata/md5-cache/dev-php/pecl-apcu_bc-1.0.1 b/metadata/md5-cache/dev-php/pecl-apcu_bc-1.0.1
new file mode 100644
index 000000000000..ec021f8f81f3
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-apcu_bc-1.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-php/pecl-apcu[php_targets_php7-0] !<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_php7-0? ( dev-lang/php:7.0 )
+DESCRIPTION=Provides APC backwards compatibility functions via APCu
+EAPI=5
+HOMEPAGE=http://pecl.php.net/apcu_bc
+IUSE=php_targets_php7-0
+KEYWORDS=~amd64 ~x86
+LICENSE=PHP-3.01
+RDEPEND=dev-php/pecl-apcu[php_targets_php7-0] php_targets_php7-0? ( dev-lang/php:7.0 )
+REQUIRED_USE=|| ( php_targets_php7-0 )
+SLOT=0
+SRC_URI=http://pecl.php.net/get/apcu_bc-1.0.1.tgz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	php-ext-pecl-r2	738a8315cc641f854af2e615c618e70b	php-ext-source-r2	74e9367fec569b8fe0935b103506d117	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=bc8d5453c4ac3ce0e6ac09a60e00efff
diff --git a/metadata/md5-cache/dev-php/pecl-mailparse-3.0.0 b/metadata/md5-cache/dev-php/pecl-mailparse-3.0.0
new file mode 100644
index 000000000000..457343b7cb18
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-mailparse-3.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=php_targets_php7-0? ( dev-lang/php:7.0[unicode] ) dev-util/re2c !<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_php7-0? ( dev-lang/php:7.0 )
+DESCRIPTION=PHP extension for parsing and working with RFC822 and MIME compliant messages
+EAPI=5
+HOMEPAGE=http://pecl.php.net/mailparse
+IUSE=php_targets_php7-0
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=PHP-3.01
+RDEPEND=php_targets_php7-0? ( dev-lang/php:7.0[unicode] ) php_targets_php7-0? ( dev-lang/php:7.0 )
+REQUIRED_USE=|| ( php_targets_php7-0 )
+SLOT=0
+SRC_URI=http://pecl.php.net/get/mailparse-3.0.0.tgz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	php-ext-pecl-r2	738a8315cc641f854af2e615c618e70b	php-ext-source-r2	74e9367fec569b8fe0935b103506d117	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=417f054e6006ee2766266834a5ca1e38
diff --git a/metadata/md5-cache/dev-php/pecl-oauth-2.0.0 b/metadata/md5-cache/dev-php/pecl-oauth-2.0.0
new file mode 100644
index 000000000000..9765522790fe
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-oauth-2.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=php_targets_php7-0? ( dev-lang/php:7.0[hash] ) !<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_php7-0? ( dev-lang/php:7.0 )
+DESCRIPTION=OAuth is an authorization protocol built on top of HTTP
+EAPI=5
+HOMEPAGE=http://pecl.php.net/oauth
+IUSE=examples php_targets_php7-0
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=php_targets_php7-0? ( dev-lang/php:7.0[hash] ) php_targets_php7-0? ( dev-lang/php:7.0 )
+REQUIRED_USE=|| ( php_targets_php7-0 )
+SLOT=0
+SRC_URI=http://pecl.php.net/get/oauth-2.0.0.tgz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	php-ext-pecl-r2	738a8315cc641f854af2e615c618e70b	php-ext-source-r2	74e9367fec569b8fe0935b103506d117	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=d811261ebafa981463208f08a2bf488c
diff --git a/metadata/md5-cache/dev-php/pecl-rrd-2.0.0 b/metadata/md5-cache/dev-php/pecl-rrd-2.0.0
new file mode 100644
index 000000000000..386cdf77b8be
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-rrd-2.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=net-analyzer/rrdtool-1.4.5-r1[graph] !<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_php7-0? ( dev-lang/php:7.0 )
+DESCRIPTION=RRDtool bindings for PHP
+EAPI=5
+HOMEPAGE=http://pecl.php.net/rrd
+IUSE=php_targets_php7-0
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=net-analyzer/rrdtool-1.4.5-r1[graph] php_targets_php7-0? ( dev-lang/php:7.0 )
+REQUIRED_USE=|| ( php_targets_php7-0 )
+SLOT=0
+SRC_URI=http://pecl.php.net/get/rrd-2.0.0.tgz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	php-ext-pecl-r2	738a8315cc641f854af2e615c618e70b	php-ext-source-r2	74e9367fec569b8fe0935b103506d117	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=441aac1c3d10416d77e2426aade48dc5
diff --git a/metadata/md5-cache/dev-python/bsddb3-6.1.1 b/metadata/md5-cache/dev-python/bsddb3-6.1.1
index feb9bb3323df..c7b19725493b 100644
--- a/metadata/md5-cache/dev-python/bsddb3-6.1.1
+++ b/metadata/md5-cache/dev-python/bsddb3-6.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for Berkeley DB
 EAPI=5
 HOMEPAGE=http://www.jcea.es/programacion/pybsddb.htm https://pypi.python.org/pypi/bsddb3
 IUSE=doc python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 ~arm ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=sys-libs/db-4.7:= <sys-libs/db-6.2:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bsddb3/bsddb3-6.1.1.tar.gz
 _eclasses_=db-use	a4966c7f4f7df444ead1212848c13cc9	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=52b11bf8fc15a0053803cbb3c05f5853
+_md5_=c7378d6a5c2fec68223045ea4c58c4d0
diff --git a/metadata/md5-cache/dev-qt/assistant-5.5.1 b/metadata/md5-cache/dev-qt/assistant-5.5.1-r1
similarity index 51%
rename from metadata/md5-cache/dev-qt/assistant-5.5.1
rename to metadata/md5-cache/dev-qt/assistant-5.5.1-r1
index a97b99aeec64..d78137a82191 100644
--- a/metadata/md5-cache/dev-qt/assistant-5.5.1
+++ b/metadata/md5-cache/dev-qt/assistant-5.5.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qthelp-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtprintsupport-5.5.1:5 >=dev-qt/qtsql-5.5.1:5[sqlite] >=dev-qt/qtwidgets-5.5.1:5 webkit? ( >=dev-qt/qtwebkit-5.5.1:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
+DEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1 ~dev-qt/qthelp-5.5.1 ~dev-qt/qtnetwork-5.5.1 ~dev-qt/qtprintsupport-5.5.1 ~dev-qt/qtsql-5.5.1[sqlite] ~dev-qt/qtwidgets-5.5.1 webkit? ( ~dev-qt/qtwebkit-5.5.1 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
 DESCRIPTION=Tool for viewing on-line documentation in Qt help file format
 EAPI=5
 HOMEPAGE=https://www.qt.io/
 IUSE=webkit test debug test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qthelp-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtprintsupport-5.5.1:5 >=dev-qt/qtsql-5.5.1:5[sqlite] >=dev-qt/qtwidgets-5.5.1:5 webkit? ( >=dev-qt/qtwebkit-5.5.1:5 ) dev-qt/qtchooser
+RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1 ~dev-qt/qthelp-5.5.1 ~dev-qt/qtnetwork-5.5.1 ~dev-qt/qtprintsupport-5.5.1 ~dev-qt/qtsql-5.5.1[sqlite] ~dev-qt/qtwidgets-5.5.1 webkit? ( ~dev-qt/qtwebkit-5.5.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
 SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	db835a31b4b380c7fe597cd915a5b5b3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=ab75d712e0bafc030140532df372cc89
+_md5_=21181add3a4b04f7674a1fca22c2b595
diff --git a/metadata/md5-cache/dev-qt/designer-5.5.1 b/metadata/md5-cache/dev-qt/designer-5.5.1
deleted file mode 100644
index bd0afd05afcc..000000000000
--- a/metadata/md5-cache/dev-qt/designer-5.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtprintsupport-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 declarative? ( >=dev-qt/qtdeclarative-5.5.1:5[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.5.1:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
-DESCRIPTION=WYSIWYG tool for designing and building Qt-based GUIs
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=declarative webkit test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtprintsupport-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 declarative? ( >=dev-qt/qtdeclarative-5.5.1:5[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.5.1:5 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	db835a31b4b380c7fe597cd915a5b5b3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=c421282f17d62f51ec35b28b352cbcaf
diff --git a/metadata/md5-cache/dev-qt/linguist-5.5.1 b/metadata/md5-cache/dev-qt/linguist-5.5.1-r1
similarity index 56%
rename from metadata/md5-cache/dev-qt/linguist-5.5.1
rename to metadata/md5-cache/dev-qt/linguist-5.5.1-r1
index 40b915c4647b..a46531d6ec17 100644
--- a/metadata/md5-cache/dev-qt/linguist-5.5.1
+++ b/metadata/md5-cache/dev-qt/linguist-5.5.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/designer-5.5.1:5 >=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtprintsupport-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
+DEPEND=~dev-qt/designer-5.5.1 ~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1 ~dev-qt/qtprintsupport-5.5.1 ~dev-qt/qtwidgets-5.5.1 ~dev-qt/qtxml-5.5.1 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
 DESCRIPTION=Graphical tool for translating Qt applications
 EAPI=5
 HOMEPAGE=https://www.qt.io/
 IUSE=test debug test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/designer-5.5.1:5 >=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtprintsupport-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 dev-qt/qtchooser
+RDEPEND=~dev-qt/designer-5.5.1 ~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1 ~dev-qt/qtprintsupport-5.5.1 ~dev-qt/qtwidgets-5.5.1 ~dev-qt/qtxml-5.5.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
 SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	db835a31b4b380c7fe597cd915a5b5b3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=2f852c595eeac3dad4d707c809e2c7f7
+_md5_=db0d64691815566a6db3ab53e5e5c900
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.5.1 b/metadata/md5-cache/dev-qt/linguist-tools-5.5.1-r1
similarity index 64%
rename from metadata/md5-cache/dev-qt/linguist-tools-5.5.1
rename to metadata/md5-cache/dev-qt/linguist-tools-5.5.1-r1
index 253ee2754392..32caa21dfbe2 100644
--- a/metadata/md5-cache/dev-qt/linguist-tools-5.5.1
+++ b/metadata/md5-cache/dev-qt/linguist-tools-5.5.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 qml? ( >=dev-qt/qtdeclarative-5.5.1:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
+DEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtxml-5.5.1 qml? ( ~dev-qt/qtdeclarative-5.5.1 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
 DESCRIPTION=Tools for working with Qt translation data files
 EAPI=5
 HOMEPAGE=https://www.qt.io/
 IUSE=qml test debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 qml? ( >=dev-qt/qtdeclarative-5.5.1:5 ) dev-qt/qtchooser
+RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtxml-5.5.1 qml? ( ~dev-qt/qtdeclarative-5.5.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
 SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	db835a31b4b380c7fe597cd915a5b5b3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=2e2608468707ccae2c6d0625a6931a8e
+_md5_=c63585be157f22f449b0a4df786634e9
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.5.1 b/metadata/md5-cache/dev-qt/pixeltool-5.5.1-r1
similarity index 61%
rename from metadata/md5-cache/dev-qt/pixeltool-5.5.1
rename to metadata/md5-cache/dev-qt/pixeltool-5.5.1-r1
index 148d41ecc4f6..f22b86c9b538 100644
--- a/metadata/md5-cache/dev-qt/pixeltool-5.5.1
+++ b/metadata/md5-cache/dev-qt/pixeltool-5.5.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
+DEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1 ~dev-qt/qtnetwork-5.5.1 ~dev-qt/qtwidgets-5.5.1 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
 DESCRIPTION=Qt screen magnifier
 EAPI=5
 HOMEPAGE=https://www.qt.io/
 IUSE=test debug test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 dev-qt/qtchooser
+RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1 ~dev-qt/qtnetwork-5.5.1 ~dev-qt/qtwidgets-5.5.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
 SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	db835a31b4b380c7fe597cd915a5b5b3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=83f45c65b4520c3e55408637db948611
+_md5_=bd5496d6fad32f3e2a1cab12c4f60278
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.5.1 b/metadata/md5-cache/dev-qt/qdbus-5.5.1-r1
similarity index 66%
rename from metadata/md5-cache/dev-qt/qdbus-5.5.1
rename to metadata/md5-cache/dev-qt/qdbus-5.5.1-r1
index 23442edceb90..b601dfb29494 100644
--- a/metadata/md5-cache/dev-qt/qdbus-5.5.1
+++ b/metadata/md5-cache/dev-qt/qdbus-5.5.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
+DEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtdbus-5.5.1 ~dev-qt/qtxml-5.5.1 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
 DESCRIPTION=Interface to Qt applications communicating over D-Bus
 EAPI=5
 HOMEPAGE=https://www.qt.io/
 IUSE=test debug test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 dev-qt/qtchooser
+RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtdbus-5.5.1 ~dev-qt/qtxml-5.5.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
 SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	db835a31b4b380c7fe597cd915a5b5b3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=93bac3d655f6f9654f883be5b1de8edf
+_md5_=7bda6e7bfebdbfcff41465f6b68c6ce4
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.5.1 b/metadata/md5-cache/dev-qt/qdbusviewer-5.5.1-r1
similarity index 61%
rename from metadata/md5-cache/dev-qt/qdbusviewer-5.5.1
rename to metadata/md5-cache/dev-qt/qdbusviewer-5.5.1-r1
index 5b765d30bb2a..ce28dd378f15 100644
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.5.1
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.5.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
+DEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtdbus-5.5.1 ~dev-qt/qtgui-5.5.1 ~dev-qt/qtwidgets-5.5.1 ~dev-qt/qtxml-5.5.1 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
 DESCRIPTION=Graphical tool that lets you introspect D-Bus objects and messages
 EAPI=5
 HOMEPAGE=https://www.qt.io/
 IUSE=test debug test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 dev-qt/qtchooser
+RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtdbus-5.5.1 ~dev-qt/qtgui-5.5.1 ~dev-qt/qtwidgets-5.5.1 ~dev-qt/qtxml-5.5.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
 SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	db835a31b4b380c7fe597cd915a5b5b3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=a2af3e633d369364adcdfd6d553e5c2d
+_md5_=9a5cb60cfdb1c2008c462520f23f8780
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.5.1 b/metadata/md5-cache/dev-qt/qtbluetooth-5.5.1-r1
similarity index 56%
rename from metadata/md5-cache/dev-qt/qtbluetooth-5.5.1
rename to metadata/md5-cache/dev-qt/qtbluetooth-5.5.1-r1
index f328f45446a9..c3f0c75aed89 100644
--- a/metadata/md5-cache/dev-qt/qtbluetooth-5.5.1
+++ b/metadata/md5-cache/dev-qt/qtbluetooth-5.5.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.5.1:5 >=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtdbus-5.5.1:5 >=net-wireless/bluez-5 qml? ( >=dev-qt/qtdeclarative-5.5.1:5 ) >=dev-qt/qtnetwork-5.5.1:5 virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
+DEPEND=~dev-qt/qtconcurrent-5.5.1 ~dev-qt/qtcore-5.5.1 ~dev-qt/qtdbus-5.5.1 >=net-wireless/bluez-5 qml? ( ~dev-qt/qtdeclarative-5.5.1 ) ~dev-qt/qtnetwork-5.5.1 virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
 DESCRIPTION=Bluetooth support library for the Qt5 framework
 EAPI=5
 HOMEPAGE=https://www.qt.io/
 IUSE=qml test debug test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtconcurrent-5.5.1:5 >=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtdbus-5.5.1:5 >=net-wireless/bluez-5 qml? ( >=dev-qt/qtdeclarative-5.5.1:5 ) dev-qt/qtchooser
+RDEPEND=~dev-qt/qtconcurrent-5.5.1 ~dev-qt/qtcore-5.5.1 ~dev-qt/qtdbus-5.5.1 >=net-wireless/bluez-5 qml? ( ~dev-qt/qtdeclarative-5.5.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
 SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtconnectivity-opensource-src-5.5.1.tar.xz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	db835a31b4b380c7fe597cd915a5b5b3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=00ab157fd3cf95e96455b10197c6c005
+_md5_=7994942b2c4c7bbf73b81f72ab1cc217
diff --git a/metadata/md5-cache/dev-qt/qtcore-4.8.7 b/metadata/md5-cache/dev-qt/qtcore-4.8.7
deleted file mode 100644
index 0418553069f1..000000000000
--- a/metadata/md5-cache/dev-qt/qtcore-4.8.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=sys-libs/zlib-1.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(-)?] glib? ( dev-libs/glib: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(-)?] ) iconv? ( >=virtual/libiconv-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( >=dev-libs/openssl-1.0.1h-r2: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-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Cross-platform application development framework
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=+glib iconv icu qt3support ssl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-PDEPEND=~dev-qt/qttranslations-4.8.7 qt3support? ( ~dev-qt/qtgui-4.8.7[aqua=,debug=,glib=,qt3support,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RDEPEND=>=sys-libs/zlib-1.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(-)?] glib? ( dev-libs/glib: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(-)?] ) iconv? ( >=virtual/libiconv-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( >=dev-libs/openssl-1.0.1h-r2: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-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	qt4-build-multilib	6c927fe8b8a816ccb98cd89a04c2947a	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=6a3c6cc75e71597cc6ee6bb98a7da340
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.5.1 b/metadata/md5-cache/dev-qt/qtdeclarative-5.5.1-r1
similarity index 51%
rename from metadata/md5-cache/dev-qt/qtdeclarative-5.5.1
rename to metadata/md5-cache/dev-qt/qtdeclarative-5.5.1-r1
index d5ab1d168bb9..42566cf26967 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.5.1
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.5.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtgui-5.5.1:5[gles2=] >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qttest-5.5.1:5 localstorage? ( >=dev-qt/qtsql-5.5.1:5 ) widgets? ( >=dev-qt/qtwidgets-5.5.1:5[gles2=] ) xml? ( >=dev-qt/qtxmlpatterns-5.5.1:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
+DEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1[gles2=] ~dev-qt/qtnetwork-5.5.1 ~dev-qt/qttest-5.5.1 localstorage? ( ~dev-qt/qtsql-5.5.1 ) widgets? ( ~dev-qt/qtwidgets-5.5.1[gles2=] ) xml? ( ~dev-qt/qtxmlpatterns-5.5.1 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
 DESCRIPTION=The QML and Quick modules for the Qt5 framework
 EAPI=5
 HOMEPAGE=https://www.qt.io/
 IUSE=gles2 +jit localstorage +widgets xml test debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtgui-5.5.1:5[gles2=] >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qttest-5.5.1:5 localstorage? ( >=dev-qt/qtsql-5.5.1:5 ) widgets? ( >=dev-qt/qtwidgets-5.5.1:5[gles2=] ) xml? ( >=dev-qt/qtxmlpatterns-5.5.1:5 ) dev-qt/qtchooser
+RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1[gles2=] ~dev-qt/qtnetwork-5.5.1 ~dev-qt/qttest-5.5.1 localstorage? ( ~dev-qt/qtsql-5.5.1 ) widgets? ( ~dev-qt/qtwidgets-5.5.1[gles2=] ) xml? ( ~dev-qt/qtxmlpatterns-5.5.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
 SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtdeclarative-opensource-src-5.5.1.tar.xz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	db835a31b4b380c7fe597cd915a5b5b3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=e737bbe1e4050be51f60dd3c497df639
+_md5_=0209ddc3beb60934f2a37b5025c8c1e4
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.5.1 b/metadata/md5-cache/dev-qt/qtdiag-5.5.1-r1
similarity index 66%
rename from metadata/md5-cache/dev-qt/qtdiag-5.5.1
rename to metadata/md5-cache/dev-qt/qtdiag-5.5.1-r1
index c29e9684b0fb..56a8bbeb02af 100644
--- a/metadata/md5-cache/dev-qt/qtdiag-5.5.1
+++ b/metadata/md5-cache/dev-qt/qtdiag-5.5.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5[ssl=] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
+DEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1 ~dev-qt/qtnetwork-5.5.1[ssl=] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
 DESCRIPTION=Tool for reporting diagnostic information about Qt and its environment
 EAPI=5
 HOMEPAGE=https://www.qt.io/
 IUSE=+ssl test debug test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5[ssl=] dev-qt/qtchooser
+RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1 ~dev-qt/qtnetwork-5.5.1[ssl=] dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
 SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	db835a31b4b380c7fe597cd915a5b5b3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=a39ef200d71c177b3ed1dd08673d91a9
+_md5_=48bb432f1877a0ecf036dd060a38b6c1
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.5.1 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.5.1-r1
similarity index 67%
rename from metadata/md5-cache/dev-qt/qtgraphicaleffects-5.5.1
rename to metadata/md5-cache/dev-qt/qtgraphicaleffects-5.5.1-r1
index 3a15d07d0a07..606abc23d143 100644
--- a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.5.1
+++ b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.5.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtdeclarative-5.5.1:5 test? ( >=dev-qt/qtgui-5.5.1:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
+DEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtdeclarative-5.5.1 test? ( ~dev-qt/qtgui-5.5.1 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
 DESCRIPTION=Set of QML types for adding visual effects to user interfaces
 EAPI=5
 HOMEPAGE=https://www.qt.io/
 IUSE=test debug test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtdeclarative-5.5.1:5 dev-qt/qtchooser
+RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtdeclarative-5.5.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
 SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtgraphicaleffects-opensource-src-5.5.1.tar.xz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	db835a31b4b380c7fe597cd915a5b5b3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=46d154b299bc68c4a380c7d278ad93c9
+_md5_=82dc1d257e1ac4ad32e3a7a05747d468
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.5.1 b/metadata/md5-cache/dev-qt/qthelp-5.5.1-r1
similarity index 58%
rename from metadata/md5-cache/dev-qt/qthelp-5.5.1
rename to metadata/md5-cache/dev-qt/qthelp-5.5.1-r1
index 3350bbf47ea8..1a21147c9c46 100644
--- a/metadata/md5-cache/dev-qt/qthelp-5.5.1
+++ b/metadata/md5-cache/dev-qt/qthelp-5.5.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtsql-5.5.1:5[sqlite] >=dev-qt/qtwidgets-5.5.1:5 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
+DEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1 ~dev-qt/qtnetwork-5.5.1 ~dev-qt/qtsql-5.5.1[sqlite] ~dev-qt/qtwidgets-5.5.1 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
 DESCRIPTION=The Help module for the Qt5 framework
 EAPI=5
 HOMEPAGE=https://www.qt.io/
 IUSE=test debug test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtsql-5.5.1:5[sqlite] >=dev-qt/qtwidgets-5.5.1:5 dev-qt/qtchooser
+RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1 ~dev-qt/qtnetwork-5.5.1 ~dev-qt/qtsql-5.5.1[sqlite] ~dev-qt/qtwidgets-5.5.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
 SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	db835a31b4b380c7fe597cd915a5b5b3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=4e4b34cc4674fc479f0dedd71e509636
+_md5_=21b52837f42e22ed2e5cdd884da10b32
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.5.1 b/metadata/md5-cache/dev-qt/qtimageformats-5.5.1-r1
similarity index 60%
rename from metadata/md5-cache/dev-qt/qtimageformats-5.5.1
rename to metadata/md5-cache/dev-qt/qtimageformats-5.5.1-r1
index bd2fb13981d4..6084ceffce7a 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.5.1
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.5.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 media-libs/jasper media-libs/libmng:= media-libs/libwebp:= media-libs/tiff:0 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
+DEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1 media-libs/jasper media-libs/libmng:= media-libs/libwebp:= media-libs/tiff:0 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
 DESCRIPTION=Additional format plugins for the Qt image I/O system
 EAPI=5
 HOMEPAGE=https://www.qt.io/
 IUSE=test debug test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 media-libs/jasper media-libs/libmng:= media-libs/libwebp:= media-libs/tiff:0 dev-qt/qtchooser
+RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1 media-libs/jasper media-libs/libmng:= media-libs/libwebp:= media-libs/tiff:0 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
 SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtimageformats-opensource-src-5.5.1.tar.xz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	db835a31b4b380c7fe597cd915a5b5b3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=5c59955ef2d448b682a77369ff362f96
+_md5_=db8e342cedb95075f4d484d411d3a0d8
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.5.1 b/metadata/md5-cache/dev-qt/qtpaths-5.5.1-r1
similarity index 72%
rename from metadata/md5-cache/dev-qt/qtpaths-5.5.1
rename to metadata/md5-cache/dev-qt/qtpaths-5.5.1-r1
index 7395fc275ddc..a79e5c10c4d7 100644
--- a/metadata/md5-cache/dev-qt/qtpaths-5.5.1
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.5.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.5.1:5 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
+DEPEND=~dev-qt/qtcore-5.5.1 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
 DESCRIPTION=Tool to query Qt path information
 EAPI=5
 HOMEPAGE=https://www.qt.io/
 IUSE=test debug test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.5.1:5 dev-qt/qtchooser
+RDEPEND=~dev-qt/qtcore-5.5.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
 SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	db835a31b4b380c7fe597cd915a5b5b3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=0e1ec00c9f3927f868eb6ecfc3078366
+_md5_=35706a824c1c13112bc9db0bed86661e
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.5.1 b/metadata/md5-cache/dev-qt/qtpositioning-5.5.1-r1
similarity index 59%
rename from metadata/md5-cache/dev-qt/qtpositioning-5.5.1
rename to metadata/md5-cache/dev-qt/qtpositioning-5.5.1-r1
index 43f8ce0470c6..290f41190bac 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.5.1
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.5.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=dev-qt/qtcore-5.5.1:5 geoclue? ( app-misc/geoclue:0 dev-libs/glib:2 ) qml? ( >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
+DEPEND=~dev-qt/qtcore-5.5.1 geoclue? ( app-misc/geoclue:0 dev-libs/glib:2 ) qml? ( ~dev-qt/qtdeclarative-5.5.1 ~dev-qt/qtnetwork-5.5.1 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
 DESCRIPTION=Physical position determination library for the Qt5 framework
 EAPI=5
 HOMEPAGE=https://www.qt.io/
 IUSE=geoclue qml test debug test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.5.1:5 geoclue? ( app-misc/geoclue:0 dev-libs/glib:2 ) qml? ( >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 ) dev-qt/qtchooser
+RDEPEND=~dev-qt/qtcore-5.5.1 geoclue? ( app-misc/geoclue:0 dev-libs/glib:2 ) qml? ( ~dev-qt/qtdeclarative-5.5.1 ~dev-qt/qtnetwork-5.5.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
 SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtlocation-opensource-src-5.5.1.tar.xz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	db835a31b4b380c7fe597cd915a5b5b3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=4d76a3a1b1cc4345ee84635eef70bc34
+_md5_=b13d35865bb0eb3feffa548b3bf8d7f1
diff --git a/metadata/md5-cache/dev-qt/qtquick1-5.5.1 b/metadata/md5-cache/dev-qt/qtquick1-5.5.1
deleted file mode 100644
index ad7548fe6f2f..000000000000
--- a/metadata/md5-cache/dev-qt/qtquick1-5.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtscript-5.5.1:5 >=dev-qt/qtsql-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 designer? ( ~dev-qt/designer-5.5.1 >=dev-qt/qtdeclarative-5.5.1:5 ) opengl? ( >=dev-qt/qtgui-5.5.1:5[gles2=] >=dev-qt/qtopengl-5.5.1:5 ) webkit? ( >=dev-qt/qtwebkit-5.5.1:5 ) xml? ( >=dev-qt/qtxmlpatterns-5.5.1:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
-DESCRIPTION=Legacy declarative UI module for the Qt5 framework (deprecated)
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=designer gles2 opengl webkit xml test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtscript-5.5.1:5 >=dev-qt/qtsql-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 designer? ( ~dev-qt/designer-5.5.1 >=dev-qt/qtdeclarative-5.5.1:5 ) opengl? ( >=dev-qt/qtgui-5.5.1:5[gles2=] >=dev-qt/qtopengl-5.5.1:5 ) webkit? ( >=dev-qt/qtwebkit-5.5.1:5 ) xml? ( >=dev-qt/qtxmlpatterns-5.5.1:5 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtquick1-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	db835a31b4b380c7fe597cd915a5b5b3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=f79a945e2deb3ca2478c1b37dbabd18c
diff --git a/metadata/md5-cache/dev-qt/qtquick1-5.5.1-r1 b/metadata/md5-cache/dev-qt/qtquick1-5.5.1-r1
new file mode 100644
index 000000000000..f2c883eae413
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtquick1-5.5.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1 ~dev-qt/qtnetwork-5.5.1 ~dev-qt/qtscript-5.5.1 ~dev-qt/qtsql-5.5.1 ~dev-qt/qtwidgets-5.5.1 designer? ( ~dev-qt/designer-5.5.1 ~dev-qt/qtdeclarative-5.5.1 ) opengl? ( ~dev-qt/qtgui-5.5.1[gles2=] ~dev-qt/qtopengl-5.5.1 ) webkit? ( ~dev-qt/qtwebkit-5.5.1 ) xml? ( ~dev-qt/qtxmlpatterns-5.5.1 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
+DESCRIPTION=Legacy declarative UI module for the Qt5 framework (deprecated)
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=designer gles2 opengl webkit xml test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1 ~dev-qt/qtnetwork-5.5.1 ~dev-qt/qtscript-5.5.1 ~dev-qt/qtsql-5.5.1 ~dev-qt/qtwidgets-5.5.1 designer? ( ~dev-qt/designer-5.5.1 ~dev-qt/qtdeclarative-5.5.1 ) opengl? ( ~dev-qt/qtgui-5.5.1[gles2=] ~dev-qt/qtopengl-5.5.1 ) webkit? ( ~dev-qt/qtwebkit-5.5.1 ) xml? ( ~dev-qt/qtxmlpatterns-5.5.1 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5
+SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtquick1-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	db835a31b4b380c7fe597cd915a5b5b3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_md5_=d2c42074b38ef40c131c2fdaf8c70a1c
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.5.1 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.5.1-r1
similarity index 62%
rename from metadata/md5-cache/dev-qt/qtquickcontrols-5.5.1
rename to metadata/md5-cache/dev-qt/qtquickcontrols-5.5.1-r1
index 4736c6a31fb5..71bcf3904d0e 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols-5.5.1
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols-5.5.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 widgets? ( >=dev-qt/qtwidgets-5.5.1:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
+DEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtdeclarative-5.5.1 ~dev-qt/qtgui-5.5.1 widgets? ( ~dev-qt/qtwidgets-5.5.1 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
 DESCRIPTION=Set of controls used in conjunction with Qt Quick to build complete interfaces
 EAPI=5
 HOMEPAGE=https://www.qt.io/
 IUSE=+widgets test debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 widgets? ( >=dev-qt/qtwidgets-5.5.1:5 ) dev-qt/qtchooser
+RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtdeclarative-5.5.1 ~dev-qt/qtgui-5.5.1 widgets? ( ~dev-qt/qtwidgets-5.5.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
 SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtquickcontrols-opensource-src-5.5.1.tar.xz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	db835a31b4b380c7fe597cd915a5b5b3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=5fc02b7f10d8a61666bc96bc2907c233
+_md5_=5df447f4b8141400d605d965b8091c66
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.5.1 b/metadata/md5-cache/dev-qt/qtscript-5.5.1-r1
similarity index 65%
rename from metadata/md5-cache/dev-qt/qtscript-5.5.1
rename to metadata/md5-cache/dev-qt/qtscript-5.5.1-r1
index 2143ad026d0b..a0ed4522c4c3 100644
--- a/metadata/md5-cache/dev-qt/qtscript-5.5.1
+++ b/metadata/md5-cache/dev-qt/qtscript-5.5.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.5.1:5 scripttools? ( >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
+DEPEND=~dev-qt/qtcore-5.5.1 scripttools? ( ~dev-qt/qtgui-5.5.1 ~dev-qt/qtwidgets-5.5.1 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
 DESCRIPTION=Application scripting library for the Qt5 framework (deprecated)
 EAPI=5
 HOMEPAGE=https://www.qt.io/
 IUSE=+jit scripttools test debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.5.1:5 scripttools? ( >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 ) dev-qt/qtchooser
+RDEPEND=~dev-qt/qtcore-5.5.1 scripttools? ( ~dev-qt/qtgui-5.5.1 ~dev-qt/qtwidgets-5.5.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
 SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtscript-opensource-src-5.5.1.tar.xz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	db835a31b4b380c7fe597cd915a5b5b3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=8ca9f971c135daba1656fdc0017be517
+_md5_=350eef6aa743cca3a3bba9954eb8b765
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.5.1 b/metadata/md5-cache/dev-qt/qtsensors-5.5.1-r1
similarity index 67%
rename from metadata/md5-cache/dev-qt/qtsensors-5.5.1
rename to metadata/md5-cache/dev-qt/qtsensors-5.5.1-r1
index 29d07ee9ddc8..f6adb7c99f06 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-5.5.1
+++ b/metadata/md5-cache/dev-qt/qtsensors-5.5.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.5.1:5 qml? ( >=dev-qt/qtdeclarative-5.5.1:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
+DEPEND=~dev-qt/qtcore-5.5.1 qml? ( ~dev-qt/qtdeclarative-5.5.1 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
 DESCRIPTION=Hardware sensor access library for the Qt5 framework
 EAPI=5
 HOMEPAGE=https://www.qt.io/
 IUSE=qml test debug test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.5.1:5 qml? ( >=dev-qt/qtdeclarative-5.5.1:5 ) dev-qt/qtchooser
+RDEPEND=~dev-qt/qtcore-5.5.1 qml? ( ~dev-qt/qtdeclarative-5.5.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
 SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtsensors-opensource-src-5.5.1.tar.xz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	db835a31b4b380c7fe597cd915a5b5b3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=5670c28c7af1b08c54f18cf11a3a4179
+_md5_=d0ead15ccad3b30f6b470f635602b8b7
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.5.1 b/metadata/md5-cache/dev-qt/qtserialport-5.5.1-r1
similarity index 71%
rename from metadata/md5-cache/dev-qt/qtserialport-5.5.1
rename to metadata/md5-cache/dev-qt/qtserialport-5.5.1-r1
index 8874c29ea994..02e96455a909 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-5.5.1
+++ b/metadata/md5-cache/dev-qt/qtserialport-5.5.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.5.1:5 virtual/udev test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
+DEPEND=~dev-qt/qtcore-5.5.1 virtual/udev test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
 DESCRIPTION=Serial port abstraction library for the Qt5 framework
 EAPI=5
 HOMEPAGE=https://www.qt.io/
 IUSE=test debug test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.5.1:5 virtual/udev dev-qt/qtchooser
+RDEPEND=~dev-qt/qtcore-5.5.1 virtual/udev dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
 SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtserialport-opensource-src-5.5.1.tar.xz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	db835a31b4b380c7fe597cd915a5b5b3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=d4742074a8981bbd68571385e92a5012
+_md5_=4c5544c6ab2c0e2727da4421d8295163
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.5.1 b/metadata/md5-cache/dev-qt/qtsvg-5.5.1-r1
similarity index 61%
rename from metadata/md5-cache/dev-qt/qtsvg-5.5.1
rename to metadata/md5-cache/dev-qt/qtsvg-5.5.1-r1
index 9590386871b7..54ac5c28057f 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-5.5.1
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.5.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=sys-libs/zlib-1.2.5 test? ( >=dev-qt/qtxml-5.5.1:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
+DEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1 ~dev-qt/qtwidgets-5.5.1 >=sys-libs/zlib-1.2.5 test? ( ~dev-qt/qtxml-5.5.1 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
 DESCRIPTION=SVG rendering library for the Qt5 framework
 EAPI=5
 HOMEPAGE=https://www.qt.io/
 IUSE=test debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=sys-libs/zlib-1.2.5 dev-qt/qtchooser
+RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1 ~dev-qt/qtwidgets-5.5.1 >=sys-libs/zlib-1.2.5 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
 SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtsvg-opensource-src-5.5.1.tar.xz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	db835a31b4b380c7fe597cd915a5b5b3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=faee11eb58ad61ff25f970813dc9eaf8
+_md5_=fcaa5b0abe6d2fe0b448f3cd1f1d6cbc
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.5.1 b/metadata/md5-cache/dev-qt/qttranslations-5.5.1-r1
similarity index 75%
rename from metadata/md5-cache/dev-qt/qttranslations-5.5.1
rename to metadata/md5-cache/dev-qt/qttranslations-5.5.1-r1
index 25f07617424d..b4678f017d09 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-5.5.1
+++ b/metadata/md5-cache/dev-qt/qttranslations-5.5.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/linguist-tools-5.5.1:5 >=dev-qt/qtcore-5.5.1:5 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
+DEPEND=~dev-qt/linguist-tools-5.5.1 ~dev-qt/qtcore-5.5.1 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
 DESCRIPTION=Translation files for the Qt5 framework
 EAPI=5
 HOMEPAGE=https://www.qt.io/
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=5
 SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttranslations-opensource-src-5.5.1.tar.xz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	db835a31b4b380c7fe597cd915a5b5b3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=be5879074f41613f3755905ef9003608
+_md5_=481c3cf4086ab06c6673085b913cc271
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.5.1 b/metadata/md5-cache/dev-qt/qtwayland-5.5.1
deleted file mode 100644
index 82c4ffc530da..000000000000
--- a/metadata/md5-cache/dev-qt/qtwayland-5.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-libs/wayland-1.4.0 >=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtgui-5.5.1:5[egl=] media-libs/mesa[egl?] >=x11-libs/libxkbcommon-0.2.0 wayland-compositor? ( qml? ( >=dev-qt/qtdeclarative-5.5.1:5 ) ) xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
-DESCRIPTION=Wayland platform plugin for Qt
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=egl qml wayland-compositor xcomposite test debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-libs/wayland-1.4.0 >=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtgui-5.5.1:5[egl=] media-libs/mesa[egl?] >=x11-libs/libxkbcommon-0.2.0 wayland-compositor? ( qml? ( >=dev-qt/qtdeclarative-5.5.1:5 ) ) xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtwayland-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	db835a31b4b380c7fe597cd915a5b5b3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=a6f85176afe36d2865d16dd9aeee227d
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.5.1-r1 b/metadata/md5-cache/dev-qt/qtwayland-5.5.1-r1
new file mode 100644
index 000000000000..1f2800acea08
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.5.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=dev-libs/wayland-1.4.0 ~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1[egl=] media-libs/mesa[egl?] >=x11-libs/libxkbcommon-0.2.0 wayland-compositor? ( qml? ( ~dev-qt/qtdeclarative-5.5.1 ) ) xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
+DESCRIPTION=Wayland platform plugin for Qt
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=egl qml wayland-compositor xcomposite test debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=>=dev-libs/wayland-1.4.0 ~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1[egl=] media-libs/mesa[egl?] >=x11-libs/libxkbcommon-0.2.0 wayland-compositor? ( qml? ( ~dev-qt/qtdeclarative-5.5.1 ) ) xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5
+SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtwayland-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	db835a31b4b380c7fe597cd915a5b5b3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_md5_=ac8ed7dcd68b043b115699ad391bf7a8
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.5.1 b/metadata/md5-cache/dev-qt/qtwebchannel-5.5.1-r1
similarity index 68%
rename from metadata/md5-cache/dev-qt/qtwebchannel-5.5.1
rename to metadata/md5-cache/dev-qt/qtwebchannel-5.5.1-r1
index 453dd3de9f21..c180125fb236 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-5.5.1
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-5.5.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.5.1:5 qml? ( >=dev-qt/qtdeclarative-5.5.1:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
+DEPEND=~dev-qt/qtcore-5.5.1 qml? ( ~dev-qt/qtdeclarative-5.5.1 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
 DESCRIPTION=Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients
 EAPI=5
 HOMEPAGE=https://www.qt.io/
 IUSE=qml test debug test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.5.1:5 qml? ( >=dev-qt/qtdeclarative-5.5.1:5 ) dev-qt/qtchooser
+RDEPEND=~dev-qt/qtcore-5.5.1 qml? ( ~dev-qt/qtdeclarative-5.5.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
 SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtwebchannel-opensource-src-5.5.1.tar.xz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	db835a31b4b380c7fe597cd915a5b5b3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=3deb3109307584619f56c57d08a62b82
+_md5_=0b7eac61c198767c8a498f6ce644663f
diff --git a/metadata/md5-cache/dev-qt/qtwebkit-5.5.1-r1 b/metadata/md5-cache/dev-qt/qtwebkit-5.5.1-r1
new file mode 100644
index 000000000000..33969734366c
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwebkit-5.5.1-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=dev-db/sqlite:3 dev-libs/icu:= >=dev-libs/leveldb-1.18-r1 dev-libs/libxml2:2 dev-libs/libxslt ~dev-qt/qtcore-5.5.1[icu] ~dev-qt/qtgui-5.5.1 ~dev-qt/qtnetwork-5.5.1 ~dev-qt/qtsql-5.5.1 ~dev-qt/qtwidgets-5.5.1 media-libs/fontconfig:1.0 media-libs/libpng:0= >=sys-libs/zlib-1.2.5 virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXrender geolocation? ( ~dev-qt/qtpositioning-5.5.1 ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gstreamer010? ( dev-libs/glib:2 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) multimedia? ( ~dev-qt/qtmultimedia-5.5.1[widgets] ) opengl? ( ~dev-qt/qtopengl-5.5.1 ) orientation? ( ~dev-qt/qtsensors-5.5.1 ) printsupport? ( ~dev-qt/qtprintsupport-5.5.1 ) qml? ( ~dev-qt/qtdeclarative-5.5.1 ) webchannel? ( ~dev-qt/qtwebchannel-5.5.1 ) webp? ( media-libs/libwebp:0= ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/ruby dev-util/gperf sys-devel/bison sys-devel/flex virtual/rubygems test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
+DESCRIPTION=WebKit rendering library for the Qt5 framework (deprecated)
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=geolocation gstreamer gstreamer010 +jit multimedia opengl orientation printsupport qml webchannel webp test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=dev-db/sqlite:3 dev-libs/icu:= >=dev-libs/leveldb-1.18-r1 dev-libs/libxml2:2 dev-libs/libxslt ~dev-qt/qtcore-5.5.1[icu] ~dev-qt/qtgui-5.5.1 ~dev-qt/qtnetwork-5.5.1 ~dev-qt/qtsql-5.5.1 ~dev-qt/qtwidgets-5.5.1 media-libs/fontconfig:1.0 media-libs/libpng:0= >=sys-libs/zlib-1.2.5 virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXrender geolocation? ( ~dev-qt/qtpositioning-5.5.1 ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gstreamer010? ( dev-libs/glib:2 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) multimedia? ( ~dev-qt/qtmultimedia-5.5.1[widgets] ) opengl? ( ~dev-qt/qtopengl-5.5.1 ) orientation? ( ~dev-qt/qtsensors-5.5.1 ) printsupport? ( ~dev-qt/qtprintsupport-5.5.1 ) qml? ( ~dev-qt/qtdeclarative-5.5.1 ) webchannel? ( ~dev-qt/qtwebchannel-5.5.1 ) webp? ( media-libs/libwebp:0= ) dev-qt/qtchooser
+REQUIRED_USE=?? ( gstreamer gstreamer010 multimedia )
+RESTRICT=mirror test
+SLOT=5
+SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtwebkit-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	qt5-build	db835a31b4b380c7fe597cd915a5b5b3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_md5_=866722132f533d7fcf7139c0d3c3ff0a
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.5.1 b/metadata/md5-cache/dev-qt/qtwebsockets-5.5.1-r1
similarity index 64%
rename from metadata/md5-cache/dev-qt/qtwebsockets-5.5.1
rename to metadata/md5-cache/dev-qt/qtwebsockets-5.5.1-r1
index abc971a37c4b..ad28d263c8d1 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.5.1
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.5.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 qml? ( >=dev-qt/qtdeclarative-5.5.1:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
+DEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtnetwork-5.5.1 qml? ( ~dev-qt/qtdeclarative-5.5.1 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
 DESCRIPTION=Implementation of the WebSocket protocol for the Qt5 framework
 EAPI=5
 HOMEPAGE=https://www.qt.io/
 IUSE=qml test debug test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 qml? ( >=dev-qt/qtdeclarative-5.5.1:5 ) dev-qt/qtchooser
+RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtnetwork-5.5.1 qml? ( ~dev-qt/qtdeclarative-5.5.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
 SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtwebsockets-opensource-src-5.5.1.tar.xz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	db835a31b4b380c7fe597cd915a5b5b3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=276f0192e1212f137d3efd102b62de2a
+_md5_=8a4edc8787b6d5e8b85afa75fc674009
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.5.1 b/metadata/md5-cache/dev-qt/qtwidgets-5.5.1
deleted file mode 100644
index aee07498d713..000000000000
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1[gles2=,gtkstyle=,png=,xcb?] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
-DESCRIPTION=Set of components for creating classic desktop-style UIs for the Qt5 framework
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2 gtkstyle +png +xcb test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1[gles2=,gtkstyle=,png=,xcb?] dev-qt/qtchooser
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	db835a31b4b380c7fe597cd915a5b5b3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=8fff61605f711d1bd4111afb0e32ce57
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.5.1 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.5.1-r1
similarity index 69%
rename from metadata/md5-cache/dev-qt/qtxmlpatterns-5.5.1
rename to metadata/md5-cache/dev-qt/qtxmlpatterns-5.5.1-r1
index 2fce5d8874d5..563ae8ccf794 100644
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.5.1
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.5.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
+DEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtnetwork-5.5.1 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
 DESCRIPTION=XPath, XQuery, and XSLT support library for the Qt5 framework
 EAPI=5
 HOMEPAGE=https://www.qt.io/
 IUSE=test debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 dev-qt/qtchooser
+RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtnetwork-5.5.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
 SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtxmlpatterns-opensource-src-5.5.1.tar.xz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	db835a31b4b380c7fe597cd915a5b5b3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=7b99805d58e273accbdbdc9418414a60
+_md5_=042bf179fd4e8299809732ae20c8fab7
diff --git a/metadata/md5-cache/dev-ruby/eventmachine-1.0.3-r2 b/metadata/md5-cache/dev-ruby/eventmachine-1.0.3-r2
deleted file mode 100644
index 6cf4a5da423e..000000000000
--- a/metadata/md5-cache/dev-ruby/eventmachine-1.0.3-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/openssl:0 ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
-DESCRIPTION=EventMachine is a fast, simple event-processing library for Ruby programs
-EAPI=5
-HOMEPAGE=http://rubyeventmachine.com
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=|| ( GPL-2 Ruby )
-RDEPEND=dev-libs/openssl:0 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
-SLOT=0
-SRC_URI=mirror://rubygems/eventmachine-1.0.3.gem
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6c71ee456386f7c677e19abb5a4f0fc5
diff --git a/metadata/md5-cache/dev-ruby/eventmachine-1.0.7 b/metadata/md5-cache/dev-ruby/eventmachine-1.0.7
deleted file mode 100644
index e63685fe99e5..000000000000
--- a/metadata/md5-cache/dev-ruby/eventmachine-1.0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/openssl:0 ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) test? ( dev-ruby/test-unit:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=EventMachine is a fast, simple event-processing library for Ruby programs
-EAPI=5
-HOMEPAGE=http://rubyeventmachine.com
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=|| ( GPL-2 Ruby )
-RDEPEND=dev-libs/openssl:0 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/eventmachine-1.0.7.gem
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3c7193a0d41d75dcb7e2c720ab62698e
diff --git a/metadata/md5-cache/dev-ruby/eventmachine-1.0.9.1 b/metadata/md5-cache/dev-ruby/eventmachine-1.0.9.1
new file mode 100644
index 000000000000..dddc1eec3cc5
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/eventmachine-1.0.9.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-libs/openssl:0 ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) test? ( dev-ruby/test-unit:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DESCRIPTION=EventMachine is a fast, simple event-processing library for Ruby programs
+EAPI=5
+HOMEPAGE=http://rubyeventmachine.com
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=|| ( GPL-2 Ruby )
+RDEPEND=dev-libs/openssl:0 ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+SLOT=0
+SRC_URI=mirror://rubygems/eventmachine-1.0.9.1.gem
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=f7bc05502129cca7dbd9ac5a273c1523
diff --git a/metadata/md5-cache/dev-ruby/parser-2.3.0.1 b/metadata/md5-cache/dev-ruby/parser-2.3.0.1
new file mode 100644
index 000000000000..33501f38ee27
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/parser-2.3.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby20? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby20] dev-ruby/racc[ruby_targets_ruby20] dev-ruby/cliver[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] dev-ruby/racc[ruby_targets_ruby21] dev-ruby/cliver[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/racc[ruby_targets_ruby22] dev-ruby/cliver[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby20? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DESCRIPTION=A production-ready Ruby parser written in pure Ruby
+EAPI=5
+HOMEPAGE=https://github.com/whitequark/parser
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+SLOT=0
+SRC_URI=mirror://rubygems/parser-2.3.0.1.gem
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=bcdd84ec23c6846d49953c618cb8b0f4
diff --git a/metadata/md5-cache/dev-ruby/rubyzip-1.1.7-r1 b/metadata/md5-cache/dev-ruby/rubyzip-1.1.7-r1
index dc783ed0f16f..1ee7d6e9dd27 100644
--- a/metadata/md5-cache/dev-ruby/rubyzip-1.1.7-r1
+++ b/metadata/md5-cache/dev-ruby/rubyzip-1.1.7-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( app-arch/zip ) ruby_targets_ruby19? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( app-arch/zip ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=A ruby library for reading and writing zip files
 EAPI=5
 HOMEPAGE=https://github.com/rubyzip/rubyzip
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1
 SRC_URI=https://github.com/rubyzip/rubyzip/archive/v1.1.7.tar.gz -> rubyzip-1.1.7-git.tgz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=771c0701266e13d671f8c3e99fbadf3f
+_md5_=eacbcd9a04fe832f538bd45535c00d5d
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-2.45.0 b/metadata/md5-cache/dev-ruby/selenium-webdriver-2.45.0
deleted file mode 100644
index 6abf96dace9c..000000000000
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-2.45.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby19] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby19] dev-ruby/rubyzip:1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby20] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby20] dev-ruby/rubyzip:1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby21] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby21] dev-ruby/rubyzip:1[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
-DESCRIPTION=This gem provides Ruby bindings for WebDriver
-EAPI=5
-HOMEPAGE=http://gemcutter.org/gems/selenium-webdriver
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby19] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby19] dev-ruby/rubyzip:1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby20] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby20] dev-ruby/rubyzip:1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby21] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby21] dev-ruby/rubyzip:1[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
-SLOT=0
-SRC_URI=mirror://rubygems/selenium-webdriver-2.45.0.gem
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=996488e2b690a7acb4c426a283105afe
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-2.47.0 b/metadata/md5-cache/dev-ruby/selenium-webdriver-2.47.0
deleted file mode 100644
index a501d392beb5..000000000000
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-2.47.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby19] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby19] dev-ruby/rubyzip:1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby20] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby20] dev-ruby/rubyzip:1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby21] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby21] dev-ruby/rubyzip:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby22] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=This gem provides Ruby bindings for WebDriver
-EAPI=5
-HOMEPAGE=http://gemcutter.org/gems/selenium-webdriver
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby19] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby19] dev-ruby/rubyzip:1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby20] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby20] dev-ruby/rubyzip:1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby21] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby21] dev-ruby/rubyzip:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby22] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/selenium-webdriver-2.47.0.gem
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=057d18205dabfae073fc5ddbc0f6e65b
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-2.48.0 b/metadata/md5-cache/dev-ruby/selenium-webdriver-2.48.0
deleted file mode 100644
index 20425b8755c2..000000000000
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-2.48.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby19] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby19] dev-ruby/rubyzip:1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby20] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby20] dev-ruby/rubyzip:1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby21] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby21] dev-ruby/rubyzip:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby22] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=This gem provides Ruby bindings for WebDriver
-EAPI=5
-HOMEPAGE=http://gemcutter.org/gems/selenium-webdriver
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby19] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby19] dev-ruby/rubyzip:1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby20] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby20] dev-ruby/rubyzip:1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby21] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby21] dev-ruby/rubyzip:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby22] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/selenium-webdriver-2.48.0.gem
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=057d18205dabfae073fc5ddbc0f6e65b
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-2.49.0 b/metadata/md5-cache/dev-ruby/selenium-webdriver-2.49.0
new file mode 100644
index 000000000000..d24f11b3efca
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-2.49.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby20] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby20] dev-ruby/rubyzip:1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby21] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby21] dev-ruby/rubyzip:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby22] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DESCRIPTION=This gem provides Ruby bindings for WebDriver
+EAPI=5
+HOMEPAGE=http://gemcutter.org/gems/selenium-webdriver
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby20] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby20] dev-ruby/rubyzip:1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby21] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby21] dev-ruby/rubyzip:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby22] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+SLOT=0
+SRC_URI=mirror://rubygems/selenium-webdriver-2.49.0.gem
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=deb464e02908711aa16ec2a2f64c9c40
diff --git a/metadata/md5-cache/dev-ruby/session-3.2.0 b/metadata/md5-cache/dev-ruby/session-3.2.0
index f4053b1309ba..65d1e5fd2e77 100644
--- a/metadata/md5-cache/dev-ruby/session-3.2.0
+++ b/metadata/md5-cache/dev-ruby/session-3.2.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( || ( sys-apps/coreutils sys-freebsd/freebsd-bin ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( || ( sys-apps/coreutils sys-freebsd/freebsd-bin ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=A set of classes to drive external programs via pipe
 EAPI=5
 HOMEPAGE=http://codeforpeople.com/lib/ruby/session/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/session-3.2.0.gem
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=614980da9fcacf276f8957ce5ae8520a
+_md5_=dda6b1201a34ac71e57a413300ca5875
diff --git a/metadata/md5-cache/dev-util/checkstyle-4.4 b/metadata/md5-cache/dev-util/checkstyle-4.4
deleted file mode 100644
index c4ae82283dc3..000000000000
--- a/metadata/md5-cache/dev-util/checkstyle-4.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=!test? ( >=virtual/jdk-1.4 ) test? ( >=virtual/jdk-1.5 ) >=dev-java/antlr-2.7.7:0[java] dev-java/commons-beanutils:1.7 dev-java/commons-cli:1 dev-java/commons-logging:0 dev-java/commons-collections:0 test? ( dev-java/ant-junit dev-java/ant-trax dev-java/emma:0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/ant-antlr dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A development tool to help programmers write Java code that adheres to a coding standard
-EAPI=2
-HOMEPAGE=http://checkstyle.sourceforge.net
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.4 >=dev-java/antlr-2.7.7:0[java] dev-java/commons-beanutils:1.7 dev-java/commons-cli:1 dev-java/commons-logging:0 dev-java/commons-collections:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/checkstyle/checkstyle-src-4.4.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=305c03a8196b8591b6d492a533451b6f
diff --git a/metadata/md5-cache/dev-util/checkstyle-5.5-r1 b/metadata/md5-cache/dev-util/checkstyle-5.5-r1
index be6ba6bfbd36..af12a8c17e4c 100644
--- a/metadata/md5-cache/dev-util/checkstyle-5.5-r1
+++ b/metadata/md5-cache/dev-util/checkstyle-5.5-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Development tool to help write Java code that adheres to a coding st
 EAPI=5
 HOMEPAGE=https://github.com/checkstyle/checkstyle
 IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=dev-java/ant-core:0 >=dev-java/antlr-2.7.7-r7:0 dev-java/commons-beanutils:1.7 dev-java/commons-cli:1 dev-java/commons-logging:0 dev-java/guava:18 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/checkstyle/checkstyle-5.5-src.tar.gz https://dev.gentoo.org/~sera/distfiles/checkstyle-5.4-maven-build.xml.tar.bz2
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2e7a72a0fba42df1adc4712fbc2dfb5c
+_md5_=52e564ff1686bc1bf878b06935e4243b
diff --git a/metadata/md5-cache/dev-util/cppcheck-1.69-r1 b/metadata/md5-cache/dev-util/cppcheck-1.69-r1
index 941232f68405..d1a970b6e8b7 100644
--- a/metadata/md5-cache/dev-util/cppcheck-1.69-r1
+++ b/metadata/md5-cache/dev-util/cppcheck-1.69-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=htmlreport? ( dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) >=dev-libs/tinyxml2-2 qt4? ( dev-qt/qtgui:4 ) pcre? ( dev-libs/libpcre ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DEPEND=htmlreport? ( dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-libs/tinyxml2-2 qt4? ( dev-qt/qtgui:4 ) pcre? ( dev-libs/libpcre ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=static analyzer of C/C++ code
 EAPI=5
 HOMEPAGE=http://cppcheck.sourceforge.net
-IUSE=htmlreport pcre qt4 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+IUSE=htmlreport pcre qt4 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-3
-RDEPEND=htmlreport? ( dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) >=dev-libs/tinyxml2-2 qt4? ( dev-qt/qtgui:4 ) pcre? ( dev-libs/libpcre ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+RDEPEND=htmlreport? ( dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-libs/tinyxml2-2 qt4? ( dev-qt/qtgui:4 ) pcre? ( dev-libs/libpcre ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://sourceforge/cppcheck/cppcheck-1.69.tar.bz2
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=8f014cd4624cd0ff543838f875dffcab
+_md5_=ae7a27819a25eb1037633d0bdae44eec
diff --git a/metadata/md5-cache/dev-util/cppcheck-1.70 b/metadata/md5-cache/dev-util/cppcheck-1.70
index b042cd2af793..fb57d183e414 100644
--- a/metadata/md5-cache/dev-util/cppcheck-1.70
+++ b/metadata/md5-cache/dev-util/cppcheck-1.70
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=htmlreport? ( dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) >=dev-libs/tinyxml2-2 qt4? ( dev-qt/qtgui:4 ) pcre? ( dev-libs/libpcre ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DEPEND=htmlreport? ( dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-libs/tinyxml2-2 qt4? ( dev-qt/qtgui:4 ) pcre? ( dev-libs/libpcre ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=static analyzer of C/C++ code
 EAPI=5
 HOMEPAGE=http://cppcheck.sourceforge.net
-IUSE=htmlreport pcre qt4 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+IUSE=htmlreport pcre qt4 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
-RDEPEND=htmlreport? ( dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) >=dev-libs/tinyxml2-2 qt4? ( dev-qt/qtgui:4 ) pcre? ( dev-libs/libpcre ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+RDEPEND=htmlreport? ( dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-libs/tinyxml2-2 qt4? ( dev-qt/qtgui:4 ) pcre? ( dev-libs/libpcre ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://sourceforge/cppcheck/cppcheck-1.70.tar.bz2
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=4529b6cf89bbbd7816ea92ca8af381a1
+_md5_=a7fd088b7dd7f61af359b7f50abf2e53
diff --git a/metadata/md5-cache/dev-util/cppcheck-1.71 b/metadata/md5-cache/dev-util/cppcheck-1.71
index ec52b253f9e7..49d986b8972e 100644
--- a/metadata/md5-cache/dev-util/cppcheck-1.71
+++ b/metadata/md5-cache/dev-util/cppcheck-1.71
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=htmlreport? ( dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) >=dev-libs/tinyxml2-2 qt4? ( dev-qt/qtgui:4 ) pcre? ( dev-libs/libpcre ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DEPEND=htmlreport? ( dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-libs/tinyxml2-2 qt4? ( dev-qt/qtgui:4 ) pcre? ( dev-libs/libpcre ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=static analyzer of C/C++ code
 EAPI=5
 HOMEPAGE=http://cppcheck.sourceforge.net
-IUSE=htmlreport pcre qt4 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+IUSE=htmlreport pcre qt4 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
-RDEPEND=htmlreport? ( dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) >=dev-libs/tinyxml2-2 qt4? ( dev-qt/qtgui:4 ) pcre? ( dev-libs/libpcre ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+RDEPEND=htmlreport? ( dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-libs/tinyxml2-2 qt4? ( dev-qt/qtgui:4 ) pcre? ( dev-libs/libpcre ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://sourceforge/cppcheck/cppcheck-1.71.tar.bz2
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=07e4efd130a8a5e9ebd9ca1bfe91c87c
+_md5_=a488472b911a9269e0462a0865a6f8fe
diff --git a/metadata/md5-cache/dev-util/cppcheck-1.72 b/metadata/md5-cache/dev-util/cppcheck-1.72
new file mode 100644
index 000000000000..22dd077ed63d
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cppcheck-1.72
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=htmlreport? ( dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-libs/tinyxml2-2 qt4? ( dev-qt/qtgui:4 ) pcre? ( dev-libs/libpcre ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=static analyzer of C/C++ code
+EAPI=5
+HOMEPAGE=http://cppcheck.sourceforge.net
+IUSE=htmlreport pcre qt4 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3
+RDEPEND=htmlreport? ( dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-libs/tinyxml2-2 qt4? ( dev-qt/qtgui:4 ) pcre? ( dev-libs/libpcre ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://sourceforge/cppcheck/cppcheck-1.72.tar.bz2
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=98efb291ee8b5b21885b9873347682b6
diff --git a/metadata/md5-cache/games-board/sirius-0.8.0 b/metadata/md5-cache/games-board/sirius-0.8.0
index b6ab40e56caa..ef912ae0a5b8 100644
--- a/metadata/md5-cache/games-board/sirius-0.8.0
+++ b/metadata/md5-cache/games-board/sirius-0.8.0
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/gtk+:2 gnome-base/gconf:2 gnome-base/libgnomeui gnome-base/libg
 SLOT=0
 SRC_URI=http://sirius.bitvis.nu/files/sirius-0.8.0.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	games	4dae170e58f773c484e07d18ef441804	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=cb2823fb23d9480cf41937ebf59fc73e
+_md5_=63a6d109f7455c71024aeb9ab2d1b67d
diff --git a/metadata/md5-cache/games-fps/doomsday-1.15.7 b/metadata/md5-cache/games-fps/doomsday-1.15.7
index 24c36a241f08..ca957dd9fe16 100644
--- a/metadata/md5-cache/games-fps/doomsday-1.15.7
+++ b/metadata/md5-cache/games-fps/doomsday-1.15.7
@@ -1,16 +1,15 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-qt/qtx11extras:5 dev-qt/qtgui:5 net-misc/curl sys-libs/zlib media-libs/assimp !dedicated? ( media-libs/libsdl2[joystick,sound] media-libs/sdl2-mixer media-libs/libpng:0 virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXrandr x11-libs/libXxf86vm ) fluidsynth? ( media-sound/fluidsynth ) openal? ( media-libs/openal ) tools? ( sys-libs/ncurses:0 ) 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(-)] virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-1.15.7 )
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-qt/qtx11extras:5 dev-qt/qtgui:5 net-misc/curl sys-libs/zlib media-libs/assimp !dedicated? ( media-libs/libsdl2[joystick,sound] media-libs/sdl2-mixer media-libs/libpng:0 virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXrandr x11-libs/libXxf86vm ) fluidsynth? ( media-sound/fluidsynth ) openal? ( media-libs/openal ) tools? ( sys-libs/ncurses:0 ) 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(-)] virtual/pkgconfig
 DESCRIPTION=A modern gaming engine for Doom, Heretic, and Hexen
 EAPI=5
 HOMEPAGE=http://www.dengine.net/
-IUSE=dedicated fluidsynth openal snowberry +doom demo freedoom heretic hexen resources tools python_targets_python2_7 test debug test
+IUSE=dedicated fluidsynth openal snowberry +doom demo freedoom heretic hexen resources tools python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+ LGPL-3+
 PDEPEND=!dedicated? ( demo? ( games-fps/doom-data ) freedoom? ( games-fps/freedoom ) resources? ( games-fps/doomsday-resources ) )
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-qt/qtx11extras:5 dev-qt/qtgui:5 net-misc/curl sys-libs/zlib media-libs/assimp !dedicated? ( media-libs/libsdl2[joystick,sound] media-libs/sdl2-mixer media-libs/libpng:0 virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXrandr x11-libs/libXxf86vm ) fluidsynth? ( media-sound/fluidsynth ) openal? ( media-libs/openal ) tools? ( sys-libs/ncurses:0 ) !dedicated? ( snowberry? ( 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-lang/python-exec:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) dev-qt/qtchooser games-misc/games-envd
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-qt/qtx11extras:5 dev-qt/qtgui:5 net-misc/curl sys-libs/zlib media-libs/assimp !dedicated? ( media-libs/libsdl2[joystick,sound] media-libs/sdl2-mixer media-libs/libpng:0 virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXrandr x11-libs/libXxf86vm ) fluidsynth? ( media-sound/fluidsynth ) openal? ( media-libs/openal ) tools? ( sys-libs/ncurses:0 ) !dedicated? ( snowberry? ( 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-lang/python-exec:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) games-misc/games-envd
 REQUIRED_USE=|| ( python_targets_python2_7 ) demo? ( doom ) freedoom? ( doom ) resources? ( doom )
-RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/deng/Doomsday%20Engine/1.15.7/doomsday-stable-1.15.7.tar.gz
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	games	4dae170e58f773c484e07d18ef441804	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	qt5-build	db835a31b4b380c7fe597cd915a5b5b3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=798443e807cf1841290c4156a199abe6
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	games	4dae170e58f773c484e07d18ef441804	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
+_md5_=8252f8581eb3580225102f26ffe5914a
diff --git a/metadata/md5-cache/mail-client/roundcube-1.1.4 b/metadata/md5-cache/mail-client/roundcube-1.1.4
new file mode 100644
index 000000000000..03f0377bcfde
--- /dev/null
+++ b/metadata/md5-cache/mail-client/roundcube-1.1.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=A browser-based multilingual IMAP client with an application-like user interface
+EAPI=5
+HOMEPAGE=http://roundcube.net
+IUSE=enigma ldap managesieve mysql postgres sqlite ssl spell vhosts
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain
+RDEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=dev-lang/php-5.3.7[crypt,filter,gd,iconv,json,ldap?,pdo,postgres?,session,sockets,sqlite?,ssl?,unicode,xml] >=dev-php/PEAR-Auth_SASL-1.0.6 >=dev-php/PEAR-Mail_Mime-1.8.9 >=dev-php/PEAR-Mail_mimeDecode-1.5.5 >=dev-php/PEAR-Net_IDNA2-0.1.1 >=dev-php/PEAR-Net_SMTP-1.6.2 virtual/httpd-php enigma? ( >=dev-php/PEAR-Crypt_GPG-1.2.0 app-crypt/gnupg ) ldap? ( >=dev-php/PEAR-Net_LDAP2-2.0.12 ) managesieve? ( >=dev-php/PEAR-Net_Sieve-1.3.2 ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) spell? ( dev-lang/php[curl,spell] ) >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=1.1.4
+SRC_URI=mirror://sourceforge/roundcubemail/roundcubemail-1.1.4.tar.gz
+_eclasses_=webapp	42c6ef7af496b228f9854b3c81e4b226
+_md5_=b22339463477caad0abcceb447844d39
diff --git a/metadata/md5-cache/media-sound/mpfc-1.3.8.1-r2 b/metadata/md5-cache/media-sound/mpfc-1.3.8.1-r2
new file mode 100644
index 000000000000..f97aca5d5183
--- /dev/null
+++ b/metadata/md5-cache/media-sound/mpfc-1.3.8.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=alsa? ( >=media-libs/alsa-lib-0.9.0 ) flac? ( media-libs/flac ) gpm? ( >=sys-libs/gpm-1.19.3 ) mad? ( media-libs/libmad ) vorbis? ( media-libs/libvorbis ) sys-libs/ncurses:0=[unicode] dev-libs/icu:= !<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=Music Player For Console
+EAPI=6
+HOMEPAGE=http://mpfc.sourceforge.net/
+IUSE=alsa cdda flac gpm mad nls oss static-libs vorbis wav
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=alsa? ( >=media-libs/alsa-lib-0.9.0 ) flac? ( media-libs/flac ) gpm? ( >=sys-libs/gpm-1.19.3 ) mad? ( media-libs/libmad ) vorbis? ( media-libs/libvorbis ) sys-libs/ncurses:0=[unicode] dev-libs/icu:=
+SLOT=0
+SRC_URI=mirror://sourceforge/mpfc/mpfc-1.3.8.1.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=dcd41e26f7d998a74dadc07733949e52
diff --git a/metadata/md5-cache/net-analyzer/nethogs-0.8.1 b/metadata/md5-cache/net-analyzer/nethogs-0.8.1
new file mode 100644
index 000000000000..c625ff3bdc1d
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nethogs-0.8.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=net-libs/libpcap sys-libs/ncurses:0= virtual/pkgconfig
+DESCRIPTION=A small 'net top' tool, grouping bandwidth by process
+EAPI=5
+HOMEPAGE=https://github.com/raboof/nethogs
+KEYWORDS=~amd64 ~arm ~ia64 ~x86
+LICENSE=GPL-2
+RDEPEND=net-libs/libpcap sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=https://github.com/raboof/nethogs/archive/v0.8.1.tar.gz -> nethogs-0.8.1.tar.gz
+_eclasses_=multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=8c5d19a63d36d6f84700fa804fa4d2f5
diff --git a/metadata/md5-cache/net-ftp/atftp-0.7-r4 b/metadata/md5-cache/net-ftp/atftp-0.7-r4
deleted file mode 100644
index 73c7a3050bc1..000000000000
--- a/metadata/md5-cache/net-ftp/atftp-0.7-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0= ) pcre? ( dev-libs/libpcre ) virtual/pkgconfig
-DESCRIPTION=Advanced TFTP implementation client/server
-EAPI=5
-HOMEPAGE=ftp://ftp.mamalinux.com/pub/atftp/
-IUSE=selinux tcpd readline pcre
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0= ) pcre? ( dev-libs/libpcre ) !net-ftp/netkit-tftp !net-ftp/tftp-hpa selinux? ( sec-policy/selinux-tftp )
-SLOT=0
-SRC_URI=ftp://ftp.mamalinux.com/pub/atftp/atftp-0.7.tar.gz mirror://debian/pool/main/a/atftp/atftp_0.7-11.diff.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=aa380070de54f3607364bfbd7f533b7f
diff --git a/metadata/md5-cache/net-ftp/atftp-0.7-r5 b/metadata/md5-cache/net-ftp/atftp-0.7-r5
new file mode 100644
index 000000000000..e4b7d17009be
--- /dev/null
+++ b/metadata/md5-cache/net-ftp/atftp-0.7-r5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0= ) pcre? ( dev-libs/libpcre ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Advanced TFTP implementation client/server
+EAPI=6
+HOMEPAGE=ftp://ftp.mamalinux.com/pub/atftp/
+IUSE=selinux tcpd readline pcre
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0= ) pcre? ( dev-libs/libpcre ) !net-ftp/netkit-tftp !net-ftp/tftp-hpa selinux? ( sec-policy/selinux-tftp )
+SLOT=0
+SRC_URI=ftp://ftp.mamalinux.com/pub/atftp/atftp-0.7.tar.gz mirror://debian/pool/main/a/atftp/atftp_0.7-11.diff.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=158380a6e8977858880f627cc6e2040e
diff --git a/metadata/md5-cache/net-irc/ngircd-23-r1 b/metadata/md5-cache/net-irc/ngircd-23-r1
new file mode 100644
index 000000000000..4a154aeb9135
--- /dev/null
+++ b/metadata/md5-cache/net-irc/ngircd-23-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=iconv? ( virtual/libiconv ) ident? ( net-libs/libident ) pam? ( virtual/pam ) ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0 ) ) gnutls? ( net-libs/gnutls ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) zlib? ( sys-libs/zlib ) >=sys-apps/sed-4
+DESCRIPTION=An IRC server written from scratch
+EAPI=5
+HOMEPAGE=http://ngircd.barton.de/
+IUSE=debug gnutls iconv ident ipv6 libressl pam ssl tcpd zlib
+KEYWORDS=~amd64 ~x86 ~x64-macos
+LICENSE=GPL-2
+RDEPEND=iconv? ( virtual/libiconv ) ident? ( net-libs/libident ) pam? ( virtual/pam ) ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0 ) ) gnutls? ( net-libs/gnutls ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) zlib? ( sys-libs/zlib )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://ngircd.barton.de/pub/ngircd/ngircd-23.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	d9bd2ddd85a58e470b49ca997e255a4c	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
+_md5_=5e3905c6515bd36ac7f497bfe362d01c
diff --git a/metadata/md5-cache/net-irc/weechat-1.4 b/metadata/md5-cache/net-irc/weechat-1.4
new file mode 100644
index 000000000000..92b4c874f05c
--- /dev/null
+++ b/metadata/md5-cache/net-irc/weechat-1.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( dev-scheme/guile:12 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) doc? ( app-text/asciidoc dev-util/source-highlight ) nls? ( >=sys-devel/gettext-0.15 ) test? ( dev-util/cpputest ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=Portable and multi-interface IRC client
+EAPI=5
+HOMEPAGE=http://weechat.org/
+IUSE=doc nls +ssl test linguas_cs linguas_de linguas_es linguas_fr linguas_hu linguas_it linguas_ja linguas_pl linguas_pt_BR linguas_ru linguas_tr guile lua +perl +python ruby tcl +alias +charset +exec +fifo +logger +relay +scripts +spell +trigger +xfer +irc python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( dev-scheme/guile:12 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://weechat.org/files/src/weechat-1.4.tar.bz2
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=ec9e29ec09c2a4a6d1d1db36a51fd1d0
diff --git a/metadata/md5-cache/net-irc/weechat-9999 b/metadata/md5-cache/net-irc/weechat-9999
index 75a1f8244cf4..eeb9e131fb0a 100644
--- a/metadata/md5-cache/net-irc/weechat-9999
+++ b/metadata/md5-cache/net-irc/weechat-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses sys-libs/zlib charset? ( virtual/libiconv ) guile? ( dev-scheme/guile:12 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] ) ruby? ( >=dev-lang/ruby-1.9 ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) doc? ( app-text/asciidoc dev-util/source-highlight ) nls? ( >=sys-devel/gettext-0.15 ) test? ( dev-util/cpputest ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=dev-vcs/git-1.8.2.1
+DEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( dev-scheme/guile:12 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) doc? ( app-text/asciidoc dev-util/source-highlight ) nls? ( >=sys-devel/gettext-0.15 ) test? ( dev-util/cpputest ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Portable and multi-interface IRC client
 EAPI=5
 HOMEPAGE=http://weechat.org/
-IUSE=doc nls +ssl test linguas_cs linguas_de linguas_es linguas_fr linguas_hu linguas_it linguas_ja linguas_pl linguas_pt_BR linguas_ru linguas_tr guile lua +perl +python ruby tcl +alias +charset +exec +fifo +logger +relay +scripts +spell +trigger +xfer +irc python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_3 python_single_target_python3_4
+IUSE=doc nls +ssl test linguas_cs linguas_de linguas_es linguas_fr linguas_hu linguas_it linguas_ja linguas_pl linguas_pt_BR linguas_ru linguas_tr guile lua +perl +python ruby tcl +alias +charset +exec +fifo +logger +relay +scripts +spell +trigger +xfer +irc python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python3_5
 LICENSE=GPL-3
-RDEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses sys-libs/zlib charset? ( virtual/libiconv ) guile? ( dev-scheme/guile:12 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] ) ruby? ( >=dev-lang/ruby-1.9 ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
+RDEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( dev-scheme/guile:12 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
 RESTRICT=test
 SLOT=0
 _eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	git-r3	0961ca04f93a7ae0e4c4a0b2b8c3be99	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6c4f31c65a7bcf8b4362fa1fda57339b
+_md5_=9ef160f70bca79e5fd87f360dff7ab88
diff --git a/metadata/md5-cache/net-libs/serf-1.3.8-r1 b/metadata/md5-cache/net-libs/serf-1.3.8-r1
new file mode 100644
index 000000000000..800b6cc887cc
--- /dev/null
+++ b/metadata/md5-cache/net-libs/serf-1.3.8-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=dev-libs/apr:1= dev-libs/apr-util:1= dev-libs/openssl:0= sys-libs/zlib:0= kerberos? ( virtual/krb5 ) >=dev-util/scons-2.3.0 dev-util/scons
+DESCRIPTION=HTTP client library
+EAPI=5
+HOMEPAGE=https://code.google.com/p/serf/
+IUSE=kerberos static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/apr:1= dev-libs/apr-util:1= dev-libs/openssl:0= sys-libs/zlib:0= kerberos? ( virtual/krb5 )
+SLOT=1
+SRC_URI=https://serf.googlecode.com/svn/src_releases/serf-1.3.8.tar.bz2
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	scons-utils	6a35944612b7ecb18a3803359554badc	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=828e35e1dbed3ff88968bd3d106f7c81
diff --git a/metadata/md5-cache/net-mail/getmail-4.49.0 b/metadata/md5-cache/net-mail/getmail-4.49.0
new file mode 100644
index 000000000000..7ddc4318fc5f
--- /dev/null
+++ b/metadata/md5-cache/net-mail/getmail-4.49.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=A POP3 mail retriever with reliable Maildir and mbox delivery
+EAPI=5
+HOMEPAGE=http://pyropus.ca/software/getmail/
+IUSE=ssl python_targets_python2_7
+KEYWORDS=~amd64 ~ppc ~x86 ~ppc-macos ~x86-macos ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=4
+SRC_URI=http://pyropus.ca/software/getmail/old-versions/getmail-4.49.0.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=30f5e6863a3731e15027d1f0057add6b
diff --git a/metadata/md5-cache/net-mail/libpst-0.6.55 b/metadata/md5-cache/net-mail/libpst-0.6.55
deleted file mode 100644
index 0a014363c568..000000000000
--- a/metadata/md5-cache/net-mail/libpst-0.6.55
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=dii? ( media-gfx/imagemagick[png] ) virtual/libiconv virtual/pkgconfig dii? ( media-libs/gd[png] ) python? ( >=dev-libs/boost-1.48[python] ) !<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 python? ( =dev-lang/python-2* )
-DESCRIPTION=Tools and library for reading Outlook files (.pst format)
-EAPI=4
-HOMEPAGE=http://www.five-ten-sg.com/libpst/
-IUSE=debug dii doc python static-libs
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=dii? ( media-gfx/imagemagick[png] ) python? ( =dev-lang/python-2* )
-SLOT=0
-SRC_URI=http://www.five-ten-sg.com/libpst/packages/libpst-0.6.55.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=9c9da51c0099aaafcfbef4bc389b9e44
diff --git a/metadata/md5-cache/net-mail/libpst-0.6.58 b/metadata/md5-cache/net-mail/libpst-0.6.58
deleted file mode 100644
index 5634c088da15..000000000000
--- a/metadata/md5-cache/net-mail/libpst-0.6.58
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=dii? ( media-gfx/imagemagick[png] ) gnome-extra/libgsf virtual/libiconv virtual/pkgconfig dii? ( media-libs/gd[png] ) python? ( >=dev-libs/boost-1.48[python] ) !<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 python? ( =dev-lang/python-2* )
-DESCRIPTION=Tools and library for reading Outlook files (.pst format)
-EAPI=4
-HOMEPAGE=http://www.five-ten-sg.com/libpst/
-IUSE=debug dii doc python static-libs
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=dii? ( media-gfx/imagemagick[png] ) gnome-extra/libgsf python? ( =dev-lang/python-2* )
-SLOT=0
-SRC_URI=http://www.five-ten-sg.com/libpst/packages/libpst-0.6.58.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=58c91043075e9294ce201bc3ede41cad
diff --git a/metadata/md5-cache/net-mail/libpst-0.6.60 b/metadata/md5-cache/net-mail/libpst-0.6.60
deleted file mode 100644
index a9344fa2443e..000000000000
--- a/metadata/md5-cache/net-mail/libpst-0.6.60
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=dii? ( media-gfx/imagemagick[png] ) gnome-extra/libgsf virtual/libiconv virtual/pkgconfig dii? ( media-libs/gd[png] ) python? ( >=dev-libs/boost-1.48[python] ) !<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 python? ( =dev-lang/python-2* )
-DESCRIPTION=Tools and library for reading Outlook files (.pst format)
-EAPI=4
-HOMEPAGE=http://www.five-ten-sg.com/libpst/
-IUSE=debug dii doc python static-libs
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dii? ( media-gfx/imagemagick[png] ) gnome-extra/libgsf python? ( =dev-lang/python-2* )
-SLOT=0
-SRC_URI=http://www.five-ten-sg.com/libpst/packages/libpst-0.6.60.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=8e8c75c461b22146e2f9d87226c5a42f
diff --git a/metadata/md5-cache/net-mail/libpst-0.6.61 b/metadata/md5-cache/net-mail/libpst-0.6.61
deleted file mode 100644
index e47f90377088..000000000000
--- a/metadata/md5-cache/net-mail/libpst-0.6.61
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=dii? ( media-gfx/imagemagick[png] ) gnome-extra/libgsf virtual/libiconv virtual/pkgconfig dii? ( media-libs/gd[png] ) python? ( >=dev-libs/boost-1.48[python] ) !<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 python? ( =dev-lang/python-2* )
-DESCRIPTION=Tools and library for reading Outlook files (.pst format)
-EAPI=4
-HOMEPAGE=http://www.five-ten-sg.com/libpst/
-IUSE=debug dii doc python static-libs
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=dii? ( media-gfx/imagemagick[png] ) gnome-extra/libgsf python? ( =dev-lang/python-2* )
-SLOT=0
-SRC_URI=http://www.five-ten-sg.com/libpst/packages/libpst-0.6.61.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=5eb056efd566e9a77a4333508ec4baa2
diff --git a/metadata/md5-cache/net-mail/libpst-0.6.63 b/metadata/md5-cache/net-mail/libpst-0.6.63
deleted file mode 100644
index c9441cdf6d46..000000000000
--- a/metadata/md5-cache/net-mail/libpst-0.6.63
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=dii? ( media-gfx/imagemagick[png] ) gnome-extra/libgsf virtual/libiconv virtual/pkgconfig dii? ( media-libs/gd[png] ) python? ( >=dev-libs/boost-1.48[python] ) !<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 python? ( =dev-lang/python-2* )
-DESCRIPTION=Tools and library for reading Outlook files (.pst format)
-EAPI=4
-HOMEPAGE=http://www.five-ten-sg.com/libpst/
-IUSE=debug dii doc python static-libs
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=dii? ( media-gfx/imagemagick[png] ) gnome-extra/libgsf python? ( =dev-lang/python-2* )
-SLOT=0
-SRC_URI=http://www.five-ten-sg.com/libpst/packages/libpst-0.6.63.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=5eb056efd566e9a77a4333508ec4baa2
diff --git a/metadata/md5-cache/net-mail/libpst-0.6.64 b/metadata/md5-cache/net-mail/libpst-0.6.64
index db83ba4c7ef1..fb717a25b63c 100644
--- a/metadata/md5-cache/net-mail/libpst-0.6.64
+++ b/metadata/md5-cache/net-mail/libpst-0.6.64
@@ -4,10 +4,10 @@ DESCRIPTION=Tools and library for reading Outlook files (.pst format)
 EAPI=4
 HOMEPAGE=http://www.five-ten-sg.com/libpst/
 IUSE=debug dii doc python static-libs
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dii? ( media-gfx/imagemagick[png] ) gnome-extra/libgsf python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://www.five-ten-sg.com/libpst/packages/libpst-0.6.64.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=7fce480de48a504cc3cf5748c83f1968
+_md5_=4b474105f166857bd0c0321259cc1f72
diff --git a/metadata/md5-cache/net-mail/libpst-0.6.59 b/metadata/md5-cache/net-mail/libpst-0.6.66
similarity index 89%
rename from metadata/md5-cache/net-mail/libpst-0.6.59
rename to metadata/md5-cache/net-mail/libpst-0.6.66
index 573d34bc36f9..cd9af4f78437 100644
--- a/metadata/md5-cache/net-mail/libpst-0.6.59
+++ b/metadata/md5-cache/net-mail/libpst-0.6.66
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare setup
 DEPEND=dii? ( media-gfx/imagemagick[png] ) gnome-extra/libgsf virtual/libiconv virtual/pkgconfig dii? ( media-libs/gd[png] ) python? ( >=dev-libs/boost-1.48[python] ) !<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 python? ( =dev-lang/python-2* )
 DESCRIPTION=Tools and library for reading Outlook files (.pst format)
-EAPI=4
+EAPI=5
 HOMEPAGE=http://www.five-ten-sg.com/libpst/
 IUSE=debug dii doc python static-libs
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=dii? ( media-gfx/imagemagick[png] ) gnome-extra/libgsf python? ( =dev-lang/python-2* )
 SLOT=0
-SRC_URI=http://www.five-ten-sg.com/libpst/packages/libpst-0.6.59.tar.gz
+SRC_URI=http://www.five-ten-sg.com/libpst/packages/libpst-0.6.66.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=8e8c75c461b22146e2f9d87226c5a42f
+_md5_=09d1b7cada4b0506daecc5dd7a5cf63c
diff --git a/metadata/md5-cache/net-misc/openssh-7.1_p1-r2 b/metadata/md5-cache/net-misc/openssh-7.1_p1-r2
index edb08912be6e..7165f12ef177 100644
--- a/metadata/md5-cache/net-misc/openssh-7.1_p1-r2
+++ b/metadata/md5-cache/net-misc/openssh-7.1_p1-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) ssh1? ( ssl ) static? ( !kerberos !p
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-7.1p1.tar.gz mirror://gentoo/openssh-6.8_p1-sctp.patch.xz hpn? ( mirror://gentoo/openssh-7.1p1-hpnssh14v9.tar.xz https://dev.gentoo.org/~polynomial-c/openssh-7.1p1-hpnssh14v9.tar.xz mirror://sourceforge/hpnssh/openssh-7.1p1-hpnssh14v9.tar.xz ) ldap? ( mirror://gentoo/openssh-lpk-6.8p1-0.3.14.patch.xz ) X509? ( http://roumenpetrov.info/openssh/x509-8.6/openssh-7.1p1+x509-8.6.diff.gz )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=61ab4903cecb2d69dbb58404bfa97816
+_md5_=b6c949192bf3a01625701e090e5e286d
diff --git a/metadata/md5-cache/net-misc/openssh-7.1_p1-r3 b/metadata/md5-cache/net-misc/openssh-7.1_p1-r3
index 1390907f1416..e5a88607e71b 100644
--- a/metadata/md5-cache/net-misc/openssh-7.1_p1-r3
+++ b/metadata/md5-cache/net-misc/openssh-7.1_p1-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Port of OpenBSD's free SSH release
 EAPI=5
 HOMEPAGE=http://www.openssh.org/
 IUSE=bindist debug +hpn kerberos kernel_linux ldap ldns libedit libressl pam +pie sctp selinux skey ssh1 +ssl static X X509
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=BSD GPL-2
 RDEPEND=!static? ( ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) libedit? ( dev-libs/libedit ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.8f:0[bindist=] dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) >=sys-libs/zlib-1.2.3 ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( >=sys-auth/pambase-20081028 ) userland_GNU? ( virtual/shadow ) X? ( x11-apps/xauth )
 REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) ssh1? ( ssl ) static? ( !kerberos !pam ) X509? ( !ldap ssl )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-7.1p1.tar.gz mirror://gentoo/openssh-6.8_p1-sctp.patch.xz hpn? ( mirror://gentoo/openssh-7.1p1-hpnssh14v9.tar.xz mirror://sourceforge/hpnssh/openssh-7.1p1-hpnssh14v9.tar.xz ) ldap? ( mirror://gentoo/openssh-lpk-6.8p1-0.3.14.patch.xz ) X509? ( http://roumenpetrov.info/openssh/x509-8.6/openssh-7.1p1+x509-8.6.diff.gz )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d3c90879c4c7c83603f881eb67e683bb
+_md5_=11eb4516075cd808d77264d26295fa5f
diff --git a/metadata/md5-cache/net-misc/openssh-7.1_p2 b/metadata/md5-cache/net-misc/openssh-7.1_p2
new file mode 100644
index 000000000000..f7919ff3c141
--- /dev/null
+++ b/metadata/md5-cache/net-misc/openssh-7.1_p2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst preinst prepare setup test
+DEPEND=!static? ( ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) libedit? ( dev-libs/libedit ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.8f:0[bindist=] dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) >=sys-libs/zlib-1.2.3 ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) static? ( ldns? ( net-libs/ldns[static-libs(+)] !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) libedit? ( dev-libs/libedit[static-libs(+)] ) sctp? ( net-misc/lksctp-tools[static-libs(+)] ) selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.8f:0[bindist=] dev-libs/openssl:0[static-libs(+)] ) libressl? ( dev-libs/libressl[static-libs(+)] ) ) >=sys-libs/zlib-1.2.3[static-libs(+)] ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Port of OpenBSD's free SSH release
+EAPI=5
+HOMEPAGE=http://www.openssh.org/
+IUSE=bindist debug +hpn kerberos kernel_linux ldap ldns libedit libressl pam +pie sctp selinux skey ssh1 +ssl static X X509
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+LICENSE=BSD GPL-2
+RDEPEND=!static? ( ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) libedit? ( dev-libs/libedit ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.8f:0[bindist=] dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) >=sys-libs/zlib-1.2.3 ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( >=sys-auth/pambase-20081028 ) userland_GNU? ( virtual/shadow ) X? ( x11-apps/xauth )
+REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) ssh1? ( ssl ) static? ( !kerberos !pam ) X509? ( !ldap ssl )
+SLOT=0
+SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-7.1p2.tar.gz mirror://gentoo/openssh-6.8_p1-sctp.patch.xz hpn? ( mirror://gentoo/openssh-7.1p2-hpnssh14v10.tar.xz mirror://sourceforge/hpnssh/openssh-7.1p2-hpnssh14v10.tar.xz ) ldap? ( mirror://gentoo/openssh-lpk-7.1p2-0.3.14.patch.xz ) X509? ( http://roumenpetrov.info/openssh/x509-8.6/openssh-7.1p2+x509-8.6.diff.xz )
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=b4cd04e31bc9c46b84a9bd3603724f76
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2016.01.14 b/metadata/md5-cache/net-misc/youtube-dl-2016.01.14
new file mode 100644
index 000000000000..55820badd0bb
--- /dev/null
+++ b/metadata/md5-cache/net-misc/youtube-dl-2016.01.14
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] test? ( dev-python/nose[coverage(+)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?]
+DESCRIPTION=Download videos from YouTube.com (and more sites...)
+EAPI=5
+HOMEPAGE=https://rg3.github.com/youtube-dl/
+IUSE=offensive test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python3_5
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=public-domain
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?]
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
+SLOT=0
+SRC_URI=http://youtube-dl.org/downloads/2016.01.14/youtube-dl-2016.01.14.tar.gz
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=3b4e05bb9e3685d19f09fa90c40f3b78
diff --git a/metadata/md5-cache/sci-mathematics/glpk-4.57 b/metadata/md5-cache/sci-mathematics/glpk-4.57
new file mode 100644
index 000000000000..84eab0e56451
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/glpk-4.57
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=sci-libs/amd:0= sci-libs/colamd:= sys-libs/zlib:0= gmp? ( dev-libs/gmp:0= ) mysql? ( virtual/mysql ) odbc? ( || ( dev-db/libiodbc:0 dev-db/unixODBC:0 ) ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=GNU Linear Programming Kit
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/glpk/
+IUSE=doc examples gmp odbc mysql static-libs
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=GPL-3
+RDEPEND=sci-libs/amd:0= sci-libs/colamd:= sys-libs/zlib:0= gmp? ( dev-libs/gmp:0= ) mysql? ( virtual/mysql ) odbc? ( || ( dev-db/libiodbc:0 dev-db/unixODBC:0 ) )
+SLOT=0/36
+SRC_URI=mirror://gnu/glpk/glpk-4.57.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=9211416af0b9e497389923e12c0968b1
diff --git a/metadata/md5-cache/sys-apps/openrc-0.20.1 b/metadata/md5-cache/sys-apps/openrc-0.20.2
similarity index 96%
rename from metadata/md5-cache/sys-apps/openrc-0.20.1
rename to metadata/md5-cache/sys-apps/openrc-0.20.2
index 936d9ceccce2..45eede948a34 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.20.1
+++ b/metadata/md5-cache/sys-apps/openrc-0.20.2
@@ -9,6 +9,6 @@ LICENSE=BSD-2
 PDEPEND=netifrc? ( net-misc/netifrc )
 RDEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) tools? ( dev-lang/perl ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils sys-libs/libselinux ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 !prefix? ( kernel_linux? ( || ( >=sys-apps/sysvinit-2.86-r6 sys-process/runit ) ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) ) selinux? ( sec-policy/selinux-base-policy sec-policy/selinux-openrc )
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~williamh/dist/openrc-0.20.1.tar.bz2
+SRC_URI=https://dev.gentoo.org/~williamh/dist/openrc-0.20.2.tar.bz2
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
 _md5_=d5d272422926cf18a82769003e64960e
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.10-r1 b/metadata/md5-cache/sys-apps/sandbox-2.10-r1
index 884c6e57d0b7..486a60889190 100644
--- a/metadata/md5-cache/sys-apps/sandbox-2.10-r1
+++ b/metadata/md5-cache/sys-apps/sandbox-2.10-r1
@@ -4,9 +4,9 @@ DESCRIPTION=sandbox'd LD_PRELOAD hack
 EAPI=0
 HOMEPAGE=https://www.gentoo.org/proj/en/portage/sandbox/
 IUSE=multilib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/sandbox-2.10.tar.xz https://dev.gentoo.org/~vapier/dist/sandbox-2.10.tar.xz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=6992e07d019990ef5882b9185b3219dd
+_md5_=8a02b0926f0a15abd8eaaa9093c392da
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.3 b/metadata/md5-cache/sys-kernel/linux-headers-4.3
index a04d509bbd1d..e193ab3d86ce 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.3
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.3
@@ -3,11 +3,11 @@ DEPEND=app-arch/xz-utils dev-lang/perl
 DESCRIPTION=Linux system headers
 EAPI=4
 HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.3.tar.xz mirror://gentoo/gentoo-headers-4.3-1.tar.xz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kernel-2	ef694b0e1e5876dc1f8cb80992dd7cb9	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b8294f00d00f6440affb9fd6d801905f
+_md5_=7c9b659390e901edf82c003542a9698a
diff --git a/metadata/md5-cache/sys-libs/efivar-0.21 b/metadata/md5-cache/sys-libs/efivar-0.21
index 5f2d630734d1..7b37a01c5ae1 100644
--- a/metadata/md5-cache/sys-libs/efivar-0.21
+++ b/metadata/md5-cache/sys-libs/efivar-0.21
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/popt
 SLOT=0
 SRC_URI=https://github.com/rhinstaller/efivar/releases/download/0.21/efivar-0.21.tar.bz2
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=e269a0fce1652923323a06bda22b6627
+_md5_=93381766f221987e13dae95f4880f813
diff --git a/metadata/md5-cache/sys-process/cronbase-0.3.7-r1 b/metadata/md5-cache/sys-process/cronbase-0.3.7-r1
index 673e7347c75d..abe809aacb8b 100644
--- a/metadata/md5-cache/sys-process/cronbase-0.3.7-r1
+++ b/metadata/md5-cache/sys-process/cronbase-0.3.7-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=install setup
 DESCRIPTION=base for all cron ebuilds
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 _eclasses_=user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=449deea8dca2a51ff729bd7793602b17
+_md5_=b19f5d092fd99f3f8254ca62e27dd445
diff --git a/metadata/md5-cache/www-client/google-chrome-47.0.2526.106_p1 b/metadata/md5-cache/www-client/google-chrome-47.0.2526.111_p1
similarity index 92%
rename from metadata/md5-cache/www-client/google-chrome-47.0.2526.106_p1
rename to metadata/md5-cache/www-client/google-chrome-47.0.2526.111_p1
index 04bd7d60adeb..444ed8290442 100644
--- a/metadata/md5-cache/www-client/google-chrome-47.0.2526.106_p1
+++ b/metadata/md5-cache/www-client/google-chrome-47.0.2526.111_p1
@@ -9,6 +9,6 @@ LICENSE=google-chrome
 RDEPEND=app-arch/bzip2 app-misc/ca-certificates 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:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 >=x11-libs/libX11-1.5.0 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/libXScrnSaver x11-libs/libXtst x11-libs/pango x11-misc/xdg-utils
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=amd64? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_47.0.2526.106-1_amd64.deb ) x86? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_47.0.2526.106-1_i386.deb )
+SRC_URI=amd64? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_47.0.2526.111-1_amd64.deb ) x86? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_47.0.2526.111-1_i386.deb )
 _eclasses_=chromium	e6257bd55bfdac1269e99d4d7ed21cda	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	linux-info	8f92e5ac1a1da684c5450b1b21a1f56a	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	readme.gentoo	cbc4807273837f5fccb5372e385e99eb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=008c75c87c3b342e7b9996f4c522e051
+_md5_=cceb340ca1e2cd6b34deb4a2ed49238b
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-48.0.2564.71_p1 b/metadata/md5-cache/www-client/google-chrome-beta-48.0.2564.79_p1
similarity index 92%
rename from metadata/md5-cache/www-client/google-chrome-beta-48.0.2564.71_p1
rename to metadata/md5-cache/www-client/google-chrome-beta-48.0.2564.79_p1
index d641392b4ecf..3fd85cd579fb 100644
--- a/metadata/md5-cache/www-client/google-chrome-beta-48.0.2564.71_p1
+++ b/metadata/md5-cache/www-client/google-chrome-beta-48.0.2564.79_p1
@@ -9,6 +9,6 @@ LICENSE=google-chrome
 RDEPEND=app-arch/bzip2 app-misc/ca-certificates 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:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 >=x11-libs/libX11-1.5.0 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/libXScrnSaver x11-libs/libXtst x11-libs/pango x11-misc/xdg-utils
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=amd64? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_48.0.2564.71-1_amd64.deb ) x86? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_48.0.2564.71-1_i386.deb )
+SRC_URI=amd64? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_48.0.2564.79-1_amd64.deb ) x86? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_48.0.2564.79-1_i386.deb )
 _eclasses_=chromium	e6257bd55bfdac1269e99d4d7ed21cda	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	linux-info	8f92e5ac1a1da684c5450b1b21a1f56a	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	readme.gentoo	cbc4807273837f5fccb5372e385e99eb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=08f0716f8c48e2d18dcbf209be17aea5
+_md5_=1a77b1386ee211ba0a9d37c19b61f6d3
diff --git a/metadata/md5-cache/www-client/opera-beta-34.0.2036.24 b/metadata/md5-cache/www-client/opera-beta-35.0.2066.23
similarity index 94%
rename from metadata/md5-cache/www-client/opera-beta-34.0.2036.24
rename to metadata/md5-cache/www-client/opera-beta-35.0.2066.23
index 1fbc281a150d..1702965517c2 100644
--- a/metadata/md5-cache/www-client/opera-beta-34.0.2036.24
+++ b/metadata/md5-cache/www-client/opera-beta-35.0.2066.23
@@ -8,6 +8,6 @@ KEYWORDS=~amd64
 LICENSE=OPERA-2014
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss >=dev-libs/openssl-1.0.1:0 gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap 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://get.geo.opera.com/pub/opera-beta/34.0.2036.24/linux/opera-beta_34.0.2036.24_amd64.deb )
+SRC_URI=amd64? ( http://get.geo.opera.com/pub/opera-beta/35.0.2066.23/linux/opera-beta_35.0.2066.23_amd64.deb )
 _eclasses_=chromium	e6257bd55bfdac1269e99d4d7ed21cda	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	linux-info	8f92e5ac1a1da684c5450b1b21a1f56a	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=571c38eb69045e78e8d2db92f202c727
diff --git a/metadata/md5-cache/www-client/opera-developer-35.0.2064.0 b/metadata/md5-cache/www-client/opera-developer-35.0.2064.0
deleted file mode 100644
index 783ff844bca9..000000000000
--- a/metadata/md5-cache/www-client/opera-developer-35.0.2064.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=A fast and secure web browser
-EAPI=5
-HOMEPAGE=http://www.opera.com/
-IUSE=+linguas_af +linguas_az +linguas_be +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_en_US +linguas_es_419 +linguas_es +linguas_fil +linguas_fi +linguas_fr_CA +linguas_fr +linguas_fy +linguas_gd +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kk +linguas_ko +linguas_lt +linguas_lv +linguas_me +linguas_mk +linguas_ms +linguas_nb +linguas_nl +linguas_nn +linguas_pa +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_uz +linguas_vi +linguas_zh_CN +linguas_zh_TW +linguas_zu
-KEYWORDS=~amd64 ~x86
-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://get.geo.opera.com/pub/opera-developer/35.0.2064.0/linux/opera-developer_35.0.2064.0_amd64.deb ) x86? ( http://get.geo.opera.com/pub/opera-developer/35.0.2064.0/linux/opera-developer_35.0.2064.0_i386.deb )
-_eclasses_=chromium	e6257bd55bfdac1269e99d4d7ed21cda	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	linux-info	8f92e5ac1a1da684c5450b1b21a1f56a	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=356f3a966652b3d585d192f316210208
diff --git a/metadata/md5-cache/www-client/opera-developer-36.0.2072.0 b/metadata/md5-cache/www-client/opera-developer-36.0.2106.0
similarity index 92%
rename from metadata/md5-cache/www-client/opera-developer-36.0.2072.0
rename to metadata/md5-cache/www-client/opera-developer-36.0.2106.0
index 8da2f2b37ad5..6873e160047d 100644
--- a/metadata/md5-cache/www-client/opera-developer-36.0.2072.0
+++ b/metadata/md5-cache/www-client/opera-developer-36.0.2106.0
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 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://get.geo.opera.com/pub/opera-developer/36.0.2072.0/linux/opera-developer_36.0.2072.0_amd64.deb ) x86? ( http://get.geo.opera.com/pub/opera-developer/36.0.2072.0/linux/opera-developer_36.0.2072.0_i386.deb )
+SRC_URI=amd64? ( http://get.geo.opera.com/pub/opera-developer/36.0.2106.0/linux/opera-developer_36.0.2106.0_amd64.deb ) x86? ( http://get.geo.opera.com/pub/opera-developer/36.0.2106.0/linux/opera-developer_36.0.2106.0_i386.deb )
 _eclasses_=chromium	e6257bd55bfdac1269e99d4d7ed21cda	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	linux-info	8f92e5ac1a1da684c5450b1b21a1f56a	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=356f3a966652b3d585d192f316210208
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-47.0.2526.106_p1 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-47.0.2526.111_p1
similarity index 79%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-47.0.2526.106_p1
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-47.0.2526.111_p1
index 7947fc510517..5553b00b3b6d 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-47.0.2526.106_p1
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-47.0.2526.111_p1
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=!www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=stable
-SRC_URI=amd64? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_47.0.2526.106-1_amd64.deb ) x86? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_47.0.2526.106-1_i386.deb )
+SRC_URI=amd64? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_47.0.2526.111-1_amd64.deb ) x86? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_47.0.2526.111-1_i386.deb )
 _eclasses_=multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=655def95b2af4c135220eb0cf7996a72
+_md5_=2120e87afcef9e45ad79c54439d3ced7
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-48.0.2564.71_beta1 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-48.0.2564.79_beta1
similarity index 79%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-48.0.2564.71_beta1
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-48.0.2564.79_beta1
index 9a6bdd48d607..9af7c0af3508 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-48.0.2564.71_beta1
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-48.0.2564.79_beta1
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=!www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=beta
-SRC_URI=amd64? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_48.0.2564.71-1_amd64.deb ) x86? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_48.0.2564.71-1_i386.deb )
+SRC_URI=amd64? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_48.0.2564.79-1_amd64.deb ) x86? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_48.0.2564.79-1_i386.deb )
 _eclasses_=multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=a298ad95eeea170c424be0b43ae88a8b
+_md5_=423059a9243d059ebccdbe8f046af2c3
diff --git a/metadata/md5-cache/x11-drivers/ati-drivers-15.12-r1 b/metadata/md5-cache/x11-drivers/ati-drivers-15.12-r1
new file mode 100644
index 000000000000..02575bf27922
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/ati-drivers-15.12-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install nofetch postinst postrm preinst prepare prerm pretend setup unpack
+DEPEND=<=x11-base/xorg-server-1.17.49[-minimal] >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth !x11-libs/xvba-video virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] qt4? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXxf86vm dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] ) gdm-hack? ( x11-base/xorg-server:= ) !x11-drivers/ati-drivers:legacy x11-proto/inputproto x11-proto/xf86miscproto x11-proto/xf86vidmodeproto x11-proto/xineramaproto x11-libs/libXtst sys-apps/findutils app-misc/pax-utils app-arch/unzip kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
+DESCRIPTION=Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets
+EAPI=5
+HOMEPAGE=http://www.amd.com
+IUSE=debug +modules qt4 static-libs pax_kernel gdm-hack abi_x86_32 abi_x86_64 kernel_linux
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=AMD GPL-2 QPL-1.0
+RDEPEND=<=x11-base/xorg-server-1.17.49[-minimal] >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth !x11-libs/xvba-video virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] qt4? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXxf86vm dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] ) gdm-hack? ( x11-base/xorg-server:= ) !x11-drivers/ati-drivers:legacy kernel_linux? ( virtual/modutils )
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
+RESTRICT=bindist test
+SLOT=1
+SRC_URI=mirror://gentoo/radeon-crimson-15.12-15.302-151217a-297685e.zip http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	linux-info	8f92e5ac1a1da684c5450b1b21a1f56a	linux-mod	9e27971daa324852d78bc7d4d811afae	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=e25205146ced8084f9b2c3a05ab787ba
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 6a1106996ace..a6408375ddcc 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 14 Jan 2016 18:14:00 +0000
+Fri, 15 Jan 2016 07:43:51 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 7825d8169bfe..1229484980dc 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -306,6 +306,7 @@
     <subproject ref="amd64@gentoo.org"/>
     <subproject ref="arm@gentoo.org"/>
     <subproject ref="alpha@gentoo.org"/>
+    <subproject ref="cron-bugs@gentoo.org"/>
     <subproject ref="embedded@gentoo.org"/>
     <subproject ref="hppa@gentoo.org"/>
     <subproject ref="ia64@gentoo.org"/>
@@ -315,6 +316,7 @@
     <subproject ref="ppc@gentoo.org"/>
     <subproject ref="s390@gentoo.org"/>
     <subproject ref="sparc@gentoo.org"/>
+    <subproject ref="sh@gentoo.org"/>
     <subproject ref="toolchain@gentoo.org"/>
     <subproject ref="x86@gentoo.org"/>
     <member>
@@ -740,6 +742,16 @@
       <role>Council member</role>
     </member>
   </project>
+  <project>
+    <email>cron-bugs@gentoo.org</email>
+    <name>Gentoo Cron Project</name>
+    <url>https://wiki.gentoo.org/wiki/Project:Cron</url>
+    <description>The Gentoo Cron Project maintains cron-related packages.</description>
+    <member>
+      <email>vapier@gentoo.org</email>
+      <name>Mike Frysinger</name>
+    </member>
+  </project>
   <project>
     <email>crypto@gentoo.org</email>
     <name>Crypto</name>
@@ -3730,6 +3742,24 @@
       <role>Administration and ebuild review</role>
     </member>
   </project>
+  <project>
+    <email>sh@gentoo.org</email>
+    <name>Gentoo Linux SuperH Development</name>
+    <url>https://wiki.gentoo.org/wiki/Project:SuperH</url>
+    <description>The SuperH Development Project is devoted to keeping Gentoo in good shape on the SuperH architecture.</description>
+    <member>
+      <email>ago@gentoo.org</email>
+      <name>Agostino Sarubbo</name>
+    </member>
+    <member>
+      <email>armin76@gentoo.org</email>
+      <name>Raúl Porcel</name>
+    </member>
+    <member>
+      <email>vapier@gentoo.org</email>
+      <name>Mike Frysinger</name>
+    </member>
+  </project>
   <project>
     <email>systemd@gentoo.org</email>
     <name>systemd</name>
@@ -4018,6 +4048,10 @@
       <email>yngwin@gentoo.org</email>
       <name>Ben de Groot</name>
     </member>
+    <member>
+      <email>zlg@gentoo.org</email>
+      <name>Daniel Campbell</name>
+    </member>
   </project>
   <project>
     <email>virtualization@gentoo.org</email>
diff --git a/metadata/timestamp b/metadata/timestamp
index 93447238049d..a4bd2db9372d 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Jan 14 18:13:10 UTC 2016
+Fri Jan 15 07:43:02 UTC 2016
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 9e5ee8677bc1..9b71822d7a96 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 14 Jan 2016 18:30:01 +0000
+Fri, 15 Jan 2016 08:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 3179dc4be7b6..98559c05a172 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1452795301 Thu 14 Jan 2016 06:15:01 PM UTC
+1452843901 Fri 15 Jan 2016 07:45:01 AM UTC
diff --git a/net-analyzer/nethogs/Manifest b/net-analyzer/nethogs/Manifest
index 27b656dec1ad..974556c4bc51 100644
--- a/net-analyzer/nethogs/Manifest
+++ b/net-analyzer/nethogs/Manifest
@@ -1 +1,2 @@
 DIST nethogs-0.8.0.tar.gz 38036 SHA256 b09cb3c2690a522f8b1314221095d5abb1958d50b56de6d36b11a8e6f28961d0 SHA512 6530c1bdbdf1ace7368941e8e0e53a83ac808bbea7a952936fa570ad2d49e8b4cef6a37d433f1873655edfd63cce556146a48ff81665905827237edf50419446 WHIRLPOOL 1b7c7456e2c55df0be188a0858ee039f7fde52ae58554ca16f7b92f732735ad4e225341526f6c4d36051898160cb063dac6fc4479ff1e3decabc9d62346dd3d5
+DIST nethogs-0.8.1.tar.gz 35986 SHA256 4c30ef43814549974a5b01fb1a94eb72ff08628c5a421085b1ce3bfe0524df42 SHA512 f1af7bb7208d08fc3a51bb38ee475da5a7b8f8814e2a7a653057d0c5d6b4e73be7742ffef5569525822160971f81dd22212d6854483928e621cfddce8d98409f WHIRLPOOL 4595abdb530329f41dc4d3c4e6ab8cf87a8589d9cd6f8f217644f435449c86747c66ed9884a2afcc858b7eaa9d216ef8d686bc7c5eff84bbec98151bea9ab6c3
diff --git a/net-analyzer/nethogs/nethogs-0.8.1.ebuild b/net-analyzer/nethogs/nethogs-0.8.1.ebuild
new file mode 100644
index 000000000000..83e92964ed50
--- /dev/null
+++ b/net-analyzer/nethogs/nethogs-0.8.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="A small 'net top' tool, grouping bandwidth by process"
+HOMEPAGE="https://github.com/raboof/nethogs"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~x86"
+
+RDEPEND="
+	net-libs/libpcap
+	sys-libs/ncurses:0=
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_compile() {
+	tc-export CC CXX
+	emake NCURSES_LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="/usr" install
+	dodoc Changelog DESIGN README.decpcap.txt README.md
+}
diff --git a/net-ftp/atftp/atftp-0.7-r4.ebuild b/net-ftp/atftp/atftp-0.7-r5.ebuild
similarity index 62%
rename from net-ftp/atftp/atftp-0.7-r4.ebuild
rename to net-ftp/atftp/atftp-0.7-r5.ebuild
index 44e2e252214a..3e5bb4619572 100644
--- a/net-ftp/atftp/atftp-0.7-r4.ebuild
+++ b/net-ftp/atftp/atftp-0.7-r5.ebuild
@@ -2,16 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-inherit eutils flag-o-matic systemd
+EAPI=6
+inherit autotools flag-o-matic systemd
 
 DEBIAN_PV="11"
-DEBIAN_A="${PN}_${PV}-${DEBIAN_PV}.diff.gz"
+DEBIAN_A="${PN}_${PV}-${DEBIAN_PV}.diff"
 
 DESCRIPTION="Advanced TFTP implementation client/server"
 HOMEPAGE="ftp://ftp.mamalinux.com/pub/atftp/"
 SRC_URI="ftp://ftp.mamalinux.com/pub/atftp/${P}.tar.gz
-	mirror://debian/pool/main/a/${PN}/${DEBIAN_A}"
+	mirror://debian/pool/main/a/${PN}/${DEBIAN_A}.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -26,26 +26,28 @@ RDEPEND="${DEPEND}
 	!net-ftp/tftp-hpa
 	selinux? ( sec-policy/selinux-tftp )"
 
+PATCHES=(
+	"${WORKDIR}/${DEBIAN_A}"
+	"${FILESDIR}/${P}-pcre.patch"
+	"${FILESDIR}/${P}-password.patch"
+	"${FILESDIR}/${P}-tests.patch"
+	"${FILESDIR}/${P}-glibc24.patch"
+	"${FILESDIR}/${P}-blockno.patch"
+	"${FILESDIR}/${P}-spaced_filename.patch"
+	"${FILESDIR}/${P}-illreply.patch"
+	"${FILESDIR}/${P}-CFLAGS.patch"
+)
+
 src_prepare() {
+	append-cppflags -D_REENTRANT -DRATE_CONTROL
 	# fix #561720 by restoring pre-GCC5 inline semantics
 	append-cflags -std=gnu89
 
-	epatch "${DISTDIR}"/${DEBIAN_A}
-	epatch "${FILESDIR}"/${P}-pcre.patch
-	epatch "${FILESDIR}"/${P}-password.patch
-	epatch "${FILESDIR}"/${P}-tests.patch
-	epatch "${FILESDIR}"/${P}-glibc24.patch
-	epatch "${FILESDIR}"/${P}-blockno.patch
-	epatch "${FILESDIR}"/${P}-spaced_filename.patch
-	epatch "${FILESDIR}"/${P}-illreply.patch
-	# remove upstream's broken CFLAGS
-	sed -i.orig -e \
-	  '/^CFLAGS="-g -Wall -D_REENTRANT"/s,".*","",g' \
-	  "${S}"/configure || die
+	default
+	eautoreconf
 }
 
 src_configure() {
-	append-flags -D_REENTRANT -DRATE_CONTROL
 	econf \
 		$(use_enable tcpd libwrap) \
 		$(use_enable readline libreadline) \
@@ -53,12 +55,8 @@ src_configure() {
 		--enable-mtftp
 }
 
-src_compile() {
-	emake CFLAGS="${CFLAGS}"
-}
-
 src_install() {
-	emake install DESTDIR="${D}"
+	default
 
 	newinitd "${FILESDIR}"/atftp.init atftp
 	newconfd "${FILESDIR}"/atftp.confd atftp
@@ -70,6 +68,6 @@ src_install() {
 	dodoc "${S}"/docs/*
 
 	docinto test
-	cd "${S}"/test
+	cd "${S}"/test || die
 	dodoc load.sh mtftp.conf pcre_pattern.txt test.sh test_suite.txt
 }
diff --git a/net-ftp/atftp/files/atftp-0.7-CFLAGS.patch b/net-ftp/atftp/files/atftp-0.7-CFLAGS.patch
new file mode 100644
index 000000000000..566c1791c591
--- /dev/null
+++ b/net-ftp/atftp/files/atftp-0.7-CFLAGS.patch
@@ -0,0 +1,32 @@
+--- atftp-0.7/configure.ac
++++ atftp-0.7/configure.ac
+@@ -66,29 +66,6 @@
+ dnl Check for AIX
+ AC_AIX
+ 
+-CFLAGS="-g -Wall -D_REENTRANT"
+-
+-if test x$debug = xtrue; then
+-   CFLAGS="$CFLAGS -O0 -DDEBUG"
+-else
+-  if test -n "$auto_cflags"; then
+-    if test -n "$GCC"; then
+-      CFLAGS="$CFLAGS -g -O2 -Wall -Wno-implicit"
+-    else
+-      case "$host_os" in
+-        *hpux*)  CFLAGS="$CFLAGS +O3"
+-	  ;;
+-        *ultrix* | *osf*) CFLAGS="$CFLAGS -O -Olimit 2000"
+-	  ;;
+-        *)       CFLAGS="$CFLAGS -O2"
+-	  ;;
+-      esac
+-    fi
+-  else
+-    CFLAGS="$CFLAGS -O2"
+-  fi
+-fi
+-
+ AC_PROG_MAKE_SET
+ AC_PROG_INSTALL
+ 
diff --git a/net-ftp/atftp/files/atftp-0.7-illreply.patch b/net-ftp/atftp/files/atftp-0.7-illreply.patch
index e18bbd99c9e9..0f1cacd9b955 100644
--- a/net-ftp/atftp/files/atftp-0.7-illreply.patch
+++ b/net-ftp/atftp/files/atftp-0.7-illreply.patch
@@ -1,5 +1,5 @@
-*** tftp_def.old.c      2009-02-28 17:56:12.000000000 +0100
---- tftp_def.c  2009-02-28 17:57:02.000000000 +0100
+*** atftp-0.7/tftp_def.old.c      2009-02-28 17:56:12.000000000 +0100
+--- atftp-0.7/tftp_def.c  2009-02-28 17:57:02.000000000 +0100
 ***************
 *** 141,146 ****
 --- 141,147 ----
diff --git a/net-irc/ngircd/files/ngircd.init-r1.d b/net-irc/ngircd/files/ngircd.init-r1.d
new file mode 100644
index 000000000000..ad7df21d3fb3
--- /dev/null
+++ b/net-irc/ngircd/files/ngircd.init-r1.d
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+	need net
+	use logger
+	provide ircd
+}
+
+start() {
+	ebegin "Starting ngIRCd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/ngircd
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ngIRCd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/ngircd
+	eend $?
+}
diff --git a/net-irc/ngircd/ngircd-23-r1.ebuild b/net-irc/ngircd/ngircd-23-r1.ebuild
new file mode 100644
index 000000000000..6cfa1ab73a12
--- /dev/null
+++ b/net-irc/ngircd/ngircd-23-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools-utils eutils user
+
+DESCRIPTION="An IRC server written from scratch"
+HOMEPAGE="http://ngircd.barton.de/"
+SRC_URI="http://ngircd.barton.de/pub/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="debug gnutls iconv ident ipv6 libressl pam ssl tcpd zlib"
+
+RDEPEND="
+	iconv? ( virtual/libiconv )
+	ident? ( net-libs/libident )
+	pam? ( virtual/pam )
+	ssl? (
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0 )
+		)
+		gnutls? ( net-libs/gnutls )
+		libressl? ( dev-libs/libressl )
+	)
+	tcpd? ( sys-apps/tcp-wrappers )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+"
+
+RESTRICT="test"
+
+src_configure() {
+	if ! use prefix; then
+		sed -i \
+			-e "s:;ServerUID = 65534:ServerUID = ngircd:" \
+			-e "s:;ServerGID = 65534:ServerGID = nogroup:" \
+			doc/sample-ngircd.conf.tmpl || die
+	fi
+
+	local myeconfargs=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		--sysconfdir="${EPREFIX}"/etc/ngircd
+		$(use_enable debug sniffer)
+		$(use_enable debug)
+		$(use_enable ipv6)
+		$(use_with iconv)
+		$(use_with ident)
+		$(use_with pam)
+		$(use_with tcpd tcp-wrappers)
+		$(use_with zlib)
+	)
+
+	if use ssl; then
+		myeconfargs+=(
+			$(use_with !gnutls openssl)
+			$(use_with gnutls)
+		)
+	else
+		myeconfargs+=(
+			--without-gnutls
+			--without-openssl
+		)
+	fi
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	newinitd "${FILESDIR}"/ngircd.init-r1.d ngircd
+}
+
+pkg_postinst() {
+	if ! use prefix; then
+		enewuser ngircd
+		chown ngircd "${ROOT}"/etc/ngircd/ngircd.conf
+	fi
+}
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 1421199dd199..4fe5d7f9ca71 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,3 +1,4 @@
 DIST weechat-1.1.1.tar.bz2 2305377 SHA256 810bf0584fd5888246797fc7f1bbc4facb064a4d1c5d91627a9c8c01cbce97b5 SHA512 710cb8badeb2734cbe6430e1c5f7fc91d8ec5c9ef85d2c6cc2206ffdf915fab083027a04d25ba23a17515e767d3b482f85b3b3e8fc445cbf1d05db941ca13dfd WHIRLPOOL d445db9a42e6ac8a58bf17a6a905bc769ea3da005d29f4c8dd703c859ae475dea0302ba471662ae52ff7c4961f35b09942757ccf657d1d419edc50416dde6002
 DIST weechat-1.2.tar.bz2 2367277 SHA256 7c4501401f3794d551331b3cede354895962858acc50437567ffd40fa7af684d SHA512 dd806c1e63e5abab8fcc2f84a615eae8769fc9271f89abb19fae9ef4489e86e132a8d6a4843714a3c772c064c9060e4b63f7433fe6beddd3e675ba08a744a1f9 WHIRLPOOL 8d9d5db2f3628e41f7b186ae80189113645f64dff407b5b64f602deefcf821b2457225d57d2cb1dee6b4c014704013c48fbc26423f6a39b762a0c55439bfb908
 DIST weechat-1.3.tar.bz2 2402422 SHA256 703dd771f74a2391bab656992712331d9151a227ac3210393a4ecf6458605148 SHA512 82159f1c630bf389e7a3b8baf29b67c50711e1a767040440c71bfd7d3cd0c3005b7423e6dd53c2437512cc68953f540039971a4e6f6d7a4cdb4a4e74e4c3985b WHIRLPOOL 325b0feec0571d07494b2b5c863999d4f0bfa8f9698144624e5b8ec4c3c3180a1c3bc252647f3ba52f4cc46de788a450a122f2f3ac028ca333cb0c124fb70d8c
+DIST weechat-1.4.tar.bz2 2464362 SHA256 e06d9949ccececdd9692c95c41304c2f7fe9ec47b5eedd0d0a8529f6a3c1ddd4 SHA512 4c4bf25da513c25a16b24d94c1a6971db12d5cf168c83aa97570ffff53c634f7b25e92f1dbe54fefd09eeb69ece9ddc4be115bb6f6fc078ef7682dcb1df21f04 WHIRLPOOL 1db202131c1cd68e0f436f2e316ad73d0887d48533c417c1446a671bc620fdaaedb6198ac23876d62a51458ab55231d528635fc4e7fa2aa0067c60f656e3d6e5
diff --git a/net-irc/weechat/weechat-1.4.ebuild b/net-irc/weechat/weechat-1.4.ebuild
new file mode 100644
index 000000000000..d77d9e73d645
--- /dev/null
+++ b/net-irc/weechat/weechat-1.4.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+inherit eutils python-single-r1 multilib cmake-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
+else
+	SRC_URI="https://weechat.org/files/src/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Portable and multi-interface IRC client"
+HOMEPAGE="http://weechat.org/"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+NETWORKS="+irc"
+PLUGINS="+alias +charset +exec +fifo +logger +relay +scripts +spell +trigger +xfer"
+#INTERFACES="+ncurses gtk"
+# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
+SCRIPT_LANGS="guile lua +perl +python ruby tcl"
+LANGS=" cs de es fr hu it ja pl pt_BR ru tr"
+IUSE="doc nls +ssl test ${LANGS// / linguas_} ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
+#REQUIRED_USE=" || ( ncurses gtk )"
+
+RDEPEND="
+	dev-libs/libgcrypt:0=
+	net-misc/curl[ssl]
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	charset? ( virtual/libiconv )
+	guile? ( dev-scheme/guile:12 )
+	lua? ( dev-lang/lua:0[deprecated] )
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) )
+	ssl? ( net-libs/gnutls )
+	spell? ( app-text/aspell )
+	tcl? ( >=dev-lang/tcl-8.4.15:0= )
+"
+#	ncurses? ( sys-libs/ncurses )
+#	gtk? ( x11-libs/gtk+:2 )
+DEPEND="${RDEPEND}
+	doc? (
+		app-text/asciidoc
+		dev-util/source-highlight
+	)
+	nls? ( >=sys-devel/gettext-0.15 )
+	test? ( dev-util/cpputest )
+"
+
+DOCS="AUTHORS.asciidoc ChangeLog.asciidoc ReleaseNotes.asciidoc README.asciidoc"
+
+# tests need to be fixed to not use system plugins if weechat is already installed
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.2-tinfo.patch )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	local i
+
+	epatch "${PATCHES[@]}"
+
+	# fix libdir placement
+	sed -i \
+		-e "s:lib/:$(get_libdir)/:g" \
+		-e "s:lib\":$(get_libdir)\":g" \
+		CMakeLists.txt || die "sed failed"
+
+	# install only required translations
+	for i in ${LANGS} ; do
+		if ! use linguas_${i} ; then
+			sed -i \
+				-e "/${i}.po/d" \
+				po/CMakeLists.txt || die
+		fi
+	done
+
+	# install only required documentation ; en always
+	for i in `grep ADD_SUBDIRECTORY doc/CMakeLists.txt \
+			| sed -e 's/.*ADD_SUBDIRECTORY( \(..\) ).*/\1/' -e '/en/d'`; do
+		if ! use linguas_${i} ; then
+			sed -i \
+				-e '/ADD_SUBDIRECTORY( '${i}' )/d' \
+				doc/CMakeLists.txt || die
+		fi
+	done
+}
+
+src_configure() {
+	# $(cmake-utils_use_enable gtk)
+	# $(cmake-utils_use_enable ncurses)
+	local mycmakeargs=(
+		"-DENABLE_NCURSES=ON"
+		"-DENABLE_LARGEFILE=ON"
+		"-DENABLE_DEMO=OFF"
+		"-DENABLE_GTK=OFF"
+		"-DENABLE_JAVASCRIPT=OFF"
+		"-DPYTHON_EXECUTABLE=${PYTHON}"
+		$(cmake-utils_use_enable alias)
+		$(cmake-utils_use_enable doc)
+		$(cmake-utils_use_enable charset)
+		$(cmake-utils_use_enable exec)
+		$(cmake-utils_use_enable fifo)
+		$(cmake-utils_use_enable guile)
+		$(cmake-utils_use_enable irc)
+		$(cmake-utils_use_enable logger)
+		$(cmake-utils_use_enable lua)
+		$(cmake-utils_use_enable nls)
+		$(cmake-utils_use_enable perl)
+		$(cmake-utils_use_enable python)
+		$(cmake-utils_use_enable relay)
+		$(cmake-utils_use_enable ruby)
+		$(cmake-utils_use_enable scripts)
+		$(cmake-utils_use_enable scripts script)
+		$(cmake-utils_use_enable spell ASPELL)
+		$(cmake-utils_use_enable ssl GNUTLS)
+		$(cmake-utils_use_enable tcl)
+		$(cmake-utils_use_enable test TESTS)
+		$(cmake-utils_use_enable trigger)
+		$(cmake-utils_use_enable xfer)
+	)
+	[[ ${EPYTHON} == python3* ]] && mycmakeargs+=( $(cmake-utils_use_enable python PYTHON3) )
+
+	cmake-utils_src_configure
+}
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index ed5f6e1fe61a..da163740534f 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 inherit eutils python-single-r1 multilib cmake-utils
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
 else
-	SRC_URI="http://${PN}.org/files/src/${P}.tar.bz2"
+	SRC_URI="https://weechat.org/files/src/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
@@ -32,7 +32,7 @@ IUSE="doc nls +ssl test ${LANGS// / linguas_} ${SCRIPT_LANGS} ${PLUGINS} ${INTER
 RDEPEND="
 	dev-libs/libgcrypt:0=
 	net-misc/curl[ssl]
-	sys-libs/ncurses
+	sys-libs/ncurses:0=
 	sys-libs/zlib
 	charset? ( virtual/libiconv )
 	guile? ( dev-scheme/guile:12 )
@@ -40,7 +40,7 @@ RDEPEND="
 	nls? ( virtual/libintl )
 	perl? ( dev-lang/perl )
 	python? ( ${PYTHON_DEPS} )
-	ruby? ( >=dev-lang/ruby-1.9 )
+	ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) )
 	ssl? ( net-libs/gnutls )
 	spell? ( app-text/aspell )
 	tcl? ( >=dev-lang/tcl-8.4.15:0= )
@@ -106,6 +106,7 @@ src_configure() {
 		"-DENABLE_LARGEFILE=ON"
 		"-DENABLE_DEMO=OFF"
 		"-DENABLE_GTK=OFF"
+		"-DENABLE_JAVASCRIPT=OFF"
 		"-DPYTHON_EXECUTABLE=${PYTHON}"
 		$(cmake-utils_use_enable alias)
 		$(cmake-utils_use_enable doc)
diff --git a/net-libs/serf/files/serf-1.3.8-openssl.patch b/net-libs/serf/files/serf-1.3.8-openssl.patch
new file mode 100644
index 000000000000..4cc3719303bb
--- /dev/null
+++ b/net-libs/serf/files/serf-1.3.8-openssl.patch
@@ -0,0 +1,28 @@
+the build doesn't actually use the openssl var for anything useful.
+it blindly adds it to the -I/-L paths which causes problems when you
+cross-compile and when you link (it also adds it to -rpath).  punt
+the setting and forget about it.
+
+--- a/SConstruct
++++ b/SConstruct
+@@ -354,8 +354,6 @@ else:
+     apr_libs = ''
+     apu_libs = ''
+ 
+-  env.Append(CPPPATH=['$OPENSSL/include'])
+-  env.Append(LIBPATH=['$OPENSSL/lib'])
+ 
+ 
+ # If build with gssapi, get its information and define SERF_HAVE_GSSAPI
+@@ -369,8 +369,9 @@ if sys.platform == 'win32':
+ # On some systems, the -R values that APR describes never make it into actual
+ # RPATH flags. We'll manually map all directories in LIBPATH into new
+ # flags to set RPATH values.
+-for d in env['LIBPATH']:
+-  env.Append(RPATH=':'+d)
++if env.get('LIBPATH', None):
++  for d in env['LIBPATH']:
++    env.Append(RPATH=':'+d)
+ 
+ # Set up the construction of serf-*.pc
+ pkgconfig = env.Textfile('serf-%d.pc' % (MAJOR,),
diff --git a/net-libs/serf/files/serf-1.3.8-static-lib.patch b/net-libs/serf/files/serf-1.3.8-static-lib.patch
new file mode 100644
index 000000000000..1538328ece66
--- /dev/null
+++ b/net-libs/serf/files/serf-1.3.8-static-lib.patch
@@ -0,0 +1,49 @@
+respect the active archiver tool instead of using `ar` all the time.
+same for `ranlib`.
+
+also add support for BUILD_STATIC bool for controlling the libserf.a.
+
+--- a/SConstruct
++++ b/SConstruct
+@@ -103,6 +103,9 @@
+   BoolVariable('APR_STATIC',
+                "Enable using a static compiled APR",
+                False),
++  RawListVariable('AR', "Command name or path of the archiver", None),
++  RawListVariable('RANLIB', "Command name or path of the archiver indexer", None),
++  BoolVariable('BUILD_STATIC', 'Build libserf static library', True),
+   RawListVariable('CC', "Command name or path of the C compiler", None),
+   RawListVariable('CFLAGS', "Extra flags for the C compiler (space-separated)",
+                   None),
+@@ -193,6 +196,7 @@ if gssapi and os.path.isdir(gssapi):
+ 
+ debug = env.get('DEBUG', None)
+ aprstatic = env.get('APR_STATIC', None)
++build_static = env.get('BUILD_STATIC', True)
+ 
+ Help(opts.GenerateHelpText(env))
+ opts.Save(SAVED_CONFIG, env)
+@@ -384,7 +388,9 @@ pkgconfig = env.Textfile('serf-%d.pc' % (MAJOR,),
+                                                        env.get('GSSAPI_LIBS', '')),
+                            })
+ 
+-env.Default(lib_static, lib_shared, pkgconfig)
++env.Default(lib_shared, pkgconfig)
++if build_static:
++  env.Default(lib_static)
+ 
+ if CALLOUT_OKAY:
+   conf = Configure(env)
+@@ -420,8 +420,10 @@ if sys.platform == 'darwin':
+                                      % (target_install_shared_path,
+                                         install_shared_path)))
+ 
+-env.Alias('install-lib', [install_static, install_shared,
+-                          ])
++install_libs = [install_shared]
++if build_static:
++  install_libs.append(install_static)
++env.Alias('install-lib', install_libs)
+ env.Alias('install-inc', env.Install(incdir, HEADER_FILES))
+ env.Alias('install-pc', env.Install(os.path.join(libdir, 'pkgconfig'),
+                                     pkgconfig))
diff --git a/net-libs/serf/serf-1.3.8-r1.ebuild b/net-libs/serf/serf-1.3.8-r1.ebuild
new file mode 100644
index 000000000000..c31fb284d26a
--- /dev/null
+++ b/net-libs/serf/serf-1.3.8-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils scons-utils toolchain-funcs
+
+DESCRIPTION="HTTP client library"
+HOMEPAGE="https://code.google.com/p/serf/"
+SRC_URI="https://serf.googlecode.com/svn/src_releases/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="kerberos static-libs"
+
+RDEPEND="dev-libs/apr:1=
+	dev-libs/apr-util:1=
+	dev-libs/openssl:0=
+	sys-libs/zlib:0=
+	kerberos? ( virtual/krb5 )"
+DEPEND="${RDEPEND}
+	>=dev-util/scons-2.3.0"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.3.2-disable_linking_against_unneeded_libraries.patch"
+	epatch "${FILESDIR}/${PN}-1.3.8-scons_variables.patch"
+	epatch "${FILESDIR}/${PN}-1.3.8-tests.patch"
+	epatch "${FILESDIR}/${PN}-1.3.8-static-lib.patch"
+	epatch "${FILESDIR}/${PN}-1.3.8-openssl.patch"
+
+	# https://code.google.com/p/serf/issues/detail?id=133
+	sed -e "/env.Append(CCFLAGS=\['-O2'\])/d" -i SConstruct
+}
+
+src_compile() {
+	myesconsargs=(
+		PREFIX="${EPREFIX}/usr"
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		# These config scripts are sent through a shell with an empty env
+		# which breaks the SYSROOT usage in them.  Set the vars inline to
+		# avoid that.
+		APR="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apr-1-config"
+		APU="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apu-1-config"
+		BUILD_STATIC=$(usex static-libs)
+		AR="$(tc-getAR)"
+		RANLIB="$(tc-getRANLIB)"
+		CC="$(tc-getCC)"
+		CPPFLAGS="${CPPFLAGS}"
+		CFLAGS="${CFLAGS}"
+		LINKFLAGS="${LDFLAGS}"
+	)
+
+	if use kerberos; then
+		myesconsargs+=( GSSAPI="${SYSROOT}${EPREFIX}/usr/bin/krb5-config" )
+	fi
+
+	escons
+}
+
+src_test() {
+	escons check
+}
+
+src_install() {
+	escons install --install-sandbox="${D}"
+}
diff --git a/net-mail/getmail/Manifest b/net-mail/getmail/Manifest
index a292cabd8f06..c4ffc8fdef54 100644
--- a/net-mail/getmail/Manifest
+++ b/net-mail/getmail/Manifest
@@ -1 +1,2 @@
 DIST getmail-4.48.0.tar.gz 190129 SHA256 49441e92eed577127331caf9b97f2ddaea14e97e8a49259efd9184a766a9b94c SHA512 fb37dfb6f9edc770f7186b8c3ae67642181b1b025cccf31434814aec4d5f78f021ce73fa5493b7b82b0f2d5a70e58d389cbfc408475547d43b82a98e4645d090 WHIRLPOOL 218a5d1d1c3719dcd64f8ee8947553cbe4b391df97ab8b90a418c846189c592a887abfc05d387534efc2ec20b6b9b71656547705650979458718adb953d99c04
+DIST getmail-4.49.0.tar.gz 150719 SHA256 1c6c4a3ebd17c1b15dc940a5888b0ceca4d135c1c20629ebe274ba025aff1ed4 SHA512 5cd53aecf54dee6e7d70aa3a1dab9c1e01e681280424c03ce4360faa2653386da2e4b14e7876e8ab46fee92f62e5036ab794850ab85f66c7c26b747bf8becc34 WHIRLPOOL d1cf995505dd889ff942af10047f7773923bd934792dd699ecb071209416edfe33fcfe8d82f894046e1c9576d0cc9d0cb6099e742a2432dc5b9af8f66573e505
diff --git a/net-mail/getmail/getmail-4.49.0.ebuild b/net-mail/getmail/getmail-4.49.0.ebuild
new file mode 100644
index 000000000000..c0f8d4e4a978
--- /dev/null
+++ b/net-mail/getmail/getmail-4.49.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ssl?"
+
+inherit distutils-r1
+
+DESCRIPTION="A POP3 mail retriever with reliable Maildir and mbox delivery"
+HOMEPAGE="http://pyropus.ca/software/getmail/"
+SRC_URI="http://pyropus.ca/software/getmail/old-versions/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x86-macos ~x64-solaris"
+IUSE="ssl"
+
+python_prepare_all() {
+	sed -i -e "s,'getmail-%s' % __version__,'${PF}'," \
+		-e "/docs\/COPYING/d" "${S}"/setup.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/net-mail/libpst/Manifest b/net-mail/libpst/Manifest
index cb48fe25a483..6b5466cf405d 100644
--- a/net-mail/libpst/Manifest
+++ b/net-mail/libpst/Manifest
@@ -1,7 +1,2 @@
-DIST libpst-0.6.55.tar.gz 13444072 SHA256 ef69d87ae5e28175c2abeb8ae5e714eae218a0c950a5071a16fefb851e2912c5 SHA512 5f797484d70c8a00be1049722809bfa1f879fdda3620c8b01ce1888988aa206ff5a2b71e5d53b5546cef24b8aa10c44b722b1998f9e187493a564318e6c22758 WHIRLPOOL c8dd98ec4904a290d7b42f3d9dc092a6d7d7f48473608f389fa78e8da2f142104a20646feb23c0709740fbcb5b9d0f0eba85fdef3a7e763a9b9950b315fd53a2
-DIST libpst-0.6.58.tar.gz 13903372 SHA256 585222d78ce288b390bea4e03b0a8d394f66a944db5a85d9eaa34a50cecd5cd4 SHA512 aed748dc5d4e126fa712f756afd985ac26ea3e934b5fbd99352bf0c3d7486bd560249ab44b6daf91535d6fa82c942598fa528bfea872c2aca1b079d54a2c8d0d WHIRLPOOL caede778ae62a8a9aaf469753c1444de4be5ae4e5fe1d1bc6721bc9838f538dca074c9d36585e07b752707aef0f584bdb9c0a7907d3bf1f2743cfdfa655386aa
-DIST libpst-0.6.59.tar.gz 13904462 SHA256 b02733c95196b81635d088dab2a7e1e1321ef357bb27d5d0996ea82b16bc15f8 SHA512 5d69660f7490f0acdda9519f20f6853769feaca4c033adb37dc2662f8edcb0c3fb0067fe8941ad728832ad16dcaefb3f406fffcc81a9aebaa67fc2d4138ed83b WHIRLPOOL 498022ac84f127fcf85ac8002726dd147212b1f2e9103f74453f26bb69223d34398aa7fd8f7bc5670362e1015c62680de6bbe79f9b975fa20ea3dc86193294ea
-DIST libpst-0.6.60.tar.gz 13851530 SHA256 dc31bb66020ce5f4cfee9d195b37172423614c281b751cd76b8e033c53cfa62f SHA512 b5e4b00d6653c3fecd0127746d64174ec69236b13ab3e9e57964fe4b283aa72ac3d62d6dd4554cdf91e3c0e42a57c6e1947baa4e358804118b763c7daa77d3dc WHIRLPOOL c7948ba6442af236867cd4933b31e6382636f4c19828cec5375b3b9cdf5b504c88ef3efc0be30eb12021abe87dd566fa7dbc72020cd19633b44ac9917bd004c9
-DIST libpst-0.6.61.tar.gz 13852925 SHA256 aad27d0097aa7359b7a839894345fb77f0e22fbac8d5ec0e96fc8ed2f738806e SHA512 46c9a685ba87bd3057754c8dd427230e747d01f42f076b9851cd2ff06e48defb98adaa44c7a905aa6e803daa22057f7f78ca0bc47375a7a5999281ea2365af03 WHIRLPOOL e05a6774ec1a3bf94e1b7fe80b061f4e9cc6a96a1d2a5a216f8a1413b9f4b667ce9c6bef5d5830f98d9132ce3eee7c02d96585491e0717d95c9cbb3ef0d8256a
-DIST libpst-0.6.63.tar.gz 13853290 SHA256 5f522606fb7b97d6e31bc2490dcce77b89ec77e12ade4af4551290f953483062 SHA512 1d45f3a19851e25b8af495c3ceeee34b74c4d14d4a9a723dcf63c009b38e5bcbc4cdb3219d136c234a85992f2d96a74b6069ad5b6cc8eed1963dfd6f7c46e836 WHIRLPOOL 19cac49b72d0fdd787105ffdadf6d8503735b21d1d6f615de4ffa0cdc4d8cb6f50010399a05bc2a101d08268ff25928eb11ece69d774dd2acc2625bf18ad4295
 DIST libpst-0.6.64.tar.gz 13861215 SHA256 13c4f26f422b571c08ec5f602d878527606a435408724b1bf90a11e31dc17fe3 SHA512 28f5ca83c4ede616b2d4d8dfd074a6866932a08594419aa7bb2af49f7871b4c92d97e0a583d8e2ef3be88a26c1a98c10ce9b1c0498073b528b6810d75988ee4a WHIRLPOOL 3f8c264cb1e9cf36992d453d5568af3fe195aef9f67fea529c50f8de71ba6b49e37b9bb95b817e34210f680b87682daaef121540bf5bd2d4388304f37c9dad46
+DIST libpst-0.6.66.tar.gz 13836942 SHA256 92b49939d821091d9d25e27e17c78dbb867f3f9ab5b8f43e2b01ace0677e1f72 SHA512 0d07b13554b9e009787ce651714281d21a4d38afae997bd87244690538bd18176ab74655c0a0646b1c475c916052d4295ffe749e6a03765450af7e9c8443dd86 WHIRLPOOL 32c59f618013a2f1799b880eb3231d668412e22b1292cd5d4c026ca12e23c2133304f6ec3bd67ea22ec3622b5f32028d54fbaebd6e1d1d788284eecc1a29252f
diff --git a/net-mail/libpst/libpst-0.6.55.ebuild b/net-mail/libpst/libpst-0.6.55.ebuild
deleted file mode 100644
index e86b407b8524..000000000000
--- a/net-mail/libpst/libpst-0.6.55.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-PYTHON_DEPEND="python? 2"
-
-inherit autotools eutils python
-
-DESCRIPTION="Tools and library for reading Outlook files (.pst format)"
-HOMEPAGE="http://www.five-ten-sg.com/libpst/"
-SRC_URI="http://www.five-ten-sg.com/${PN}/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="debug dii doc python static-libs"
-
-RDEPEND="dii? ( media-gfx/imagemagick[png] )"
-DEPEND="${RDEPEND}
-	virtual/libiconv
-	virtual/pkgconfig
-	dii? ( media-libs/gd[png] )
-	python? ( >=dev-libs/boost-1.48[python] )"
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# don't build the static python library
-	epatch "${FILESDIR}"/${PN}-0.6.52-no-static-python-lib.patch
-
-	# fix pkgconfig file for static linking
-	epatch "${FILESDIR}"/${PN}-0.6.53-pkgconfig-static.patch
-
-	# conditionally install the extra documentation
-	use doc || { sed -i -e "/SUBDIRS/s: html::" Makefile.am || die; }
-
-	# don't install duplicate docs
-	sed -i -e "/^html_DATA =/d" Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-libpst-shared \
-		$(use_enable debug pst-debug) \
-		$(use_enable dii) \
-		$(use_enable python) \
-		$(use_enable static-libs static) \
-		$(use python && echo --with-boost-python=boost_python-${PYTHON_ABI})
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/net-mail/libpst/libpst-0.6.58.ebuild b/net-mail/libpst/libpst-0.6.58.ebuild
deleted file mode 100644
index 25914c5946a5..000000000000
--- a/net-mail/libpst/libpst-0.6.58.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-PYTHON_DEPEND="python? 2"
-
-inherit autotools eutils python
-
-DESCRIPTION="Tools and library for reading Outlook files (.pst format)"
-HOMEPAGE="http://www.five-ten-sg.com/libpst/"
-SRC_URI="http://www.five-ten-sg.com/${PN}/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="debug dii doc python static-libs"
-
-RDEPEND="dii? ( media-gfx/imagemagick[png] )
-	gnome-extra/libgsf"
-DEPEND="${RDEPEND}
-	virtual/libiconv
-	virtual/pkgconfig
-	dii? ( media-libs/gd[png] )
-	python? ( >=dev-libs/boost-1.48[python] )"
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# don't build the static python library
-	epatch "${FILESDIR}"/${PN}-0.6.52-no-static-python-lib.patch
-
-	# fix pkgconfig file for static linking
-	epatch "${FILESDIR}"/${PN}-0.6.53-pkgconfig-static.patch
-
-	# conditionally install the extra documentation
-	use doc || { sed -i -e "/SUBDIRS/s: html::" Makefile.am || die; }
-
-	# don't install duplicate docs
-	sed -i -e "/^html_DATA =/d" Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-libpst-shared \
-		$(use_enable debug pst-debug) \
-		$(use_enable dii) \
-		$(use_enable python) \
-		$(use_enable static-libs static) \
-		$(use python && echo --with-boost-python=boost_python-${PYTHON_ABI})
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/net-mail/libpst/libpst-0.6.60.ebuild b/net-mail/libpst/libpst-0.6.60.ebuild
deleted file mode 100644
index 79a4353c0ed4..000000000000
--- a/net-mail/libpst/libpst-0.6.60.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-PYTHON_DEPEND="python? 2"
-
-inherit autotools eutils python
-
-DESCRIPTION="Tools and library for reading Outlook files (.pst format)"
-HOMEPAGE="http://www.five-ten-sg.com/libpst/"
-SRC_URI="http://www.five-ten-sg.com/${PN}/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug dii doc python static-libs"
-
-RDEPEND="dii? ( media-gfx/imagemagick[png] )
-	gnome-extra/libgsf"
-DEPEND="${RDEPEND}
-	virtual/libiconv
-	virtual/pkgconfig
-	dii? ( media-libs/gd[png] )
-	python? ( >=dev-libs/boost-1.48[python] )"
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# don't build the static python library
-	epatch "${FILESDIR}"/${PN}-0.6.52-no-static-python-lib.patch
-
-	# fix pkgconfig file for static linking
-	epatch "${FILESDIR}"/${PN}-0.6.53-pkgconfig-static.patch
-
-	# conditionally install the extra documentation
-	use doc || { sed -i -e "/SUBDIRS/s: html::" Makefile.am || die; }
-
-	# don't install duplicate docs
-	sed -i -e "/^html_DATA =/d" Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-libpst-shared \
-		$(use_enable debug pst-debug) \
-		$(use_enable dii) \
-		$(use_enable python) \
-		$(use_enable static-libs static) \
-		$(use python && echo --with-boost-python=boost_python-${PYTHON_ABI})
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/net-mail/libpst/libpst-0.6.61.ebuild b/net-mail/libpst/libpst-0.6.61.ebuild
deleted file mode 100644
index 354401ed9618..000000000000
--- a/net-mail/libpst/libpst-0.6.61.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-PYTHON_DEPEND="python? 2"
-
-inherit autotools eutils python
-
-DESCRIPTION="Tools and library for reading Outlook files (.pst format)"
-HOMEPAGE="http://www.five-ten-sg.com/libpst/"
-SRC_URI="http://www.five-ten-sg.com/${PN}/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="debug dii doc python static-libs"
-
-RDEPEND="dii? ( media-gfx/imagemagick[png] )
-	gnome-extra/libgsf"
-DEPEND="${RDEPEND}
-	virtual/libiconv
-	virtual/pkgconfig
-	dii? ( media-libs/gd[png] )
-	python? ( >=dev-libs/boost-1.48[python] )"
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# don't build the static python library
-	epatch "${FILESDIR}"/${PN}-0.6.52-no-static-python-lib.patch
-
-	# fix pkgconfig file for static linking
-	epatch "${FILESDIR}"/${PN}-0.6.53-pkgconfig-static.patch
-
-	# conditionally install the extra documentation
-	use doc || { sed -i -e "/SUBDIRS/s: html::" Makefile.am || die; }
-
-	# don't install duplicate docs
-	sed -i -e "/^html_DATA =/d" Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-libpst-shared \
-		$(use_enable debug pst-debug) \
-		$(use_enable dii) \
-		$(use_enable python) \
-		$(use_enable static-libs static) \
-		$(use python && echo --with-boost-python=boost_python-${PYTHON_ABI})
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/net-mail/libpst/libpst-0.6.63.ebuild b/net-mail/libpst/libpst-0.6.63.ebuild
deleted file mode 100644
index 354401ed9618..000000000000
--- a/net-mail/libpst/libpst-0.6.63.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-PYTHON_DEPEND="python? 2"
-
-inherit autotools eutils python
-
-DESCRIPTION="Tools and library for reading Outlook files (.pst format)"
-HOMEPAGE="http://www.five-ten-sg.com/libpst/"
-SRC_URI="http://www.five-ten-sg.com/${PN}/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="debug dii doc python static-libs"
-
-RDEPEND="dii? ( media-gfx/imagemagick[png] )
-	gnome-extra/libgsf"
-DEPEND="${RDEPEND}
-	virtual/libiconv
-	virtual/pkgconfig
-	dii? ( media-libs/gd[png] )
-	python? ( >=dev-libs/boost-1.48[python] )"
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# don't build the static python library
-	epatch "${FILESDIR}"/${PN}-0.6.52-no-static-python-lib.patch
-
-	# fix pkgconfig file for static linking
-	epatch "${FILESDIR}"/${PN}-0.6.53-pkgconfig-static.patch
-
-	# conditionally install the extra documentation
-	use doc || { sed -i -e "/SUBDIRS/s: html::" Makefile.am || die; }
-
-	# don't install duplicate docs
-	sed -i -e "/^html_DATA =/d" Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-libpst-shared \
-		$(use_enable debug pst-debug) \
-		$(use_enable dii) \
-		$(use_enable python) \
-		$(use_enable static-libs static) \
-		$(use python && echo --with-boost-python=boost_python-${PYTHON_ABI})
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/net-mail/libpst/libpst-0.6.64.ebuild b/net-mail/libpst/libpst-0.6.64.ebuild
index 6a70f8892712..3ea5b8fc2156 100644
--- a/net-mail/libpst/libpst-0.6.64.ebuild
+++ b/net-mail/libpst/libpst-0.6.64.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.five-ten-sg.com/${PN}/packages/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="debug dii doc python static-libs"
 
 RDEPEND="dii? ( media-gfx/imagemagick[png] )
diff --git a/net-mail/libpst/libpst-0.6.59.ebuild b/net-mail/libpst/libpst-0.6.66.ebuild
similarity index 96%
rename from net-mail/libpst/libpst-0.6.59.ebuild
rename to net-mail/libpst/libpst-0.6.66.ebuild
index 79a4353c0ed4..d74c815c7d9b 100644
--- a/net-mail/libpst/libpst-0.6.59.ebuild
+++ b/net-mail/libpst/libpst-0.6.66.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=5
 PYTHON_DEPEND="python? 2"
 
 inherit autotools eutils python
diff --git a/net-mail/libpst/metadata.xml b/net-mail/libpst/metadata.xml
index 896f994c2ce1..f2dd6174b4b0 100644
--- a/net-mail/libpst/metadata.xml
+++ b/net-mail/libpst/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>forensics</herd>
+  <herd>forensics</herd>
   <use>
     <flag name="dii">enable dii support</flag>
   </use>
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index c7e4e9dda25d..775ee66ef488 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -2,4 +2,8 @@ DIST openssh-6.8_p1-sctp.patch.xz 7388 SHA256 2c74dd00aaae9f4de908d8e5685ae98277
 DIST openssh-7.1p1+x509-8.6.diff.gz 413931 SHA256 cbf661a1fec080dc9ed335a290414154326c2a13f124985db050b86a91073d52 SHA512 c91d0f1b69b6d34984e94b391ad022271e73d0634cef2df355ba555366bc38d30649b478f245b6c51ce79d71adf1b693bc97826e6c6013a78e7ccfb7023b4bcc WHIRLPOOL 4ed4427e80026996c43a188d7d45f2c53fa6a7fd842a248b1225b27f3e9037e761f0ed172d79b53ada81c24d958a2193e94d918f6ca1320e45d5e68379845981
 DIST openssh-7.1p1-hpnssh14v9.tar.xz 21580 SHA256 a795c2f2621f537b3fd98172cbd1f7c71869e4da78cd280d123fa19ae4262b97 SHA512 6ce151949bf81b5518b95092a2f18d2f24581954e2c629deaf3c1d10136f32f830567aafb9b4045547e95e3ab63cf750e240eac40e2b9caa6d71cb2b132821ec WHIRLPOOL 8e3c9a1d79112092a6cb42c6766ccdf61e5d8fcd366ea5c7d3bab94cf309bcc12f3761476a288158638a340023aa24519d888caac19fb0ef25fa56bdab06412c
 DIST openssh-7.1p1.tar.gz 1493170 SHA256 fc0a6d2d1d063d5c66dffd952493d0cda256cad204f681de0f84ef85b2ad8428 SHA512 f1491ca5a0a733eb27ede966590642a412cb7be7178dcb7b9e5844bbdc8383032f4b00435192b95fc0365b6fe74d6c5ac8d6facbe9d51e1532d049e2f784e8f7 WHIRLPOOL a650a93657f930d20dc3fa24ab720857f63f7cd0a82d1906cf1e58145e866129207851d5e587d678655e5731fa73221ab9b6ea0754533100c25fe2acaa442e05
+DIST openssh-7.1p2+x509-8.6.diff.xz 283964 SHA256 0848ceb42fa15f6197d5d81f9da6dea9cc3a7fda2fdb424447fa0f995a5197d1 SHA512 276f5738498ce9a559a5066cfeb670c48f275c2cbf7b007f213405b71349f1f77cc2c7bee6af5ee548b9443f0e44ede0e3d232a31b52ac834cf81cac855bfa87 WHIRLPOOL 024b9f0d9dda3ec2ae7da156f801c3735e5ff7198010fbc021ccde8adada28e45f076264c9f09fc34586adc52d8ad93689b4bdbecaaad7761bb9e26a8c4af231
+DIST openssh-7.1p2-hpnssh14v10.tar.xz 22388 SHA256 729e20a2627ca403da6cfff8ef251c03421022123a21c68003181b4e5409bcc5 SHA512 b8e88ac5891ed632416db8da6377512614f19f5f7a7c093b55ecfe3e3f50979c61c0674e9381c316632d8daed90f8cce958c9b77bd00084a4ee1b0297cf321ba WHIRLPOOL c466cc33dc4a40e9466148beb154c539e095ac1b9cdcc5b3d235cbcf12ca10255d63da2f0e1da10d1afa1a0d2ebd436ca0d9e542c732df6ef67fb8f4d2d0192c
+DIST openssh-7.1p2.tar.gz 1475829 SHA256 dd75f024dcf21e06a0d6421d582690bf987a1f6323e32ad6619392f3bfde6bbd SHA512 d5be60f3645ec238b21e1f2dfd801b2136146674bbc086ebdb14be516c613819bc87c84b5089f3a45fe6e137a7458404f79f42572c69d91571e45ebed9d5e3af WHIRLPOOL 9f48952b82db3983c20e84bcff5b6761f5b284174072c828698dced3a53ca8bbc2e1f89d2e82b62a68f4606b52c980fcf097250f86c1a67ad343d20e3ec9d1f4
 DIST openssh-lpk-6.8p1-0.3.14.patch.xz 16940 SHA256 d5f048dc7e9d3fca085c152fc31306f1d8fa793e524c538295915b075ec085b0 SHA512 2470b6b46f8c7ac985f82d14b788a3eb81a468a1d5013cb7f89257d9dd78b6037e24bf54ac57b757db8ed1df24332d659cf918c11ea73592fd24a69c25a54081 WHIRLPOOL b041ee9e0efdf370686f11df4131ab5e5ffb2f11cc66c386a8223bf563c5b78ab9443f06e4adc2e506e440cdec9dc5b20f5972cd8d691d786d2f903bb49b947b
+DIST openssh-lpk-7.1p2-0.3.14.patch.xz 17704 SHA256 fbf2e1560cac707f819a539999c758a444ba6bfe140ef80d1af7ef1c9a95f0df SHA512 95851baa699da16720358249d54d2f6a3c57b0ae082375bef228b97697c501c626ab860916c5b17e3c649b44f14f4009ff369962597438dfd60480a0e4882471 WHIRLPOOL 4629b3a7d1f373a678935e889a6cd0d66d70b420e93e40ae0ad19aa7f91be7dcf2169fb797d89df93005a885d54ebaa0d46c2e5418bd2d0a77ad64e65897b518
diff --git a/net-misc/openssh/files/openssh-7.1_p2-x509-hpn14v10-glue.patch b/net-misc/openssh/files/openssh-7.1_p2-x509-hpn14v10-glue.patch
new file mode 100644
index 000000000000..512456975bd6
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.1_p2-x509-hpn14v10-glue.patch
@@ -0,0 +1,51 @@
+--- openssh-7.1p2/Makefile.in
++++ openssh-7.1p2/Makefile.in
+@@ -45,7 +45,7 @@
+ CC=@CC@
+ LD=@LD@
+ CFLAGS=@CFLAGS@
+-CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@
++CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
+ LIBS=@LIBS@
+ K5LIBS=@K5LIBS@
+ GSSLIBS=@GSSLIBS@
+@@ -53,6 +53,7 @@
+ SSHDLIBS=@SSHDLIBS@
+ LIBEDIT=@LIBEDIT@
+ LIBLDAP=@LDAP_LDFLAGS@ @LDAP_LIBS@
++CPPFLAGS+=@LDAP_CPPFLAGS@
+ AR=@AR@
+ AWK=@AWK@
+ RANLIB=@RANLIB@
+--- openssh-7.1p2/sshconnect.c
++++ openssh-7.1p2/sshconnect.c
+@@ -465,7 +465,7 @@
+ {
+ 	/* Send our own protocol version identification. */
+ 	if (compat20) {
+-		xasprintf(&client_version_string, "SSH-%d.%d-%.100s PKIX\r\n",
++		xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n",
+ 		    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION);
+ 	} else {
+ 		xasprintf(&client_version_string, "SSH-%d.%d-%.100s\n",
+--- openssh-7.1p2/sshd.c
++++ openssh-7.1p2/sshd.c
+@@ -472,8 +472,8 @@
+ 		comment = "";
+ 	}
+ 
+-	xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s%s",
+-	    major, minor, SSH_VERSION, comment,
++	xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s",
++	    major, minor, SSH_VERSION,
+ 	    *options.version_addendum == '\0' ? "" : " ",
+ 	    options.version_addendum, newline);
+ 
+--- openssh-7.1p2/version.h
++++ openssh-7.1p2/version.h
+@@ -3,4 +3,5 @@
+ #define SSH_VERSION	"OpenSSH_7.1"
+ 
+ #define SSH_PORTABLE	"p2"
++#define SSH_X509	" PKIX"
+ #define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
diff --git a/net-misc/openssh/openssh-7.1_p1-r2.ebuild b/net-misc/openssh/openssh-7.1_p1-r2.ebuild
index 584f3848d12d..40ee3c8aa5ef 100644
--- a/net-misc/openssh/openssh-7.1_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-7.1_p1-r2.ebuild
@@ -116,9 +116,11 @@ src_prepare() {
 
 	if use X509 ; then
 		pushd .. >/dev/null
-		pushd ${HPN_PATCH%.*.*} >/dev/null
-		epatch "${FILESDIR}"/${PN}-7.1_p1-hpn-x509-glue.patch
-		popd >/dev/null
+		if use hpn ; then
+			pushd ${HPN_PATCH%.*.*} >/dev/null
+			epatch "${FILESDIR}"/${PN}-7.1_p1-hpn-x509-glue.patch
+			popd >/dev/null
+		fi
 		epatch "${FILESDIR}"/${PN}-7.0_p1-sctp-x509-glue.patch
 		popd >/dev/null
 		epatch "${WORKDIR}"/${X509_PATCH%.*}
diff --git a/net-misc/openssh/openssh-7.1_p1-r3.ebuild b/net-misc/openssh/openssh-7.1_p1-r3.ebuild
index f8aac3e0c6af..07f0e7fcf6d6 100644
--- a/net-misc/openssh/openssh-7.1_p1-r3.ebuild
+++ b/net-misc/openssh/openssh-7.1_p1-r3.ebuild
@@ -27,7 +27,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 # Probably want to drop ssl defaulting to on in a future version.
 IUSE="bindist debug ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl pam +pie sctp selinux skey ssh1 +ssl static X X509"
 REQUIRED_USE="ldns? ( ssl )
@@ -115,9 +115,11 @@ src_prepare() {
 
 	if use X509 ; then
 		pushd .. >/dev/null
-		pushd ${HPN_PATCH%.*.*} >/dev/null
-		epatch "${FILESDIR}"/${PN}-7.1_p1-hpn-x509-glue.patch
-		popd >/dev/null
+		if use hpn ; then
+			pushd ${HPN_PATCH%.*.*} >/dev/null
+			epatch "${FILESDIR}"/${PN}-7.1_p1-hpn-x509-glue.patch
+			popd >/dev/null
+		fi
 		epatch "${FILESDIR}"/${PN}-7.0_p1-sctp-x509-glue.patch
 		popd >/dev/null
 		epatch "${WORKDIR}"/${X509_PATCH%.*}
diff --git a/net-misc/openssh/openssh-7.1_p2.ebuild b/net-misc/openssh/openssh-7.1_p2.ebuild
new file mode 100644
index 000000000000..153649a27ab0
--- /dev/null
+++ b/net-misc/openssh/openssh-7.1_p2.ebuild
@@ -0,0 +1,327 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils user flag-o-matic multilib autotools pam systemd versionator
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_}
+
+HPN_PATCH="${PARCH}-hpnssh14v10.tar.xz"
+LDAP_PATCH="${PN}-lpk-7.1p2-0.3.14.patch.xz"
+X509_VER="8.6" X509_PATCH="${PN}-${PV/_}+x509-${X509_VER}.diff.xz"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="http://www.openssh.org/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	mirror://gentoo/${PN}-6.8_p1-sctp.patch.xz
+	${HPN_PATCH:+hpn? (
+		mirror://gentoo/${HPN_PATCH}
+		mirror://sourceforge/hpnssh/${HPN_PATCH}
+	)}
+	${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )}
+	${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
+	"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+# Probably want to drop ssl defaulting to on in a future version.
+IUSE="bindist debug ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl pam +pie sctp selinux skey ssh1 +ssl static X X509"
+REQUIRED_USE="ldns? ( ssl )
+	pie? ( !static )
+	ssh1? ( ssl )
+	static? ( !kerberos !pam )
+	X509? ( !ldap ssl )"
+
+LIB_DEPEND="
+	ldns? (
+		net-libs/ldns[static-libs(+)]
+		!bindist? ( net-libs/ldns[ecdsa,ssl] )
+		bindist? ( net-libs/ldns[-ecdsa,ssl] )
+	)
+	libedit? ( dev-libs/libedit[static-libs(+)] )
+	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
+	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
+	skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
+	ssl? (
+		!libressl? (
+			>=dev-libs/openssl-0.9.8f:0[bindist=]
+			dev-libs/openssl:0[static-libs(+)]
+		)
+		libressl? ( dev-libs/libressl[static-libs(+)] )
+	)
+	>=sys-libs/zlib-1.2.3[static-libs(+)]"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( virtual/pam )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	virtual/pkgconfig
+	virtual/os-headers
+	sys-devel/autoconf"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20081028 )
+	userland_GNU? ( virtual/shadow )
+	X? ( x11-apps/xauth )"
+
+S=${WORKDIR}/${PARCH}
+
+pkg_setup() {
+	# this sucks, but i'd rather have people unable to `emerge -u openssh`
+	# than not be able to log in to their server any more
+	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
+	local fail="
+		$(use X509 && maybe_fail X509 X509_PATCH)
+		$(use ldap && maybe_fail ldap LDAP_PATCH)
+		$(use hpn && maybe_fail hpn HPN_PATCH)
+	"
+	fail=$(echo ${fail})
+	if [[ -n ${fail} ]] ; then
+		eerror "Sorry, but this version does not yet support features"
+		eerror "that you requested:	 ${fail}"
+		eerror "Please mask ${PF} for now and check back later:"
+		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
+		die "booooo"
+	fi
+
+	# Make sure people who are using tcp wrappers are notified of its removal. #531156
+	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
+		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
+		ewarn "you're trying to use it.  Update your ${EROOT}etc/hosts.{allow,deny} please."
+	fi
+}
+
+save_version() {
+	# version.h patch conflict avoidence
+	mv version.h version.h.$1
+	cp -f version.h.pristine version.h
+}
+
+src_prepare() {
+	sed -i \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
+		pathnames.h || die
+	# keep this as we need it to avoid the conflict between LPK and HPN changing
+	# this file.
+	cp version.h version.h.pristine
+
+	# don't break .ssh/authorized_keys2 for fun
+	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
+
+	if use X509 ; then
+		pushd .. >/dev/null
+		if use hpn ; then
+			pushd ${HPN_PATCH%.*.*} >/dev/null
+			epatch "${FILESDIR}"/${PN}-7.1_p1-hpn-x509-glue.patch
+			popd >/dev/null
+		fi
+		epatch "${FILESDIR}"/${PN}-7.0_p1-sctp-x509-glue.patch
+		popd >/dev/null
+		epatch "${WORKDIR}"/${X509_PATCH%.*}
+		epatch "${FILESDIR}"/${PN}-7.1_p2-x509-hpn14v10-glue.patch
+		epatch "${FILESDIR}"/${PN}-6.9_p1-x509-warnings.patch
+		save_version X509
+	fi
+	if use ldap ; then
+		epatch "${WORKDIR}"/${LDAP_PATCH%.*}
+		save_version LPK
+	fi
+	epatch "${FILESDIR}"/${PN}-4.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+	epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
+	# The X509 patchset fixes this independently.
+	use X509 || epatch "${FILESDIR}"/${PN}-6.8_p1-ssl-engine-configure.patch
+	epatch "${WORKDIR}"/${PN}-6.8_p1-sctp.patch
+	if use hpn ; then
+		EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+			EPATCH_MULTI_MSG="Applying HPN patchset ..." \
+			epatch "${WORKDIR}"/${HPN_PATCH%.*.*}
+		save_version HPN
+	fi
+
+	tc-export PKG_CONFIG
+	local sed_args=(
+		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
+		# Disable PATH reset, trust what portage gives us #254615
+		-e 's:^PATH=/:#PATH=/:'
+		# Disable fortify flags ... our gcc does this for us
+		-e 's:-D_FORTIFY_SOURCE=2::'
+	)
+	# The -ftrapv flag ICEs on hppa #505182
+	use hppa && sed_args+=(
+		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
+		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
+	)
+	sed -i "${sed_args[@]}" configure{.ac,} || die
+
+	epatch_user #473004
+
+	# Now we can build a sane merged version.h
+	(
+		sed '/^#define SSH_RELEASE/d' version.h.* | sort -u
+		macros=()
+		for p in HPN LPK X509 ; do [ -e version.h.${p} ] && macros+=( SSH_${p} ) ; done
+		printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros}"
+	) > version.h
+
+	eautoreconf
+}
+
+src_configure() {
+	addwrite /dev/ptmx
+
+	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
+	use static && append-ldflags -static
+
+	local myconf=(
+		--with-ldflags="${LDFLAGS}"
+		--disable-strip
+		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
+		--sysconfdir="${EPREFIX}"/etc/ssh
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX}"/var/empty
+		--with-privsep-user=sshd
+		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
+		# We apply the ldap patch conditionally, so can't pass --without-ldap
+		# unconditionally else we get unknown flag warnings.
+		$(use ldap && use_with ldap)
+		$(use_with ldns)
+		$(use_with libedit)
+		$(use_with pam)
+		$(use_with pie)
+		$(use_with sctp)
+		$(use_with selinux)
+		$(use_with skey)
+		$(use_with ssh1)
+		$(use_with ssl openssl)
+		$(use_with ssl md5-passwords)
+		$(use_with ssl ssl-engine)
+	)
+
+	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
+	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake install-nokeys DESTDIR="${D}"
+	fperms 600 /etc/ssh/sshd_config
+	dobin contrib/ssh-copy-id
+	newinitd "${FILESDIR}"/sshd.rc6.4 sshd
+	newconfd "${FILESDIR}"/sshd.confd sshd
+	keepdir /var/empty
+
+	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+	if use pam ; then
+		sed -i \
+			-e "/^#UsePAM /s:.*:UsePAM yes:" \
+			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
+			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+
+	# Gentoo tweaks to default config files
+	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
+
+	# Allow client to pass locale environment variables #367017
+	AcceptEnv LANG LC_*
+	EOF
+	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
+
+	# Send locale environment variables #367017
+	SendEnv LANG LC_*
+	EOF
+
+	if ! use X509 && [[ -n ${LDAP_PATCH} ]] && use ldap ; then
+		insinto /etc/openldap/schema/
+		newins openssh-lpk_openldap.schema openssh-lpk.schema
+	fi
+
+	doman contrib/ssh-copy-id.1
+	dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config
+
+	diropts -m 0700
+	dodir /etc/skel/.ssh
+
+	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
+	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
+}
+
+src_test() {
+	local t tests skipped failed passed shell
+	tests="interop-tests compat-tests"
+	skipped=""
+	shell=$(egetshell ${UID})
+	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
+		elog "Running the full OpenSSH testsuite"
+		elog "requires a usable shell for the 'portage'"
+		elog "user, so we will run a subset only."
+		skipped="${skipped} tests"
+	else
+		tests="${tests} tests"
+	fi
+	# It will also attempt to write to the homedir .ssh
+	local sshhome=${T}/homedir
+	mkdir -p "${sshhome}"/.ssh
+	for t in ${tests} ; do
+		# Some tests read from stdin ...
+		HOMEDIR="${sshhome}" \
+		emake -k -j1 ${t} </dev/null \
+			&& passed="${passed}${t} " \
+			|| failed="${failed}${t} "
+	done
+	einfo "Passed tests: ${passed}"
+	ewarn "Skipped tests: ${skipped}"
+	if [[ -n ${failed} ]] ; then
+		ewarn "Failed tests: ${failed}"
+		die "Some tests failed: ${failed}"
+	else
+		einfo "Failed tests: ${failed}"
+		return 0
+	fi
+}
+
+pkg_preinst() {
+	enewgroup sshd 22
+	enewuser sshd 22 -1 /var/empty sshd
+}
+
+pkg_postinst() {
+	if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then
+		elog "Starting with openssh-5.8p1, the server will default to a newer key"
+		elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
+		elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
+	fi
+	if has_version "<${CATEGORY}/${PN}-6.9_p1" ; then
+		elog "Starting with openssh-6.9p1, ssh1 support is disabled by default."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.0_p1" ; then
+		elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
+		elog "Make sure to update any configs that you might have.  Note that xinetd might"
+		elog "be an alternative for you as it supports USE=tcpd."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.1_p1" ; then #557388 #555518
+		elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
+		elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
+		elog "adding to your sshd_config or ~/.ssh/config files:"
+		elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
+		elog "You should however generate new keys using rsa or ed25519."
+
+		elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
+		elog "to 'prohibit-password'.  That means password auth for root users no longer works"
+		elog "out of the box.  If you need this, please update your sshd_config explicitly."
+	fi
+	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then
+		elog "Be aware that by disabling openssl support in openssh, the server and clients"
+		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
+		elog "and update all clients/servers that utilize them."
+	fi
+}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 3df4c019a2aa..b892e026e675 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -3,3 +3,4 @@ DIST youtube-dl-2015.12.23.tar.gz 1850244 SHA256 fe7088979c78eb900c3db110a577866
 DIST youtube-dl-2015.12.29.tar.gz 1863530 SHA256 4ff67c9cb65f36f0409dc2f35953fe1b66164512c06d46ebb345cb8a70e46208 SHA512 15bef247acca28f29c798bda8413155c8985e0f2ffc8be35ec539de95710747c2c6af4304286eebb21cb0d6932d4d0d51f5a0e581d479d9fec5dc930e01b7e6e WHIRLPOOL 2596183f3e3897790964703c2585299d094aa63f9be112549123e56ff9f0c4b2651749b9dd80f066e01d942cd0b884ce7717a3849d67c2d99d6234cb9034c957
 DIST youtube-dl-2016.01.01.tar.gz 1874602 SHA256 732f37c99d71b4239d72d61dd32214b5a5a618671fb0629c8f8deb28209a172c SHA512 fdb022bed426250e5ee1c2bcc1354dd195c0f9793ca479ca8ca4cfe2f71e07ba100b0dbcda2fb9f310308ab130587d06b16a6a86f9036f0d196b317d2e5b5e92 WHIRLPOOL 152e709ba15264c35a89644ea0d4793bb47c82b317e54043ccfff72e40bdf95e42d76605e801233632d3863537a945cfb9ecc2f75245171b8de31b51ce6af801
 DIST youtube-dl-2016.01.09.tar.gz 1888095 SHA256 463cfed59a1e2c6609a8e3d3354e0494833f1b249fe1979984b06a51ac5c904d SHA512 bc022939ec2cdd574ca5ecedbfb349d516881996b50aac6a96220d94c358a38ff4ec8f8bd50195e2a6087dee558149e820935c60eaff8bb521bc8828413d44bf WHIRLPOOL a9fcffa926a72d6558b583390f1023568ee8c97695a87e15add7d72b7bd556c23056948df2bfb55902d7f2cbc3206c69844bee8b5e8ea1e3d7786b58806108f6
+DIST youtube-dl-2016.01.14.tar.gz 1891877 SHA256 8fb4829219c591d0b9a94ebc7bda933db33d4b04d9875a8d725affdbc28e5aad SHA512 2c75fb70472daa7ee83c3a5c25af3c0a9a8928cc5c0517f4b566164495aece3274af5003f21fd861f543b32659ea507c8bf96319c6451a9ba9f16320433f4b5d WHIRLPOOL 74bb7949baff66a87729ec60b9c33451581325bd1e412d8d48bf7fa3fa095873849a3efe5c36ccc15e92a89ebfbe2ae50ddf140f900372bca87abe53213f60c3
diff --git a/net-misc/youtube-dl/youtube-dl-2016.01.14.ebuild b/net-misc/youtube-dl/youtube-dl-2016.01.14.ebuild
new file mode 100644
index 000000000000..5db7401e49ee
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2016.01.14.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=(python{2_7,3_3,3_4,3_5})
+DISTUTILS_SINGLE_IMPL=true
+inherit bash-completion-r1 distutils-r1 eutils
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://rg3.github.com/youtube-dl/"
+SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="offensive test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[coverage(+)] )
+"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	if ! use offensive; then
+		sed -i -e "/__version__/s|'$|-gentoo_no_offensive_sites'|g" \
+			youtube_dl/version.py || die
+		# these have single line import statements
+		local xxx=(
+			alphaporno anysex behindkink chaturbate drtuber eporner eroprofile
+			extremetube fourtube foxgay goshgay hellporno hentaistigma
+			hornbunny keezmovies mofosex motherless porn91 pornhd pornotube
+			pornovoisines pornoxo redtube sexykarma sexu sunporno slutload
+			spankbang spankwire thisav trutube tube8 vporn xbef xnxx xtube
+			xvideos xxxymovies youjizz youporn
+		)
+		# these have multi-line import statements
+		local mxxx=(
+			pornhub xhamster tnaflix
+		)
+		# do single line imports
+		sed -i \
+			-e $( printf '/%s/d;' ${xxx[@]} ) \
+			youtube_dl/extractor/__init__.py \
+			|| die
+
+		# do multiple line imports
+		sed -i \
+			-e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
+			youtube_dl/extractor/__init__.py \
+			|| die
+
+		sed -i \
+			-e $( printf '/%s/d;' ${mxxx[@]} ) \
+			youtube_dl/extractor/generic.py \
+			youtube_dl/extractor/tumblr.py \
+			|| die
+
+		rm \
+			$( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
+			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
+			test/test_age_restriction.py \
+			|| die
+	fi
+
+	epatch_user
+}
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	python_domodule youtube_dl
+	dobin bin/${PN}
+	dodoc README.txt
+	doman ${PN}.1
+	newbashcomp ${PN}.bash-completion ${PN}
+	python_fix_shebang "${ED}"
+}
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 58a145dbc99d..bbb355123ff5 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -5,6 +5,13 @@
 # This file requires >=portage-2.1.1
 # New entries go on top.
 
+# James Le Cuirot <chewi@gentoo.org> (2 Jan 2016)
+# Incorrectly depends on gjdoc, which is going to be
+# last-rited. Doesn't actually install the javadocs in this ebuild
+# version anyway. Unfortunately this will also prevent the other HTML
+# docs from installing. Sorry about that.
+=net-dns/libidn-1.30 doc
+
 # NP-Hardass <NP-Hardass@gentoo.org> (1 Jan 2016)
 # USE flag is renamed to postscript, mask the old flag #564422
 # to notify users.  This entry may be removed after 30 days
diff --git a/profiles/package.mask b/profiles/package.mask
index 9ea334df56e3..df30b0a30355 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,6 +30,10 @@
 
 #--- END OF EXAMPLES ---
 
+# James Le Cuirot <chewi@gentoo.org> (14 Jan 2016)
+# Superseded by gnu-classpath. Removal in 30 days.
+dev-java/gjdoc
+
 # Sergei Trofimovich <slyfox@gentoo.org> (14 Jan 2016)
 # Masked for testing.
 >=net-im/openfire-4.0.0
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index d722b74f2973..7aa8696b03b9 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1707,7 +1707,6 @@ dev-java/ant:regexp - Enable Apache Regexp Ant tasks
 dev-java/ant:resolver - Enable Apache Resolver Ant tasks
 dev-java/ant:testutil - Enable optional test util classes
 dev-java/antlr:gunit - gUnit is a "Unit Test" framework for ANTLR grammars
-dev-java/antlr:script - Install a script to run antlr
 dev-java/bcel:findbugs - Include performance patch for findbugs package.
 dev-java/commons-collections:test-framework - Install the test framework
 dev-java/commons-logging:avalon-framework - Add optional support for avalon-framework
@@ -7551,6 +7550,7 @@ sys-fs/aufs4:nfs - Enable support for nfs export
 sys-fs/aufs4:pax_kernel - Apply patch needed for pax enabled kernels
 sys-fs/aufs4:ramfs - Enable initramfs/rootfs support
 sys-fs/btrfs-progs:convert - Build ext2 conversion utility (btrfs-convert)
+sys-fs/btrfs-progs:static - Build static binaries in addition to the dynamic ones
 sys-fs/cryptsetup:gcrypt - Use dev-libs/libgcrypt crypto backend
 sys-fs/cryptsetup:kernel - Use kernel crypto backend (mainly for embedded systems)
 sys-fs/cryptsetup:nettle - Use dev-libs/nettle crypto backend
diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest
index 0a4f763600c4..369538545d69 100644
--- a/sci-mathematics/glpk/Manifest
+++ b/sci-mathematics/glpk/Manifest
@@ -2,3 +2,4 @@ DIST glpk-4.45.tar.gz 3132439 SHA256 9207cb613d4436d9a66bc1b1f2018176d106cef0e92
 DIST glpk-4.48.tar.gz 3488482 SHA256 abc2c8f895b20a91cdfcfc04367a0bc8677daf8b4ec3f3e86c5b71c79ac6adb1 SHA512 16795e6cf4db302f25e06e5c9a660e5ed8c7b24ffc5126cde0f864e83fa77d4d61838eab4f716291d568963dddf7442a36a39425a62bd58bd00ca73dac4ffa70 WHIRLPOOL c3e826d08cc6033e8553d7d1fb2a556d42622f38a184e8bbc18bf29d872103245218482b749bfb214cf707cc60eaaf54d7e6840537b483cf8e63c2d33b2c313d
 DIST glpk-4.54.tar.gz 3098202 SHA256 ab72c8078402d34d176eda18c3f9a6ef006e223d530897a4d1d73fb4ad12f9a1 SHA512 7eb815a6d8416dd9f2bb94e9a4aef493c171898404ebc6276fcc1c4f3b4244220213a2bd098707104589348080820a7cb8a717aab73ca513f05b2f9a10aea070 WHIRLPOOL 56ff0baf5e98fdc8e12e4d4db664a4a287dc358dd75839d90d463c04e3e7d97b1023ea93217dd642f6737cccddecdb8f534980e48f8893aff395dc430622de69
 DIST glpk-4.55.tar.gz 3424345 SHA256 37090d7f16796ec1034496e182a39d5cc8bb7c9fb5dc48a38b13d620bf2b1de7 SHA512 a0c8ce0c850e0075098f0526db8f7584a86d5cb44d8ddefa55abf9f1f66af89f5aec19cf1cad51fc5585d8dfa50eab6ece984a038e00c472aec2ef1473eac689 WHIRLPOOL 4b3f543c862008dd09e867947c0383eb2f482f63b8fe30d9f682ccc7d0af1693af043c8cd63362be1bc736ef39393d59cdf0196326b08c7f48495bb5b5937487
+DIST glpk-4.57.tar.gz 3782998 SHA256 7323b2a7cc1f13e45fc845f0fdca74f4daea2af716f5ad2d4d55b41e8394275c SHA512 1979e59b96ce359168a81b720207045916f66c5755023b02c2e197e5a713d456165d94f1e40830547dc072de865f94e3b3a4d8e66d5d15aeb93f304f1893fe48 WHIRLPOOL 225760810ae9efbff31d0238dff08d966db5167e9b61a79f960d03b6d6bdaa2ed7d9b1e7608a99418d5346d3e8ddbe8b58f0d561aaacb292decf235b821fbc62
diff --git a/sci-mathematics/glpk/files/glpk-4.57-debundle-system-libs.patch b/sci-mathematics/glpk/files/glpk-4.57-debundle-system-libs.patch
new file mode 100644
index 000000000000..d9efff2bb5f5
--- /dev/null
+++ b/sci-mathematics/glpk/files/glpk-4.57-debundle-system-libs.patch
@@ -0,0 +1,88 @@
+Remove suitesparse (camd,colamd) and zlib bundles
+bicatali - apr 2014
+Updated for 4.57 by soap (Jan 2016)
+
+--- glpk-4.57/configure.ac
++++ glpk-4.57/configure.ac
+@@ -59,6 +59,11 @@
+ dnl Check for math library
+ AC_CHECK_LIB([m], [exp])
+ 
++AC_CHECK_LIB([amd], [amd_1])
++AC_CHECK_LIB([colamd], [colamd])
++AC_CHECK_HEADER([amd.h])
++AC_CHECK_LIB([z], [gzopen])
++
+ dnl Check for <sys/time.h> header
+ AC_CHECK_HEADER([sys/time.h],
+    AC_DEFINE([HAVE_SYS_TIME_H], [1], [N/A]))
+--- glpk-4.57/src/Makefile.am
++++ glpk-4.57/src/Makefile.am
+@@ -6,16 +6,13 @@
+ 
+ libglpk_la_CPPFLAGS = \
+ -I$(srcdir) \
+--I$(srcdir)/amd \
+ -I$(srcdir)/bflib \
+ -I$(srcdir)/cglib \
+--I$(srcdir)/colamd \
+ -I$(srcdir)/env \
+ -I$(srcdir)/minisat \
+ -I$(srcdir)/misc \
+ -I$(srcdir)/proxy \
+--I$(srcdir)/simplex \
+--I$(srcdir)/zlib
++-I$(srcdir)/simplex
+ 
+ libglpk_la_LDFLAGS = \
+ -version-info 38:0:2 \
+@@ -90,18 +87,6 @@
+ glpssx01.c \
+ glpssx02.c \
+ lux.c \
+-amd/amd_1.c \
+-amd/amd_2.c \
+-amd/amd_aat.c \
+-amd/amd_control.c \
+-amd/amd_defaults.c \
+-amd/amd_dump.c \
+-amd/amd_info.c \
+-amd/amd_order.c \
+-amd/amd_post_tree.c \
+-amd/amd_postorder.c \
+-amd/amd_preprocess.c \
+-amd/amd_valid.c \
+ bflib/btf.c \
+ bflib/btfint.c \
+ bflib/fhv.c \
+@@ -115,7 +100,6 @@
+ bflib/sva.c \
+ cglib/cfg.c \
+ cglib/cfg1.c \
+-colamd/colamd.c \
+ env/alloc.c \
+ env/dlsup.c \
+ env/env.c \
+@@ -158,21 +142,6 @@
+ simplex/spxprob.c \
+ simplex/spychuzc.c \
+ simplex/spychuzr.c \
+-simplex/spydual.c \
+-zlib/adler32.c \
+-zlib/compress.c \
+-zlib/crc32.c \
+-zlib/deflate.c \
+-zlib/gzclose.c \
+-zlib/gzlib.c \
+-zlib/gzread.c \
+-zlib/gzwrite.c \
+-zlib/inffast.c \
+-zlib/inflate.c \
+-zlib/inftrees.c \
+-zlib/trees.c \
+-zlib/uncompr.c \
+-zlib/zio.c \
+-zlib/zutil.c
++simplex/spydual.c
+ 
+ ## eof ##
diff --git a/sci-mathematics/glpk/glpk-4.57.ebuild b/sci-mathematics/glpk/glpk-4.57.ebuild
new file mode 100644
index 000000000000..0ac569817c51
--- /dev/null
+++ b/sci-mathematics/glpk/glpk-4.57.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="GNU Linear Programming Kit"
+LICENSE="GPL-3"
+HOMEPAGE="https://www.gnu.org/software/glpk/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+SLOT="0/36"
+IUSE="doc examples gmp odbc mysql static-libs"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+RDEPEND="
+	sci-libs/amd:0=
+	sci-libs/colamd:=
+	sys-libs/zlib:0=
+	gmp? ( dev-libs/gmp:0= )
+	mysql? ( virtual/mysql )
+	odbc? ( || ( dev-db/libiodbc:0 dev-db/unixODBC:0 ) )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-debundle-system-libs.patch
+)
+
+src_prepare() {
+	use odbc && [[ -z $(type -P odbc_config) ]] && \
+		append-cppflags $($(tc-getPKG_CONFIG) --cflags libiodbc)
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use mysql || use odbc; then
+		myconf="--enable-dl"
+	else
+		myconf="--disable-dl"
+	fi
+
+	econf ${myconf} \
+		$(use_enable mysql) \
+		$(use_enable odbc) \
+		$(use_with gmp)
+}
+
+src_install() {
+	default
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	use doc && dodoc doc/*.pdf doc/notes/*.pdf doc/*.txt
+}
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 8bd3d9b06ef6..6fd71860ec34 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -11,4 +11,4 @@ DIST openrc-0.17.tar.bz2 160533 SHA256 45818d9ef4659e8dd924a1468a091255c305daee5
 DIST openrc-0.18.3.tar.bz2 159104 SHA256 891478b28b3d2b964276b35a3cdf538a7f3d9cfdc41f455eb7453c881f629837 SHA512 49edd83c578d99b2df57b85a1db236748310ee012fee9c7220ad657e1543c04004817117c05060268b8493e95c294894124d3e958cdb01389cfd30a85cde3644 WHIRLPOOL 2b0c7f70c689c3d2851e1c78c1e4285fb60dde689624487b9cedf920882e7285b6c4bf7e37564f1995a8ee6f4106a77aedf69933c11f04af53f5d402e4b22bfb
 DIST openrc-0.18.4.tar.bz2 157237 SHA256 2c8bf1c6f52fcf4c1f6945a2836ba2551a7d93015aa63ba5a2e1d2851c2942e4 SHA512 13f5dbc1292ce94c2e42a35e582bbba12e4bba943640952ea4cecc7ff5c60175d362055a4f5e213f218236ab4a040a5dff01a47c8bc007237554744d8a89a48a WHIRLPOOL f1f44effad80863276339af5bce1b3a9068d9c5ae7f7c3b571fb883b376c9083c207980c6d05170b0a18c0902ad1e2d76a1bafb0f11721b0522308e2cb7c67b4
 DIST openrc-0.19.1.tar.bz2 159598 SHA256 5628c04b12e2f51f25e59c303bdccbf545ba0db25484adcca48e70d0712ce0e6 SHA512 303db4475fd02aa3aa161dbd8794a45c2633b9fe96aaab67b81014fa3915bed1aa51cff57128f4413cf9f2329ce1f2012e460e089c39f01ac6eb061a95844329 WHIRLPOOL a4e8720579b8983cb3c2c9b4dd983c1b7bf45e053aa0c9545f31e36c22e44d06e55198d4143dc0a6bca3b7d00b151b43d1da439b2479044344ca12f3151711f1
-DIST openrc-0.20.1.tar.bz2 162152 SHA256 8536b092e61ac0e42da7e66d489a769fae5199188d7f346587c2b6f4e2a4d823 SHA512 fac64ce013d4ad8ecae4270800f49c88c06c1750bb115a6d9eed5bf81a1e758c9bd01916236e539c2583654e075e8b7bc127ddab6dd70064efd6b7de7228e32c WHIRLPOOL eab007b57c3f3702551bcf8dabd70fed07b69c3b76bf2dcb1bcf1dee0191702edff4a26349bad2a37c624cd731137a67734ed24668d8c78c0de9a971fc15d2d2
+DIST openrc-0.20.2.tar.bz2 162434 SHA256 fc06e6f34d6185627e83cc69f963417142ce5d5429c4ce835ec7b9d10bc3b3b8 SHA512 445b4301b994514ed030b046b824be1a9ce4bb63670759d93528c098c7ef38111342d9e474cfa97624b3d34a2fe0ed483e437e0ee8750c6dacb175e07ade768f WHIRLPOOL 90b3a8428963a7c11ddda3c30822f7f5e523babba385988c323f442dba1f9e9713799ace872a7ffbcbafb04cfa8f42468f4ffc452159421733d7f37f1f786a24
diff --git a/sys-apps/openrc/openrc-0.20.1.ebuild b/sys-apps/openrc/openrc-0.20.2.ebuild
similarity index 100%
rename from sys-apps/openrc/openrc-0.20.1.ebuild
rename to sys-apps/openrc/openrc-0.20.2.ebuild
diff --git a/sys-apps/sandbox/sandbox-2.10-r1.ebuild b/sys-apps/sandbox/sandbox-2.10-r1.ebuild
index 9df5d2946a02..2d8c48fecd81 100644
--- a/sys-apps/sandbox/sandbox-2.10-r1.ebuild
+++ b/sys-apps/sandbox/sandbox-2.10-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="multilib"
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-fs/btrfs-progs/metadata.xml b/sys-fs/btrfs-progs/metadata.xml
index 99f2c6f7db29..132b20ee7ce7 100644
--- a/sys-fs/btrfs-progs/metadata.xml
+++ b/sys-fs/btrfs-progs/metadata.xml
@@ -11,5 +11,6 @@
   </maintainer>
   <use>
     <flag name='convert'>Build ext2 conversion utility (btrfs-convert)</flag>
+	<flag name='static'>Build static binaries in addition to the dynamic ones</flag>
   </use>
 </pkgmetadata>
diff --git a/sys-kernel/linux-headers/linux-headers-4.3.ebuild b/sys-kernel/linux-headers/linux-headers-4.3.ebuild
index f0e395419fbc..047873870ced 100644
--- a/sys-kernel/linux-headers/linux-headers-4.3.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.3.ebuild
@@ -13,7 +13,7 @@ PATCH_VER="1"
 SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 
 DEPEND="app-arch/xz-utils
 	dev-lang/perl"
diff --git a/sys-libs/efivar/efivar-0.21.ebuild b/sys-libs/efivar/efivar-0.21.ebuild
index 29fb8702cd1d..9053afffe883 100644
--- a/sys-libs/efivar/efivar-0.21.ebuild
+++ b/sys-libs/efivar/efivar-0.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,6 +19,8 @@ DEPEND="${RDEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}/0.21-initializer.patch"
+	epatch "${FILESDIR}/0.21-nvme_ioctl.h.patch"
+	epatch_user
 }
 
 src_configure() {
diff --git a/sys-libs/efivar/files/0.21-nvme_ioctl.h.patch b/sys-libs/efivar/files/0.21-nvme_ioctl.h.patch
new file mode 100644
index 000000000000..221ec5a73140
--- /dev/null
+++ b/sys-libs/efivar/files/0.21-nvme_ioctl.h.patch
@@ -0,0 +1,30 @@
+From ae0869b71a90bc14e67f3c917bd9c96db25c99a6 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 14 Jan 2016 17:02:31 -0500
+Subject: [PATCH] Workaround rename of linux/nvme.h
+
+Bug: https://bugs.gentoo.org/571548
+---
+ src/linux.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/linux.c b/src/linux.c
+index 5ebc151..e551377 100644
+--- a/src/linux.c
++++ b/src/linux.c
+@@ -22,7 +22,12 @@
+ #include <inttypes.h>
+ #include <limits.h>
+ #include <linux/ethtool.h>
++#include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)
++#include <linux/nvme_ioctl.h>
++#else
+ #include <linux/nvme.h>
++#endif
+ #include <linux/sockios.h>
+ #include <net/if.h>
+ #include <scsi/scsi.h>
+-- 
+2.7.0
+
diff --git a/sys-process/cronbase/cronbase-0.3.7-r1.ebuild b/sys-process/cronbase/cronbase-0.3.7-r1.ebuild
index 9e09a39715f4..cc601e3f02f4 100644
--- a/sys-process/cronbase/cronbase-0.3.7-r1.ebuild
+++ b/sys-process/cronbase/cronbase-0.3.7-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gentoo.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 25eaa192fcbf..dd5c5d4f940c 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,2 +1,2 @@
-DIST google-chrome-beta_48.0.2564.71-1_amd64.deb 48220296 SHA256 ddb8a9aeac06adda5e88596f34e738934dd49a5801fee3ca4b36e084d7dc4aef SHA512 031788a092d5d17c1d698b0820c7158b785952aa7a9907a315920522683de766b7d3ab4d5f11fcc4dda09e2d1e44c59308f8c53b741c33d42174cdd303216a6a WHIRLPOOL d401434b195bf1da8c95b143226aa095e4a7e3c4b34937bce17b88726af079466f392520bfa7b053b43c87f462662ee8fb3fe97567944d09bdff816349fad83c
-DIST google-chrome-beta_48.0.2564.71-1_i386.deb 47437164 SHA256 4167ff8fa090bfe220f2e431741828fe260ffc899615c0cc20e328c1a9d24997 SHA512 6d3073d6d064ca924f2dda1570c4cd66b86106228f64580b3c29e2b687628b3c23a4de6fdd1540175f8bbeb8bcda94ffec3c365549a81dc529d7fdb3747095f9 WHIRLPOOL c39dfaea2bac07a42d8976c35cc985cb2d709f1be585409c717917e5c85314bac70606691c153fe7c36715786660cc1482c3f448c872f969e393ec1ddca9c555
+DIST google-chrome-beta_48.0.2564.79-1_amd64.deb 48085212 SHA256 6ac10492d468e60274f4a8a3256a087871600d93667aee1537a809bec7c65eed SHA512 a7bceab46eee22be2bb0c07a548f9827269384b802c0a25f1c5b53e3faa5050bdc6cc49b39fb8d9b474860552bd2dfc0f9f02bfaf690accafa2c8d2b217aad1a WHIRLPOOL 973afe6fd34059aabcfe7aca3dec05f227e1a5ce6684e79498c034c5ca7afbd72a447f19b074b92928e9df52a6c2ca8a0bfdfe52517f35b287d4b8d0743b9ad0
+DIST google-chrome-beta_48.0.2564.79-1_i386.deb 47420828 SHA256 8eadcaf9c96bb051793d9f49253be8e492d167534ccd009bcc10064be9939d62 SHA512 c7b9f90a9985f55576f7ca7485684e6ee94cbbf81140b1eb4c6aec9f47bf3fdae9bba2248562b1340881911918cb85977f0f2076a9067f890c0d0f4e2f7a241d WHIRLPOOL 75cd4cfb3d226c2bbea4d0141bd7d0b4db0850abe68abd3a3267cb63b381c74428592030072b57a3f52cdcc951892b2ea8f9c99c26a3dd18559c7ad27f6e7ccd
diff --git a/www-client/google-chrome-beta/google-chrome-beta-48.0.2564.71_p1.ebuild b/www-client/google-chrome-beta/google-chrome-beta-48.0.2564.79_p1.ebuild
similarity index 99%
rename from www-client/google-chrome-beta/google-chrome-beta-48.0.2564.71_p1.ebuild
rename to www-client/google-chrome-beta/google-chrome-beta-48.0.2564.79_p1.ebuild
index e448b33dbd32..4d0ec1a60d35 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-48.0.2564.71_p1.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-48.0.2564.79_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index c669ff4ad4d6..bde15b22e5ef 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,2 +1,2 @@
-DIST google-chrome-stable_47.0.2526.106-1_amd64.deb 47539262 SHA256 a9d9307f90a0d5a1129df8b6478837876275298c545c28c60a697cc577422288 SHA512 b8623c44eb1de38c8a067a56effb0a34f9ee2f6a6c2697f2f87f7748fe3526047aeab79c787df037e5322d9d1e8b08539ddc8b477d97a5ee9c97857c1f1caeba WHIRLPOOL 380f4f0953779ecf6114d5557bdf1bfcbe582f424c7662fe6f5a5a5c513ac3f659ade8790a7a2fc071340e331b967cab35d49af5279266e0e8ce8432b40fdbad
-DIST google-chrome-stable_47.0.2526.106-1_i386.deb 46749162 SHA256 168de6fe1f98ab00f73e8a370796b57a8977130ebde7e85ef4de7d8a7a695b93 SHA512 f8aeb7012e5accfc0b5e479d3d750878316280e95b404ecba100e1318ae5ee63fee591ca0263c59aa9326898d6acc2b45cd8476b5310288ae73007b5c1b14d4b WHIRLPOOL 8e736fb7e5b7871e3f417c8a6a51ceda50c08fa674a29c9595f6c48bea11a0f5862097e71b1e73b2f424844bb1a0e2acbb484f0fd837830a41dd4011c621f73e
+DIST google-chrome-stable_47.0.2526.111-1_amd64.deb 47331202 SHA256 c0f0f4a42440de8b12eaf27daaea4876c9173f8f36eb589eaa50cd8924c02014 SHA512 00d04288d6deb0a05399290f93ea9943ddcbf47acc33424eab414ef5e27caeb2cb01ea3b3dc3be5a4c2ee9703a13554e767876741e7605cc25906392aa43c789 WHIRLPOOL 471795e9c5716d3dcc46bb18118024e5eb0fd1a352069deec6ecff5cd7dd552defa2a020b90c62a049f106a3678d061570dbd865211a8ff74b81c70da9965daf
+DIST google-chrome-stable_47.0.2526.111-1_i386.deb 47199998 SHA256 27192b9f477dc98ba26c088b27081ec836dc4fa922da4e6f03c848ca7ff6d447 SHA512 f50ecd35b8096be30ee6044c24d833c8e6a27b6ec615ca941a7c9a33096ea2c53be0168c9f54c24787483343d3d688f325f4eecf1b049027373ca4688612f84e WHIRLPOOL b3e317b073bf844993ac75e7fa6c8eda44991e8f5c46691274c421e8f6d92d9f96df42a40dfd27c78783927c8bab0068c3ca04c7441b54dfa6f2e54a415136d3
diff --git a/www-client/google-chrome/google-chrome-47.0.2526.106_p1.ebuild b/www-client/google-chrome/google-chrome-47.0.2526.111_p1.ebuild
similarity index 98%
rename from www-client/google-chrome/google-chrome-47.0.2526.106_p1.ebuild
rename to www-client/google-chrome/google-chrome-47.0.2526.111_p1.ebuild
index 91980585d5da..a5d7f7dcddcd 100644
--- a/www-client/google-chrome/google-chrome-47.0.2526.106_p1.ebuild
+++ b/www-client/google-chrome/google-chrome-47.0.2526.111_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index bd3be807824e..5e7412893c80 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,2 +1,2 @@
-DIST opera-beta_34.0.2036.24_amd64.deb 44714292 SHA256 0d6bd569c1ab9913eae583735a74c3349fda5f00f3fae698c8d8535bab4580b7 SHA512 bc90703a4ed8852e5817fb01611cad10e13616d4b8d5075fd8ac23ece87aabbfb9d736ec3eea9ea6a948bac4441c64589e930b81c880289f7c67664e5872bf6b WHIRLPOOL 4cfba8ee39c3519115ea492170e36208e6f10a948d0e6a9bdf8d8d6d3e5abf64b74682ea5a7184578f2efa408187eb30bbfc4125a06b4ebbb828a2d0b51ab119
 DIST opera-beta_35.0.2066.10_amd64.deb 45305092 SHA256 7a4a745e9e22632dc9c2439fa8a2aa93ead1eb1cb14d58e22c7b2d8ed2b5a5a0 SHA512 993ca06a62641aa31fb75bff6caaab03d4222303669bc5ecba602f1ebf4cd923359616897e66659fd2eddf97041f8315f05a4b0c8314175d7473a0e1ef9382ba WHIRLPOOL e1470f6df3ff11794d204b41f299787084456ac42316886ffef921ea0919f916b980fb59d219ddfcc17bdc8768fd02b8dfff46466bfed86993e1cd0a5cf7b09a
+DIST opera-beta_35.0.2066.23_amd64.deb 46055652 SHA256 5031aa88f62efd44cabb05b5ec3de6173b672f5e10d4da7572321d9192741133 SHA512 39643779ae402b27eff2aab4cd0b65713f0dc91a0c451991a5ad27e4f5603a47e9beb8eccd6adaa249dd7113bd57fe42a644a9e52108c00b8084fd0ad8a46aa0 WHIRLPOOL 2b63a97e55f7e6a41d9338ef910348f71d184b330b8f1d8c088e2bdb12448a41e850024b75982599e5e0ae633ba4dd8bb9a2d31e000ab6b9c994c3fe763083a6
diff --git a/www-client/opera-beta/opera-beta-34.0.2036.24.ebuild b/www-client/opera-beta/opera-beta-35.0.2066.23.ebuild
similarity index 100%
rename from www-client/opera-beta/opera-beta-34.0.2036.24.ebuild
rename to www-client/opera-beta/opera-beta-35.0.2066.23.ebuild
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 647a59c9b953..5391865963b1 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,6 +1,4 @@
-DIST opera-developer_35.0.2064.0_amd64.deb 46017124 SHA256 1f4221dcf266cfe5a7b0c931df106f4686c0c277a30f839a346f99aa652f283c SHA512 270c5a21dde40164ae3efb522a17b33b18dac6e640c713ca56dc124364684a2a255112878a737e7e2179685d421ca965b1ecaea0b60a0e844ad598a199224f7e WHIRLPOOL fd3f2cd8a198eb750a9b71f3df1bd4cb4ba095ef861c37dbfa7d246c3d95229de119119df1d3b499be57bfead9a67dc4e026274db3d8303525933d924cc7e874
-DIST opera-developer_35.0.2064.0_i386.deb 46705518 SHA256 cffb1dd084208249a2e989a4cdfc047e449a54d6557533bae26f8500b127de0b SHA512 51767d2ff8c2eaee6abee069be31984e81885ebf34604c1a5fc4a15e1a150753b6b308334ef87f5db3e1a4b83c7d77d6b9cda9963aec3482fb9d60bc3f03b86f WHIRLPOOL 502859b3c8ea12bbaf9483feac5ca30efdd8ad993c542f0d31f9e12f19c3380c4581cd060d57ae18aae3f3d50dc788d64056ef44b2aa37f197386eb71d74d2de
-DIST opera-developer_36.0.2072.0_amd64.deb 45379122 SHA256 e9a553903352120c7b84d8985d7c5dd52a59407cde93b15dcfbc9ac77344cb5a SHA512 fbf9b9ea2e7704681213dcecb176a942ab27907978366fe4f65fadfb8d565bad90197433a6bb66f51ee52afc011ba06981cd2b26d8ff97c85ea7f62e6484b2ed WHIRLPOOL 54e8635ed35fcc9908d690f04af553263218aea47c81a1906bb36874b815b23ad8b5a3e31aa7f4f8a46a903f6f46dcb716be415e9dcac6e03511b99cf77310b0
-DIST opera-developer_36.0.2072.0_i386.deb 47196596 SHA256 6aefedb8c25d7e8e2401231b0cd228a905d6b0b09d034034cc0300ec359bc778 SHA512 3329fccf93077772517d52dfcec898ab268b5cb9fa8526738059a1c198f2bcac42dfc71a174f5bf8fc9905b8ff6dc18a1646f6e04b10675165ede080c49aada2 WHIRLPOOL 885729776ddcd644e9ada8bfe7b84299e110370591652b10c46147a19245da514492a89f8c65abc86bc4362eb9cd347142824417199d4ed544e02be5e280e6b1
 DIST opera-developer_36.0.2079.0_amd64.deb 46430558 SHA256 bbbd0a95fc0a25c82c5c41dd7d28ba67e37480d0b26b7791b05cea6a8c7a0de5 SHA512 460d8b476f9d736101085ec45f75af5d9d391ed13f702a11132cfb22c8c553b810bf9b1c98316a7f2143e2058f42fd0edc46812116a6b4c1f32e51ba0167b6a6 WHIRLPOOL df9bb13d4e28a110c654f12dbf37473eec6fe81ef605a45f1b6f5c2ba282dcbbd5b88f70fc905507ea07227fd2d3aca2162270eceb652fe9e4d4209d24c2cdd9
 DIST opera-developer_36.0.2079.0_i386.deb 47359312 SHA256 05d908ba11ce2306094da45c9ca987932bf1d578a79a6ef43b05025a200fce2f SHA512 cd161d4cd1866acba3563b806594185d7d19387a25e5439595bf4ea4c7727af3f8f8c744a655486657c95b7089f3a5a039c0b547654b57f5bad7165dc1d4824c WHIRLPOOL 90577377351282d538e2a9ccefeddf34e5eaf1031c0254ee2dd6d35c8f91e3f6ef6e6b3da7db1dc13163eebce4f5d1bfd811da21d1f5df49c130f64c98ce82ae
+DIST opera-developer_36.0.2106.0_amd64.deb 47098912 SHA256 91b0e9d813cc1c9e29846077d61b7125690394361fa5653de9ed0a9d51cb6c38 SHA512 9cf3ab9d0898bb156c6c93ab6445466888ebc86a03cbfa926ca3f0a0a0659eaa34dd5153c77fd3635b39525faa703903f00bc3e0495b174a3c3081611fb69dc4 WHIRLPOOL 643b1f2315d40e7662264e5e3084982f925814bdc2e4d35c796fdf8b2e90eed599396e78a556ffe236b38ef5d0aadb3144cbe8d041cd7ed95b13ae076f0af71c
+DIST opera-developer_36.0.2106.0_i386.deb 47155488 SHA256 20609906471c84448eadaa0251aa5fb7ca77b04cdbc72a34eda61d9ba2be32c0 SHA512 b66edd3f9e96cad1466c8e586106dd20a5cfcd2569a2f9a9ca89849a0725b407d6807fbb97f73b320602b56a2ef77ec703bd802a039243fe363f2c866bfd97ce WHIRLPOOL 985103899222aa40622b14af0be74635ef3df087c853df3b1f986ef49413206972e4d5755f9b44ada465bf45252d8e0ceaca56d7b1ad75cc40da64fe83359303
diff --git a/www-client/opera-developer/opera-developer-36.0.2072.0.ebuild b/www-client/opera-developer/opera-developer-36.0.2072.0.ebuild
deleted file mode 100644
index bfeded8ebfc9..000000000000
--- a/www-client/opera-developer/opera-developer-36.0.2072.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-CHROMIUM_LANGS="
-	af az be bg bn ca cs da de el en_GB en_US es_419 es fil fi fr_CA fr fy gd
-	hi hr hu id it ja kk ko lt lv me mk ms nb nl nn pa pl pt_BR pt_PT ro ru sk
-	sr sv sw ta te th tr uk uz vi zh_CN zh_TW zu
-"
-inherit chromium multilib unpacker
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="http://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="http://get.geo.opera.com/pub/"
-SRC_URI="
-	amd64?	( "${SRC_URI_BASE}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb" )
-	x86?	( "${SRC_URI_BASE}${PN}/${PV}/linux/${PN}_${PV}_i386.deb" )
-"
-KEYWORDS="~amd64 ~x86"
-
-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]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
-	esac
-
-	rm usr/bin/${PN} || die
-
-	rm usr/share/doc/${PN}/copyright || die
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
diff --git a/www-client/opera-developer/opera-developer-35.0.2064.0.ebuild b/www-client/opera-developer/opera-developer-36.0.2106.0.ebuild
similarity index 100%
rename from www-client/opera-developer/opera-developer-35.0.2064.0.ebuild
rename to www-client/opera-developer/opera-developer-36.0.2106.0.ebuild
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 049f1213774c..26d8236c2ad6 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,6 +1,6 @@
-DIST google-chrome-beta_48.0.2564.71-1_amd64.deb 48220296 SHA256 ddb8a9aeac06adda5e88596f34e738934dd49a5801fee3ca4b36e084d7dc4aef SHA512 031788a092d5d17c1d698b0820c7158b785952aa7a9907a315920522683de766b7d3ab4d5f11fcc4dda09e2d1e44c59308f8c53b741c33d42174cdd303216a6a WHIRLPOOL d401434b195bf1da8c95b143226aa095e4a7e3c4b34937bce17b88726af079466f392520bfa7b053b43c87f462662ee8fb3fe97567944d09bdff816349fad83c
-DIST google-chrome-beta_48.0.2564.71-1_i386.deb 47437164 SHA256 4167ff8fa090bfe220f2e431741828fe260ffc899615c0cc20e328c1a9d24997 SHA512 6d3073d6d064ca924f2dda1570c4cd66b86106228f64580b3c29e2b687628b3c23a4de6fdd1540175f8bbeb8bcda94ffec3c365549a81dc529d7fdb3747095f9 WHIRLPOOL c39dfaea2bac07a42d8976c35cc985cb2d709f1be585409c717917e5c85314bac70606691c153fe7c36715786660cc1482c3f448c872f969e393ec1ddca9c555
-DIST google-chrome-stable_47.0.2526.106-1_amd64.deb 47539262 SHA256 a9d9307f90a0d5a1129df8b6478837876275298c545c28c60a697cc577422288 SHA512 b8623c44eb1de38c8a067a56effb0a34f9ee2f6a6c2697f2f87f7748fe3526047aeab79c787df037e5322d9d1e8b08539ddc8b477d97a5ee9c97857c1f1caeba WHIRLPOOL 380f4f0953779ecf6114d5557bdf1bfcbe582f424c7662fe6f5a5a5c513ac3f659ade8790a7a2fc071340e331b967cab35d49af5279266e0e8ce8432b40fdbad
-DIST google-chrome-stable_47.0.2526.106-1_i386.deb 46749162 SHA256 168de6fe1f98ab00f73e8a370796b57a8977130ebde7e85ef4de7d8a7a695b93 SHA512 f8aeb7012e5accfc0b5e479d3d750878316280e95b404ecba100e1318ae5ee63fee591ca0263c59aa9326898d6acc2b45cd8476b5310288ae73007b5c1b14d4b WHIRLPOOL 8e736fb7e5b7871e3f417c8a6a51ceda50c08fa674a29c9595f6c48bea11a0f5862097e71b1e73b2f424844bb1a0e2acbb484f0fd837830a41dd4011c621f73e
+DIST google-chrome-beta_48.0.2564.79-1_amd64.deb 48085212 SHA256 6ac10492d468e60274f4a8a3256a087871600d93667aee1537a809bec7c65eed SHA512 a7bceab46eee22be2bb0c07a548f9827269384b802c0a25f1c5b53e3faa5050bdc6cc49b39fb8d9b474860552bd2dfc0f9f02bfaf690accafa2c8d2b217aad1a WHIRLPOOL 973afe6fd34059aabcfe7aca3dec05f227e1a5ce6684e79498c034c5ca7afbd72a447f19b074b92928e9df52a6c2ca8a0bfdfe52517f35b287d4b8d0743b9ad0
+DIST google-chrome-beta_48.0.2564.79-1_i386.deb 47420828 SHA256 8eadcaf9c96bb051793d9f49253be8e492d167534ccd009bcc10064be9939d62 SHA512 c7b9f90a9985f55576f7ca7485684e6ee94cbbf81140b1eb4c6aec9f47bf3fdae9bba2248562b1340881911918cb85977f0f2076a9067f890c0d0f4e2f7a241d WHIRLPOOL 75cd4cfb3d226c2bbea4d0141bd7d0b4db0850abe68abd3a3267cb63b381c74428592030072b57a3f52cdcc951892b2ea8f9c99c26a3dd18559c7ad27f6e7ccd
+DIST google-chrome-stable_47.0.2526.111-1_amd64.deb 47331202 SHA256 c0f0f4a42440de8b12eaf27daaea4876c9173f8f36eb589eaa50cd8924c02014 SHA512 00d04288d6deb0a05399290f93ea9943ddcbf47acc33424eab414ef5e27caeb2cb01ea3b3dc3be5a4c2ee9703a13554e767876741e7605cc25906392aa43c789 WHIRLPOOL 471795e9c5716d3dcc46bb18118024e5eb0fd1a352069deec6ecff5cd7dd552defa2a020b90c62a049f106a3678d061570dbd865211a8ff74b81c70da9965daf
+DIST google-chrome-stable_47.0.2526.111-1_i386.deb 47199998 SHA256 27192b9f477dc98ba26c088b27081ec836dc4fa922da4e6f03c848ca7ff6d447 SHA512 f50ecd35b8096be30ee6044c24d833c8e6a27b6ec615ca941a7c9a33096ea2c53be0168c9f54c24787483343d3d688f325f4eecf1b049027373ca4688612f84e WHIRLPOOL b3e317b073bf844993ac75e7fa6c8eda44991e8f5c46691274c421e8f6d92d9f96df42a40dfd27c78783927c8bab0068c3ca04c7441b54dfa6f2e54a415136d3
 DIST google-chrome-unstable_49.0.2618.8-1_amd64.deb 48318522 SHA256 562901837a0e8d3fc79809dee5a38d4000ab6397129081029ded175dfbe594aa SHA512 7a5f17b180abb557d64500f0d2042ec7667cc011a72850920af5becf36eea023f912a8ff7fcc7b10d7f83050d4dfdca78b8a869ea5ae896db4dc3edc97dbec34 WHIRLPOOL 2459079c340cc3106ea12f480c4b808c741ecb2db8f67c126c1a689b8d79c12f259102a7a4ea4ba8b87f04aefc5f020256862f86fe38bfc25dd65f31cc671887
 DIST google-chrome-unstable_49.0.2618.8-1_i386.deb 47696436 SHA256 89026fc9b7684140c08e8664fbe58e0e7d249807376f441be0b90dd180c4f0bf SHA512 7fd797b59328744c458b57fdda568eefff38dd41a4568397f74a800d4937f3ccd6380c356f21c0701591c8bf400bf0a012690bb9c1efab7a2dc5a6a334a69f3e WHIRLPOOL 3ca9d6560ae9d5ffa628eff6a92560dd65af3cea670902e74fdff71887218bc88e2732b18a1c83e89011fd7bbafd422101ea1e33718d595693a31f2bdc18170a
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-47.0.2526.106_p1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-47.0.2526.111_p1.ebuild
similarity index 98%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-47.0.2526.106_p1.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-47.0.2526.111_p1.ebuild
index a3cec8396f86..e859db625286 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-47.0.2526.106_p1.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-47.0.2526.111_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2564.71_beta1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2564.79_beta1.ebuild
similarity index 98%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2564.71_beta1.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2564.79_beta1.ebuild
index 0d9e442ee50b..6622518f2d30 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2564.71_beta1.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2564.79_beta1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/x11-drivers/ati-drivers/ati-drivers-15.12-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-15.12-r1.ebuild
new file mode 100644
index 000000000000..096e8c310ef8
--- /dev/null
+++ b/x11-drivers/ati-drivers/ati-drivers-15.12-r1.ebuild
@@ -0,0 +1,641 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit eutils multilib-build linux-info linux-mod systemd toolchain-funcs versionator pax-utils
+
+DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets"
+HOMEPAGE="http://www.amd.com"
+BUILD_VER=15.302
+RUN="${WORKDIR}/fglrx-${BUILD_VER}/amd-driver-installer-${BUILD_VER}-x86.x86_64.run"
+SLOT="1"
+# Uses javascript for download YESSSS
+#DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip"
+#DRV_VER="amd-catalyst-${PV}-linux-installer-15.201.1151-x86.x86_64.zip"
+DRV_VER="radeon-crimson-${PV}-${BUILD_VER}-151217a-297685e.zip"
+DRIVERS_URI="mirror://gentoo/${DRV_VER}"
+SDK_VER="xvba-sdk-0.74-404001.tar.gz"
+XVBA_SDK_URI="http://developer.amd.com/wordpress/media/2012/10/${SDK_VER}"
+SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}"
+FOLDER_PREFIX="common/"
+IUSE="debug +modules qt4 static-libs pax_kernel gdm-hack"
+
+LICENSE="AMD GPL-2 QPL-1.0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RESTRICT="bindist test"
+
+RDEPEND="
+	<=x11-base/xorg-server-1.17.49[-minimal]
+	>=app-eselect/eselect-opengl-1.0.7
+	app-eselect/eselect-opencl
+	sys-power/acpid
+	x11-apps/xauth
+	!x11-libs/xvba-video
+	virtual/glu[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXinerama[${MULTILIB_USEDEP}]
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	x11-libs/libXrender[${MULTILIB_USEDEP}]
+	qt4? (
+			x11-libs/libICE
+			x11-libs/libSM
+			x11-libs/libXcursor
+			x11-libs/libXfixes
+			x11-libs/libXxf86vm
+			dev-qt/qtcore:4
+			dev-qt/qtgui:4[accessibility]
+	)
+	gdm-hack? (
+		x11-base/xorg-server:=
+	)
+"
+if [[ legacy != ${SLOT} ]]; then
+	RDEPEND="${RDEPEND}
+		!x11-drivers/ati-drivers:legacy"
+else
+	RDEPEND="${RDEPEND}
+		!x11-drivers/ati-drivers:1"
+fi
+
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/xf86miscproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xineramaproto
+	x11-libs/libXtst
+	sys-apps/findutils
+	app-misc/pax-utils
+	app-arch/unzip
+"
+
+EMULTILIB_PKG="true"
+
+S="${WORKDIR}"
+
+# QA Silencing
+QA_TEXTRELS="
+	usr/lib*/opengl/ati/lib/libGL.so.1.2
+	usr/lib*/libatiadlxx.so
+	usr/lib*/xorg/modules/glesx.so
+	usr/lib*/libaticaldd.so
+	usr/lib*/dri/fglrx_dri.so
+"
+
+QA_EXECSTACK="
+	opt/bin/atiode
+	opt/bin/amdcccle
+	usr/lib*/opengl/ati/lib/libGL.so.1.2
+	usr/lib*/dri/fglrx_dri.so
+"
+
+QA_WX_LOAD="
+	usr/lib*/opengl/ati/lib/libGL.so.1.2
+	usr/lib*/dri/fglrx_dri.so
+"
+
+QA_PRESTRIPPED="
+	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
+	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
+	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
+	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
+	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
+	usr/lib\(32\|64\)\?/libaticaldd.so
+	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
+	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1
+	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\).so
+"
+
+QA_SONAME="
+	usr/lib\(32\|64\)\?/libatiadlxx.so
+	usr/lib\(32\|64\)\?/libaticalcl.so
+	usr/lib\(32\|64\)\?/libaticaldd.so
+	usr/lib\(32\|64\)\?/libaticalrt.so
+	usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
+	usr/lib\(32\|64\)\?/libamdhsasc\(32\|64\)\?.so
+"
+
+QA_DT_HASH="
+	opt/bin/amdcccle
+	opt/bin/aticonfig
+	opt/bin/atiodcli
+	opt/bin/atiode
+	opt/bin/clinfo
+	opt/bin/fglrxinfo
+	opt/sbin/atieventsd
+	opt/sbin/amdnotifyui
+	usr/lib\(32\|64\)\?/libaticalcl.so
+	usr/lib\(32\|64\)\?/libaticalrt.so
+	usr/lib\(32\|64\)\?/libatiuki.so.1.0
+	usr/lib\(32\|64\)\?/libatiadlxx.so
+	usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0
+	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
+	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
+	usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so
+	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
+	usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so
+	usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so
+	usr/lib\(32\|64\)\?/libaticaldd.so
+	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
+	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
+	usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so
+	usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2
+	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
+	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\)\?.so
+	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1
+"
+
+pkg_nofetch() {
+	einfo "The driver packages"
+	einfo ${A}
+	einfo "need to be downloaded manually from"
+	einfo "http://support.amd.com/en-us/download/desktop?os=Linux+x86"
+	einfo "or http://support.amd.com/en-us/download/desktop?os=Linux+x86_64"
+	einfo "and ${XVBA_SDK_URI}"
+}
+
+pkg_pretend() {
+	local CONFIG_CHECK="~MTRR ~!DRM ACPI PCI_MSI \
+		!LOCKDEP !PAX_KERNEXEC_PLUGIN_METHOD_OR"
+	use amd64 && CONFIG_CHECK+=" COMPAT"
+
+	local ERROR_MTRR="CONFIG_MTRR required for direct rendering."
+	local ERROR_DRM="CONFIG_DRM must be disabled or compiled as a
+		module and not loaded for direct rendering to work."
+	local ERROR_LOCKDEP="CONFIG_LOCKDEP (lock tracking) exports
+		the symbol lock_acquire as GPL-only. This prevents ${P} from
+		compiling with an error like this:
+		FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
+	local ERROR_PAX_KERNEXEC_PLUGIN_METHOD_OR="This config option will cause
+		kernel to reject loading the fglrx module with
+		\"ERROR: could not insert 'fglrx': Exec format error.\"
+		You may want to try CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS instead."
+	local ERROR_BKL="CONFIG_BKL must be enabled for kernels 2.6.37-2.6.38."
+
+	# workaround until bug 365543 is solved
+	if use modules; then
+		linux-info_pkg_setup
+		require_configured_kernel
+		kernel_is ge 2 6 37 && kernel_is le 2 6 38 && CONFIG_CHECK+=" BKL"
+		check_extra_config
+		if ! linux_chkconfig_present AGP && \
+			! linux_chkconfig_present PCIEPORTBUS; then
+			ewarn "You don't have AGP and/or PCIe support enabled in the kernel"
+			ewarn "Direct rendering will not work."
+		fi
+	fi
+
+	if ! has XT ${PAX_MARKINGS} && use pax_kernel; then
+		ewarn "You have disabled xattr pax markings for portage."
+		ewarn "This will likely cause programs using ati-drivers provided"
+		ewarn "libraries to be killed kernel."
+	fi
+}
+
+pkg_setup() {
+	if use modules; then
+		MODULE_PATH="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod/2.6.x"
+		MODULE_NAMES="fglrx(video:${MODULE_PATH})"
+		BUILD_TARGETS="kmod_build"
+		linux-mod_pkg_setup
+		BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_OUT_DIR}"
+		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\""
+		if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then
+			BUILD_PARAMS="${BUILD_PARAMS} \
+				CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
+		else
+			BUILD_PARAMS="${BUILD_PARAMS} \
+				CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
+		fi
+	fi
+	# Define module dir.
+	MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod"
+	# get the xorg-server version and set BASE_DIR for that
+	BASE_DIR="${S}/xpic"
+
+	# amd64/x86
+	if use amd64 ; then
+		MY_BASE_DIR="${BASE_DIR}_64a"
+		PKG_LIBDIR=lib64
+		ARCH_DIR="${S}/arch/x86_64"
+	else
+		MY_BASE_DIR="${BASE_DIR}"
+		PKG_LIBDIR=lib
+		ARCH_DIR="${S}/arch/x86"
+	fi
+
+	elog
+	elog "Please note that this driver only supports graphic cards based on"
+	elog "Evergreen chipset and newer."
+	elog "This includes the AMD Radeon HD 5400+ series at this moment."
+	elog
+	elog "If your card is older then use ${CATEGORY}/xf86-video-ati"
+	elog "For migration informations please refer to:"
+	elog "https://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
+	einfo
+}
+
+src_unpack() {
+	local DRIVERS_DISTFILE XVBA_SDK_DISTFILE
+	DRIVERS_DISTFILE=${DRIVERS_URI##*/}
+	XVBA_SDK_DISTFILE=${XVBA_SDK_URI##*/}
+
+	if [[ ${DRIVERS_DISTFILE} =~ .*\.tar\.gz ]]; then
+		unpack ${DRIVERS_DISTFILE}
+		mkdir -p common
+		mv etc lib usr common || die "Assumed to find etc lib and usr for common"
+	else
+		#please note, RUN may be insanely assigned at top near SRC_URI
+		if [[ ${DRIVERS_DISTFILE} =~ .*\.zip ]]; then
+			unpack ${DRIVERS_DISTFILE}
+			[[ -z "$RUN" ]] && RUN="${S}/${DRIVERS_DISTFILE/%.zip/.run}"
+		else
+			RUN="${DISTDIR}/${DRIVERS_DISTFILE}"
+		fi
+		sh "${RUN}" --extract "${S}" 2>&1 > /dev/null || die
+	fi
+
+	mkdir xvba_sdk
+	cd xvba_sdk
+	unpack ${XVBA_SDK_DISTFILE}
+
+	mkdir -p "${WORKDIR}/extra" || die "mkdir extra failed"
+	cd "${WORKDIR}/extra"
+	tar -xf "../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz"
+}
+
+src_prepare() {
+	if use modules; then
+		if use debug; then
+			sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
+				"${MODULE_DIR}/firegl_public.c" \
+				|| die "Failed to enable debug output."
+		fi
+	fi
+
+	# These are the userspace utilities that we also have source for.
+	# We rebuild these later.
+	rm \
+		"${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \
+		|| die "bin rm failed"
+
+	# in this version amdcccle isn't static, thus we depend on qt4
+	use qt4 || rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle
+
+	# ACPI fixups
+	sed -i \
+		-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
+		-e "s:/var/lib/gdm/:/var/gdm/:" \
+		"${S}/${FOLDER_PREFIX}etc/ati/authatieventsd.sh" \
+		|| die "ACPI fixups failed."
+
+	# Since "who" is in coreutils, we're using that one instead of "finger".
+	sed -i -e 's:finger:who:' \
+		"${S}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
+		|| die "Replacing 'finger' with 'who' failed."
+	# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
+	# add function to detect default state.
+	epatch "${FILESDIR}"/ati-powermode-opt-path-3.patch
+
+	# see http://ati.cchtml.com/show_bug.cgi?id=495
+	#epatch "${FILESDIR}"/ati-drivers-old_rsp.patch
+	# first hunk applied upstream second (x32 related) was not
+	epatch "${FILESDIR}"/ati-drivers-x32_something_something.patch
+
+	# compile fix for AGP-less kernel, bug #435322
+	epatch "${FILESDIR}"/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch
+
+	epatch "${FILESDIR}/ati-drivers-13.8-beta-include-seq_file.patch"
+
+	# Fix #483400
+	epatch "${FILESDIR}/fgl_glxgears-do-not-include-glATI.patch"
+
+	# Compile fix, https://bugs.gentoo.org/show_bug.cgi?id=454870
+	use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch"
+
+	# Compile fix, #526602
+	# epatch "${FILESDIR}/use-kernel_fpu_begin.patch"
+
+	# Fix #542320
+	epatch "${FILESDIR}/15.9-preempt.patch"
+
+	# Compile fixes, #548118
+	epatch "${FILESDIR}/15.11-remove-gpl-symbols.patch"
+	epatch "${FILESDIR}/15.9-kcl_str.patch"
+	epatch "${FILESDIR}/15.9-sep_printf.patch"
+	epatch "${FILESDIR}/15.9-mtrr.patch"
+
+	epatch "${FILESDIR}/15.12-xstate-fp.patch"
+	epatch_user
+
+	cd "${MODULE_DIR}"
+
+	# bugged fglrx build system, this file should be copied by hand
+	cp ${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x
+
+	convert_to_m 2.6.x/Makefile || die "convert_to_m failed"
+
+	# When built with ati's make.sh it defines a bunch of macros if
+	# certain .config values are set, falling back to less reliable
+	# detection methods if linux/autoconf.h is not available. We
+	# simply use the linux/autoconf.h settings directly, bypassing the
+	# detection script.
+	sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed"
+	sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \
+		|| die "MODVERSIONS sed failed"
+}
+
+src_compile() {
+	use modules && linux-mod_src_compile
+
+	ebegin "Building fgl_glxgears"
+	cd "${S}"/extra/fgl_glxgears
+	# These extra libs/utils either have an Imakefile that does not
+	# work very well without tweaking or a Makefile ignoring CFLAGS
+	# and the like. We bypass those.
+	# The -DUSE_GLU is needed to compile using nvidia headers
+	# according to a comment in ati-drivers-extra-8.33.6.ebuild.
+	"$(tc-getCC)" -o fgl_glxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \
+		-I"${S}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \
+		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
+	eend $?
+}
+
+src_install() {
+	use modules && linux-mod_src_install
+
+	# We can do two things here, and neither of them is very nice.
+
+	# For direct rendering libGL has to be able to load one or more
+	# dri modules (files ending in _dri.so, like fglrx_dri.so).
+	# Gentoo's mesa looks for these files in the location specified by
+	# LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded
+	# location /usr/$(get_libdir)/dri. Ati's libGL does the same
+	# thing, but the hardcoded location is /usr/X11R6/lib/modules/dri
+	# on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64
+	# 64bit. So we can either put the .so files in that (unusual,
+	# compared to "normal" mesa libGL) location or set
+	# LIBGL_DRIVERS_PATH. We currently do the latter. See also bug
+	# 101539.
+
+	# The problem with this approach is that LIBGL_DRIVERS_PATH
+	# *overrides* the default hardcoded location, it does not extend
+	# it. So if ati-drivers is merged but a non-ati libGL is selected
+	# and its hardcoded path does not match our LIBGL_DRIVERS_PATH
+	# (because it changed in a newer mesa or because it was compiled
+	# for a different set of multilib abis than we are) stuff breaks.
+
+	# We create one file per ABI to work with "native" multilib, see
+	# below.
+
+	echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep"
+	doenvd "${T}/03ati-colon-sep" || die
+
+	# All libraries that we have a 32 bit and 64 bit version of on
+	# amd64 are installed in src_install-libs. Everything else
+	# (including libraries only available in native 64bit on amd64)
+	# goes in here.
+	multilib_foreach_abi src_install-libs
+
+	# This is sorted by the order the files occur in the source tree.
+
+	# X modules.
+	exeinto /usr/$(get_libdir)/xorg/modules/drivers
+	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
+	exeinto /usr/$(get_libdir)/xorg/modules/linux
+	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so
+	exeinto /usr/$(get_libdir)/xorg/modules
+	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{glesx.so,amdxmm.so}
+
+	#516816
+	if use gdm-hack; then
+		sed -i 's#/proc/%i/fd/0#/etc/ati/xvrn#g' \
+			"${D}/usr/$(get_libdir)/xorg/modules/drivers/fglrx_drv.so" || \
+			die "Applying gdm-hack failed"
+	fi
+
+	# Arch-specific files.
+	# (s)bin.
+	into /opt
+	dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
+	use qt4 && dosbin "${ARCH_DIR}"/usr/sbin/amdnotifyui
+	dobin "${ARCH_DIR}"/usr/bin/clinfo
+	# We cleaned out the compilable stuff in src_unpack
+	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
+
+	# Common files.
+	# etc.
+	insinto /etc/ati
+	exeinto /etc/ati
+	# Everything except for the authatieventsd.sh script.
+	doins ${FOLDER_PREFIX}etc/ati/{logo*,control,signature,amdpcsdb.default}
+	doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh
+
+	# include.
+	insinto /usr
+	doins -r ${FOLDER_PREFIX}usr/include
+	insinto /usr/include/X11/extensions
+
+	# Just the atigetsysteminfo.sh script.
+	into /usr
+	dosbin ${FOLDER_PREFIX}usr/sbin/*
+
+	# data files for the control panel.
+	if use qt4 ; then
+		insinto /usr/share
+		doins -r ${FOLDER_PREFIX}usr/share/ati
+		insinto /usr/share/pixmaps
+		doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm
+		make_desktop_entry amdcccle 'AMD Catalyst Control Center' \
+			ccc_large System
+	fi
+
+	# doc.
+	dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx
+
+	doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8
+
+	pushd ${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi > /dev/null
+
+	exeinto /etc/acpi
+	doexe ati-powermode.sh
+	insinto /etc/acpi/events
+	doins events/*
+
+	popd > /dev/null
+
+	# Done with the "source" tree. Install tools we rebuilt:
+	dobin extra/fgl_glxgears/fgl_glxgears
+	newdoc extra/fgl_glxgears/README README.fgl_glxgears
+
+	# Gentoo-specific stuff:
+	newinitd "${FILESDIR}"/atieventsd.init atieventsd
+	echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
+	newconfd "${T}"/atieventsd.conf atieventsd
+	systemd_dounit "${FILESDIR}/atieventsd.service"
+
+	# PowerXpress stuff
+	exeinto /usr/$(get_libdir)/fglrx
+	doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed"
+	cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx
+	doexe "${T}"/switchlibglx || die "doexe switchlibglx failed"
+
+	#516816
+	use gdm-hack && Xorg -version > "${D}/etc/ati/xvrn" 2>&1
+}
+
+src_install-libs() {
+	if [[ "${ABI}" == "amd64" ]]; then
+		local EX_BASE_DIR="${BASE_DIR}_64a"
+		local pkglibdir=lib64
+		local MY_ARCH_DIR="${S}/arch/x86_64"
+		local oclsuffix=64
+	else
+		local EX_BASE_DIR="${BASE_DIR}"
+		local pkglibdir=lib
+		local MY_ARCH_DIR="${S}/arch/x86"
+		local oclsuffix=32
+	fi
+	einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system"
+
+	local ATI_ROOT=/usr/$(get_libdir)/opengl/ati
+	# To make sure we do not miss a spot when these change.
+	local libmajor=1 libminor=2
+	local libver=${libmajor}.${libminor}
+
+	# The GLX libraries
+	# (yes, this really is "lib" even on amd64/multilib --marienz)
+	exeinto ${ATI_ROOT}/lib
+	newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \
+		libGL.so.${libver}
+	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor}
+	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so
+
+	if multilib_is_native_abi; then
+		exeinto ${ATI_ROOT}/extensions
+		doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/fglrx/fglrx-libglx.so
+		mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so
+
+		#516816
+		if use gdm-hack; then
+			sed -i 's#/proc/%i/fd/0#/etc/ati/xvrn#g' \
+				"${D}/${ATI_ROOT}/extensions/libglx.so" \
+				|| die "Applying gdm-hack failed"
+		fi
+	fi
+
+	# other libs
+	exeinto /usr/$(get_libdir)
+	# Everything except for the libGL.so installed some row above
+	doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
+		-maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
+	insinto /usr/$(get_libdir)
+	doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
+		-maxdepth 1 -type f -not -name '*.so*')
+
+	# DRI modules, installed into the path used by recent versions of mesa.
+	exeinto /usr/$(get_libdir)/dri
+	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
+
+	# AMD Cal and OpenCL libraries
+	exeinto /usr/$(get_libdir)/OpenCL/vendors/amd
+	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so*
+	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so*
+	dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so
+	exeinto /usr/$(get_libdir)
+	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
+
+	# OpenCL vendor files
+	insinto /etc/OpenCL/vendors/
+	cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF
+		/usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so
+	EOF
+	doins "${T}"/amdocl${oclsuffix}.icd
+
+	local envname="${T}"/04ati-dri-path
+	if [[ -n ${ABI} ]]; then
+		envname="${envname}-${ABI}"
+	fi
+	echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
+	doenvd "${envname}"
+
+	# Silence the QA notice by creating missing soname symlinks
+	for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9])
+	do
+		local soname=${so##*/}
+		local soname_one=${soname%.[0-9]}
+		local soname_zero=${soname_one%.[0-9]}
+		dosym ${soname} /usr/$(get_libdir)/${soname_one}
+		dosym ${soname_one} /usr/$(get_libdir)/${soname_zero}
+	done
+
+	# See https://bugs.gentoo.org/show_bug.cgi?id=443466
+	dodir /etc/revdep-rebuild/
+	echo "SEARCH_DIRS_MASK=\"/opt/bin/clinfo\"" > "${ED}/etc/revdep-rebuild/62-ati-drivers"
+
+	#remove static libs if not wanted
+	use static-libs || rm -rf "${D}"/usr/$(get_libdir)/libfglrx_dm.a
+
+	#install xvba sdk headers
+	doheader xvba_sdk/include/amdxvba.h
+
+	# VA-API internal wrapper
+	dosym /usr/$(get_libdir)/libXvBAW.so.1.0 /usr/$(get_libdir)/va/drivers/fglrx_drv_video.so
+
+	if use pax_kernel; then
+		pax-mark m "${D}"/usr/lib*/opengl/ati/lib/libGL.so.1.2 || die "pax-mark failed"
+	fi
+}
+
+pkg_postinst() {
+	elog "To switch to AMD OpenGL, run \"eselect opengl set ati\""
+	elog "To change your xorg.conf you can use the bundled \"aticonfig\""
+	elog
+	elog "If you experience unexplained segmentation faults and kernel crashes"
+	elog "with this driver and multi-threaded applications such as wine,"
+	elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
+	elog
+	elog "Fully rebooting the system after an ${PN} update is recommended"
+	elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg"
+	elog "might not work"
+	elog
+	elog "Some cards need acpid running to handle events"
+	elog "Please add it to boot runlevel with rc-update add acpid boot"
+	elog
+
+	use modules && linux-mod_pkg_postinst
+	"${ROOT}"/usr/bin/eselect opengl set --use-old ati
+	"${ROOT}"/usr/bin/eselect opencl set --use-old amd
+
+	if has_version "x11-drivers/xf86-video-intel[sna]"; then
+		ewarn "It is reported that xf86-video-intel built with USE=\"sna\""
+		ewarn "causes the X server to crash on systems that use hybrid"
+		ewarn "AMD/Intel graphics. If you experience this crash, downgrade"
+		ewarn "to xf86-video-intel-2.20.2 or earlier or try disabling sna"
+		ewarn "for xf86-video-intel."
+		ewarn "For details, see https://bugs.gentoo.org/show_bug.cgi?id=430000"
+	fi
+
+	if use pax_kernel; then
+		ewarn "Please run \"revdep-pax -s libGL.so.1 -me\" after installation and"
+		ewarn "after you have run \"eselect opengl set ati\". Executacle"
+		ewarn "revdep-pax is part of package sys-apps/elfix."
+	fi
+}
+
+pkg_preinst() {
+	use modules && linux-mod_pkg_preinst
+}
+
+pkg_prerm() {
+	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	use modules && linux-mod_pkg_postrm
+	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
diff --git a/x11-drivers/ati-drivers/files/15.12-xstate-fp.patch b/x11-drivers/ati-drivers/files/15.12-xstate-fp.patch
new file mode 100644
index 000000000000..22e43fc0c7b6
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/15.12-xstate-fp.patch
@@ -0,0 +1,26 @@
+From: Krzysztof Kolasa <kkolasa@winsoft.pl>
+Date: Thu, 26 Nov 2015 14:28:46 +0100
+Subject: [PATCH] Patch for kernel 4.4.0-rc2
+
+constant change of name XSTATE_XP to name XFEATURE_MASK_FP
+---
+ firegl_public.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
+index 3626c7b..f071d42 100644
+--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
++++ b/common/lib/modules/fglrx/build_mod//firegl_public.c
+@@ -6463,7 +6463,11 @@ static int KCL_fpu_save_init(struct task_struct *tsk)
+       if (!(fpu->state->xsave.xsave_hdr.xstate_bv & XSTATE_FP))
+ #else
+ 	  copy_xregs_to_kernel(&fpu->state.xsave);
+-      if (!(fpu->state.xsave.header.xfeatures & XSTATE_FP))
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0)
++      if (!(fpu->state.xsave.header.xfeatures & XFEATURE_MASK_FP))
++#else
++      if (!(fpu->state.xsave.header.xfeatures & XSTATE_FP))
++#endif
+ #endif
+          return 1;
+    } else if (static_cpu_has(X86_FEATURE_FXSR)) {