From 1203f29921f5fbefd4bbe57987de479800e30d36 Mon Sep 17 00:00:00 2001
From: root <root@sandbox.local.calculate.ru>
Date: Fri, 4 Sep 2015 09:31:36 +0300
Subject: [PATCH] Sync with portage [Fri Sep  4 09:31:36 MSK 2015].

---
 app-admin/webmin/Manifest                     |   3 -
 app-admin/webmin/webmin-1.730.ebuild          | 304 -------
 app-backup/spideroak-bin/Manifest             |   3 +
 .../spideroak-bin/spideroak-bin-6.0.1.ebuild  |  94 ++
 app-misc/screen/Manifest                      |   2 +-
 app-misc/screen/screen-9999.ebuild            |   2 +-
 dev-dotnet/log4net/Manifest                   |   2 +-
 dev-dotnet/log4net/log4net-1.2.11.ebuild      |   2 +-
 dev-games/ogre/Manifest                       |   7 +-
 dev-games/ogre/files/ogre-1.9.0-gcc52.patch   |  63 ++
 ...re-1.9.0-remove_media_path_to_bindir.patch |   4 +-
 ...1.9.0-remove_resource_path_to_bindir.patch |   4 +-
 dev-games/ogre/ogre-1.9.0-r1.ebuild           |   6 +-
 dev-lang/python/Manifest                      |   8 +-
 dev-lang/python/python-2.7.10.ebuild          |   4 +-
 dev-lang/python/python-2.7.9-r1.ebuild        |   4 +-
 dev-lang/python/python-3.4.1.ebuild           |   4 +-
 dev-lang/python/python-3.4.3.ebuild           |   4 +-
 dev-libs/openssl/Manifest                     |   2 +-
 dev-libs/openssl/openssl-1.0.2d.ebuild        |   2 +-
 dev-python/cachetools/Manifest                |   3 +
 dev-python/cachetools/cachetools-1.1.0.ebuild |  21 +
 dev-python/cachetools/metadata.xml            |  10 +
 dev-python/fasteners/Manifest                 |   1 +
 dev-python/fasteners/metadata.xml             |  10 +
 dev-python/futurist/Manifest                  |   3 +
 dev-python/futurist/futurist-0.4.0.ebuild     |  30 +
 dev-python/futurist/metadata.xml              |  10 +
 dev-python/keystonemiddleware/Manifest        |   2 +
 .../keystonemiddleware-2.2.0.ebuild           |  83 ++
 dev-python/oslo-messaging/Manifest            |   2 +
 .../oslo-messaging-2.4.0.ebuild               |  74 ++
 dev-python/oslo-middleware/Manifest           |   2 +
 .../oslo-middleware-2.8.0.ebuild              |  54 ++
 dev-python/oslo-service/Manifest              |   3 +
 dev-python/oslo-service/metadata.xml          |  10 +
 .../oslo-service/oslo-service-0.9.0.ebuild    |  58 ++
 dev-python/pypax/Manifest                     |   3 +
 dev-python/pypax/pypax-0.9.1.ebuild           |  49 ++
 dev-python/pypax/pypax-9999.ebuild            |  49 ++
 dev-python/python-memcached/Manifest          |   2 +
 .../python-memcached-1.57.ebuild              |  46 +
 dev-ruby/amq-protocol/Manifest                |   2 +
 .../amq-protocol/amq-protocol-2.0.0.ebuild    |  28 +
 dev-ruby/mixlib-shellout/Manifest             |   6 +-
 .../mixlib-shellout-2.0.1.ebuild              |  27 -
 ....1.ebuild => mixlib-shellout-2.2.0.ebuild} |   4 +-
 dev-ruby/sass-rails/Manifest                  |   6 +-
 dev-ruby/sass-rails/sass-rails-5.0.1.ebuild   |  37 -
 ...s-5.0.2.ebuild => sass-rails-5.0.4.ebuild} |  10 +-
 dev-util/catalyst/Manifest                    |   2 +-
 dev-util/catalyst/catalyst-2.9999.ebuild      |   4 +-
 games-roguelike/adom/Manifest                 |   2 +-
 games-roguelike/adom/adom-1.1.1-r1.ebuild     |   4 +-
 games-rpg/freedink/Manifest                   |   2 +-
 games-rpg/freedink/freedink-108.4.ebuild      |   5 +-
 kde-plasma/plasma-nm/Manifest                 |   2 +-
 kde-plasma/plasma-nm/plasma-nm-5.4.0.ebuild   |   2 +-
 metadata/dtd/timestamp.chk                    |   2 +-
 metadata/glsa/timestamp.chk                   |   2 +-
 metadata/md5-cache/app-admin/webmin-1.730     |  13 -
 .../md5-cache/app-backup/spideroak-bin-6.0.1  |  14 +
 metadata/md5-cache/app-misc/screen-9999       |   2 +-
 metadata/md5-cache/dev-dotnet/log4net-1.2.11  |   2 +-
 metadata/md5-cache/dev-games/ogre-1.9.0-r1    |   2 +-
 metadata/md5-cache/dev-lang/python-2.7.10     |   6 +-
 metadata/md5-cache/dev-lang/python-2.7.9-r1   |   6 +-
 metadata/md5-cache/dev-lang/python-3.4.1      |   6 +-
 metadata/md5-cache/dev-lang/python-3.4.3      |   6 +-
 metadata/md5-cache/dev-libs/openssl-1.0.2d    |   4 +-
 .../md5-cache/dev-python/cachetools-1.1.0     |  14 +
 metadata/md5-cache/dev-python/futurist-0.4.0  |  14 +
 .../dev-python/keystonemiddleware-2.2.0       |  14 +
 .../md5-cache/dev-python/oslo-messaging-2.4.0 |  14 +
 .../dev-python/oslo-middleware-2.8.0          |  14 +
 .../md5-cache/dev-python/oslo-service-0.9.0   |  14 +
 metadata/md5-cache/dev-python/pypax-0.9.1     |  14 +
 metadata/md5-cache/dev-python/pypax-9999      |  12 +
 .../dev-python/python-memcached-1.57          |  15 +
 .../md5-cache/dev-ruby/amq-protocol-2.0.0     |  14 +
 .../md5-cache/dev-ruby/mixlib-shellout-2.0.1  |  14 -
 ...b-shellout-1.6.1 => mixlib-shellout-2.2.0} |   6 +-
 metadata/md5-cache/dev-ruby/sass-rails-5.0.1  |  15 -
 metadata/md5-cache/dev-ruby/sass-rails-5.0.2  |  15 -
 metadata/md5-cache/dev-ruby/sass-rails-5.0.4  |  15 +
 metadata/md5-cache/dev-util/catalyst-2.9999   |   6 +-
 .../md5-cache/games-roguelike/adom-1.1.1-r1   |   4 +-
 metadata/md5-cache/games-rpg/freedink-108.4   |   4 +-
 metadata/md5-cache/kde-plasma/plasma-nm-5.4.0 |   4 +-
 .../{wireshark-1.99.8 => wireshark-1.99.9}    |   4 +-
 .../{limnoria-20150429 => limnoria-20150829}  |   2 +-
 metadata/md5-cache/net-nds/openldap-2.4.42    |  14 +
 .../md5-cache/sci-geosciences/qmapshack-1.3.0 |  12 +
 .../{maxima-5.37.1 => maxima-5.37.1-r1}       |   2 +-
 .../sci-mathematics/rstudio-0.99.473          |  13 -
 .../sci-mathematics/wxmaxima-15.08.1          |  12 +
 metadata/md5-cache/sys-apps/elfix-0.9.1       |  15 +
 metadata/md5-cache/sys-apps/elfix-9999        |  13 +
 .../md5-cache/sys-libs/libsemanage-2.4-r2     |  14 +
 metadata/news/timestamp.chk                   |   2 +-
 metadata/timestamp                            |   2 +-
 metadata/timestamp.calculate                  | 110 ++-
 metadata/timestamp.chk                        |   2 +-
 metadata/timestamp.x                          |   2 +-
 net-analyzer/wireshark/Manifest               |   4 +-
 ...-1.99.8.ebuild => wireshark-1.99.9.ebuild} |   0
 net-irc/limnoria/Manifest                     |   4 +-
 ...150429.ebuild => limnoria-20150829.ebuild} |   0
 net-nds/openldap/Manifest                     |   3 +
 .../files/openldap-2.4.42-mdb-unbundle.patch  | 136 +++
 net-nds/openldap/openldap-2.4.42.ebuild       | 809 ++++++++++++++++++
 sci-geosciences/qmapshack/Manifest            |   3 +
 sci-geosciences/qmapshack/metadata.xml        |  15 +
 .../qmapshack/qmapshack-1.3.0.ebuild          |  21 +
 sci-mathematics/maxima/Manifest               |   3 +-
 sci-mathematics/maxima/files/db-0.patch       |  20 +
 ...-5.37.1.ebuild => maxima-5.37.1-r1.ebuild} |   2 +-
 sci-mathematics/rstudio/Manifest              |   1 -
 .../rstudio/rstudio-0.99.473.ebuild           | 201 -----
 sci-mathematics/wxmaxima/Manifest             |   3 +
 .../wxmaxima/wxmaxima-15.08.1.ebuild          |  77 ++
 sys-apps/elfix/Manifest                       |   3 +
 sys-apps/elfix/elfix-0.9.1.ebuild             |  50 ++
 sys-apps/elfix/elfix-9999.ebuild              |  50 ++
 sys-libs/libsemanage/Manifest                 |   5 +
 ...policy-binary-and-file_contexts.loca.patch | 318 +++++++
 ...file_contexts-and-seusers-to-the-sto.patch | 265 ++++++
 ...-homedir_template-in-the-policy-stor.patch |  54 ++
 ...tore-users_extra-in-the-policy-store.patch |  57 ++
 .../libsemanage/libsemanage-2.4-r2.ebuild     | 131 +++
 130 files changed, 3152 insertions(+), 781 deletions(-)
 delete mode 100644 app-admin/webmin/webmin-1.730.ebuild
 create mode 100644 app-backup/spideroak-bin/spideroak-bin-6.0.1.ebuild
 create mode 100644 dev-games/ogre/files/ogre-1.9.0-gcc52.patch
 create mode 100644 dev-python/cachetools/Manifest
 create mode 100644 dev-python/cachetools/cachetools-1.1.0.ebuild
 create mode 100644 dev-python/cachetools/metadata.xml
 create mode 100644 dev-python/fasteners/metadata.xml
 create mode 100644 dev-python/futurist/Manifest
 create mode 100644 dev-python/futurist/futurist-0.4.0.ebuild
 create mode 100644 dev-python/futurist/metadata.xml
 create mode 100644 dev-python/keystonemiddleware/keystonemiddleware-2.2.0.ebuild
 create mode 100644 dev-python/oslo-messaging/oslo-messaging-2.4.0.ebuild
 create mode 100644 dev-python/oslo-middleware/oslo-middleware-2.8.0.ebuild
 create mode 100644 dev-python/oslo-service/Manifest
 create mode 100644 dev-python/oslo-service/metadata.xml
 create mode 100644 dev-python/oslo-service/oslo-service-0.9.0.ebuild
 create mode 100644 dev-python/pypax/pypax-0.9.1.ebuild
 create mode 100644 dev-python/pypax/pypax-9999.ebuild
 create mode 100644 dev-python/python-memcached/python-memcached-1.57.ebuild
 create mode 100644 dev-ruby/amq-protocol/amq-protocol-2.0.0.ebuild
 delete mode 100644 dev-ruby/mixlib-shellout/mixlib-shellout-2.0.1.ebuild
 rename dev-ruby/mixlib-shellout/{mixlib-shellout-1.6.1.ebuild => mixlib-shellout-2.2.0.ebuild} (88%)
 delete mode 100644 dev-ruby/sass-rails/sass-rails-5.0.1.ebuild
 rename dev-ruby/sass-rails/{sass-rails-5.0.2.ebuild => sass-rails-5.0.4.ebuild} (76%)
 delete mode 100644 metadata/md5-cache/app-admin/webmin-1.730
 create mode 100644 metadata/md5-cache/app-backup/spideroak-bin-6.0.1
 create mode 100644 metadata/md5-cache/dev-python/cachetools-1.1.0
 create mode 100644 metadata/md5-cache/dev-python/futurist-0.4.0
 create mode 100644 metadata/md5-cache/dev-python/keystonemiddleware-2.2.0
 create mode 100644 metadata/md5-cache/dev-python/oslo-messaging-2.4.0
 create mode 100644 metadata/md5-cache/dev-python/oslo-middleware-2.8.0
 create mode 100644 metadata/md5-cache/dev-python/oslo-service-0.9.0
 create mode 100644 metadata/md5-cache/dev-python/pypax-0.9.1
 create mode 100644 metadata/md5-cache/dev-python/pypax-9999
 create mode 100644 metadata/md5-cache/dev-python/python-memcached-1.57
 create mode 100644 metadata/md5-cache/dev-ruby/amq-protocol-2.0.0
 delete mode 100644 metadata/md5-cache/dev-ruby/mixlib-shellout-2.0.1
 rename metadata/md5-cache/dev-ruby/{mixlib-shellout-1.6.1 => mixlib-shellout-2.2.0} (55%)
 delete mode 100644 metadata/md5-cache/dev-ruby/sass-rails-5.0.1
 delete mode 100644 metadata/md5-cache/dev-ruby/sass-rails-5.0.2
 create mode 100644 metadata/md5-cache/dev-ruby/sass-rails-5.0.4
 rename metadata/md5-cache/net-analyzer/{wireshark-1.99.8 => wireshark-1.99.9} (98%)
 rename metadata/md5-cache/net-irc/{limnoria-20150429 => limnoria-20150829} (99%)
 create mode 100644 metadata/md5-cache/net-nds/openldap-2.4.42
 create mode 100644 metadata/md5-cache/sci-geosciences/qmapshack-1.3.0
 rename metadata/md5-cache/sci-mathematics/{maxima-5.37.1 => maxima-5.37.1-r1} (98%)
 delete mode 100644 metadata/md5-cache/sci-mathematics/rstudio-0.99.473
 create mode 100644 metadata/md5-cache/sci-mathematics/wxmaxima-15.08.1
 create mode 100644 metadata/md5-cache/sys-apps/elfix-0.9.1
 create mode 100644 metadata/md5-cache/sys-apps/elfix-9999
 create mode 100644 metadata/md5-cache/sys-libs/libsemanage-2.4-r2
 rename net-analyzer/wireshark/{wireshark-1.99.8.ebuild => wireshark-1.99.9.ebuild} (100%)
 rename net-irc/limnoria/{limnoria-20150429.ebuild => limnoria-20150829.ebuild} (100%)
 create mode 100644 net-nds/openldap/files/openldap-2.4.42-mdb-unbundle.patch
 create mode 100644 net-nds/openldap/openldap-2.4.42.ebuild
 create mode 100644 sci-geosciences/qmapshack/Manifest
 create mode 100644 sci-geosciences/qmapshack/metadata.xml
 create mode 100644 sci-geosciences/qmapshack/qmapshack-1.3.0.ebuild
 create mode 100644 sci-mathematics/maxima/files/db-0.patch
 rename sci-mathematics/maxima/{maxima-5.37.1.ebuild => maxima-5.37.1-r1.ebuild} (98%)
 delete mode 100644 sci-mathematics/rstudio/rstudio-0.99.473.ebuild
 create mode 100644 sci-mathematics/wxmaxima/wxmaxima-15.08.1.ebuild
 create mode 100644 sys-apps/elfix/elfix-0.9.1.ebuild
 create mode 100644 sys-apps/elfix/elfix-9999.ebuild
 create mode 100644 sys-libs/libsemanage/files/0002-libsemanage-Add-policy-binary-and-file_contexts.loca.patch
 create mode 100644 sys-libs/libsemanage/files/0003-libsemanage-Add-file_contexts-and-seusers-to-the-sto.patch
 create mode 100644 sys-libs/libsemanage/files/0004-libsemanage-save-homedir_template-in-the-policy-stor.patch
 create mode 100644 sys-libs/libsemanage/files/0005-libsemanage-store-users_extra-in-the-policy-store.patch
 create mode 100644 sys-libs/libsemanage/libsemanage-2.4-r2.ebuild

diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index 8939c93f5383..46ae8da7f72f 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -1,11 +1,8 @@
 AUX gentoo-setup 12857 SHA256 2646409bb4bc1a4d68791d8700107fd65952a81ca9848e00ff3099a7c4a37b57 SHA512 9d05224193cc95948bec93d1f1cb443c21fb786a25124c6f94f0e4c7d0a7a238a5ba88454dd85d4f38ede7d02c93fe6abb23b8027825f2eb47bedced6e43528a WHIRLPOOL 117c52169063417f2d8ba62b720f1a7ac7bffaddbceb6b6c1c8ebff425a046ce275b8a6eb2c6b201e899bf6718b5721db922551a637f6d3197f5c2a954fda312
 AUX init.d.webmin 2166 SHA256 e2ee80dd57b0071bb642462e5fb50dc4b35a9e66f861498ffb677abfddcdfdfe SHA512 e65ebb9d05a49dd184371a1f8f534b7530a1791f87d6bd0e37ae23d277c28e8d40ad067890fa67b1d0fef4965cf091a55e17f34b1c324690229721d0ed911491 WHIRLPOOL e9b5c0bcfd9c07d6115f127fed71d97bc74f8c4d396c730c36a8c549ad4c8e89a65ca7df321dc8918c0e8ed79f00a30b9942497fdb1a773904e489010f16b807
 AUX webmin.service 416 SHA256 f5e9301ad853929e15cb4c4860f8d3da5a27036bcaebce38a32ec81da798b8ef SHA512 7cf86342db3d34cbe39b62fa768660ba7dd160d9c0d113ef6a3a176187fa0c72531bed38e3203cf627ab05c1ac4d9a8b9e829d1baa9739d63dfa74f09c445f1e WHIRLPOOL 9d4fbe570364a94516cf5f66eb968209f9731b6a1f3083071f3c299d65c28559e35dd76ca7e2ac2f3e5381b854cb8b5a561c48388b761c3dbb4d57829c59520b
-DIST webmin-1.730-minimal.tar.gz 2616032 SHA256 9e101e5cbd728f43474222dd3948aa8d4a006620e9b4b7074af60db8b22cd117 SHA512 62f5067a1dc122c037a08d3dddb6a6de7ea88203ca9f8d99c3d349e2bf20c138aa56a0cd62fd5b65d520b38b8df655a9177ffb412fea2f880bdb410b2817dd43 WHIRLPOOL 6eed741e901fe96843801d060e9ffaf3e80130ec532953144e6f2b33244fb4de2111e59800d6ef2113b788a67d81ee5b529cca8252d8ca7011afc56a356f94ea
-DIST webmin-1.730.tar.gz 22469783 SHA256 91ec24951c5df041da9a299d280fcfcd83df7406b60ffa6ff816cb7a63d3a9cc SHA512 060fe881e6e8588bc46c01769de913aa56f004fdab6144baefa705c66086624cbb621be5c65bee6814c6dee340b7f93434843b34def00a83acbd259056b21529 WHIRLPOOL ea86d251cf551a3661619c46101b30c28ab01aeb75ac4b5e8de6354c0ede6af8b3602410ca8eed876c876681233d8e5763aaa6b4f8a93d3c4c8ed14366521b4f
 DIST webmin-1.760-minimal.tar.gz 2601515 SHA256 1a9faf4d765f7356a2db39bee22f7030daa95be1f2f06d1de40a9dbbeecc4d9c SHA512 c6e1b5fae3921a368b9341d21285e0b3c2366331250849846d1ebb221958b809bce83d96f0506972cc9b2f474fd4059ecb935b80b6593d09a65947cdc47950d4 WHIRLPOOL d4c0c1215419b700fad742904fdd55918955bfe0447d8b7c2278303abbd54d20e4bd22af726ed6645639ef81dcaef2c4ccd8aa7f3f1bafccbee8f36022da3ff5
 DIST webmin-1.760.tar.gz 26885420 SHA256 6e7adefe2a8349487484a15b94914ab7e540404b43f97dc49b21a618c9b1776e SHA512 8d7ce0b88dd561e91ba36dc97d4f0ab6da616726cefd6b53d642641eb82a906bddd9f0a5b8b5e3875336ac9f6a70bda9595e74d062952d653e72dae226db6e8f WHIRLPOOL b1fc7e4719b384ee5f1b3c6e023bc9d5790b0e30320c726942bcd5b72c4afbaf380526dfee05eb515a5a3280fea35143f5ed2be50621c7e7977dc01f91700a7e
-EBUILD webmin-1.730.ebuild 10219 SHA256 a7df4a08104e02b0c0f24f9a5b8eed521823c648c1625b92d29cb2b59f4bf1f1 SHA512 f4a9d1303ebb4fdf8f4175e8dc9aee2a3729eff82263faa3d95750babc0b66fcc369d7af8a737f230ed8915630462ca0ca39def5fcc56ce78b0a3eb975effc07 WHIRLPOOL def045d456e2745f65ad1a234744f01c12b9a9fec4d06ea4a58d5da4423c3d451fc8ce581b8c4f229abfe4bdc8efcb60c985b559a517146d979417952806b49b
 EBUILD webmin-1.760.ebuild 10219 SHA256 a7df4a08104e02b0c0f24f9a5b8eed521823c648c1625b92d29cb2b59f4bf1f1 SHA512 f4a9d1303ebb4fdf8f4175e8dc9aee2a3729eff82263faa3d95750babc0b66fcc369d7af8a737f230ed8915630462ca0ca39def5fcc56ce78b0a3eb975effc07 WHIRLPOOL def045d456e2745f65ad1a234744f01c12b9a9fec4d06ea4a58d5da4423c3d451fc8ce581b8c4f229abfe4bdc8efcb60c985b559a517146d979417952806b49b
 MISC ChangeLog 4254 SHA256 efa22131b44fe313a9fd5a7e4fbd909e6d35c6c4611f1efcb2300a2da97a4a54 SHA512 8836feee09cf4bf9c9dea1ace319e61966de8c12a756a7fbd852ebe009a3cf6bda31a1643d4a1fcc1e70b26f056c2ca8ddb3f3706cba96c144c79f824716f790 WHIRLPOOL c19dd95150a439595aad92a7d6fa0878402338f85fbd1561cf09518e75586f8a85738d13d30cb68fe509fb622d19c8d7109e17510b15b83802ee8969246504b9
 MISC metadata.xml 404 SHA256 5afe44cc4726c1fb252890e27cfa32b1d45bb90d94d461f0b4d49c12329b1a66 SHA512 5a68efff617706c401796e9820cb22380f00b85de850a09392c185af9889f73f2f3e1908ecb00c20ad3c29b88a2d8fa227ca9312e684a4c3f212f44cd259e70f WHIRLPOOL 2c2eb3f71c455a44e5236126533b584b7b32a1b9c61ed26208a09d84b5e2fafcb4fb361bfbbba935c4acd2786edee0cbafdfb64c277a4b35f714a338879cb59c
diff --git a/app-admin/webmin/webmin-1.730.ebuild b/app-admin/webmin/webmin-1.730.ebuild
deleted file mode 100644
index 54f23b10a374..000000000000
--- a/app-admin/webmin/webmin-1.730.ebuild
+++ /dev/null
@@ -1,304 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils pam ssl-cert systemd
-
-DESCRIPTION="A web-based Unix systems administration interface"
-HOMEPAGE="http://www.webmin.com/"
-SRC_URI="minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
-	!minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz )"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-# NOTE: The ssl flag auto added by ssl-cert eclass is not used actually
-# because openssl is forced by dev-perl/Net-SSLeay
-IUSE="minimal +ssl mysql postgres ldap"
-
-# All the required perl modules can be found easily using (in Webmin's root src dir):
-# find . -name cpan_modules.pl -exec grep "::" {} \;
-# NOTE: If Webmin doesn't find the required perl modules, it offers(runtime) the user
-# to install them using the in-built cpan module, and this will mess up perl on the system
-# That's why some modules are forced without a use flag
-# NOTE: pam, ssl and dnssec-tools deps are forced for security and Gentoo compliance installation reasons
-DEPEND="virtual/perl-MIME-Base64
-	virtual/perl-Socket
-	virtual/perl-Sys-Syslog
-	virtual/perl-Time-HiRes
-	virtual/perl-Time-Local
-	dev-perl/Authen-Libwrap
-	dev-perl/IO-Tty
-	dev-perl/MD5
-	dev-perl/Net-SSLeay
-	dev-perl/Authen-PAM
-	dev-perl/Sys-Hostname-Long
-	>=net-dns/dnssec-tools-1.13
-	!minimal? (
-		mysql? ( dev-perl/DBD-mysql )
-		postgres? ( dev-perl/DBD-Pg )
-		ldap? ( dev-perl/perl-ldap )
-		dev-perl/XML-Generator
-		dev-perl/XML-Parser
-	)"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	local perl="$( which perl )"
-
-	# Remove the unnecessary and incompatible files
-	rm -rf acl/Authen-SolarisRBAC-0.1*
-	if ! use minimal ; then
-		rm -rf {format,{bsd,hpux,sgi}exports,zones,rbac}
-		rm -f mount/{free,net,open}bsd-mounts*
-		rm -f mount/macos-mounts*
-	fi
-
-	# For security reasons remove the SSL certificate that comes with Webmin
-	# We will create our own later
-	rm -f miniserv.pem
-
-	# Remove the Webmin setup scripts to avoid Webmin in runtime to mess up config
-	# We will use our own later
-	rm -f setup.{sh,pl}
-
-	# Set the installation type/mode to Gentoo
-	echo "gentoo" > install-type
-
-	# Fix the permissions of the install files
-	chmod -R og-w "${S}"
-
-	# Since we should not modify any files after install
-	# we set the perl path in all cgi and pl files here using Webmin's routines
-	# The pl file is Prefix safe and works only on provided input, no other filesystem files
-	ebegin "Fixing perl path in source files"
-	(find "${S}" -name '*.cgi' -print ; find "${S}" -name '*.pl' -print) | $perl "${S}"/perlpath.pl $perl -
-	eend $?
-}
-
-src_install() {
-	# Create config dir and keep
-	diropts -m0755
-	dodir /etc/webmin
-	keepdir /etc/webmin
-
-	# Create install dir
-	# Third party modules installed through Webmin go here too, so keep
-	dodir /usr/libexec/webmin
-	keepdir /usr/libexec/webmin
-
-	# Copy our own setup script to installation folder
-	insinto /usr/libexec/webmin
-	newins "${FILESDIR}"/gentoo-setup gentoo-setup.sh
-	fperms 0744 /usr/libexec/webmin/gentoo-setup.sh
-
-	# This is here if we ever want in future ebuilds to add some specific
-	# config values in the /etc/webmin/miniserv.conf
-	# The format of this file should be the same as the one of miniserv.conf:
-	# var=value
-	#
-	# Uncomment it if you use such file. Before that check if upstream
-	# has this file in root dir too.
-	#newins "${FILESDIR}/miniserv-conf" miniserv-conf
-
-	# Create the log dir and keep
-	diropts -m0700
-	dodir /var/log/webmin
-	keepdir /var/log/webmin
-
-	# Create the init.d file and put the neccessary variables there
-	newinitd "${FILESDIR}"/init.d.webmin webmin
-	sed -i \
-		-e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
-		-e "s:%pid%:${EROOT}var/run/webmin.pid:" \
-		-e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
-		-e "s:%config%:${EROOT}etc/webmin/config:" \
-		-e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
-		"${ED}etc/init.d/webmin" \
-		|| die "Failed to patch the webmin init file"
-
-	# Create the systemd service file and put the neccessary variables there
-	systemd_newunit "${FILESDIR}"/webmin.service webmin.service
-	sed -i \
-		-e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
-		-e "s:%pid%:${EROOT}var/run/webmin.pid:" \
-		-e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
-		-e "s:%config%:${EROOT}etc/webmin/config:" \
-		-e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
-		"${ED}$(_systemd_get_unitdir)/webmin.service" \
-		|| die "Failed to patch the webmin systemd service file"
-
-	# Setup pam
-	pamd_mimic system-auth webmin auth account session
-
-	# Copy files to installation folder
-	ebegin "Copying install files to destination"
-	cp -pPR "${S}"/* "${ED}usr/libexec/webmin"
-	eend $?
-}
-
-pkg_preinst() {
-	# First stop service if running so Webmin to not messup our config
-	ebegin "Stopping any running Webmin instance prior merging"
-	if systemd_is_booted ; then
-		systemctl stop webmin.service 2>/dev/null
-	else
-		rc-service --ifexists -- webmin --ifstarted stop
-	fi
-	eend $?
-}
-
-pkg_postinst() {
-	# Run pkg_config phase first - non interactively
-	export INTERACTIVE="no"
-	pkg_config
-	# Every next time pkg_config should be interactive
-	INTERACTIVE="yes"
-
-	ewarn
-	ewarn "Bare in mind that not all Webmin modules are Gentoo tweaked and may have some issues."
-	ewarn "Always be careful when using modules that modify init entries, do update of webmin, install CPAN modules etc."
-	ewarn "To avoid problems, please before using any module, look at its configuration options first."
-	ewarn "(Usually there is a link at top in the right pane of Webmin for configuring the module.)"
-	ewarn
-	if systemd_is_booted ; then
-		elog "- To make Webmin start at boot time, run: 'systemctl enable webmin.service'"
-	else
-		elog "- To make Webmin start at boot time, run: 'rc-update add webmin default'"
-	fi
-	elog "- The default URL to connect to Webmin is: https://localhost:10000"
-	elog "- The default user that can login is: root"
-	elog "- To reconfigure Webmin in case of problems run 'emerge --config app-admin/webmin'"
-}
-
-pkg_prerm() {
-	# First stop service if running - we do not want Webmin to mess up config
-	ebegin "Stopping any running Webmin instance prior unmerging"
-	if systemd_is_booted ; then
-		systemctl stop webmin.service 2>/dev/null
-	else
-		rc-service --ifexists -- webmin --ifstarted stop
-	fi
-	eend $?
-}
-
-pkg_postrm() {
-	# If removing webmin completely, remind the user for the Webmin's own cron jobs.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		ewarn
-		ewarn "You have uninstalled Webmin, so have in mind that all cron jobs scheduled"
-		ewarn "by Webmin for its own modules, are left active and they will fail when Webmin is missing."
-		ewarn "To fix this just disable them if you intend to use Webmin again,"
-		ewarn "OR delete them if not."
-		ewarn
-	fi
-}
-
-pkg_config(){
-	# First stop service if running
-	ebegin "Stopping any running Webmin instance"
-	if systemd_is_booted ; then
-		systemctl stop webmin.service 2>/dev/null
-	else
-		rc-service --ifexists -- webmin --ifstarted stop
-	fi
-	eend $?
-
-	# Next set the default reset variable to 'none'
-	# reset/_reset can be:
-	# 'none' - does not reset anything, just upgrades if a conf is present
-	#		   OR installs new conf if a conf is missing
-	# 'soft' - deletes only $config_dir/config file and thus resetting most
-	#		  conf values to their defaults. Keeps the specific Webmin cron jobs
-	# 'hard' - deletes all files in $config_dir (keeping the .keep_* Gentoo file)
-	#		  and thus resetting all Webmin. Deletes the specific Webmin cron jobs too.
-	local _reset="none"
-
-	# If in interactive mode ask user what should we do
-	if [[ "${INTERACTIVE}" = "yes" ]]; then
-		einfo
-		einfo "Please enter the number of the action you would like to perform?"
-		einfo
-		einfo "1. Update configuration"
-		einfo "   (keeps old config options and adds the new ones)"
-		einfo "2. Soft reset configuration"
-		einfo "   (keeps some old config options, the other options are set to default)"
-		ewarn "   All Webmin users will be reset"
-		einfo "3. Hard reset configuration"
-		einfo "   (all options including module options are set to default)"
-		ewarn "   You will lose all Webmin configuration options you have done till now"
-		einfo "4. Exit this configuration utility (default)"
-		while [ "$correct" != "true" ] ; do
-			read answer
-			if [[ "$answer" = "1" ]] ; then
-				_reset="none"
-				correct="true"
-			elif [[ "$answer" = "2" ]] ; then
-				_reset="soft"
-				correct="true"
-			elif  [[ "$answer" = "3" ]] ; then
-				_reset="hard"
-				correct="true"
-			elif  [ "$answer" = "4" -o "$answer" = "" ] ; then
-				die "User aborted configuration."
-			else
-				echo "Answer not recognized. Enter a number from 1 to 4"
-			fi
-		done
-
-		if [[ "$_reset" = "hard" ]]; then
-			while [ "$sure" != "true" ] ; do
-				ewarn "You will lose all Webmin configuration options you have done till now."
-				ewarn "Are you sure you want to do this? (y/n)"
-				read answer
-				if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-					sure="true"
-				elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-					die "User aborted configuration."
-				else
-					echo "Answer not recognized. Enter 'y' or 'n'"
-				fi
-			done
-		fi
-	fi
-
-	export reset=$_reset
-
-	# Create ssl certificate for Webmin if there is not one in the proper place
-	if [[ ! -e "${EROOT}etc/ssl/webmin/server.pem" ]]; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Webmin Server}"
-		SSL_COMMONNAME="${SSL_COMMONNAME:-*}"
-		install_cert "${EROOT}/etc/ssl/webmin/server"
-	fi
-
-	# Ensure all paths passed to the setup script use EROOT
-	export wadir="${EROOT}usr/libexec/webmin"
-	export config_dir="${EROOT}etc/webmin"
-	export var_dir="${EROOT}var/log/webmin"
-	export tempdir="${T}"
-	export pidfile="${EROOT}var/run/webmin.pid"
-	export perl="$( which perl )"
-	export os_type='gentoo-linux'
-	export os_version='*'
-	export real_os_type='Gentoo Linux'
-	export real_os_version='Any version'
-	# Forcing 'ssl', 'no_ssl2', 'no_ssl3', 'ssl_redirect' and 'no_sslcompression' for tightening security
-	export ssl=1
-	export no_ssl2=1
-	export no_ssl3=1
-	export ssl_redirect=1
-	export no_sslcompression=1
-	export keyfile="${EROOT}etc/ssl/webmin/server.pem"
-	export port=10000
-
-	export atboot=0
-
-	einfo "Executing Webmin's configure script"
-	$wadir/gentoo-setup.sh
-
-	einfo "Configuration of Webmin done"
-}
diff --git a/app-backup/spideroak-bin/Manifest b/app-backup/spideroak-bin/Manifest
index aca43fa6ff3a..cbe7e8c0e06b 100644
--- a/app-backup/spideroak-bin/Manifest
+++ b/app-backup/spideroak-bin/Manifest
@@ -4,11 +4,14 @@ DIST spideroak-bin-5.1.8_amd64.deb 20000116 SHA256 b91f3077c2238bbb1123361afc597
 DIST spideroak-bin-5.1.8_x86.deb 19361954 SHA256 806aae6ac96cb47443c50bfc3bc3f5f7b00abc0b5d978cc2746d10cb1f6b6742 SHA512 43242b9fcd577fc51b838de72215fa971f385ae1f6ea7c606cc198b2dacd0bbca9b693ea2452c2c957c3af6dc97625d6bd15176067542dfdcbc1505a50c8b42b WHIRLPOOL 5f88e3b699be60151471c71998b2aad2d7e5a42a1c179ccb10a168940dd4ea291f812e6d6e9eb475345b53f403aa3a09cd785759413a0cf50edc9b92300af14f
 DIST spideroak-bin-5.2.0_amd64.deb 20284404 SHA256 f9b452f891796fcd1046c4a955d2b4722b0a452b24f8ea728a30833c0a576f32 SHA512 75a96c6f6f0ec6a14255fc4f3bdad96ba54be4a4ee2ea385159c575e7b0e05bf3cfcfc4b0595a430b4a686acda3cb2674df5959d0b1a3ddc609a590d7737d94e WHIRLPOOL c6045af1101008b2ca25df4fd4d34d55b3dcda2187660f3601fbc9a6aa53c7e9ad3d59fffa954c2eb57022a46ecf04a42f39577914fc01dbe2c46c4c5e184475
 DIST spideroak-bin-5.2.0_x86.deb 19641884 SHA256 f4689dcc0630e4b46b039c64a16e291d740cc245b7507863ae5938473f504c30 SHA512 e98041b98c77e011774abe5b832c9a2ee4ecd179864bd39aacdb439f906110797f9f96e7326a394a6da0cbb88650c242da51060b501de0c379a0efdb75594403 WHIRLPOOL bf96a2cd8f3bbf6ab2ec26c532546b8c40dda09a1902075332fb2c8787af4a4a1808094fb6e7fb90f27c9da2d480b1129e235fa656c76bd1acbfd3b8bbda90d5
+DIST spideroak-bin-6.0.1_amd64.deb 26718286 SHA256 7baa2573756ce174fbdff882be21de2306580de12d31cf760b706da72efdb711 SHA512 28551b5a5e7824e06c17a7f53a9218d82a18ddc9c9ba3bd19361eef02d02afb795ee75d4aad9819ff87de78193edca1015efcea0c65e36bcdfad9d9bdf96f819 WHIRLPOOL dd34a78a675beb8c08c7c36abc6fb65182dcb24ec9a446cc6fc6bb8114f457c2383743305eb3d5886ddb0d9cc3a4dc3489d75fef2226947660f19624b81b5098
+DIST spideroak-bin-6.0.1_x86.deb 26232394 SHA256 084013d54c335e74fb853b74f54ac1ca2a90d96338cb6e3dbdf4f83dc718c611 SHA512 b94363fa66338be4af70ac753c7aac0e80dac6bea2a23310075de4e77c950fb67a63e9c6aa14734f00d49ea8a537b788379d3599dfa874fddc9f7455e805f773 WHIRLPOOL 7a735006f179ef1421cc071ebe7118650a6052f5563735beb290021420ef75730f2f105d2606f42a4721d48775eced463e9ca9da58315efae2b9e5c95087bf98
 DIST spideroak-bin-6.0_amd64.deb 26676730 SHA256 5825635b706da95740e4b2e1d36870d17d0cfd6a8b26ded6116708d9496e0551 SHA512 9c0cb6195a0c553e0e1e691d4f22950fd826142c526035ac0ef84628a15a17f293dcaed5bf2ab138ddfb94a47265e06906f6b55e78582212672c9dcb503e86f9 WHIRLPOOL d31fb7a4bd3bc3a49d0a7241bd4bd723ccee28b784ddfbf75c598638bf47dbc0fc75edbdcb5134ea2574f5897d399a79fe42d59a22b41bdc31c63c9fe48f28e0
 DIST spideroak-bin-6.0_x86.deb 26196770 SHA256 0d655cddc6201188f7bb04d46774bdca42ca6e9958ed458a1bf89bc53485fc58 SHA512 692418c59462f53930583df01bc5f31520b33d10f9bf616cca6bffcea425d667f65e194c4d40c8357822895f7f54e42f747b25e1dd9af522ab44cec940a66c45 WHIRLPOOL a963aa5a05e85fd55d53849d09099aa585b481c2c9f4756f3d4a7e2c17edd5375da12c669341073453f9a62e471c9121a92008a90288a20b10c75f323885d4d5
 EBUILD spideroak-bin-5.1.10.ebuild 2357 SHA256 db3fcfaca66da577e13fea3f1a3f626c3b41008f6dd235a56d0e5ea198079032 SHA512 2db8f91ddaed0afc0c515ea44b875ad6ecb6d8b39cd2a04aa59252812ac25fcdba1fb6d61fb80fd5a9b2d52ad5618ac7acd03b724fed2f83aaca32549621e1ae WHIRLPOOL da9fd5aa14bd8b7995500f6c431bc2efa612b1bfe668e85ab56e16e1930ef0694d5a8832f7ac136e096133436f0dc1618df2429f574272bb873d0c31151e49c3
 EBUILD spideroak-bin-5.1.8-r2.ebuild 2337 SHA256 ee110c9b801341ec66e99fac7d1e32abeb729df8c147ed8af694423899a7d6bd SHA512 a0a325bf27783582d9dc64e2a42d803c9f8a9f1d8df1136ccf914490eef991d8fd76a1ee23f8752345c16ad534d9a4c4e4bedecb3cbd9cd25dc8612c90408ba3 WHIRLPOOL eb258488b94e9884cc247d840935173e8f780d250d5bf632531ada26be58b0b6952f54fe66292630b7c0179ad3a33c73ae4d8c58a6ceafd000bfb8ac12c4db1a
 EBUILD spideroak-bin-5.2.0.ebuild 2357 SHA256 db3fcfaca66da577e13fea3f1a3f626c3b41008f6dd235a56d0e5ea198079032 SHA512 2db8f91ddaed0afc0c515ea44b875ad6ecb6d8b39cd2a04aa59252812ac25fcdba1fb6d61fb80fd5a9b2d52ad5618ac7acd03b724fed2f83aaca32549621e1ae WHIRLPOOL da9fd5aa14bd8b7995500f6c431bc2efa612b1bfe668e85ab56e16e1930ef0694d5a8832f7ac136e096133436f0dc1618df2429f574272bb873d0c31151e49c3
+EBUILD spideroak-bin-6.0.1.ebuild 2402 SHA256 ff761be2cf264e29f04fb601b6ec8a1c80a9a5de2c45dc8bd0f1bc2dc3edbcbd SHA512 09904d615ba01f2c5b3dea739ab958c7676dccf145ff8cc4a1960b2eeb86de16b47185a222ff34b21e7bb0875785e075a26aaf8ab3d39b72514872dc80019ee8 WHIRLPOOL 93f445aeaf1fea0cf69a31733af8ad7774c2fc0b9ea9f64ae8c89c1fd6192684c60e2dd99f9e7357e011d1a8ca5481da11b456a3e94eb88e15293e4ecc41ae44
 EBUILD spideroak-bin-6.0.ebuild 2402 SHA256 ff761be2cf264e29f04fb601b6ec8a1c80a9a5de2c45dc8bd0f1bc2dc3edbcbd SHA512 09904d615ba01f2c5b3dea739ab958c7676dccf145ff8cc4a1960b2eeb86de16b47185a222ff34b21e7bb0875785e075a26aaf8ab3d39b72514872dc80019ee8 WHIRLPOOL 93f445aeaf1fea0cf69a31733af8ad7774c2fc0b9ea9f64ae8c89c1fd6192684c60e2dd99f9e7357e011d1a8ca5481da11b456a3e94eb88e15293e4ecc41ae44
 MISC ChangeLog 9976 SHA256 d87f260588c0a3256fbe97db8968c9d6cac8265129e21a6d4192f523e1fe7af1 SHA512 990b38cee66eb2af2705d4fdb34463a6ab8692620ee404a0fb2c7336fbff94d08db6b4d1275603d4d2a038a531fee917d8c8fad3bf044e3753edf5d940ffc808 WHIRLPOOL 3518bf66138df84344eff40abe128e109720e2942b862dd5869051ee01a5e2b3ae4d0590b91df88cd587fdd5eb776f5d9cbc3c4be0446ce3089a8cae64271116
 MISC metadata.xml 397 SHA256 d6329b13e376b9a294e3d3b58403320a2b41d08163d609b5a1ef5a44c0b25d3f SHA512 a2d334c2bf30fa90a9ffa4455c9d85911a771ff8889ad5c029abc4fd4f2c9675132a6b0844f6e723a83ac08ac10fadc212c5529ee13abf7d257c21e80d4fea19 WHIRLPOOL 3cb59afe1e6acb069de77ec9aceb059f316c88d4db4c7c0302bafc22373e489d1867f2125574da40ed4d0bc4944a3e7dcb562fdea10b523bd32c87e11db96ccd
diff --git a/app-backup/spideroak-bin/spideroak-bin-6.0.1.ebuild b/app-backup/spideroak-bin/spideroak-bin-6.0.1.ebuild
new file mode 100644
index 000000000000..f6b262a6e1e3
--- /dev/null
+++ b/app-backup/spideroak-bin/spideroak-bin-6.0.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils unpacker
+
+SRC_URI_BASE="https://spideroak.com/getbuild?platform=ubuntu"
+
+DESCRIPTION="An easy, secure and consolidated free online backup, storage, access and sharing system"
+HOMEPAGE="https://spideroak.com"
+SRC_URI="x86? ( ${SRC_URI_BASE}&arch=i386&version=${PV} -> ${P}_x86.deb )
+	amd64? ( ${SRC_URI_BASE}&arch=x86_64&version=${PV} -> ${P}_amd64.deb )"
+RESTRICT="mirror strip"
+
+LICENSE="spideroak"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus X"
+
+DEPEND="dev-util/patchelf"
+RDEPEND="
+	app-crypt/mit-krb5[keyutils]
+	dbus? ( sys-apps/dbus )
+	X? (
+		media-libs/fontconfig
+		media-libs/freetype:2
+		dev-libs/glib:2
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+"
+
+S=${WORKDIR}
+
+QA_PREBUILT="*"
+
+src_prepare() {
+	# Set RPATH for preserve-libs handling (bug #400979).
+	cd "${S}/opt/SpiderOakONE/lib" || die
+	local x
+	for x in `find` ; do
+		# Use \x7fELF header to separate ELF executables and libraries
+		[[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue
+		patchelf --set-rpath '$ORIGIN' "${x}" || \
+			die "patchelf failed on ${x}"
+	done
+}
+
+src_install() {
+	#install the wrapper script
+	exeinto /usr/bin
+	doexe usr/bin/SpiderOakONE
+
+	# inotify_dir_watcher needs to be marked executable, bug #453266
+	#chmod a+rx opt/SpiderOakONE/lib/inotify_dir_watcher
+
+	#install the executable
+	exeinto /opt/SpiderOakONE/lib
+	doexe opt/SpiderOakONE/lib/SpiderOakONE
+	doexe opt/SpiderOakONE/lib/inotify_dir_watcher
+	rm -f opt/SpiderOakONE/lib/{SpiderOakONE,inotify_dir_watcher}
+
+	#install the prebundled libraries
+	insinto /opt/SpiderOakONE
+	doins -r opt/SpiderOakONE/lib
+
+	#install the config files
+	use dbus || rm -rf etc/dbus-1
+	insinto /
+	doins -r etc
+
+	#install the manpage
+	doman usr/share/man/man1/SpiderOakONE.1.gz
+
+	if use X; then
+		domenu usr/share/applications/spideroakone.desktop
+		doicon usr/share/pixmaps/SpiderOakONE.png
+	fi
+}
+
+pkg_postinst() {
+	if ! use X; then
+		einfo "For instructions on running SpiderOakONE without a GUI, please read the FAQ:"
+		einfo "  https://spideroak.com/faq/questions/62/how_do_i_install_spideroak_on_a_headless_linux_server/"
+		einfo "  https://spideroak.com/faq/questions/67/how_can_i_use_spideroak_from_the_commandline/"
+	fi
+}
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index 0ea5f5673f49..e2f95015c93f 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -21,6 +21,6 @@ EBUILD screen-4.0.3-r7.ebuild 4761 SHA256 f871fed6ccdef5a3b3122d38da466817582054
 EBUILD screen-4.0.3-r8.ebuild 5058 SHA256 f39a6207f0bd46806cc6748d589d38f100f17587af89a538d4517d9fbaecf15f SHA512 50b50bd68ed2813e9ba68388b606578af5efaa63a08c67402b0b3d004c8612c42732f7faeeb1414bbaa209af50dea21656bbdf04687956436abcc9fcf246d23e WHIRLPOOL cbcea2d4f704578226ea1157adb102f8f4c91e6d488b7886a8502d33b552b66629b8e2a2642022f10a69def29a76714f91754a5fc76672df92107c4281c0c113
 EBUILD screen-4.2.1-r2.ebuild 3916 SHA256 ff9d78e5f6e6803ed5e1bfd614103933c00ba70827a41e9ea990505b9cf11a87 SHA512 edb508149394481a4d91d3d883b4ce94557cc9ffcfd457a130341f8042e415a74cabe785dd69dfb20a7c648eb0ca4fd2b8a095ac6f893c3a875a29f75218e845 WHIRLPOOL d0974bf400e2aec3d911c8c8d56de68aa7701859f46ff80e3a572847b19d8c0dab4c0c180da07dd07b5a376a157844ca73f2c868c1ddd8ee37bfbe7903f82b3a
 EBUILD screen-4.3.1.ebuild 3917 SHA256 70f29d0ebb7e8061e8ddf0fe152a875f43e8bd6b1cab65559c8584918acfcd0f SHA512 bd84885d8e43b725a1127b7e25b10dc131bc2c24aefaa17e3f751cf17ce9e629953da1282f985e3e75914b9b85a84b69a5d37660027a448b698cadb02b5395a7 WHIRLPOOL 5354367c4aa853d8cea0a37e6609f4cb96d47b6e491a0b3835399d8d7735ea98c59d064762e93d92707ee643e3886fb4b4448531c62eddd7f9cf5e8d513759b3
-EBUILD screen-9999.ebuild 3669 SHA256 82ed558e0c4b54156edb9b3b56d11c2e0bfb4a508b13589496e967c3039f51c3 SHA512 43ff373aba0584bcb5d68f57a846446a76a234a299f289a79fc243c8dd0800228e16e3a05f6f6273965b8b1516eb4b50261befc5664dc387b57eb4e233b8f6b6 WHIRLPOOL 27c697f2d33f4c23c6be508ea5e93113b1e9f8ecbd39714dc88148e90c269b07da74a253dfb022c72590de3a72257ebc0f4e96f034b3f391ae346727f7170347
+EBUILD screen-9999.ebuild 3675 SHA256 4ee5dc7659919e9f4cbc3909f6049d417f3251c02bd86b0ad3eaf3e4e15a6fae SHA512 229167fb38cdf20065e44303204290f03beb8d813e03d3de05c3343b77400b68b3dab75768379d0e3331728ea851dd6f330939fae44a28abd0ef9bfcf832ee76 WHIRLPOOL 360a03fed7290946943d7a28346567c9925835208d69983850e62614ab888d0ba37122f316f0f95aeddc93c5daf7741c471b94ccdd08f757bf0ce57d51676d89
 MISC ChangeLog 29858 SHA256 481ee48a0440100320f3ebf9d717d6aebb6f95ac4eff5ea793711b9e24f5324b SHA512 d3015d0c2ab3e7f019c414fc95542ff3408ee1ddccf1e805e5885646307141aa9c6d0a4aaf1bbe733b930da929e6eb1896c632cfcc2658ee4508a1c9fa830eac WHIRLPOOL 17a24afb34b439e9eff882ad54410af5117f41e92540854981e56671d5746b9caa15d6196d572a5d0421948763dea9a2f0953d0440792e1bafa593f00424e237
 MISC metadata.xml 1717 SHA256 3b683391c778841993813e38bc255e9fb7d36afc6c160b231fef4956ad6820dc SHA512 b6adab02c25cc3fac41f897c031fcd6265d1e8f4f2091501514b8469aecdbfe5efe7b2d2c66eef76bc2dd55dbb12de5f06f09ab3192fda5606cc249562820103 WHIRLPOOL 3f366cfca6b408350c0ea2d069fad9943a479033419f58558a93c58ecced96e518c0f3c59b8a71cef8fb4807b85eca7435c83beb2e1060b69931c4305fffa4d1
diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild
index e4f0ab8faa87..21051322e812 100644
--- a/app-misc/screen/screen-9999.ebuild
+++ b/app-misc/screen/screen-9999.ebuild
@@ -37,7 +37,7 @@ pkg_setup() {
 
 src_prepare() {
 	# Don't use utempter even if it is found on the system
-	epatch "${FILESDIR}"/4.0.2-no-utempter.patch
+	epatch "${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
 
 	# sched.h is a system header and causes problems with some C libraries
 	mv sched.h _sched.h || die
diff --git a/dev-dotnet/log4net/Manifest b/dev-dotnet/log4net/Manifest
index f5731a7724f9..d0051f473414 100644
--- a/dev-dotnet/log4net/Manifest
+++ b/dev-dotnet/log4net/Manifest
@@ -1,6 +1,6 @@
 AUX log4net.pc.in-r1 200 SHA256 3f314f295ba47a048c02f01661e2c814ee460d37c3ae534cad0bbe87c80a2c58 SHA512 57b3d07219d8ba030108e73d2208b424caa3d7afb6004a04647771c2963fc4669ba3cf057cb30b93d6e04cf736127f96ebda8fbb05910eed9ea60ca0245bfb2f WHIRLPOOL f282f04bd9b40966c934bc21a2487a51191b9e8fde4837d93b2a6243d46c1e919cb5e132643845665d2b45265ec32958d0db4e7a773990b40c157041a10354d2
 DIST log4net-1.2.11-src.zip 1208854 SHA256 d9926e32e2b18a67ef4f90553b560621d34c49e6eb53b1f4d954b6bf6501e771 SHA512 b6ad8c873de69a30c68c82265dd2a5de331ecb780896f750088fe1e91f17191c2b54850629ece26659ec4c72b695cccae48eae30dbdf4dd18d5545cc24a42865 WHIRLPOOL d2c0c3e1c4d59c0c94b395d4055ad7ab1a0b84966aeb1f8f89396c1f74c8e11aa55bf448fec5915e3e7d91093c30e740285a615c462b4e9de1cc5e5a2d87aba8
 DIST log4net.snk 596 SHA256 6d593f81f9557e206d9f822cc2b0a07bd28a7e6a6448e8eed4b619812950db69 SHA512 b0525adfe90b8d86c7e7ac8295097b60b03b427aa4e6ad36b32bb98c7bc9fc081158249285c42eeff7637bd66a742ca422906a85544ca6526fe5e785cead8ff7 WHIRLPOOL 342123baa0ed762c67e7e14d9dd5b9f1cdea477fed9061bce7ee446916dda804f44e00f5647cd65649ca605ff4fd414dc3dd53f2705ca20db5594923f74348f7
-EBUILD log4net-1.2.11.ebuild 1178 SHA256 38f1fb81a637955cb2d920a693e52a75e8a7788bd2807b0b28296e3af1b4d370 SHA512 f3cce7fff4bd763d8d2885fed90d5815bf75cea5a0267e275ba5154b05faf57b81d7241e2d200de2fbf2c4cadf00ddabe04a064ac4864b856e2fded82462924b WHIRLPOOL c11d71d115f36d16c3a152b13b6276b61ce264877c4914be3293bf97fbb8878329de984a93ec7a07c6e3a809abd09cff63b1dbc2baa9f2e2beb0201577849be6
+EBUILD log4net-1.2.11.ebuild 1177 SHA256 37e73f07b06df98ff60e14f9024de64090ef81ebe1646e3163e39bd2ae808310 SHA512 349c7788832baa925ebdae9a2dace067a4f35f3a1b1bee926cb6d80e311e8f1d99de537fddb8feaa012fbe9128d4e339d3cfe6c32a9a795d591d0b14fef74a26 WHIRLPOOL 9477426a27d491110a3bb3febeb807c8a40b4a3b48610532de3346c21309c48bce8ffd5e465e7e513db117551c08a52c3a7d682d6e4785d70f5e1a4b18a9a167
 MISC ChangeLog 2813 SHA256 f150bc4bc968fbc517e1b3846e7060a5ae610b8702edb23e862b0bf0ae31c680 SHA512 9e268e56bc6546cf054420338e5fd008457150666ccd49fc1f4b836c62430ee525917316afc6f8b722cee7e15309ee8c526b08c8b23187fd880b3ed11a7b9cce WHIRLPOOL 86719fbfff4fea4839be88239999cceec627134d599bf32f4f01e7875559e4e8bcbbf9db7eff7c1678fb640d21edd390b7aad27b386460bcb63834b9f82cc69c
 MISC metadata.xml 159 SHA256 986c3e2fa3baa5d6e8c0b5c27a2550601780d0cc7857f7f1c01523491706d909 SHA512 dcbe6340201ba1f19cc562308323859123ddac17ee0e5466e70c81820985de9c90e723a80fdb56a3b26e1ac75f0b2977e1e04a5eaaa6a2fae024728b04a811f1 WHIRLPOOL ff15518ca0a64a0ff5d2760e6fb0393d76b7285581f9ce3930f08393d56f7768acfdf574e9bdc631026577564893c19764d561bd4a41b33e8d11c67ddd519a03
diff --git a/dev-dotnet/log4net/log4net-1.2.11.ebuild b/dev-dotnet/log4net/log4net-1.2.11.ebuild
index cd753c25de57..b9f428007d46 100644
--- a/dev-dotnet/log4net/log4net-1.2.11.ebuild
+++ b/dev-dotnet/log4net/log4net-1.2.11.ebuild
@@ -22,7 +22,7 @@ RDEPEND=">=dev-lang/mono-2.0"
 DEPEND="${RDEPEND}"
 
 src_compile() {
-	/usr/bin/gmcs \
+	/usr/bin/mcs \
 		-t:library \
 		-out:log4net.dll \
 		-keyfile:"${DISTDIR}"/log4net.snk \
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index c48313a19040..b22256fe1fa9 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -1,6 +1,7 @@
-AUX ogre-1.9.0-remove_media_path_to_bindir.patch 617 SHA256 1bda0f31de7711e7a33c5a36f74431a2e02f91916b18e85679cef5322baf3805 SHA512 49baf3c7c3e230771e87927a15efc0d307edc18e86ad0569edf9e548a3fb83ef452be8a63f469fcfea170d400ae3f5f47d123857d8756a230f8a312d697a21be WHIRLPOOL 86345549787c78b9ef445599662d3fa80dce06ff8c9340ff1f4c99db88f157dc7501e422b9f8634fc1fb38e558525cdbc712cce7d1d447075ebff139c120efb9
-AUX ogre-1.9.0-remove_resource_path_to_bindir.patch 524 SHA256 95fc1c6c1128eace78e1fe3c3bb85805d1546c8cca7beb7a5d26aa1e5cbb884f SHA512 57130cba16cdbaa8f2fbd2465ea93ebff05e8e4e195afc132fe54d30c1fe087c22ad206d6f98e5e8b6106413134de6bd7c0016507279d6e17b96799f62f0d5bf WHIRLPOOL 621acb1df61cf294dcd7d78cad58dbeac8ae45704305ee398cb300d952d7526026d28dc6fa402d4688d2842a78ba28a22c593dd800b9ff7b5689fa455c7a7dd4
+AUX ogre-1.9.0-gcc52.patch 2392 SHA256 36ffe23eab258a1bba85573b1704379d136b15ccb2d33aa0ab24db54d1a89c42 SHA512 ade6885334698ea2df8a678b3b9058f2cd06aa6c32dd57645e5b28e3f22cbaacc4821bbd661e97ecc426f216114dd9595d9b98c9368061561afea82779a942c7 WHIRLPOOL 6393459415ab178f032a53086b715f31ffa971f892ad266369fb5c623db4b7b79020fcc391d962df6d42ba1584240da8f77c9c9aeff536e058b5bbb4147013bf
+AUX ogre-1.9.0-remove_media_path_to_bindir.patch 545 SHA256 331eb7b47513df49edebcd45ad754e1ba11b5f72553876e462f0de6aa7a32447 SHA512 7248e6dba4837765ebf0bc1cd06c07891ea785a415ecbd279f1d6adc88b4a8aae0a12993635d9139697771e8b94739e709e2410754e0e004571d1a48a1bf614d WHIRLPOOL 1a692f70128a5aff5c2cbd6b8d46c3e98fbae540cc4835c75ae704e398dad20f69dc85eb2ef372878703492ae39c349cab2f30058c70978a13643e1fbdcd67c7
+AUX ogre-1.9.0-remove_resource_path_to_bindir.patch 452 SHA256 b339cc3e2d21700a6849e3c9d01bc56837e6b13ea1ef0365e246fe0993456499 SHA512 57cef0efbbbe791234b117556c6f56051ebeee90a1b1802a9fc8e106edabbfa53f96a2e43d4c332a8631b04954e87676444cdca417bcc8957f860d041f80d2b9 WHIRLPOOL aacabdaa0c7869fd6d6e8ff084b888be0b4a1a4c88a2203dad6145a81193154d84acdbdb5956060d5a2f0dcc9d35fe77bf26cd427baf0371ac1f9df2ba9d2368
 DIST ogre-1.9.0.tar.bz2 128098305 SHA256 3072df52b2bed2a1b52e969f140ae9a4373ec931029d3eaa032e7c609a91ef82 SHA512 b1ea93d80ac0978a7c228460a6714f8d17797450efd5af6765c9fa4402e9060a8ef3a700d2757593a3016fdc32276722c8f4a5d9889a3e2eb424f16162a52bde WHIRLPOOL 625cc09ba5a76757b47764c41583584f538eb9561e5bfd546192e06da504aa3924d7070a7dfbe420c4db3edf5870baf5e8b77cc611aa4185806508f79302d6cd
-EBUILD ogre-1.9.0-r1.ebuild 3705 SHA256 823c760dd0cd267c4180918d63e2c794c90e1ef0928d81a8dd2801d5d47c24c3 SHA512 60de7ceb82e73d1f7e81df1ab703ec77a95450df0f18b695d2458c40fbaca31f96b9a0cef113a558a0d53614bc7b1f05165635ce73ad48cf2651a36113d0965b WHIRLPOOL 9affe5b0e2c7c2dc25882cbc3f67079f6aace0fba485b065131b22ec0758e65cd141940a2a994023181a138b00a98c775f3bdb265d7175661c58d58eec4b6611
+EBUILD ogre-1.9.0-r1.ebuild 3744 SHA256 f17fb2d554d2b1322491888c3f3533bd2452c5f07da2bef64eee20cee99236a6 SHA512 b7a0ef043fd551119d67b65ad12f0af99e62bd70762cb1cdb2189ea7ee700bf11b3447197b88400a28289013eacceff456b3bdc9b00f48006bf2c67e0ca28244 WHIRLPOOL e192d2af2301340150e442465cd5ed2f6aff52a6e34aa7d3c09510d633e4b7ae1cb28c7fbd9dd02405b411114a9fde40b946ff7d64b62adbc47b4327d7988a8c
 MISC ChangeLog 14769 SHA256 f5e52631051f0c33054b4a97d4da67c61136b80807fef520738f2bac700961ba SHA512 c9c8f40e0a8507c1b07ed6a8ea871628f9fd5eb279304e3d56d078a95da282b3b73a1eb775fb4b6cbc89130fe11d7c3c49ea67cb1faab3a1d6acd7e457b51a73 WHIRLPOOL a1ad7516ddd1d5df84a3d8b5bfded71d4c57fa419392f5af75315e8b1ac5ab6b1e85ea01a9486dad651f886bdd8266522389fc2d44ab8f5c6cad2408af555e99
 MISC metadata.xml 5027 SHA256 d7eefe3cf5c25a5f7fed26277ea771bed386b56d5e45a5126000e8588662245b SHA512 45c6f2b47aad3aca08c273be97a3a1f933a5f85bf4f538e1e0383c2223dd1eff72d4240c159d151839e60ae9d62a011e134d08ae11e34c1edb6584ea543d3f15 WHIRLPOOL 54d46098a887c9d7776aa6e95944a4f81a3babb716f7faab95b698b5f9211d747fa82b965f803e347917b580e7ba74733327d71305f8b19248e969aaaba72dbe
diff --git a/dev-games/ogre/files/ogre-1.9.0-gcc52.patch b/dev-games/ogre/files/ogre-1.9.0-gcc52.patch
new file mode 100644
index 000000000000..030368de29e3
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.9.0-gcc52.patch
@@ -0,0 +1,63 @@
+--- a/OgreMain/include/OgreProgressiveMeshGenerator.h
++++ b/OgreMain/include/OgreProgressiveMeshGenerator.h
+@@ -215,7 +215,40 @@
+ 	void tuneContainerSize();
+ 	void addVertexData(VertexData* vertexData, bool useSharedVertexLookup);
+ 	template<typename IndexType>
+-	void addIndexDataImpl(IndexType* iPos, const IndexType* iEnd, VertexLookupList& lookup, unsigned short submeshID);
++	void addIndexDataImpl(IndexType* iPos, const IndexType* iEnd, VertexLookupList& lookup, unsigned short submeshID)
++	{
++
++		// Loop through all triangles and connect them to the vertices.
++		for (; iPos < iEnd; iPos += 3) {
++			// It should never reallocate or every pointer will be invalid.
++			OgreAssert(mTriangleList.capacity() > mTriangleList.size(), "");
++			mTriangleList.push_back(PMTriangle());
++			PMTriangle* tri = &mTriangleList.back();
++			tri->isRemoved = false;
++			tri->submeshID = submeshID;
++			for (int i = 0; i < 3; i++) {
++				// Invalid index: Index is bigger then vertex buffer size.
++				OgreAssert(iPos[i] < lookup.size(), "");
++				tri->vertexID[i] = iPos[i];
++				tri->vertex[i] = lookup[iPos[i]];
++			}
++			if (tri->isMalformed()) {
++#if OGRE_DEBUG_MODE
++				stringstream str;
++				str << "In " << mMeshName << " malformed triangle found with ID: " << getTriangleID(tri) << ". " <<
++				std::endl;
++				printTriangle(tri, str);
++				str << "It will be excluded from LOD level calculations.";
++				LogManager::getSingleton().stream() << str.str();
++#endif
++				tri->isRemoved = true;
++				mIndexBufferInfoList[tri->submeshID].indexCount -= 3;
++				continue;
++			}
++			tri->computeNormal();
++			addTriangleToEdges(tri);
++		}
++	}
+ 	void addIndexData(IndexData* indexData, bool useSharedVertexLookup, unsigned short submeshID);
+ 
+ 	void computeCosts();
+--- a/OgreMain/src/OgreProgressiveMeshGenerator.cpp
++++ b/OgreMain/src/OgreProgressiveMeshGenerator.cpp
+@@ -219,6 +219,8 @@
+ 	}
+ 	vbuf->unlock();
+ }
++/// Called from OgreQueuedProgressiveMeshGenerator.cpp, so it can not be defined in here.
++#if 0
+ template<typename IndexType>
+ void ProgressiveMeshGenerator::addIndexDataImpl(IndexType* iPos, const IndexType* iEnd,
+                                                 VertexLookupList& lookup,
+@@ -256,6 +258,7 @@
+ 		addTriangleToEdges(tri);
+ 	}
+ }
++#endif // 0
+ 
+ void ProgressiveMeshGenerator::addIndexData(IndexData* indexData, bool useSharedVertexLookup, unsigned short submeshID)
+ {
diff --git a/dev-games/ogre/files/ogre-1.9.0-remove_media_path_to_bindir.patch b/dev-games/ogre/files/ogre-1.9.0-remove_media_path_to_bindir.patch
index 9af7685c7d77..bb2ca551dbe4 100644
--- a/dev-games/ogre/files/ogre-1.9.0-remove_media_path_to_bindir.patch
+++ b/dev-games/ogre/files/ogre-1.9.0-remove_media_path_to_bindir.patch
@@ -1,5 +1,5 @@
---- a/CMake/InstallResources.cmake	2014-10-29 12:43:49.000000000 +0100
-+++ b/CMake/InstallResources.cmake	2014-10-29 12:46:10.017611431 +0100
+--- a/CMake/InstallResources.cmake
++++ b/CMake/InstallResources.cmake
 @@ -178,10 +178,6 @@
  
  # CREATE CONFIG FILES - BUILD DIR VERSIONS
diff --git a/dev-games/ogre/files/ogre-1.9.0-remove_resource_path_to_bindir.patch b/dev-games/ogre/files/ogre-1.9.0-remove_resource_path_to_bindir.patch
index d73762859081..a26aa3f447bd 100644
--- a/dev-games/ogre/files/ogre-1.9.0-remove_resource_path_to_bindir.patch
+++ b/dev-games/ogre/files/ogre-1.9.0-remove_resource_path_to_bindir.patch
@@ -1,5 +1,5 @@
---- a/CMake/InstallResources.cmake	2013-12-01 18:28:12.000000000 +0100
-+++ b/CMake/InstallResources.cmake	2014-10-29 12:38:29.963602465 +0100
+--- a/CMake/InstallResources.cmake
++++ b/CMake/InstallResources.cmake
 @@ -201,11 +201,6 @@
    set(OGRE_PLUGIN_DIR_DBG "")
    set(OGRE_SAMPLES_DIR_REL "")
diff --git a/dev-games/ogre/ogre-1.9.0-r1.ebuild b/dev-games/ogre/ogre-1.9.0-r1.ebuild
index 059d63e167ba..9b79034fd623 100644
--- a/dev-games/ogre/ogre-1.9.0-r1.ebuild
+++ b/dev-games/ogre/ogre-1.9.0-r1.ebuild
@@ -68,8 +68,10 @@ src_prepare() {
 	rm -f Tools/XMLConverter/{include,src}/tiny*.*
 
 	# Fix some path issues
-	epatch "${FILESDIR}/${P}-remove_resource_path_to_bindir.patch" \
-		"${FILESDIR}/${P}-remove_media_path_to_bindir.patch"
+	epatch \
+		"${FILESDIR}/${P}-remove_resource_path_to_bindir.patch" \
+		"${FILESDIR}/${P}-remove_media_path_to_bindir.patch" \
+		"${FILESDIR}/${P}-gcc52.patch"
 }
 
 src_configure() {
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 4aaf4ce3fdc2..ca3a8739a2f1 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -20,13 +20,13 @@ DIST python-gentoo-patches-3.4.0-0.tar.xz 12900 SHA256 5e5ca54eaf446c7dde4155e5d
 DIST python-gentoo-patches-3.4.1-0.tar.xz 11164 SHA256 7d88e40ed02bef2d26802516fc0138a28cca58e298204e6b1a32054f9224fcb6 SHA512 5ecdf6a1ccb8d12b5b7436e1b7f641a41afcd7fde573e9249e3dc0d438bacb1eb6a5255e149388194dbfd2951fee4f8c800199362dfd072ff96776bbbcad0bbe WHIRLPOOL 707f943f9af7c3fc6deed7cfca5a4198f65a34434893840ba8e4f4c2a3d055e8f927069cb8855b5fe20dff643b7e2d41f35f65e1f3f300e350c0f291b4df6bc2
 DIST python-gentoo-patches-3.4.2-0.tar.xz 11568 SHA256 86028c50ecb16fdbaae68662d9749f8c5dbbad6359423ed02c7b379d4aaeb7e3 SHA512 786d74df8ca168655f38d052a3e79541fd1d9f58845f8fdc296246208f8ddc61e5a0d95d675432fcac77dda7c0ab419162790d0e39337bce2fb5c5d3f23c9ef4 WHIRLPOOL 5b26c7d5facd93ca334f23057e26e3a2af71d9d590ab270d4619bb57e0d14bc6465c08ea34c53e1ccf347f5938fd0199a0edf2ddada3c3a891a5568f1eb81227
 DIST python-gentoo-patches-3.4.3-0.tar.xz 11736 SHA256 917a9d98d40a91379c81ea57922a8632ba3c6f6db6f304ed6262bc88c5044946 SHA512 7ad1b30cf8bb7900fe518ed71e4ee55dd92ce7e23ae583a1f2f851b26cfa8c4f4271d28f418e780f3725a48d4ca8eeb8fd083f850810c66c29fb08c430828d72 WHIRLPOOL 074e8c0055b49a028eebda21d1acfb8a25ec968eb8b350c2bed37e042f9f354871e413db13e0ef2fe41d7e56d647178a7b3622019f36c4819c2c68f088366eb1
-EBUILD python-2.7.10.ebuild 10472 SHA256 f722395bb6af3358c81ae89088eb20b027c8a9309721a7ad66f6609ba052638d SHA512 58ae8f42d513144ea5ece1207e1e4b129ef6c237cf934f646b9d52fc4d161c1c65af9a0ef93d478d70db9c12bc07ae58a6213328336d6cd1ae5225c669c11549 WHIRLPOOL 4784009bf6db48fba199435d5f16a5858b5aa50d3bba6b9fa2a8334d51614df0a1a79591dc38417095c7ed8c6655538c28b2de6c7212dcd86c58eb56f74b0fe7
-EBUILD python-2.7.9-r1.ebuild 10430 SHA256 625629875f61def9309a7e9ed5f7c3de761387f3fa79315ce66f5dec68c5608b SHA512 689205f615d4a4c1fab9dda8376f2aa21548e6110754104cbf85bac7f7a1a8b70f66796c27b8201e08e75e141f33197fecb651e73896fd2d6be376bfb08f96a0 WHIRLPOOL d9bc95b9d7d7733f8eb20cf9e925e37d67ab0cd39fabe54dd4b3712f9d45c5ffcdef8867fd81092a9611552a2e886bf016cc0d7f6e984776f7bb4343f2d4ac6b
+EBUILD python-2.7.10.ebuild 10450 SHA256 c40ca76410aa9d2e9cc1f6df6b7ec717ebb45cd8ab2a9009890c460e6f389d80 SHA512 306ca657eb2c159c381690ff295a59bfc7f6de7938311c4a16d13ece5c78c4cef265ac5a826d5d7ef1f89d62e45058eae30e018d2047815ffa088e8108b317c1 WHIRLPOOL 21a8006c690c1e04f405006d6ae48d20995e0b013be4945ac79dac7199ceb4349b4588977aef0263564050761d83e6df1e68378b1c8477528fb12118a6f314a6
+EBUILD python-2.7.9-r1.ebuild 10408 SHA256 18112522542a5fa5befd29143621392ee00b36e9f721314ec6d99ed6a47b89c0 SHA512 e8cfe96a47cde5d91684b8fb7c1650a9dbcee7e476aad85a2bb22059362647b920a2167239cbd27477a347bbcd036782b92e740331bc6167e08f69c8e7ce2b19 WHIRLPOOL 111d53396592f0f13fec207bd8468a7904aeb1a7466dc40e3491e1790d6bfec7f14f78128eb0d306391e542ad0e4a64e657a31af92554f67c15d10fafd1a8449
 EBUILD python-2.7.9-r2.ebuild 10503 SHA256 b7418fd312216b1362966081a98758b15b0f646f04c880d8541d3b5e0ce14642 SHA512 e80f99f12d0fdc71d3c364b8928d32e31112588a6afb4cabc9704260627521e655fa93df4fe40679af802c7db1f020742b6826c29bbfd3c6405b99fed5ecf3cd WHIRLPOOL 825d79c71df3e3f4acb861d736d8ed07cfa25fd96620a1a9dee34303f3d067157521f900d2dcd9c2c4bf460cb6f9920dcc71355a8a03e48c0df2da90ded6f5cd
 EBUILD python-3.3.5-r1.ebuild 9478 SHA256 a79da64ca712399d41652db820beeb8f35bfed3331cbbc533165f3cc2e3f8578 SHA512 94e335c6039aa7781ba4d6518fc5753438d731549dd772d6809ea2222d33302ccee462f5d321c884f4440e5f306ea0555062c5969b1e04f7db7df3073b08a6e2 WHIRLPOOL db22ed7ec290a8102596b76e99a09a001bdc64da97b375b0d150e84fd5038c867a9ed1fb40a738e732a9842d0e987600679b14bed60d6c0692427f12a9157d8a
 EBUILD python-3.4.0.ebuild 9207 SHA256 8154219c1d048930051bf3aae97f3949acdd4b6da7d6b846c13fa415b60e4bca SHA512 06b59ac47d359fcbfb5faf9e7fb7203f9584aa106bccfc7b455d9f6b9e5fc127d493ba91d35406d1bce6387a8e7c02572cb56d641c05b434dd9bacf418934ce6 WHIRLPOOL d1f4ff2fefa497249c011d35b1f656091fda5de67dca29b6e14044442cbe6632c6f8e06cfcf1f2814bd9e0608a1a63cb2bc74c3952d232a31def389a8d575761
-EBUILD python-3.4.1.ebuild 9128 SHA256 0062f778726ecf837c797d280bc041a2e4613fb771e7ce0631f6e285bca9ad87 SHA512 ab2326d434833bfe82e3a4971327302e7d51a7b8ff790a01d7d5f84b20dece0149b06478c77a5e19a6c07f66382aa2c11c86522fb3a2a9ae01a420b2063b0f7e WHIRLPOOL 842ecc871ec04f57e51a6ef71b2bab7dc1941e530bd28e2214dc0d1657956c2ed77cdb4ca350449dd1b7e8443efe4e88be6794d14e9300b8fd0970b90d7a74b5
+EBUILD python-3.4.1.ebuild 9106 SHA256 a66c8104bdd9ddf57efe8a87fa6102230679ff60717bbe9a538ba5ba3faec749 SHA512 402df77447f541ac6ecb83484b0ec54961a698444d003271abec0356d1e0dcacd3b0bef9a6430d19d7c613c91708b733892e2de20a95c3a0e0c87e2e32776316 WHIRLPOOL 657e5fa06629ee56be6c708b7574a0c277a0fb2e1b783896b57f4db4dfe08f1d91048b96966a031c107681996ae0e3b1886b48a28e8dc20afceb10661691cb7c
 EBUILD python-3.4.2.ebuild 9141 SHA256 6b2ba1f5234b314eae4e5f6ed00a0d94133712c8364b926c8602e0932c8c14bb SHA512 d6cfe257d10f351ea7d08967820dfa57e331b0f2a356e3df17ab09a6a3abcb69453fcfe57b0eb8a41a8c06dfe1e0c0edf340196178ba511fe19dd0b87fe61a11 WHIRLPOOL 55f6b0f45cb32ef037d59ac74b6b9bdaa8a2d67559dd355722ed9b8991eb8d8f8d8627f01aec5ad95a8c6704b35ad7afd74c602f661b9c28ac5107bfefce0b22
-EBUILD python-3.4.3.ebuild 9168 SHA256 37991408caf196d7234be535aa0802df68ebd505548e643e9c542c17e9c566f1 SHA512 7322f2fcd7fa07b5b7652ee5febe06ef9f409256b2527b8d2e4b6f14cb86f1ac582ee1d8a197083994d397871b9073882fd8ab313809121cbd10f0c9b264616d WHIRLPOOL 482a4a76599bb5beae51a160f00958aab77519da132286f005e7ad6a77657ae260f37775f060eb860285555c29bde23b491d52f9efc8a025db8b7236a9053129
+EBUILD python-3.4.3.ebuild 9146 SHA256 0cb52b6878da266047e4544442ee52ebb50e864db2b1bbe6d356537b19066cea SHA512 b724dbf62a363eb78fb5ce13f246132f88003382d212078437a1a6a1c22496baf6535f3ce210b69edb5c3e6b32952258940feb04553984a6ab3156c92f972460 WHIRLPOOL 7d04d5a025aa3ba4a61205b6ab8c3393b2a7c055497e5637cf6ddcfdb896822ea373af8f3df4095ddb882c7a970dad450d6040b8a9268a8103352b1eddc1b3fe
 MISC ChangeLog 40926 SHA256 f5d1dfa6038a588334062ea3e00e9ef9647ef13c7d667a0288a0cec4958aaa85 SHA512 36477f494cfe71e85401b97f1bf5035ebe255e4995886b74a2d535c9d77ca287d324adf239a3213e3be010793835d88f3f513b869bbeee57feb3cb2737549530 WHIRLPOOL b80dc69c8fa4666dbeb71e13c801ed332fbb80141076dc31e1e5b91f34531727f9b2004bee04b2415ad709c77e0be23318e96f4a7219c05dec79f99c22ffc853
 MISC metadata.xml 661 SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908 SHA512 871989a29417ce20d95da950fa385f1a958139de7b1567beb9cda28a1217901243cd9d25235fe3c7b0e43a82176d72286e31e4e97310b26488d2a3252ef3a8a0 WHIRLPOOL b694b1b4270ba15640d04a3b0b26a08575ea4afc9be256717f7f3b1768d75da9f71ceca6afd2f69971906227d5ba42263d2df2fc9387441aa240222d39fd094e
diff --git a/dev-lang/python/python-2.7.10.ebuild b/dev-lang/python/python-2.7.10.ebuild
index 00ff5c59242d..74ff08afc5ac 100644
--- a/dev-lang/python/python-2.7.10.ebuild
+++ b/dev-lang/python/python-2.7.10.ebuild
@@ -29,6 +29,7 @@ RDEPEND="app-arch/bzip2
 	>=sys-libs/zlib-1.1.3
 	virtual/libffi
 	virtual/libintl
+	xml? ( >=dev-libs/expat-2.1 )
 	!build? (
 		berkdb? ( || (
 			sys-libs/db:5.3
@@ -55,7 +56,6 @@ RDEPEND="app-arch/bzip2
 			dev-tcltk/blt
 			dev-tcltk/tix
 		)
-		xml? ( >=dev-libs/expat-2.1 )
 	)
 	!!<sys-apps/portage-2.1.9"
 DEPEND="${RDEPEND}
@@ -119,7 +119,7 @@ src_prepare() {
 src_configure() {
 	if use build; then
 		# Disable extraneous modules with extra dependencies.
-		export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
+		export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses _curses_panel readline _sqlite3 _tkinter"
 		export PYTHON_DISABLE_SSL="1"
 	else
 		# dbm module can be linked against berkdb or gdbm.
diff --git a/dev-lang/python/python-2.7.9-r1.ebuild b/dev-lang/python/python-2.7.9-r1.ebuild
index d87a47c409b1..a31a4475e30d 100644
--- a/dev-lang/python/python-2.7.9-r1.ebuild
+++ b/dev-lang/python/python-2.7.9-r1.ebuild
@@ -30,6 +30,7 @@ RDEPEND="app-arch/bzip2
 	>=sys-libs/zlib-1.1.3
 	virtual/libffi
 	virtual/libintl
+	xml? ( >=dev-libs/expat-2.1 )
 	!build? (
 		berkdb? ( || (
 			sys-libs/db:5.3
@@ -56,7 +57,6 @@ RDEPEND="app-arch/bzip2
 			dev-tcltk/blt
 			dev-tcltk/tix
 		)
-		xml? ( >=dev-libs/expat-2.1 )
 	)
 	!!<sys-apps/portage-2.1.9"
 DEPEND="${RDEPEND}
@@ -120,7 +120,7 @@ src_prepare() {
 src_configure() {
 	if use build; then
 		# Disable extraneous modules with extra dependencies.
-		export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
+		export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses _curses_panel readline _sqlite3 _tkinter"
 		export PYTHON_DISABLE_SSL="1"
 	else
 		# dbm module can be linked against berkdb or gdbm.
diff --git a/dev-lang/python/python-3.4.1.ebuild b/dev-lang/python/python-3.4.1.ebuild
index d44d70cd584e..5c5df4c798b4 100644
--- a/dev-lang/python/python-3.4.1.ebuild
+++ b/dev-lang/python/python-3.4.1.ebuild
@@ -31,6 +31,7 @@ RDEPEND="app-arch/bzip2
 	>=sys-libs/zlib-1.1.3
 	virtual/libffi
 	virtual/libintl
+	xml? ( >=dev-libs/expat-2.1 )
 	!build? (
 		gdbm? ( sys-libs/gdbm[berkdb] )
 		ncurses? (
@@ -44,7 +45,6 @@ RDEPEND="app-arch/bzip2
 			dev-tcltk/blt
 			dev-tcltk/tix
 		)
-		xml? ( >=dev-libs/expat-2.1 )
 	)
 	!!<sys-apps/sandbox-2.6-r1"
 DEPEND="${RDEPEND}
@@ -93,7 +93,7 @@ src_prepare() {
 src_configure() {
 	if use build; then
 		# Disable extraneous modules with extra dependencies.
-		export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
+		export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _tkinter"
 		export PYTHON_DISABLE_SSL="1"
 	else
 		local disable
diff --git a/dev-lang/python/python-3.4.3.ebuild b/dev-lang/python/python-3.4.3.ebuild
index f0f894a67d26..109d4532db89 100644
--- a/dev-lang/python/python-3.4.3.ebuild
+++ b/dev-lang/python/python-3.4.3.ebuild
@@ -30,6 +30,7 @@ RDEPEND="app-arch/bzip2
 	>=sys-libs/zlib-1.1.3
 	virtual/libffi
 	virtual/libintl
+	xml? ( >=dev-libs/expat-2.1 )
 	!build? (
 		gdbm? ( sys-libs/gdbm[berkdb] )
 		ncurses? (
@@ -43,7 +44,6 @@ RDEPEND="app-arch/bzip2
 			dev-tcltk/blt
 			dev-tcltk/tix
 		)
-		xml? ( >=dev-libs/expat-2.1 )
 	)
 	!!<sys-apps/sandbox-2.6-r1"
 DEPEND="${RDEPEND}
@@ -92,7 +92,7 @@ src_prepare() {
 src_configure() {
 	if use build; then
 		# Disable extraneous modules with extra dependencies.
-		export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
+		export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _tkinter"
 		export PYTHON_DISABLE_SSL="1"
 	else
 		local disable
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 931f9f09d264..07e4b6a7bb33 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -32,6 +32,6 @@ EBUILD openssl-1.0.1p.ebuild 8708 SHA256 12fbb97613360ad2bd9b5088e4fed26c2cafdcf
 EBUILD openssl-1.0.2a.ebuild 8975 SHA256 6a89c480f37dc4b910e678740afb4283d358f6cfd2bf2de0ac73fa26ae43f20f SHA512 185f31d235e8dfd0bd0c9a8c6ecbc1d4f0464862346d9b46c7bc39731f211596fc8f1b725e54af2a7de939b84aeab166d35456308ef48b9f8202abe88b9fa97e WHIRLPOOL 547521747e4a5bc0b406bbd74b45d1dce4ea1bf6cd0cd47221aafd9784942b41e9891c3c3b4e934b22546324d4e361d5cab78942c77bc2eee9359aba2bf98b13
 EBUILD openssl-1.0.2b.ebuild 8856 SHA256 0ab19a1058f701975572a1ddbc046d51586d050c861bfb4b4e37757181ea24f9 SHA512 091f2459f0a77fb4781d850b7f921dd387e80cf47a32d6ce56df0bfd736c653ae315d62b78913233a574361a388cc500c9e155b7cdbf89427da036fa75c6e336 WHIRLPOOL 8b39fa91b3529a7d931a4bc4b406a99647d16b87030117f9e5c5deb9793a971eeeb1a4cc91858a0d63d95f0e5e3148589705b0b3335b82843120cf5c0e28d729
 EBUILD openssl-1.0.2c.ebuild 8856 SHA256 0ab19a1058f701975572a1ddbc046d51586d050c861bfb4b4e37757181ea24f9 SHA512 091f2459f0a77fb4781d850b7f921dd387e80cf47a32d6ce56df0bfd736c653ae315d62b78913233a574361a388cc500c9e155b7cdbf89427da036fa75c6e336 WHIRLPOOL 8b39fa91b3529a7d931a4bc4b406a99647d16b87030117f9e5c5deb9793a971eeeb1a4cc91858a0d63d95f0e5e3148589705b0b3335b82843120cf5c0e28d729
-EBUILD openssl-1.0.2d.ebuild 8911 SHA256 3e0f8d4aa9cfa5a5aef514aea7c3be0e560ed3fcebf9aa309292029856383c5b SHA512 4105922ced6a459c146d37696eb94fa1608469f9d5a8a3f20e672c2c964b03ef35fece02225e8557d6c39948df5735649c3529a23e36949f9f02e3c080775406 WHIRLPOOL d510fd6fa22944232a710896c32658ebbe7dee1cc876c61d2d06b181efd11c9560c3d5f188c7e5e1c5a233ac326953f76c9425f26ff0ef3b2ccb9aaa05840d7d
+EBUILD openssl-1.0.2d.ebuild 8910 SHA256 a571e85d3fe2906af6df50f90c1e2e0509861e596a292169045af88d46716221 SHA512 df331c3c49ba0108f0f12eb4b541129c4b220cb18714682a1115832636917d7c7ee3555c023b40968f7cd206bd49af81a5b054eb59b53fc9aac54d530d86f5f6 WHIRLPOOL f6374d5dd1eb28ad771de422706b3f8cbdde69564eae27b9ce86a380ab8cae75781c35e2d91f019cd9de56cd21e2813d0de50be334d1f2a4782d22113f90e58f
 MISC ChangeLog 105012 SHA256 78da8e54f925dd55fa0e87800ab2e3ad9833cb33f6c334a4364339195d44a8a8 SHA512 fa8deec570b40406f273a5ea929f10113d81d828815c67f225968bbbaa6737f6c4832502a100b06fe6c8cf124529fedaa04cbaf7a70f037680a420ce244be1e5 WHIRLPOOL a2acbfb3283a9521492b4b96d9d2283aefc3445df87e47e584c66f87547cfa954914beaddd040c7097fded7029897f9481cded1d1f2d1ad7fa7b2e5425b285ba
 MISC metadata.xml 730 SHA256 229ceddc7f42d44d7cee107774dc210810cfcf866040306eb95e1c09da0279fc SHA512 31e307f60d08e38d39892f13f8d7bff9b530bf99d489983d224c9a0d061593448732f2a60beb70abc560672b49347567e20ea5692892274882bf4e955cbd52cd WHIRLPOOL edbcd6c8010d6282a798faf68279bb5a74420588f339ee2c59d110546a61d2911b30071bac8f7e2b60b33711d4d13b5226c6b5a195aa458ab8502fa1fe520c90
diff --git a/dev-libs/openssl/openssl-1.0.2d.ebuild b/dev-libs/openssl/openssl-1.0.2d.ebuild
index 37fe1cd9c244..6b4277416a34 100644
--- a/dev-libs/openssl/openssl-1.0.2d.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2d.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 
 LICENSE="openssl"
 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"
 IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )"
 
diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
new file mode 100644
index 000000000000..bda961f1525d
--- /dev/null
+++ b/dev-python/cachetools/Manifest
@@ -0,0 +1,3 @@
+DIST cachetools-1.1.0.tar.gz 12901 SHA256 089aca268864a5d1fd77ad96f51ef6afe011d7df55df21ca586968e2a24d68dd SHA512 271b5ba5a373165cfccb47b50c3ffa384577e53a85eb58327e9ef716036a6129e0ad0f1ef16603817666eb7ab4cd781b7731ce8ea88dce47965b4e8e61fc3dab WHIRLPOOL 1ce4c23bd974ed43ae0df6179a9bb8b3fd62705e63392a0f53ea054524afd6e93f753ba4ae6cccbb1fa44d7e7ffaf94493ef902dc81f3edaf7d6fb4ca4b5e9d3
+EBUILD cachetools-1.1.0.ebuild 445 SHA256 8cc0037d4371a7fc67a962ec44277dd2d8d73617c269deb14005fc9b14f241c4 SHA512 1a9ceea6f8bd691f8bfde426f7b44ecc9f1f2be75dd64fdeafb0e5704fd84108e3e01519e0840aa1df193049589ba97b9aa086297632cc47fd3098384c6f9366 WHIRLPOOL 0d81b008ee105c63e7447426bab264a53280a4a6ac5348f55b36476d22fa0140bfd0857391ede09a1a0e1475394600442710f8e708b9cd8f74058b33eca46231
+MISC metadata.xml 289 SHA256 e4ebc68118646dcd94cfedb5a9914e1679fb957ffedf41b91e672457408abaa6 SHA512 69ea7a3e2e9c9eb54611a8665f74e9ad3012d4ff0349c867663ff485e090fec380cb60c9a4bc459524512e0e16cdec42aa2b185e40e146ac48a467e8901366dc WHIRLPOOL 598e1636772b93358d7c2f78cfe33d74c30c2c40d30394a9623b7ec60afa1883cebfdf07d4459e912b03b19c780a273e692da45095e8f59a59bf8efb2ba06ab5
diff --git a/dev-python/cachetools/cachetools-1.1.0.ebuild b/dev-python/cachetools/cachetools-1.1.0.ebuild
new file mode 100644
index 000000000000..69dfd7ed2684
--- /dev/null
+++ b/dev-python/cachetools/cachetools-1.1.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Extensible memoizing collections and decorators"
+HOMEPAGE="https://pypi.python.org/pypi/cachetools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-python/cachetools/metadata.xml b/dev-python/cachetools/metadata.xml
new file mode 100644
index 000000000000..d5dfd322223c
--- /dev/null
+++ b/dev-python/cachetools/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/fasteners/Manifest b/dev-python/fasteners/Manifest
index 576364ac637c..5f5803d326fc 100644
--- a/dev-python/fasteners/Manifest
+++ b/dev-python/fasteners/Manifest
@@ -1,2 +1,3 @@
 DIST fasteners-0.13.0.tar.gz 17510 SHA256 76a804e7d5793ea5239aee7ccface4a51262fdd1d49cdb407838c2f8076ef059 SHA512 921affd29452548e97e0dbb2dc70d7f0df9c181b6f17da734dceef37f42f0873d4316da50905b56d9dae20801001d1fdde94569f6bb41f60fc211ef5bc7f161d WHIRLPOOL 3b94d7700a7e600328a42ddac0b3e2306a79dd2bd4fb1b3e540d0d635da3a81e75339abdf612833fbaf717e36430539dbf2a1b73390b0f8e57b665ac1e65f866
 EBUILD fasteners-0.13.0.ebuild 515 SHA256 7b7a8caedb9ef04968700819e702273f8ab9e375b57971b14ffc485af7238a0b SHA512 09f7f695d1d564cc2850763dbd7a6325914fa06f6ad32b4d00c5096692f1a677484c58339b95dbc22fb679a509b989245f437bc9dc85077145cfaa86b668e358 WHIRLPOOL 3dfaef609489401dc4bb0c9c8b3c8e98243a478493cd941424ed1fc6438123198f770bc11351b6e7d7e19e68b6a0ee645849df80e75e44412a4d4b53007b8a03
+MISC metadata.xml 289 SHA256 e4ebc68118646dcd94cfedb5a9914e1679fb957ffedf41b91e672457408abaa6 SHA512 69ea7a3e2e9c9eb54611a8665f74e9ad3012d4ff0349c867663ff485e090fec380cb60c9a4bc459524512e0e16cdec42aa2b185e40e146ac48a467e8901366dc WHIRLPOOL 598e1636772b93358d7c2f78cfe33d74c30c2c40d30394a9623b7ec60afa1883cebfdf07d4459e912b03b19c780a273e692da45095e8f59a59bf8efb2ba06ab5
diff --git a/dev-python/fasteners/metadata.xml b/dev-python/fasteners/metadata.xml
new file mode 100644
index 000000000000..d5dfd322223c
--- /dev/null
+++ b/dev-python/fasteners/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/futurist/Manifest b/dev-python/futurist/Manifest
new file mode 100644
index 000000000000..7cb7fc5e01b6
--- /dev/null
+++ b/dev-python/futurist/Manifest
@@ -0,0 +1,3 @@
+DIST futurist-0.4.0.tar.gz 27870 SHA256 a0c97c7dc7bd8fa1abe0012c129a303ba652074709bfed6c71730bbfce6f18bf SHA512 0ff6be28a5ce45458e9af4957ce17f55fbe2eb5971d365fe23b3e58486b702167fb9f0d2709d86c4eb3cbc92693e6a4de9ca7b858c5be083180c5bb34e331e6a WHIRLPOOL 6b1694bd839c1c43602de50f3a2557f5ed3b16c9cc0c7b0a40a8a09b247e8df3ac486ff67e62ccf0de80ef1934e6925d38c34f6c7b0c46050d94f25b2078e6a5
+EBUILD futurist-0.4.0.ebuild 754 SHA256 b82c4dbaa348ccb01d8faa6f508d4831fc87d5e0bcdac80842ae74ce94c930d9 SHA512 0a388ea2e653b210bcaaf007eac61fb7a0f4052c477c4b8b0c8f777f66a6a647a8a3327d600e14d7c2732849699573791ee0329f5d3cec02097b25699d7c8a2c WHIRLPOOL 24cf776accbfca0b9ed2abbb4363962b153891c50c932b1c1ea28784a6d4a96440ea7d1bae765357c5e157af80d1386875010c30a31e8b9ce418803d003e8f57
+MISC metadata.xml 289 SHA256 e4ebc68118646dcd94cfedb5a9914e1679fb957ffedf41b91e672457408abaa6 SHA512 69ea7a3e2e9c9eb54611a8665f74e9ad3012d4ff0349c867663ff485e090fec380cb60c9a4bc459524512e0e16cdec42aa2b185e40e146ac48a467e8901366dc WHIRLPOOL 598e1636772b93358d7c2f78cfe33d74c30c2c40d30394a9623b7ec60afa1883cebfdf07d4459e912b03b19c780a273e692da45095e8f59a59bf8efb2ba06ab5
diff --git a/dev-python/futurist/futurist-0.4.0.ebuild b/dev-python/futurist/futurist-0.4.0.ebuild
new file mode 100644
index 000000000000..8a9f1b0683f3
--- /dev/null
+++ b/dev-python/futurist/futurist-0.4.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Useful additions to futures, from the future."
+HOMEPAGE="https://pypi.python.org/pypi/futurist"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="
+	>=dev-python/pbr-1.4[${PYTHON_USEDEP}]
+	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.3[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	>=dev-python/contextlib2-0.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/futurist/metadata.xml b/dev-python/futurist/metadata.xml
new file mode 100644
index 000000000000..d5dfd322223c
--- /dev/null
+++ b/dev-python/futurist/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/keystonemiddleware/Manifest b/dev-python/keystonemiddleware/Manifest
index 7463eb1a4c6a..e62e2d8d82d6 100644
--- a/dev-python/keystonemiddleware/Manifest
+++ b/dev-python/keystonemiddleware/Manifest
@@ -1,7 +1,9 @@
 AUX cve-2015-1852-master-keystonemiddleware.patch 2606 SHA256 3f1fe254a8be40bfbf3441dc1db69d409b300cf3e7aa7fa143a81527cd37d1ca SHA512 90bf9bb62cc874fe7c34f67dc1069858c9a8da7ab32506b296e78a61d88597d21ae9c4e1334c0b91e31a6bc02c85170030b9c604e46ba30e7043998342dc920b WHIRLPOOL 04c941466ef6d209ef34195bd2f05ecb9716bd5801a59cea87a4e5f53ffc9ca15deed0fa4dc58f7e15dce6d6a98f2cb0455b2f51a06753bd338030a93e0beaed
 DIST keystonemiddleware-1.5.0.tar.gz 176315 SHA256 73e98aab8bceb7843b6cc8aba2cbff824a379428519e2f9ffbb8e32578b38fe8 SHA512 365643f7eba633587d8055204df04cfb40bdcc28c57d7ecf8c4ed67803b9b027b6334f868a1bc634d9beefd7410d74da08a7ed599637ec1656e6ef6196043dab WHIRLPOOL da7014869d3fc1ac5339671344542e33c22ac07adfb76ad00144cdcf4e1e26c60eea7ca7867cea6c6e105af1d05be64eff7d55ae1b3cf5114597da966b756b55
 DIST keystonemiddleware-1.5.2.tar.gz 176172 SHA256 5f443162157946d2f33c4729d0bde55291f12963b0f1ee553984aedd8a509d51 SHA512 172143f2e80860de3d89f53667bf670c1986cfc63a21392bf977b3beaa5669db76f46997d6939952856cb4abc970b57920810980d00db7e7cd711bdbede5908e WHIRLPOOL 99a4553778b5dae07a710e78f816c8b30def42bfc7024cac7d6be8d8b6f76326383ed72935c6526758ac65fb26945937869985cba167d8804fe3a7cf2e3c4208
+DIST keystonemiddleware-2.2.0.tar.gz 179743 SHA256 e3fca3fdc093d7fd3817bbd767faca7f0aa221b54155808694eb1286fae469f9 SHA512 9aa498aa0bceec1774c70dc7fc4ce8c398e72721d33e715594b3396e160f9b60dfc3533687f0706eb272abd812b44d31b2a76fece739a2ccad33039b37f3fca5 WHIRLPOOL a1b348e3e2f004038afa6b2b06d018d2e1130af1b2eb0e5740ea6a716dabaa98fe7a58cfd6e5100e5cdd6c7297fb150f4d9cc45dd8c831b7ca54a265b0d56662
 EBUILD keystonemiddleware-1.5.0.ebuild 2557 SHA256 616423831c83bd8820eb5e5da467094da69dfe961c51db3997d3edaf9e44ac9a SHA512 5ae9a6cce7c9fb52f7d90752f451d44f55c059c1967789335ec7f3ccf63a660f8ec7ef1e88ac07e04ad41fc1434055e3f3b109e2615f72c46f15d04a7a0c0599 WHIRLPOOL 0067cd4fbd573b4f3a4176793763bb9f7faa5ce4fef035c9605a124b87d923223220339f27ae4431dcfefd3237875c5ad0df167ff42414d2162e10f5ad6583ac
 EBUILD keystonemiddleware-1.5.2.ebuild 3102 SHA256 34361cf4f31e777ed214eff57de721a82368f2056552e80a8b56cdd3c699fe9e SHA512 6f49c56c340b3807898daf80049fe4e380cd29c919e5cc7c442963e307ae0fdd26ae69abe9013cca5f2ce8a934ad05d0e68c927f5207249719514a9ed8184141 WHIRLPOOL f52b8080124aef4e364af3af9266ac469ff58d3a33d1acc641655494724d1609d570ce39b2aa25a2831022b9fc4c09a695edc44afc0071ab49281ccb550b833c
+EBUILD keystonemiddleware-2.2.0.ebuild 2611 SHA256 b9b0129761a4403a471b85327292846a8de30dbcafeb0df6196286bed99e942d SHA512 43fa56151b897bfb8d41d22fdc2cf7c64eb65e9c028a5e1a39eae3f7c14c641affce362d96758a2de9a09bc39694798b94782192357fcdee08c1d17037aacd10 WHIRLPOOL 18e61d7930db17e09e8f87b890370249aad5f828d9b439fb0237ee8efe4fbfa1979538f31b1ddbc20e2f65c6180eb362d8090ce2674d3dbdf5b4c2a940420f10
 MISC ChangeLog 1361 SHA256 44a6b6328925989e37f72899a6d1c92979456403664f1d35108e75011d781c2f SHA512 83c7e134af7bfe198fb53f98949fe444cb0d29faa88d629638cd05d949c0d9aa45b8f7201de9a29219c5ea6a57d9d8f22ffa72c743f3eb7e9b4db070eff63c41 WHIRLPOOL 629f47fe230bc404cfa45c8572a2d0a733c5c9a8e06d6a30a8906c4d46e576f68450b7c41fe73bbd98e4b60e82b8433da80e3c3253b1da09f87ae2f95d81ed20
 MISC metadata.xml 522 SHA256 e12177db9166df5c3080be687e147888153b2be225013568e0fca7ca234d2550 SHA512 4214d22306c2302a1168a472cdc0dccb1bd29b6d37103bc7bdab2faa0928069c0a4ff9d02ba3349624af279c13338a684306c2ff8ce16c811e95d5e393bb2328 WHIRLPOOL 89dec8dcab2f03cdc84b75a3d7536176b9b118cf388b4c159ed69f81d404bc26e91a65daf39c4497260d5fbe7695ba5e0756fda531735a094d8719cca46e09a3
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-2.2.0.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-2.2.0.ebuild
new file mode 100644
index 000000000000..816e3791d3cc
--- /dev/null
+++ b/dev-python/keystonemiddleware/keystonemiddleware-2.2.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+#PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A middleware for the OpenStack Keystone API"
+HOMEPAGE="https://github.com/openstack/keystonemiddleware"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+CDEPEND="
+	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
+	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
+		>=dev-python/bandit-0.13.2[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pycadf-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]"
+
+PATCHES=(
+)
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	testr init
+	testr run || die "testsuite failed under python2.7"
+	flake8 ${PN/python-/}/tests || die "run over tests folder by flake8 drew error"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	use examples && local EXAMPLES=( examples/.)
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/oslo-messaging/Manifest b/dev-python/oslo-messaging/Manifest
index bbf6c1efd46e..80a8d296a5db 100644
--- a/dev-python/oslo-messaging/Manifest
+++ b/dev-python/oslo-messaging/Manifest
@@ -6,6 +6,7 @@ DIST oslo.messaging-1.8.0.tar.gz 201858 SHA256 afff6d8367e6723a64dcb518d709d4ed0
 DIST oslo.messaging-1.8.2.tar.gz 208688 SHA256 31222c9afe3b5655401424a6229f633bebf20cfe5027e69d2e12f7e954556f1a SHA512 a8940635fb1d08871675730d2eb841af74896963d1f9624fec6ecff03e99f280091f342abba683aa9a5eac209009e75618f637571e34c5ef76fd8617f4ffe525 WHIRLPOOL 0fa2f5531178763ff607b062b8741ba02d396e868cc41a4e668e2ec26ef119f12dfa4261da418ec314c915e36e90f2cbd8da88f1bf559460fa0e442cd4a9b0f1
 DIST oslo.messaging-1.8.3.tar.gz 208757 SHA256 149d325431e2c4415edd5bdaec0cff4e9109c02e8f428382610cfa1a238692ea SHA512 98fd93a4ae366ac413ec0ad0310b669d9e0dddf61a03b2da40bfdfb3aec63de95a187556bcdecc19a209c38398f2ed0359aa05c9024bbad429e4c79c35b91b01 WHIRLPOOL 22f2a4237f874f3a681d3ea6e87bea7ed9759f967dfe8abfa8c6dc0f68d362b248f54b98fb7e64ff388de7c406f0cde29861fd17fe2fef5a8a688855b67c436c
 DIST oslo.messaging-1.9.0.tar.gz 214963 SHA256 ac5f58378515597e6d5759653cac3828eb2ee6bb11e2bbf94ee0d65a692990ed SHA512 2e7de860fed55b0548f3cfa4a911cba0750889fd807ed7addb83192dd37f84997ceecd92faf480be97873e58286748865c8c57a09014ae0de97c60be826cd27f WHIRLPOOL 8e331116313757c93b2add853a35929e0a0603b691f9ffb322f4e39c422e13d83ee757277e42ce9b0360cf9e5823bb066a48fadc8eb706f7ebca018b014e1e06
+DIST oslo.messaging-2.4.0.tar.gz 181234 SHA256 6e505e86ebd2115992d41db2ab4e2e2b946d2a2699ef205f84d74f1a62c710bf SHA512 2d3b8dd220307d97fcf5e06269771d2c8b1412ed69e08258f4e77791a9b43077e787b8f21248c8282e53630d57c461034d93aa91d8d129ffe5e6d9abe871a72f WHIRLPOOL 99c023e230505b06a75ae51f63d67de60fadf4f44851a6a50466dd865b6a3f9b39c949ce31c36fdd35917281700b316edac6301d2d6d64b2440fc22ad61e1681
 EBUILD oslo-messaging-1.10.0.ebuild 2408 SHA256 12f43a4250cd47ad6fa4a6f4132529e9bc848e1a4b24f70c0af28832f057ffac SHA512 34b1c57015a850628d533524d69c2ad8b2bb65306927ec21cfcf5a759b3312ce5a0c0b104d3b9130e7d44dd31cd913a820be7a81c59b1c5334b81b8fa569ac20 WHIRLPOOL cab3981b13f81d3945846760bfd22cfd9cc7349836f627df217639100c3b0b15ffec14a7255b172ee59ba23c1e3e40798f58e9b5a03bafc4213be355a18c3b9c
 EBUILD oslo-messaging-1.4.1.ebuild 1913 SHA256 e194d9de991aba131edb5b5d1e2fad7e14018fab1666a5fb7d87efad21d62257 SHA512 b85e4d3b4081e67dd2de507b8a9b81d7bc0a9aff737364a25bb1e795a47b049b481f49e5664536dce22613df57e954ac46ad253d593885d2dea6743e3343631f WHIRLPOOL 92b34fb2f18ec318323ab03bcfa2568f4884bfaface3940a9aae8a5e44bce7cd1b3a518262fcf813679d56818cc879c8b8c571aa73977980ec54402d62b9e50a
 EBUILD oslo-messaging-1.5.1.ebuild 2092 SHA256 80afeeb17d63020d6070ffa3d04e3e89a077650ea167b6752a937e40e33d94d4 SHA512 9ea3a95bf0edfe8084647884f98b3f287a5a3ec63f5b7ff52014fca73f6d8f53687db2a26465b7808a8aac1eba5e59e3cbeddf434aa66390806903ad8b670e4c WHIRLPOOL 29fc6adaf7c10e675d2efe4bf24a3e05010a95c1a2b8aae9abab33bd611f70e4a9d6b70a0c1fc13735705c1bd37f7784cf51821459e2fa74d1cfa3c6be676cb2
@@ -14,5 +15,6 @@ EBUILD oslo-messaging-1.8.0.ebuild 2327 SHA256 17cd91f78bf47de0383e7d8004c0b9c17
 EBUILD oslo-messaging-1.8.2.ebuild 2325 SHA256 b6c1613f91991daeb7b537a965853a549a56a8b9855d9defe291f66a926a267d SHA512 d88ab8cf3f220d210cf50bd44737ef1c64a29fa277a9a4459c05a12d4b09dfe040428db4992df28a1f600434e9588ed86c0fa7762fc98162fc2b0e1c26e96c58 WHIRLPOOL 519f12a71404b4b95295ab006a919a100bb70b76a121c99b50a64ad9266aad46216fe484584bdb07fbc1e72d0b02c1f8c97dd7d1ca9f63ca1f707f75b7ebf035
 EBUILD oslo-messaging-1.8.3.ebuild 2773 SHA256 9a1ae3a09faf7d7126708580907f9b8160e95fa19e2f903189110d99de16876d SHA512 f8a83f6cb06991c4f952c63f9008133cedb9f42de5b261822538727f6a13c4353c5523698ae8aea4079b2d8652efd9dd9447d700eb38e70762c898cb957bb014 WHIRLPOOL 346aa3e47ae4b75632d1045032a466d5b067fb564340b5ec5573dc626e884bd261bfd1dc74ee49b6ad6c87207c7752374dc63141f521feace4498bf7e14eed92
 EBUILD oslo-messaging-1.9.0.ebuild 2838 SHA256 9130538492165821eea115a11f7b59c01457babeea196e681d6acb5937b68d31 SHA512 0cdae923474dd527e6411d94f7d95e6972a82c612b19cfb3d6fac02622a7ae425713111b8453d804fde122ad70febd435e7bddde20e788134590dd15c2cd7798 WHIRLPOOL 2efacd9d0525d39b4ed5efb73dae9c86cf57c7fb69c8571e1208ad8a413056fcecbf918604d4a8ae713f10f3f621be0184e08e1b47d5cffd1d782f06af2f859d
+EBUILD oslo-messaging-2.4.0.ebuild 2647 SHA256 c92a986eb000a5fc3ec30598db7b84d6d3845622812cbdf4942dd272899ea0ce SHA512 d109a94358f913d559f58041f09da4bc92020aa007e7f5cb04065095d01749920fe7d9cb65c690dfc87fa4c3c54f39ed936b9e1a363d618c380db69fb250306f WHIRLPOOL 29013dfbdd28069de209dfc954287820b7ada1659610f3dffedeb6b2b7845c53ac699860fe8f54d31e3a250fd5d13608486933b5df29c96c9f8ef6c246914192
 MISC ChangeLog 2612 SHA256 2aca8b8b9d8b40c9bb83c0a2dbc06ccd322351eb07550290b6a1146dcde10cb1 SHA512 00c9ea11198e4fbc3b5564e22b77bda1a7bb0e953c444715dc3fef4ac600c1c35bc907766a1bb0e83c0c727ed1a6ecd10f7f5959a1f3b95562d5194031a0eef8 WHIRLPOOL 477ec84d0090f699e200af6026c95a229be5f51d5931099f88b5806ca3b867f70ea0277b45a2497cdaaee457eef1e2530c1e2c7580bea12d9e67c62b0d04993b
 MISC metadata.xml 507 SHA256 eb30f67b2cdcc2ad996e80b9338ea2bf858315dca5b5b15e7285774c2f091fb4 SHA512 0cca909c3efb1872a5bf65461a4ef4f012355270818bf6045ed708b2eef7fc9d7b05bf15e7af6d336c2aa0c44926790f4428eb1333d1ae00d52755a94f50ad3a WHIRLPOOL a9dd31d088db8d441e27567e5c6efc21f31c3c5c9c33a34616b44bf6c0ddceb60d7fef9e5d9b946ea6865a837ff352e7ad767b553c53c3b057258fbcc34a4b3d
diff --git a/dev-python/oslo-messaging/oslo-messaging-2.4.0.ebuild b/dev-python/oslo-messaging/oslo-messaging-2.4.0.ebuild
new file mode 100644
index 000000000000..f1332c928a16
--- /dev/null
+++ b/dev-python/oslo-messaging/oslo-messaging-2.4.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Messaging API for RPC and notifications over a number of different messaging transports"
+HOMEPAGE="https://pypi.python.org/pypi/oslo.messaging"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
+S="${WORKDIR}/oslo.messaging-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/pbr-1.4[${PYTHON_USEDEP}]
+	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		dev-python/qpid-python[$(python_gen_usedep 'python2*')]
+		>=dev-python/redis-py-2.10.0[${PYTHON_USEDEP}]
+		>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/futurist-0.1.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/cachetools-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/py-amqp-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/kombu-3.0.7[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-2.4.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-middleware-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/aioeventlet-0.4[${PYTHON_USEDEP}]
+	>=dev-python/trollius-1.0.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/oslo-middleware/Manifest b/dev-python/oslo-middleware/Manifest
index 7c6527b7bda8..e0d438246025 100644
--- a/dev-python/oslo-middleware/Manifest
+++ b/dev-python/oslo-middleware/Manifest
@@ -4,11 +4,13 @@ DIST oslo.middleware-1.0.0.tar.gz 23209 SHA256 5ccf160ae5ce23f3f59b86535352e3b5a
 DIST oslo.middleware-1.1.0.tar.gz 29957 SHA256 0647456ebf1611e2a0efc445673af3583780b0ccf694f61a8830d54fb5d6f63c SHA512 ae497098fe4edccf79ce93de1bd42967081616a81f7be8ec255a8732021943e8f377a6b57f6cc23c992506a5bed2641299d2653fcce6f6619d2ca1eff318cf71 WHIRLPOOL 410e422ea3b36e843e2ee91d64c23d84ffd86819bfca7e226fda3f1c2a6d11c9e8a8a4e7d5696764ce276a0b9984becf9361967861c17676b4fd9d77894baf82
 DIST oslo.middleware-1.2.0.tar.gz 29850 SHA256 0597ae9df233ba58e3f58e03878ba1f1d34a30918895bb109ebe50d8760495b7 SHA512 021836c40d096d96effc904a1ddd4889dde7f40e598aa435be3e8b5a0ff5dce013515bae878bf4eb05680fe01737c9fa20701de46bad151e7b795b229309e9db WHIRLPOOL 627b3c968e806cb1256768286ea580aa2ff4edd37107e3873db52030224cddda19ae2a4b341616f6a103dc4c456260d5c02f6645be4bf805758587eb54fece68
 DIST oslo.middleware-1.3.0.tar.gz 29172 SHA256 9e0fcf28f5d635c10e684bce26524e79a9da78a5c3d380c6759d2f419a0ff1c5 SHA512 39f3ba43aac0839aa47112eb6406286ae5e9ff92c53b46540e456d885617ad583a5a1ec3d86bdd1f95be9bb31354b3dba061da1fe28e6174ce01adc75901e6c7 WHIRLPOOL 05d57f094c22cddae6982cd3cc45cbf2fb881b181eceb39fc7295e9f930425180d4c2e72ce0ee700c979dffd0f40bc65d4d83eaada424553cc047cb7a8123db3
+DIST oslo.middleware-2.8.0.tar.gz 35432 SHA256 ec4c4da59abaa441814d85610f911df4be405a98f9c4af0482dc2fa03f3d2bac SHA512 73c3d18a2d97a3a06436e31124a73c6196f874a3b99ca3e698bc73426461ab4402545e53eb12fa048030508f32d523c47978723b51d30490529686b7e119087f WHIRLPOOL 419a21db7c26b31ec40fc7b28ba9b1fff600c3169e069184968af05a3631779f1e79e0159ce30752aee91f049b68b96add647d6d0988a70d0cd59776722f2538
 EBUILD oslo-middleware-0.4.0.ebuild 1706 SHA256 394ae82c4630cd782f00d3b023407751bd4242c817f2646f1457ac5058bbc89d SHA512 17b95d421468e38c986fc8e14e8734b7d6b243975fbfe59e718564bf2ad2806d5e6848d6f1a30737309a7843153805f6aef524518db8427343af915adb3aecb0 WHIRLPOOL f0fc78a4ab123ca331baf32911a5f0cf94fc9aaa711c67f917fbc4c1f294a915ca52551a8278ae2fdbe9525cbe9f3ae68f1e942e7edd89cc840c945b24ba8905
 EBUILD oslo-middleware-0.5.0.ebuild 1706 SHA256 c640718780d5bcf9294c80dac56f0f9911ed12f660ebf42cc5c6f9e9d5bdaabe SHA512 025955653998c7f37255b7a4b35de0152496ef5940b8855d16cac854c2e7a474ad3774270921f9144905d77971a4d1178eec74182290f5a77bd953e817aebe01 WHIRLPOOL 0c8ad5f9b59a6c6fecfdb00d0215d4b06f5635d10344f199c8d5ca410f9c599b089761530f51741a02ecbf57b505d0d59c7f119ed59376d10e9e7c4553bf54e9
 EBUILD oslo-middleware-1.0.0.ebuild 1704 SHA256 dc2d42a9a40aaf2614a060fcf3e12ac22072550e96568c0106e48a1608098079 SHA512 8b5b84dbf07ca261ddd4b6f2262458bad149632b92e597f2642ab68830e236ba4b093121e337dbbf247e7faf001e14d03b2fc460fcad2362884b679dd4f7d078 WHIRLPOOL 2aea78a6aa5e06c28ea795a71c55ef6f3762d049c3d17f9fdf9b38cece7fd14b3d0eab3cda4ef087592246e210a59b2cb100124517eb0e93d8cda201452d3cd0
 EBUILD oslo-middleware-1.1.0.ebuild 1705 SHA256 78396192601272043c6ea8833be70fc35988c2c19a952a91c0cdc606c355788a SHA512 4b17bfd55022bae06549c290bbccfb238648d43ef7449c98ab117bf31d53ef88e8fa3b30c8729306a6bb0d96a22eeeaf21aef8abce548d9fb49e971b08a5cb50 WHIRLPOOL faf9e663df03027198199d7f08538d3a812a0dd43f35b3d2d22f4b4af7ac20e9875a870a9748d0ad10cf6890a70ab7bacf655211a3fcbb4566b47a7de591f6a9
 EBUILD oslo-middleware-1.2.0.ebuild 1706 SHA256 0754a753969ece3c28034705d4d238e56d837de93f0457ac0f5a286d436330c8 SHA512 970d00b6a777a2ccf066ab9e92e404d16d1a7fadd61de450a744eabb8fe61de2c3a8b5f8e3814efc8ea4d65b7b498892731b9eee5137eaf4b2d60869273e1f13 WHIRLPOOL b8ae9a8d0ec5005153c0fbceee572a6a1dd1e1ae5450cb40eb6e4ef289be1626dde788f35c0b736f3c731abf08c29b900ba5c23331db96642a51d078434c923c
 EBUILD oslo-middleware-1.3.0.ebuild 1718 SHA256 a0d41018dba97742d6f56bdaa3a6a410ff67ee386d39ea116ce78c8195899acd SHA512 a4d9aabf954ecdaea816445c7801196474d42e34143948fac3b1db07e22e953a3113c71b17bbeb9e49e3b51696a8f423265223047ee9ea0606803f4984e1fc3a WHIRLPOOL c7f33559a6a5c03e3e494078a1314b637046101886298d0aa5b97b1c3688cd36e9e0f7cd5066d7d0698f3f3ea378049f628f3691336756fd0c93623516f8c1ce
+EBUILD oslo-middleware-2.8.0.ebuild 1665 SHA256 f62244d7409ff92fe1f6a210746f5a62df40b1137b1e5b74d7427263ab35b0d7 SHA512 8a15b1ccdc1c21f1487c3f74868a6527af0b0a758b1c15b2faeaef318d75db0ad31cffce15f23fc84534a949a43751081cbb37a8170c7116f7c2528cdaa9a0db WHIRLPOOL 5c4695bf4814a737332cb1d274f3a3e7224dea536e188b6f9319c0371b9e492d90a19a874dcd48dd3accbf2ea2fe36f7a397faf2257a79b542d67b0be64a7212
 MISC ChangeLog 1532 SHA256 821854b55a4b7ceaf11b9f234b0066f1ecdc109d12bd77b0794b22015bd08d3a SHA512 6ebd7f88a04e1c3173181fc8c3aac5a9f773ecff566bc5446d343c3a31159d981af93b0901e10016bd504408b34eb8784f8d8fbee0f1105033247de56d02de16 WHIRLPOOL bb409aa8a01167ddf8440dca4429545711969135158b318a4576b92a5ad66a95620cc7e8b7e7364226b2fb568ad0697f769f289e808ea49104c9fbb4cdf65fcc
 MISC metadata.xml 667 SHA256 90b2a78c8d1e6347827b52370e4ea1fc19e5f153b04e729dcf9b60207840f627 SHA512 fad889f20ba1c0a2be17fe1e37d293a746921cba5fc88b838900208ebfc0be10c39838f56d57b6faa74c93d55187378db3e778cb4997e39500f350adb26b3da6 WHIRLPOOL 5390fdad66ccfc9a8e857c20bf439ca4d6793d41b4d4b6dac59d37f236c48a30b9cc0e1f506fcc24f3255745292a9dfbfecef2ce39e0db2e70d283643cb31b7f
diff --git a/dev-python/oslo-middleware/oslo-middleware-2.8.0.ebuild b/dev-python/oslo-middleware/oslo-middleware-2.8.0.ebuild
new file mode 100644
index 000000000000..0a498f169f37
--- /dev/null
+++ b/dev-python/oslo-middleware/oslo-middleware-2.8.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Library includes components to be injected into wsgi pipelines to intercept request/response flows."
+HOMEPAGE="https://pypi.python.org/pypi/oslo.middleware"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.middleware/oslo.middleware-${PV}.tar.gz"
+S="${WORKDIR}/oslo.middleware-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
+	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/oslo-service/Manifest b/dev-python/oslo-service/Manifest
new file mode 100644
index 000000000000..cefe17314bfb
--- /dev/null
+++ b/dev-python/oslo-service/Manifest
@@ -0,0 +1,3 @@
+DIST oslo.service-0.9.0.tar.gz 57558 SHA256 f77753910391a1b2bd7fd9b5b863d7230b1ff727443dd2efcb725ce937ffb566 SHA512 6e17d1e28682732c8866e43f509a7fd7f69d2718493de3dab939600207e56fd0622036ff62928b9855b6219729e1173e62e1a1c949959a5d2d58eeeded97a1e2 WHIRLPOOL be645ac0d461056d5df4d17bbfe6f3819d6eba4fd2764459d287badf056d5c962e2c690b64fceba72160094ca1d29ff5f6c7708fef90bd192faa8ba532a4d4bb
+EBUILD oslo-service-0.9.0.ebuild 1774 SHA256 21ac4d24fc70703c09c71fa9b0f685cf1a6b2caf761bb8f5490e59bd1c062216 SHA512 f109459baaab829dae60d657ad7bdf8d731dea21600cdfa6a50da4b522d812e2b17257377c6615dfb95bcb2fe8ce737ed0bdc406ace14d0a8d69559e660a7175 WHIRLPOOL 9f7183d913f61cbedd0432358a81aa19f05d3a6b4c6ee233da75d6b30a988959150620f59496bed7665bde5bc19434dc5b41790f344fda29c0cb0c9d8cfd6433
+MISC metadata.xml 289 SHA256 e4ebc68118646dcd94cfedb5a9914e1679fb957ffedf41b91e672457408abaa6 SHA512 69ea7a3e2e9c9eb54611a8665f74e9ad3012d4ff0349c867663ff485e090fec380cb60c9a4bc459524512e0e16cdec42aa2b185e40e146ac48a467e8901366dc WHIRLPOOL 598e1636772b93358d7c2f78cfe33d74c30c2c40d30394a9623b7ec60afa1883cebfdf07d4459e912b03b19c780a273e692da45095e8f59a59bf8efb2ba06ab5
diff --git a/dev-python/oslo-service/metadata.xml b/dev-python/oslo-service/metadata.xml
new file mode 100644
index 000000000000..d5dfd322223c
--- /dev/null
+++ b/dev-python/oslo-service/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/oslo-service/oslo-service-0.9.0.ebuild b/dev-python/oslo-service/oslo-service-0.9.0.ebuild
new file mode 100644
index 000000000000..9b1f4f6006a5
--- /dev/null
+++ b/dev-python/oslo-service/oslo-service-0.9.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for running OpenStack services"
+HOMEPAGE="https://pypi.python.org/pypi/oslo.service"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.service/oslo.service-${PV}.tar.gz"
+S="${WORKDIR}/oslo.service-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
+	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/pypax/Manifest b/dev-python/pypax/Manifest
index 0b0098463d1b..092dedf2fdf0 100644
--- a/dev-python/pypax/Manifest
+++ b/dev-python/pypax/Manifest
@@ -1,6 +1,9 @@
 DIST elfix-0.8.4.tar.gz 374742 SHA256 374be66da3dddef485bbb5e95bfcab6fd0c2db478255bddd10079730ada5260b SHA512 10aacc3fff33c934e2d4487d174a2b0cec10ffb7a35fc72b160c786f82f0355f3a2dea716bc7fb929d2919cc32a26844f37f9d73064b755098bdaa72e8075bda WHIRLPOOL b04e099f188c0b76d8c07abd76559c1313854aa83a03ad69afb72674d93cde6ce538ae10d0fea3be5495937e72a4b98fdd36efbb2e3aa8ff23c1d9f7f943c1ae
 DIST elfix-0.9.0.tar.gz 372014 SHA256 8b547d987edb2f7dc23ddf30f959d7d051a9ed49810f983b8fe6c489fe731cf0 SHA512 fd9bab90d745f77429c902acd2a14f615132731b3c38929dce764f1e5f7ee8f6478a6fef7ce0cb38e7ebd9181ba57965ff0c97da5e01d0fbf2cfb940ed691ebf WHIRLPOOL c09fa2193b990a506cae17f370ec10fa6302e17d2a165e42eceb88644f8a92e297c839ad788204e213d8205695b65557a7dcef5f6417177c434c8d0a34bd5eb7
+DIST elfix-0.9.1.tar.gz 398588 SHA256 0368d07bfdad4a14f039929a30d85a612dcd9d22ac87211f8e59d452bac23625 SHA512 28fdde7841263cee766434b5eda1a4151999526aa3a1acaacd2e6355502df4b56db9faf64ce81bdc89606d366d0a6dd28c5c135290fe7f0285cee480f6002527 WHIRLPOOL cd7dc6e191d97836f4b8859b73777e3b4b6fce5d290087400327f87a621e9879f5c233eef51bef981398d0d00ecc753f222655108994d25a4e0503799569ec82
 EBUILD pypax-0.8.4.ebuild 893 SHA256 1e3398d362aa3e6a215c3e17d44c2e1e7155587af4b1265641061e7f41366aa3 SHA512 695cc89d90e72a9d894fd441496bebf493cd8f1fe855478912bd49972fedc94176ffa4ddbd32636d7f2843e87bc8a8a134a49515ab27abd2e2c9fead669314f2 WHIRLPOOL 5a95c51c67576556cc64f9a2f19a5755519ec95abd1197f15709cca68a7acffc7854ef934aa81f7ea1634a0aef432ddaa4e4d7a448bbaf6e15ba50a2612e4a83
 EBUILD pypax-0.9.0.ebuild 897 SHA256 d353ea6233d7d7b4e43bdd47c0ff4520449399d9ddf8f9bf8664fdb3c0ee0d81 SHA512 a109672f157683fb40803aa0360f02f9d38999d79b3c5031366df11c1a1ca2b02d730f43c9484731323d0627bdda9ebc9af2d5cd8f99c698e28a44b5b12a048f WHIRLPOOL 226d7a00676f20242b0a0dfe84004a6f83b10a41d1d10127ef23909ff62a44ed37f3c782da80716f1bd15e28f6a4d0a6a18f2704ccf87b9385d4cbd8a9edd811
+EBUILD pypax-0.9.1.ebuild 1082 SHA256 e14ac6b1d868cd61424e911c6dbfbe06bde28bdc6e981bfde9ae3a3cc8dc32c2 SHA512 8228a854e86d15f9cadc5d413a1f16d5aa863b9ce3d1c25c203032ceea1b38bc69644883ee131679e7337b276d64b1d4a998163ef5c8f0f4f7aae3f6a68ca458 WHIRLPOOL d5fcdb13ddb6b98f3a0edfc24eef9c9206cc987d0d4a3d9c61e11470ae64a30d6065f650c8fa85d5de167f4e2afcdefa3cbf6843c7cb9aab270547454a19d89e
+EBUILD pypax-9999.ebuild 1082 SHA256 e14ac6b1d868cd61424e911c6dbfbe06bde28bdc6e981bfde9ae3a3cc8dc32c2 SHA512 8228a854e86d15f9cadc5d413a1f16d5aa863b9ce3d1c25c203032ceea1b38bc69644883ee131679e7337b276d64b1d4a998163ef5c8f0f4f7aae3f6a68ca458 WHIRLPOOL d5fcdb13ddb6b98f3a0edfc24eef9c9206cc987d0d4a3d9c61e11470ae64a30d6065f650c8fa85d5de167f4e2afcdefa3cbf6843c7cb9aab270547454a19d89e
 MISC ChangeLog 12040 SHA256 f4db17e69dbb409cc06ad9b8de295d2a5219ce08f5069b7f868b1bad038a22fa SHA512 cbe9487651e5019a36c7607b0ec74ffa9a65f8bc16a0ae36873c9efb28d2a011ede094e15b683b2c46ccba2bfd60852675155ccd8e2a46f98c244d64e7a04ea2 WHIRLPOOL 2e20773724a3607263f15bc695bbb966f4b4951b8b22120917edce8ef0d9e582754413879a2c101a4faf735b856e1f6043c2a78bbd3cf5a9c40fce9a55e27742
 MISC metadata.xml 414 SHA256 b8a25ee4be8142ffd84a774ac6caa868b6e745dfc42897925374cf6ac8ed1443 SHA512 b7323283a6bbb9021ff9538bb79222c8cad75a22778a4a92e01477e18da6d04b79dad10fe72a22c23c428a33e53e24e67c789895335bcc250f5e2f231c25d467 WHIRLPOOL 22b9464f1fd2ee62b7f05667ee66482a4e6aa1c91e9139a152e4d24315ec308c8905c6db3a07f0a14948af9e26d98ac3d7a11c5ba73bbf5cfcf60f170e811e9f
diff --git a/dev-python/pypax/pypax-0.9.1.ebuild b/dev-python/pypax/pypax-0.9.1.ebuild
new file mode 100644
index 000000000000..2b2ef718c083
--- /dev/null
+++ b/dev-python/pypax/pypax-0.9.1.ebuild
@@ -0,0 +1,49 @@
+# 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} pypy )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/elfix.git"
+	inherit git-2
+else
+	SRC_URI="https://dev.gentoo.org/~blueness/elfix/elfix-${PV}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	S="${WORKDIR}/elfix-${PV}"
+fi
+
+DESCRIPTION="Python module to get or set either PT_PAX and/or XATTR_PAX flags"
+HOMEPAGE="https://dev.gentoo.org/~blueness/elfix/
+	https://www.gentoo.org/proj/en/hardened/pax-quickstart.xml"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+ptpax +xtpax"
+
+REQUIRED_USE="|| ( ptpax xtpax )"
+
+RDEPEND="
+	ptpax? ( dev-libs/elfutils )
+	xtpax? ( sys-apps/attr )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${RDEPEND}"
+
+src_compile() {
+	cd scripts
+	unset PTPAX
+	unset XTPAX
+	use ptpax && export PTPAX="yes"
+	use xtpax && export XTPAX="yes"
+	distutils-r1_src_compile
+}
+
+src_install() {
+	cd scripts
+	distutils-r1_src_install
+}
diff --git a/dev-python/pypax/pypax-9999.ebuild b/dev-python/pypax/pypax-9999.ebuild
new file mode 100644
index 000000000000..2b2ef718c083
--- /dev/null
+++ b/dev-python/pypax/pypax-9999.ebuild
@@ -0,0 +1,49 @@
+# 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} pypy )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/elfix.git"
+	inherit git-2
+else
+	SRC_URI="https://dev.gentoo.org/~blueness/elfix/elfix-${PV}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	S="${WORKDIR}/elfix-${PV}"
+fi
+
+DESCRIPTION="Python module to get or set either PT_PAX and/or XATTR_PAX flags"
+HOMEPAGE="https://dev.gentoo.org/~blueness/elfix/
+	https://www.gentoo.org/proj/en/hardened/pax-quickstart.xml"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+ptpax +xtpax"
+
+REQUIRED_USE="|| ( ptpax xtpax )"
+
+RDEPEND="
+	ptpax? ( dev-libs/elfutils )
+	xtpax? ( sys-apps/attr )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${RDEPEND}"
+
+src_compile() {
+	cd scripts
+	unset PTPAX
+	unset XTPAX
+	use ptpax && export PTPAX="yes"
+	use xtpax && export XTPAX="yes"
+	distutils-r1_src_compile
+}
+
+src_install() {
+	cd scripts
+	distutils-r1_src_install
+}
diff --git a/dev-python/python-memcached/Manifest b/dev-python/python-memcached/Manifest
index 14accbd855b2..93bd067604f3 100644
--- a/dev-python/python-memcached/Manifest
+++ b/dev-python/python-memcached/Manifest
@@ -1,6 +1,8 @@
 DIST python-memcached-1.53.tar.gz 35025 SHA256 af04ea031b271a54f085166773e028fe053fc1d9a58cd8b3c3a57945990bfb48 SHA512 33ffd2778025a8e15beddf1660c4b5c9f1ba144adab5c36fd679e15508015c00e3e1185b5cc179cfcfc556b7c3ab44ed9914089e5ce9db66a04d0a658dd38bb3 WHIRLPOOL 81b80a05010eec576ce8eb00ac4c799213bfc82af4dd3d3da138d02337d28dcb5fbefcbdf11e8d9344b307ba8b1ab2a770b8130fce2f732e484f283e2fe85aae
 DIST python-memcached-1.54.tar.gz 36662 SHA256 df21d1431424c512901ecc3cd244039833aebc4bc7d345af403d4abdace20081 SHA512 e66684fba5ac638efef971df14f4049f1aeae1a84a9c530f26560c1150d7b136746daa164754a0e451ee1caf0b24fd856083aa23f42be1bd4e90a6943d9e45ad WHIRLPOOL a2d1c60fba41002c03718a75659ff1c3944e32b3c900643af2ed227e6280af2635f068f27923ed1722ae1407cd3a1e9696e6c628e4898aaf73451105846c31cb
+DIST python-memcached-1.57.tar.gz 22620 SHA256 3b689a135afb2fdb6da2298d5213780f43a3f210cf8c960d50b252acb3f62902 SHA512 1862d9a5c7c29c8956384e1b951b59dba1fb2bbaeb1c3a99b1b917a93e04e0d86f4b38022a4b0146889448a2d2152e7282cdf33d0240126350dc88d34f216ad4 WHIRLPOOL cda22d597848bf2ca138f0cc9cfedb9d1b58cf217568d6bf8ffe6b7ca2b9771f079db76e1b0fc577b079e717fd851007ec65859454ae6fc5eb369394bc205a6b
 EBUILD python-memcached-1.53-r1.ebuild 1221 SHA256 04f2593bc7397c3c699778fd5530d96c2ea5cfb8fe0055c960b6cc9d86fac4be SHA512 f5524257407aecb1b46daae00c74714455ef62c443eac85a9af40e340c79ef91b7fd223033cb6f114ba2defa31133c55940aaa655425fb2ad9129699dd626a56 WHIRLPOOL e4dec3cba908531df424766f0f69a40b7713fdc654a00c41575f76c9842ae64118db4799fd1581ba110d5cda9fdebcddd8a6bfa85c4b2ae30b670057d739228a
 EBUILD python-memcached-1.54.ebuild 1224 SHA256 87779a6a9f1d328279974463df0098a14d92a9f1d623cff93970cd67f16e53d8 SHA512 237d35f8fbfafd2e1c13e9d7a7ceb39efc727142327d476afed05c7a4ceda85aabc67020202f719a9c194bc089751a8f7fc6aebd2129e53bd7cdfdc815dd3202 WHIRLPOOL f4dfe6ea9ced7c9dba742579215ba87d3a2b3be10b4f11887efa79aa9966556a1926eeea01de8d7d5e2b14334227120e223f2bf3595d661a35db28150a095399
+EBUILD python-memcached-1.57.ebuild 1271 SHA256 b4439b445c67af752e8c71eba886622dae434f38757cc80fe8af82899ce183b4 SHA512 f0a945eea001d208ba8d53cdf99f0bb0ebdbf4fdf999e95e69dadf4af07a6cff369f96f047cf5a5391c9138f60f57b86173cb030691f6c590aa4c7d04fff44b0 WHIRLPOOL b77357f32173a8093e7aa8dde0fd535d94dc9c811bfbf83753ac6b3efd48069621d230a70bc6f065a92b969e15696201dd31bb9db99a235ed6435089c1ce49f2
 MISC ChangeLog 5438 SHA256 09b76d264483e4ae6476489e534f588a2d20ab224498434cd939bd122075a94f SHA512 7c27b87c1f6abb8ca32d74aba6f13deabe1cf77c6ed59fa582adf583b5b47750a956b168468324f9983c41e6a207345148f8f9a4af2b29bdaea2011d1f5974d9 WHIRLPOOL b5e6162c5849f083ccf5b238ddd53c7f1ef928440a2507c69ca670a3928edfb97a4bbd1582da029ca56c203dab2ce7149fa01b24a9bbaa58adad4f4bf3685faa
 MISC metadata.xml 431 SHA256 4a7116ac4a2d70cddbab6a7ea152885ce769ad4887f42860c73d7a0026f4e393 SHA512 14087d6aed97a1f692a410055d097f095c808a028c769ee356293437bd8f50a10de6c34fd73650fb406622624afab1ec99b33fefb5fe50912e6aa0e6fefb428a WHIRLPOOL ed4bf092944f4ecf10a40fcf795480f67dd6d6bc0d88c74b67ff35a430dd45e120032ecfb233a1cc7a77824ddde14df6eb07c7d4ca0d86bdac30f817c0e41df0
diff --git a/dev-python/python-memcached/python-memcached-1.57.ebuild b/dev-python/python-memcached/python-memcached-1.57.ebuild
new file mode 100644
index 000000000000..77c2b9cd9da5
--- /dev/null
+++ b/dev-python/python-memcached/python-memcached-1.57.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure python memcached client"
+HOMEPAGE="http://www.tummy.com/Community/software/python-memcached/ https://pypi.python.org/pypi/python-memcached"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="OSL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		net-misc/memcached
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+# Tests try to connect to memcached via TCP/IP. Please do not re-enable
+# until you get them all to pass properly while using the UNIX socket
+# only and not even trying to connect to memcached over TCP/IP.
+RESTRICT=test
+
+python_test() {
+	# Note: partial. Needs fixing. Stuff like that.
+
+	cd "${TMPDIR}" || die
+
+	local memcached_opts=( -d -P memcached.pid -s memcached.socket )
+	[[ ${EUID} == 0 ]] && memcached_opts+=( -u portage )
+
+	memcached "${memached_opts[@]}" || die
+
+	"${PYTHON}" memcache.py --do-unix || die "Tests fail with ${EPYTHON}"
+
+	kill "$(<memcached.pid)" || die
+	rm memcached.pid || die
+}
diff --git a/dev-ruby/amq-protocol/Manifest b/dev-ruby/amq-protocol/Manifest
index 508000f4455e..1adaffbe2af5 100644
--- a/dev-ruby/amq-protocol/Manifest
+++ b/dev-ruby/amq-protocol/Manifest
@@ -1,4 +1,6 @@
 DIST amq-protocol-1.9.2.gem 43520 SHA256 79e018cb1a3522967525973ae04d40884620e8d4adca02afeb710f00643a84be SHA512 ea4553b337589589cc89b70e351722ec8af402bd560d73fd35ad41665424a6212e03e26ac86aace5d90f599c7fc2236686fbd83bd75c7023647d95163a2d8573 WHIRLPOOL 5fcfd806b8d84aa64b10bc160fe439dcdff2977b739e04ec23b8f86d94f7a5bee4b95d3688317096b0dcf9214a12921f4b0a4c93c9bd0f6ad3376a6199659189
+DIST amq-protocol-2.0.0.gem 43008 SHA256 13ffd60f8f41d986b522f4dabce1c9d97e248395998e358298d1dfe54943ef9b SHA512 d0bc3de546b4d618fb66ecee57691c948058f8c82fab6f5747a6122d56be39d36a5670df76e4ad23124cccc81c5d1ba2babe6dda02f070a6d306eb30a8ad7cc8 WHIRLPOOL c4c98f6892f35959f92c42b35aea51b90bc074942e30999c7f8bf4f13156148d917f2a6d35580654483f8495b2e8423cbe123c130865ea2e2ac173860e8347a9
 EBUILD amq-protocol-1.9.2.ebuild 587 SHA256 76f8681b23d4e38dce48fe7e3ad464a02b0f92dcc7926de6a040089e5ca8cb14 SHA512 b00ed0f06a4980f7228747f2d097cbc3222d05d3aac9292a5aad0a7c64c4812dd7e3e5f06b8e1805d6f4d52cd14d76c139afe5a95256a5a8e9a97b8deae23529 WHIRLPOOL 199f848a7ab62fa99aa082d115287bd04b5cc2fa3d919b1708a305f1e80e1795457925137691516afae2b09fee6effbadaf0d8995a9a68010b75973061d2a0fc
+EBUILD amq-protocol-2.0.0.ebuild 637 SHA256 cf26e23c6170e447e96b47d142b3581a7df916ee354596edc111d156f703f589 SHA512 1e6b15596a596a35b3edda1c7e4695c76667c063e6756a6d018c91586e6e4c97d3924973c29255353762c8e09ccf0fefde593f2e63f56b28ea22fc287d67b1d8 WHIRLPOOL c4660b969e000e3593185cb3761282cf308fd31aa20f1e91fa5176c4a00db05b900e45d8453301b8c402a7de3640b4569d47954d19006c7828ecc24082acfbc6
 MISC ChangeLog 3037 SHA256 081d8decd68df668ee108ac425e0da36e5229a32de0dd8bec5a7fc21a13b677c SHA512 b2da421a5e5ca2332ea1e9a7afae75768c97c1efb768d06a9a52276e2660295227ca925fe5d770a5bbafbc7634a91c6f497bd17cf07f78020ae87d82e80116d5 WHIRLPOOL 31fddc4f7e718ad05681f94c34fb40e696e92ecddabb6a2fd56161ef8a43a8568db3ca02d8f0e4b90ced77575e5edb92a2f1136c7bfe3405185e416010053456
 MISC metadata.xml 250 SHA256 46b68deb8fff2a411adbc6063b1c89b0d774dff4576717eafc5e08789fc22113 SHA512 109f976a0f2ad2deff76fd903de97c65f129c781a0e29de7551dd941867d7e82a4bab2057e326f37ae46fab1d6489b4e38d9bd2f5c0b283ed0807341792079b4 WHIRLPOOL 3e1ed48f824054e45921aaf112aca0232e8e1669aadc4fdb8b6f7f5fc7b254201b5c1d62fa25697c2c7c51e641f2ab3d95ecf3b05e908b04008041e67dd756c0
diff --git a/dev-ruby/amq-protocol/amq-protocol-2.0.0.ebuild b/dev-ruby/amq-protocol/amq-protocol-2.0.0.ebuild
new file mode 100644
index 000000000000..e1517c879e37
--- /dev/null
+++ b/dev-ruby/amq-protocol/amq-protocol-2.0.0.ebuild
@@ -0,0 +1,28 @@
+# 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"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An AMQP 0.9.1 serialization library for Ruby"
+HOMEPAGE="https://github.com/ruby-amqp/amq-protocol"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec-its )"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/bundler/ s:^:#:' -e '/effin_utf8/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/mixlib-shellout/Manifest b/dev-ruby/mixlib-shellout/Manifest
index 9dba5824f565..a17a91e2424d 100644
--- a/dev-ruby/mixlib-shellout/Manifest
+++ b/dev-ruby/mixlib-shellout/Manifest
@@ -1,8 +1,6 @@
-DIST mixlib-shellout-1.6.1.tar.gz 30601 SHA256 98949512840f800283b2b065b1b2c605e4b899e0b950624b8f84ab17b0d07dc8 SHA512 1a95e4b5520695808e03d45b8b3889b3a343d3d76561572ca99f705998fb68a0f7bbb0b6ca5655cc454d71f4cba24ff07cde7f0301bfcca803e66104cf885f15 WHIRLPOOL 7c2e4a2df53fa820f61ff231a66ea97590e0198e8c4b5d5ba92d3d1ba0714184c681bc66060e1fb54dfedd61dbc96938ee19cf2618c1345767605520d43d93d7
-DIST mixlib-shellout-2.0.1.tar.gz 31038 SHA256 f1a64b5882b125acf87fc9699a2c461a5e7dff443d9bc76fa8f3f25798a60044 SHA512 224952f0114dd39d31d0401bbccbf76d60b9461559b742223c0e8b95600bb3d9938957c03a4cdefc06898c5cb4035539a10298698052ebf42ed41dd9a3384cc1 WHIRLPOOL c86738088ed920c695b4b07900ca801de7ae4fb5856c736cbeaa211fca362ee4a658c64487d4933ed0a822f8a44167ccd3fbda64c8d97981e9bd8f840c837a54
 DIST mixlib-shellout-2.1.0.tar.gz 32800 SHA256 8dcc6ae1be5dc3055808b3d40a9155520e6188f1772f6f5e4ecf037ab7a5283d SHA512 15fef2f9b661ac02edecfd4c48b00866e34bc361f2070da4382991e0455ab15650327209cbcae153fcface727c47efc75d7f9dac2a92867fd148941942f117d8 WHIRLPOOL 7e039b721d73d2b4531a3d69224358c67e2afb3d051cd1cf21380a1c47b23523c2e1115184542999fee4f63f9bdafd64e4d67d3133d269043f2828449d374e02
-EBUILD mixlib-shellout-1.6.1.ebuild 696 SHA256 2abda105e9d04cabf2f4be8be8b28ddc10ee6070fc583a46b8263bed815ec9d7 SHA512 5d73736402c7c2a732d7e98848d980a06bc804f19f0142d4687b691f39e9653f12468b476540832c9202f60f6d45311b583ae5ca463adbd2a9db9a6b654b3c62 WHIRLPOOL 3eb4a0c83eee85735ca4f3f4acbbb7ec1eebeab6d53c7714a85867a5cacc227ccf93fd11cc2d8df0ccf831acc0d0e3a1a2f8f8558635e8b2a3fb34f38247c039
-EBUILD mixlib-shellout-2.0.1.ebuild 696 SHA256 2abda105e9d04cabf2f4be8be8b28ddc10ee6070fc583a46b8263bed815ec9d7 SHA512 5d73736402c7c2a732d7e98848d980a06bc804f19f0142d4687b691f39e9653f12468b476540832c9202f60f6d45311b583ae5ca463adbd2a9db9a6b654b3c62 WHIRLPOOL 3eb4a0c83eee85735ca4f3f4acbbb7ec1eebeab6d53c7714a85867a5cacc227ccf93fd11cc2d8df0ccf831acc0d0e3a1a2f8f8558635e8b2a3fb34f38247c039
+DIST mixlib-shellout-2.2.0.tar.gz 33057 SHA256 ee7165b51dce388d189eae1eddcffcde602c7819e8ec14c3fa97025077cbbb23 SHA512 3b6383d4b4c5b891a688c7aceb615ad08682030ecc840a95a8eb5d55978fafeb07e1bd62a53eb1f39aaca0b94d93260ec8e0824c43c1adf51cabccc66f869c22 WHIRLPOOL 5651933bc78179730f76814312591a4b7b2f48fbbd75644529bd43176ccfac23aa1960e04f85e1dcbbb16c655e9d326ef52cce75ed3561109776198325a6f70d
 EBUILD mixlib-shellout-2.1.0.ebuild 710 SHA256 8e46f76568379a097c641779a3145f23fb77b8689bf9cb3b83c83e61f216a929 SHA512 d987db85be3e49f8c51b04ea14d29e923194bea368dc838eb35bdecd7e078c3921450d12f1e813099cf94584c30e5670bcee1c5a61e55ea0434de9535c32e328 WHIRLPOOL 2000f19e43de833433e4dc5e229fd0c9dad7aa751b55ba80cc507bddd3d9de5500f68e323539e89f9a822d637de5c7cb5c1c581d538142438d540a5a7df05fa0
+EBUILD mixlib-shellout-2.2.0.ebuild 710 SHA256 8e46f76568379a097c641779a3145f23fb77b8689bf9cb3b83c83e61f216a929 SHA512 d987db85be3e49f8c51b04ea14d29e923194bea368dc838eb35bdecd7e078c3921450d12f1e813099cf94584c30e5670bcee1c5a61e55ea0434de9535c32e328 WHIRLPOOL 2000f19e43de833433e4dc5e229fd0c9dad7aa751b55ba80cc507bddd3d9de5500f68e323539e89f9a822d637de5c7cb5c1c581d538142438d540a5a7df05fa0
 MISC ChangeLog 2436 SHA256 bd3d128e36ff09234753e1a9bbb02e0fe4c02b89eaa6e5dffc3d9c78c13b4d5c SHA512 78a19bdb71b5d482684083b4bfa67d00727f7893cc356c0bd5b8c0c382b8c29653da24a0b89c4a37ad2645d8637027f22bb80b4c4a5909c54c07a35ae899a5fc WHIRLPOOL 0325bfccbc840deda6dae9a5b7773f6f1a3785894277a0d62c853a6ad4ac500696a10baf1f0b6b2c9588c753c5672016658840952fc8161aed40fab158820e79
 MISC metadata.xml 251 SHA256 d4796172314b40ddb0dbfa64ac30519376cad3b1d47d532fad6ad16cd651adc4 SHA512 76004a89efecb84a014b99671b71541c38646da229e1b5b3ed526eaf3b0706f0d6f30f8698c22b63c73eaa5b91c61d2d9b15c46946c08762114125ecc00ad577 WHIRLPOOL 752c27352270041c8c857718fe142bff6e0b8350dc41699e4a52833eb90cad2d51bf60f7ca4caebd1de03980a7667326b9b578f8493e662c338ff032185d4d7f
diff --git a/dev-ruby/mixlib-shellout/mixlib-shellout-2.0.1.ebuild b/dev-ruby/mixlib-shellout/mixlib-shellout-2.0.1.ebuild
deleted file mode 100644
index 7b237a7c7f6c..000000000000
--- a/dev-ruby/mixlib-shellout/mixlib-shellout-2.0.1.ebuild
+++ /dev/null
@@ -1,27 +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"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_EXTRA_DOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Run external commands on Unix or Windows"
-HOMEPAGE="https://github.com/opscode/mixlib-shellout"
-SRC_URI="https://github.com/opscode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-each_ruby_prepare() {
-	# Make sure we actually use the right interpreter for testing
-	sed -i -e "/ruby_eval/ s:ruby :${RUBY} :" spec/mixlib/shellout_spec.rb || die
-}
diff --git a/dev-ruby/mixlib-shellout/mixlib-shellout-1.6.1.ebuild b/dev-ruby/mixlib-shellout/mixlib-shellout-2.2.0.ebuild
similarity index 88%
rename from dev-ruby/mixlib-shellout/mixlib-shellout-1.6.1.ebuild
rename to dev-ruby/mixlib-shellout/mixlib-shellout-2.2.0.ebuild
index 7b237a7c7f6c..6d1fc6f7db65 100644
--- a/dev-ruby/mixlib-shellout/mixlib-shellout-1.6.1.ebuild
+++ b/dev-ruby/mixlib-shellout/mixlib-shellout-2.2.0.ebuild
@@ -6,9 +6,9 @@ EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
-RUBY_FAKEGEM_EXTRA_DOC="README.md"
+RUBY_FAKEGEM_EXTRA_DOC="CHANGELOG.md README.md"
 
 inherit ruby-fakegem
 
diff --git a/dev-ruby/sass-rails/Manifest b/dev-ruby/sass-rails/Manifest
index e7577d338a87..e522b6e3b8d7 100644
--- a/dev-ruby/sass-rails/Manifest
+++ b/dev-ruby/sass-rails/Manifest
@@ -1,12 +1,10 @@
 DIST sass-rails-3.2.6.gem 88576 SHA256 a8e5618ecbc88b1b1678d3f7ccf5639d70da8e421b599546c3cef5c9627f67ed SHA512 ebbc9b3901176871dce8cdce3f3896fe726bfa7a826420ec6e313d6573119585a70d10cc008aec5e58888f60bc4794c08327c3e2743b11cfe3cd6305cf6e942e WHIRLPOOL 3432ab8c4f02d1a4b1421c04ab90682e4dc5060df67c3d86ee8c30363974a81ea10c98fb56ebacf1e1be505fa466dc5d295fec920908f83f3a8ba721b9344ebd
 DIST sass-rails-4.0.5.gem 92672 SHA256 8b93da41049d32f14625abd6a0514d34286b87e9123093db054eddbe644487db SHA512 71515d2c16886d64af4c00bd78094691579bfbb3660ff9ba4d9f2807bcbedf104da2f7a321a3cc558f0e2420f702eb2bd2379cce30f1d21d8b09ab5fbc8347c5 WHIRLPOOL 9a39907a182ba20c7a14963dc00d6455babc63c1a3c5a202c6475f5e7b0dbec86663309f416b21d393e904da704f84f15634cda9521d5fbfbb03bb5bf10338a1
-DIST sass-rails-5.0.1.gem 11264 SHA256 73820862a8a08c9d04d912f0d0aeddca85bd3c7e89808aa16a57ba41b077d992 SHA512 0519b97e8662ebb1f7191a83583ac99464a2d9db74816ab149fed9eb2a669486491c3b6340b8ffcb6bc68618fd8628a4e14eaaa333f411411b2f5bd5e7d44749 WHIRLPOOL df480462265dc167d1468af6f3673086506831fcb6a77e06b4c5b2a138ffc8aaac30253e89d25659b8422615c0c189d08c13948235661b2de7c31ef83c0fc36e
-DIST sass-rails-5.0.2.tar.gz 89342 SHA256 952cb0f8df2fe0cf1614105a752fd09bfd2ebf43924023e160eb4f5817fd80c1 SHA512 b3ae333b58901ac867e649fd7101ae672b012e1c96c3f30ae38a00477a4e9da24bc3f6e7dfea4b4da55e12b238c469f0a555b3ede8169f22d5ad858350aeadd2 WHIRLPOOL aa6dd85570bae206f29ae04702f03a79acc02298ece097284e60b8bb88bc5096d6131b38d2edff600553e6d2d02855f9ed344bc1237da05b8f5e14792a143423
 DIST sass-rails-5.0.3.tar.gz 89341 SHA256 84130672050715a1e33957ed798dba5098d4184121fd85c0d2a24661e4cef7b6 SHA512 c1fe25a686ebf9d9ccb87bd79abd9fec1ed94a1abb32532142d0e812bc699358806a6861cd509644738499ce317754e3c7e1000818e4654994a3c16bc7e2b0ba WHIRLPOOL 650369126270d6937f62ea142d88526622a3ba180967b4ccc4c1968f62e5e3f35a605795b1eb822a3153373229c89cf00fc8478dd0029449efd3959105017685
+DIST sass-rails-5.0.4.tar.gz 89426 SHA256 cc4533ad0f4a20eebbacf714d7a22f79be03421699810c2951c6a52534395b5c SHA512 99266e49a8b1cc16fd22f10113717f1208d7d696b40c940ef97bd05999f9cab3e28826a998ce08a14e72f1af5ab9c901501242f56366b87606f2c861217ce75f WHIRLPOOL baf80ebfd2f4c158253cfcd81ec7080ed51f85f304b4233c717c60782f46d854fc0daf1414c01eae71ace8ef20d162a961c5216bc878d726d6cd7873219fae2b
 EBUILD sass-rails-3.2.6.ebuild 973 SHA256 6d93653680aaff73ce9cd2703a5440275e30ae0902b972bf4bcf72af69d38306 SHA512 b255245e979b42ef4e11645345df37f6ba5d6a2cc0b55400e4c21e37a799719f826cd52cebf1256fbec66757484d5c8d771659242615141f3c9c4734ce5de59b WHIRLPOOL 8cabde9ca7fe1f5e8678fd12110ecd986d8fa7a3af1d0b99ff61622b908370ca06dcbadae2fda3ebeb62414c70a15e609ad81bdc27f6358abba3918505425b7e
 EBUILD sass-rails-4.0.5.ebuild 889 SHA256 1917d472f7ddd09859c7b21d6086a0d51dc597c5b509c1e8346eaaafb6230684 SHA512 26c5106ace55feb4b28b821b69c003e499155ed695e5c7cd27da2bb02e474c112a3f50d5059afcc7f8b4299f88593e42e67ba88f2ef81cd10d12a696b8731632 WHIRLPOOL eee1b75f8781b14a1ad23b70b7fc2f5460ca821e22174fd0bdc51c62cfd38bc4f16148b81214eaa78967b42c411c3f0cbce9c3adfe91f87fa80863f0e9e1d014
-EBUILD sass-rails-5.0.1.ebuild 971 SHA256 7bbca9a7653ab08a00858eff7341b431d010dc36cd8e3080243e397430f5e5af SHA512 72764469bbb8675c5e005b1bce50f9dbda514ff3ca2ec8ad2daae2d4c0b15443a64be9c4872d9d48b1d1aeac099cbc5a8e7c474eea6063a3a5dad5b082429f28 WHIRLPOOL 1616d323cce6ff7a8de36a328c2349fb4e30ae9834c6384abee327e3aa6286cab88f137da1f5063b5b96b350a61ca1e19d631e9225c46e1f41d7964ec0d57fcc
-EBUILD sass-rails-5.0.2.ebuild 1041 SHA256 478f751ec3502a0297739b36bbabeb0d842458645a04721d4824f83302c6051f SHA512 71d1c95b99377cfb236ca15a8962184eb61ebea0099af06df0607cee6d5567732f2d0f836bddd75f713d878622e1c59572cffaa38eaebd9aa44a5d68ea143d00 WHIRLPOOL 44392e13d59d1544f8ca71304520121263f46770e8aff92b7bf280ec02921353e1983ec8ada5fba3f4ebc9a1a93dd96981b734b112d21357a5d30ed5c94a5bce
 EBUILD sass-rails-5.0.3.ebuild 1041 SHA256 478f751ec3502a0297739b36bbabeb0d842458645a04721d4824f83302c6051f SHA512 71d1c95b99377cfb236ca15a8962184eb61ebea0099af06df0607cee6d5567732f2d0f836bddd75f713d878622e1c59572cffaa38eaebd9aa44a5d68ea143d00 WHIRLPOOL 44392e13d59d1544f8ca71304520121263f46770e8aff92b7bf280ec02921353e1983ec8ada5fba3f4ebc9a1a93dd96981b734b112d21357a5d30ed5c94a5bce
+EBUILD sass-rails-5.0.4.ebuild 1058 SHA256 19f07bb83f1651009c0239c8d01f7ae271cbb526f67975eb7988d4cf34f8aed1 SHA512 9afb270e1b690949505b68fbbda541d49e53f6cfb9ac1c6dac288f99a15f7762fb7090f9746bd51bd41cd812c3ea6d5b99500a2207076f9fd1a2d43d238f05ab WHIRLPOOL c756d0af09d8183f7f3ad90e3ab7c4b87f15dd49366a97fb06aebe9de7278d9512f704f4cf79ed1d556f9f06fe741bdd0d26b4e6f0f84aa234d22c5596a9a477
 MISC ChangeLog 3699 SHA256 b3b4a3f3f8bd078fd8c76e8a4c5ae5590428aade667f8e1e20522f2ad5e45423 SHA512 05c7509fe73bb0347c348d412c388ca3da13118dd6e788b91d729f144844c6ee8a0b8bc240504a10a98b9148d063f94cc6b1bf0840ea743806e91cd5c9afdc63 WHIRLPOOL afed238d3d258435eb0dbda1cf9673c0fc74b6a65c994125fc880cfd382160de5854b314e7a31a6150cf36d9fc9b3bdb0c66cd1578d1b3e570507d5b763ace33
 MISC metadata.xml 244 SHA256 62bd4ce49f3126ac548f6b6a8bc178e361c05c34b28264afc7da593c228da1c1 SHA512 fe63957d5ba6b0047c54af483b9ccfdd8ef8771603dff5828dd952d8434dfadb60663258547d9feba96cb24423f51e123ea9800b5693e2c4ebbc27f5bc80c6c1 WHIRLPOOL c9075b2734a33355f4f750f74a51ecede35ce1f36eaf999ec5902913a57fb0b1ddae269617416b3a1e5f6f3c1b3b5ea692d66a7fb3ff9620a07c3bbc6d00544e
diff --git a/dev-ruby/sass-rails/sass-rails-5.0.1.ebuild b/dev-ruby/sass-rails/sass-rails-5.0.1.ebuild
deleted file mode 100644
index ac77b56e73e6..000000000000
--- a/dev-ruby/sass-rails/sass-rails-5.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Official Ruby-on-Rails Integration with Sass"
-HOMEPAGE="https://github.com/rails/sass-rails"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-
-IUSE=""
-
-# Restrict tests for now since it is hard to set up the right
-# environment with the correct ruby interpreter and Rails test
-# application.
-RESTRICT="test"
-
-#ruby_add_bdepend "test? ( dev-ruby/sfl dev-ruby/bundler )"
-
-ruby_add_rdepend ">=dev-ruby/sass-3.1 =dev-ruby/sass-3*
-	=dev-ruby/railties-4*
-	>=dev-ruby/sprockets-rails-2.0 <dev-ruby/sprockets-rails-4
-	>=dev-ruby/sprockets-2.8 <dev-ruby/sprockets-4
-	>=dev-ruby/tilt-1.1 =dev-ruby/tilt-1*"
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rake test || die
-}
diff --git a/dev-ruby/sass-rails/sass-rails-5.0.2.ebuild b/dev-ruby/sass-rails/sass-rails-5.0.4.ebuild
similarity index 76%
rename from dev-ruby/sass-rails/sass-rails-5.0.2.ebuild
rename to dev-ruby/sass-rails/sass-rails-5.0.4.ebuild
index 92f45053c7d4..e723e548d5bb 100644
--- a/dev-ruby/sass-rails/sass-rails-5.0.2.ebuild
+++ b/dev-ruby/sass-rails/sass-rails-5.0.4.ebuild
@@ -27,11 +27,11 @@ RESTRICT="test"
 
 #ruby_add_bdepend "test? ( dev-ruby/sfl dev-ruby/bundler )"
 
-ruby_add_rdepend ">=dev-ruby/sass-3.1 =dev-ruby/sass-3*
-	=dev-ruby/railties-4*
-	>=dev-ruby/sprockets-rails-2.0 <dev-ruby/sprockets-rails-4
-	>=dev-ruby/sprockets-2.8 <dev-ruby/sprockets-4
-	>=dev-ruby/tilt-1.1 =dev-ruby/tilt-1*"
+ruby_add_rdepend ">=dev-ruby/sass-3.1:* =dev-ruby/sass-3*:*
+	=dev-ruby/railties-4*:*
+	>=dev-ruby/sprockets-rails-2.0:* <dev-ruby/sprockets-rails-4:*
+	>=dev-ruby/sprockets-2.8:* <dev-ruby/sprockets-4:*
+	>=dev-ruby/tilt-1.1:* <dev-ruby/tilt-3:*"
 
 each_ruby_test() {
 	${RUBY} -S bundle exec rake test || die
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index ef4f66879056..86c7ba6e1af2 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -7,7 +7,7 @@ EBUILD catalyst-2.0.17.ebuild 3036 SHA256 5e0366fbbcd4910b23e1df7e848913f053e6c1
 EBUILD catalyst-2.0.18-r1.ebuild 3150 SHA256 be253a9a39a8329d706cd82721f9ec2fa5ee7c219a0ce4275d697c9d9147943b SHA512 b8de5dce843406ec9fbc02b1b21e870eb751cf594da0e5eef7bc09c6c7dd671836e511b433378e98bebfa598114b7f3cc0927b469f1bcf666b8da6031c7a8a05 WHIRLPOOL 0b74a61306215009e9807c50bd88bd3ad1c666cb642f41d5521535700418814b02e83909e213c6219df16a3cb6244084b386ae0d57a3e87c290971d10fdb4b23
 EBUILD catalyst-2.0.18.ebuild 3036 SHA256 5e0366fbbcd4910b23e1df7e848913f053e6c139c735057cf2b1f1934753307d SHA512 f271f3bb2f9034d98020bc0fe5ed51e78e189973688d567a22aa175c455188093b8f10bb03d6094448962a29d00842e6bc3bfbb7610fbcb7f0f049e0f6984600 WHIRLPOOL 542039f2ad1b683f32050e81ba944c46081aa94eb896ff75d0aaaebc5d725d6085c81c0f6e406a3c204daf3fb91de79ac6c3d086da752e745f61dc8c5c972f47
 EBUILD catalyst-2.0.9999.ebuild 2939 SHA256 bf940afa23e6a38c23cd7e9b22d3128832fcb37344af6c2cd68a2b98ccb8c330 SHA512 e7450614c34e409cbf63be311b1cd8b2f9bb1467bad201af483f03d0904398cc142d5fa83b7838ab85a3de4247ab00beb3f96e4e514acbf26f734cf540b4f114 WHIRLPOOL 8af626332adc5b43bebb712fc8774f6656fc13cdc2a56cab405c1759c633623158bd9d2bce2f4ad91dbe777faa07fa309378a78d0c6d5219c5abd671696a7616
-EBUILD catalyst-2.9999.ebuild 1543 SHA256 6b3f87ece98d86c5f1a35af145ad70c7f4e36716259f13c7c0997a747e49f7c2 SHA512 fb8095d9be1e6af6898760f0627c297e23e903214f57ec78e045fec13c22da5457c48940f3688b0ea851d5024ba49346bd472f368f0a12a950556fc17d853f5b WHIRLPOOL 79257861c0b8888ee18c2aebe46b1f9491cfa7c6a671e87996e3adf448d12d22dd6c10c0f8cfcbca6d17c2bc2cb3ae0309895a2d8e5d8382e4b268c9cdff6e68
+EBUILD catalyst-2.9999.ebuild 1546 SHA256 68e49ee74de1c6bfe12d92b636c93af171c86b412496d544377f2c0113a61633 SHA512 3fe3148534319332dea5589735c4215548ff64792505e730d432685174a631f085717403fbac42e14fa64cf50ced0fe5be79874c748d333a0ccc6348dd22e555 WHIRLPOOL f7ba90fcffd4b602a1ab0995efefa7fe12b17ca0ee08d9376991b4fa590cebb3b75f6285447bc5b2be19b69f02070781d11dbbe1777b754039b3f659c05a44d7
 EBUILD catalyst-9999.ebuild 1496 SHA256 6449cc8faea9a91eb975c78a1c8bbd794ec6a18c87742e4ade6029dc3a98f44f SHA512 a52e0e794175da8272617dab6693defd0fdefbaf29b4e86a110d8402df22c69c0d12535b652c297ec1014e829f4ee1f319c4b27859da9624838b6f60bf92d8c7 WHIRLPOOL 3784e7ff30b4868bc82f4514e24085148034621d04847acaca794271ce0a65e1c4c30b316a9f2a29e3b1ca0667983e77ac6b7c2aaf9358c992b9a768ed3972b7
 MISC ChangeLog 60029 SHA256 cafac934525a38bf3872a8d838d94ab234aa35e0b7bcbc051fe119e50fbbacfe SHA512 1d74d4f864b83b9da9c527a3f6fdac871cfabe3cced2cf21298f4b3289a1674e7d5cc62ee743da3962a53fe5dcfde511f324b47f9c090830140b96e16742d5fe WHIRLPOOL 5deae7a6e5aa600c6f4d9e030155380a5b0d9862ce59ad7d773986076ac207e69cf782209704eecb6209b808bae53a015a67e1d267ce390ae117a0f570161835
 MISC metadata.xml 302 SHA256 52c8f4e22cff9920c9a11b04ee574b28cd6fbf71a8212259d9d19122e0ddf955 SHA512 bd15682c5b17cde8b9b0ffe4559839eb2419b070659c388a21f3bba6b94d4a3861cbb76328c996c107e5fde9e4e4fd09e1f54d99e6d76df1ef25f1f52e557a2a WHIRLPOOL 5951e4d293d63763c8d1b922b6e7a88b3b8c3db0a3db5cae5bd4457920a8e14c338ff202d5d074e1893facddc8a04b83d83cefd6bd13d65029364d905f2c1450
diff --git a/dev-util/catalyst/catalyst-2.9999.ebuild b/dev-util/catalyst/catalyst-2.9999.ebuild
index 3a76b3694757..605525298320 100644
--- a/dev-util/catalyst/catalyst-2.9999.ebuild
+++ b/dev-util/catalyst/catalyst-2.9999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_ECLASS="git-2"
 	EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git"
 	EGIT_MASTER="master"
-	EGIT_BRANCH="3.0"
+	EGIT_BRANCH="pending"
 	SRC_URI=""
 	KEYWORDS=""
 	S="${WORKDIR}/${PN}"
@@ -33,9 +33,9 @@ IUSE="ccache doc kernel_linux"
 DEPEND="
 	app-text/asciidoc
 	>=dev-python/snakeoil-0.5.2
-	<dev-python/snakeoil-0.6.5
 "
 RDEPEND="
+	=dev-python/pyDeComp-9999
 	app-arch/lbzip2
 	app-crypt/shash
 	virtual/cdrtools
diff --git a/games-roguelike/adom/Manifest b/games-roguelike/adom/Manifest
index 75f88119cd41..85a3c8bab323 100644
--- a/games-roguelike/adom/Manifest
+++ b/games-roguelike/adom/Manifest
@@ -1,4 +1,4 @@
 DIST adom-111-elf.tar.gz 1001683 SHA256 3200e814c6c70f1a3ecb6e82651803db2f837c2b398ca597c7ddffea773438bb SHA512 7b1d8916f66273b4ab06edd2d77c30e2edce827d346451d83c677af32492c40e5c578a8450ab3cc9be7888a0052a0960306e97db408e8581700c71c1b480b128 WHIRLPOOL 65d3df96bbab1af8d4110fc130f197eb715eb8d52e67390ff49340c9d88ea6238335bc089cf99972c4f7598605d5acaa6d929257ebf7b6752e89df3268fc13d9
-EBUILD adom-1.1.1-r1.ebuild 806 SHA256 0cb52f633cfbb4462fcefe27309e00696f901b0ee86bb77b9df7e2ac559ea56c SHA512 e72432807c34327fcd09d17d3dbca05e06a9fa4f2d6d1ab11d8b8811da707a0fef96fe7e42d8160574eade4b3e9b4bcbe10b25f7953a3c7d3129e0377f8f4e94 WHIRLPOOL 1e52baaf03be2a82e7832d5cb18e1832d9526bef7b6f2680badd2c7c666e431c180d825d3ed17127856c88bcc0ec1355eafa9aab19abf1b50a39c073b5ac15ea
+EBUILD adom-1.1.1-r1.ebuild 864 SHA256 0522b9b7d55432e7369693a2def730656323513d1f5be596b731fbb00731b634 SHA512 29698b9293e72f10970b84c8ac25b0d657598385fbc3eddfe55919b0cebe14323f518bf8bf487fa6b44d39bb89c34322e93f750fe173d55a7e7bb8b319668707 WHIRLPOOL 077510c49944659a7a96b5b156891d8405a3c753a84a72e91afdbc0adfd62570f4ca0b053e23e02f5a444634d03386d64834739c0eae204ea7902768a5d48782
 MISC ChangeLog 1524 SHA256 97f0bfb5268a8da8440c14ee52a48cd35810fc3b5468e26086e800d8008ce18c SHA512 904f1e890620e2235e27f38c960d27daeb392dc34cda508ba2984b3191e2e75f947213d61f1523c190131351864ec4e54339f69cdf4fd7b5fc0e7f2d8aaef1f0 WHIRLPOOL 859e0d48b6f98368c638380fb26ecc0243a9f840a9fa2ecab72762082f3b32fbec02b1842273c4e73d081abb9ad101b31041fd0c102613c9b56b33bc049ea5f2
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-roguelike/adom/adom-1.1.1-r1.ebuild b/games-roguelike/adom/adom-1.1.1-r1.ebuild
index af8ecd1eb258..83d5f81227c5 100644
--- a/games-roguelike/adom/adom-1.1.1-r1.ebuild
+++ b/games-roguelike/adom/adom-1.1.1-r1.ebuild
@@ -16,7 +16,9 @@ IUSE=""
 RESTRICT="strip" #bug #137340
 QA_FLAGS_IGNORED="${GAMES_PREFIX_OPT:1}/bin/adom"
 
-RDEPEND=">=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]"
+RDEPEND="|| (
+	>=sys-libs/ncurses-5.9-r3:0/5[abi_x86_32(-)]
+	>=sys-libs/ncurses-5.9-r3:5/5[abi_x86_32(-)] )"
 
 S=${WORKDIR}/${PN}
 
diff --git a/games-rpg/freedink/Manifest b/games-rpg/freedink/Manifest
index 08c2fa2ddfd5..ae2d99fa18cd 100644
--- a/games-rpg/freedink/Manifest
+++ b/games-rpg/freedink/Manifest
@@ -1,4 +1,4 @@
 DIST freedink-108.4.tar.gz 1897701 SHA256 82cfb2e019e78b6849395dc4750662b67087d14f406d004f6d9e39e96a0c8521 SHA512 1496b6a7826bf694a2919add22a8b4b08a4967d8a7fdebf2d599bd99c7a7ce67de6c2b11124423c7aa1f0feb2e7c03ce1cf00252070182936e7481791dafee61 WHIRLPOOL 487f82adc1c36631220f23c6ac6aebaaafb3788bfdfbbf8a4e30d0c77d2a1ff97a9c43d5017fa5d50bfc7c3c36042521f3f7e194c4faa77f836ad45cff845d75
-EBUILD freedink-108.4.ebuild 1137 SHA256 a87aa875c94636182c9bab1426862318b223a9bb62ef6a54e21269a42e92f288 SHA512 02ba2b4cd410bf4b1f5ef8cffbd0d6acf48f826271894789a3948ac63787e9ba81d42fe67000a01d070ce8e7e4facb5dbfdc9af2095ce4b6cc9d608b4514ad75 WHIRLPOOL 0bc2e05d69bf22029443d8d870f8cad151b2b60d60dbe93bccb8ee1d2226a555e56cb31931f551c475d00d22a42e701fa61273f5c9d18056a5feff9445c6073e
+EBUILD freedink-108.4.ebuild 1235 SHA256 31a5eb62f377cf4445c7095708a95daa01b7d742d64f75cf54f4423c1c9b6116 SHA512 3efb3434b14756f4f5cc3183056dac98d20d788a5fca858092b97d924edb972398bf8cb3e518644e09734961fef280db8e8cd6b88d86dea19e4f4731d35b7daa WHIRLPOOL 63adf32b4b8f68d2fbcc84fb848daaf2b1a21546824f9e593a3f2efdc690ac4ac64320a9c5c5e2e4dada3ceddb242cb77e5e4ebb2e2d74574d10532a92bd2ddf
 MISC ChangeLog 1750 SHA256 e2c183e1f86c13c913fe3647d61896e97056013239502b00aa9d096a5a6c9e18 SHA512 44fad43dc08302cb8b9baba3e5e61c35c3949207e0cb4e39faf3f27e7bc47671ca35a9db1ad9e630c2c90aa5ac175f155d88022d0a497065b55eea9ea7b729f3 WHIRLPOOL d98c25b2d9c48fe64271f8efe27f347414edb152637d69836e99ad7c6d6d7645f0485ff7a719650b0916ccc00e2d7b8ae2a6aa808ac54a887a6ee9b6370410bc
 MISC metadata.xml 159 SHA256 a222ada7640e6dfb21d27151813829e91a72a6878d809dfddaa41581455f6b69 SHA512 6352e00c52c5aea882fb49482fa13058b44892b9f0d348747a104a92bac4317beebdab189dada073ab9c87fbd9a4d276e725884741fc86bcb6f5b1857c031974 WHIRLPOOL abfa1ff25d21dc915422368c253795602590b470ca5cf3f099bf8675e2684baccac5e3d145391adac1fc5313f2e1d54bf9d8f21704e1b99fe22dec46f3f5acf5
diff --git a/games-rpg/freedink/freedink-108.4.ebuild b/games-rpg/freedink/freedink-108.4.ebuild
index 8d47573110d9..dafba425737d 100644
--- a/games-rpg/freedink/freedink-108.4.ebuild
+++ b/games-rpg/freedink/freedink-108.4.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-inherit games
+inherit flag-o-matic games
 
 DESCRIPTION="Dink Smallwood is an adventure/role-playing game, similar to Zelda (2D top view)"
 HOMEPAGE="http://www.freedink.org/"
@@ -32,6 +32,9 @@ src_prepare() {
 	sed -i \
 		-e 's#^datarootdir =.*$#datarootdir = /usr/share#' \
 		share/Makefile.in || die
+	# seems like the code is fragile (bug #559548)
+	filter-flags
+	replace-flags -O? -O0
 }
 
 src_configure() {
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index e8caee838003..bd5ac0c6428a 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,4 +1,4 @@
 DIST plasma-nm-5.4.0.tar.xz 547376 SHA256 127b4eb083f1ca65fdc35a1f3d5db0549a49c85cdc1a0b81375863956cdb8194 SHA512 a2659ee727b1ca29cda98c04e2c725c4434f6059c53d086f8bc3310fc6770c4207df8896ed7830e1e43dcb9099b719985e7c4a7af658698e6df90b9d4d78f012 WHIRLPOOL 045f1b40bb0948e36da88fc4cd1ce945a966058ae44ca13350a16295a76ea47018275ec98f04dec2717c3936582b8f54fc2c35a4a07679244f2055032f35f751
-EBUILD plasma-nm-5.4.0.ebuild 1621 SHA256 19940501fc1eb51663ef68d8485c12284a039788f453852a7129dfd0af6312fe SHA512 37dd14736471c01392e637f7d8598d32e4f4e64b6780965359fa614d0034744deb0d67f6cd16dae977a008e81839fe02d1d6b79caae068bcb51c3f0643b1e6b1 WHIRLPOOL 093bab31e1035dfb9724764b22bf7c6f5668fb7cfc69ee325e7a293186d5b884c7c79dec85eec11e38d72a112e9cc2bbcc9a1e519439cc2882733bb671cc4177
+EBUILD plasma-nm-5.4.0.ebuild 1621 SHA256 dc25c24198d3eac05b7f70afa3ad10e68ba2cd95bb83c61936c61e9bb117499d SHA512 8e0a7480d34e4e3d0e46d694f2db1b9e946279bb36d428829fb6fd71a08fa3803bb22a8d89d289b340e6d47bbea588a761a216600880e87851f81efe3abbd997 WHIRLPOOL 7be49cce5869ab293945c21605768229ffea16a1b659457b824bf8bb78b49ecc7dc53d25765e6742103c85e868e6c2a2e9875b9967a7f550ce498d291890f09a
 MISC ChangeLog 717 SHA256 10bad360e1886e62359446b046ef7f782e76732fd8addb4003895c95f47f5ef1 SHA512 2c9c6092eade0d1af004a0ae8a2130d94c07d69c695e874cd9127e0736734a62a74cadc5e00995023de790a06298754d6f67d1a420493dbaf58aad7a291437e9 WHIRLPOOL ee89760c08b2594221148654d4a0d93970a77a83854940fafe35541e475dc04278e9da230de5c8d641a16363a2a02d13c7ea681bf1e8a5c56f6d11d960c636d4
 MISC metadata.xml 387 SHA256 f66dd92534723d15d0be8a0bba4459b0ed7adef6d83e87195d11f74ebb98cbb7 SHA512 a57fe36df7a2d64d1a0c65b51ad2400c02cd908dcbdfa2b59460c3bf6af8efd30ea48107605ee4b5bfd7d58d69d114734c4bc173d0d567cd6806761941a36f03 WHIRLPOOL 02426a15554a706e6581a43e7fb030557f786ced7d3b98d7ed85b42863e987d523b24afb521e3b387e8fffb2b3d7b2199e7e974dd74527eaaf7f1446553315e9
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.4.0.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.4.0.ebuild
index 258e56826934..8c6fb4cec288 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.4.0.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.4.0.ebuild
@@ -50,7 +50,7 @@ DEPEND="
 	)
 "
 RDEPEND="${DEPEND}
-	!kde-base/plasma-nm
+	!kde-misc/plasma-nm
 "
 
 src_configure() {
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 3915a6c792d3..a5b315089543 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 03 Sep 2015 17:11:21 +0000
+Fri, 04 Sep 2015 05:41:12 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index e783419d0824..a5b315089543 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 03 Sep 2015 17:11:22 +0000
+Fri, 04 Sep 2015 05:41:12 +0000
diff --git a/metadata/md5-cache/app-admin/webmin-1.730 b/metadata/md5-cache/app-admin/webmin-1.730
deleted file mode 100644
index e5ac9f62f0e4..000000000000
--- a/metadata/md5-cache/app-admin/webmin-1.730
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=config install postinst postrm preinst prepare prerm
-DEPEND=virtual/perl-MIME-Base64 virtual/perl-Socket virtual/perl-Sys-Syslog virtual/perl-Time-HiRes virtual/perl-Time-Local dev-perl/Authen-Libwrap dev-perl/IO-Tty dev-perl/MD5 dev-perl/Net-SSLeay dev-perl/Authen-PAM dev-perl/Sys-Hostname-Long >=net-dns/dnssec-tools-1.13 !minimal? ( mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) ldap? ( dev-perl/perl-ldap ) dev-perl/XML-Generator dev-perl/XML-Parser ) ssl? ( dev-libs/openssl ) virtual/pkgconfig
-DESCRIPTION=A web-based Unix systems administration interface
-EAPI=5
-HOMEPAGE=http://www.webmin.com/
-IUSE=minimal +ssl mysql postgres ldap ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD GPL-2
-RDEPEND=virtual/perl-MIME-Base64 virtual/perl-Socket virtual/perl-Sys-Syslog virtual/perl-Time-HiRes virtual/perl-Time-Local dev-perl/Authen-Libwrap dev-perl/IO-Tty dev-perl/MD5 dev-perl/Net-SSLeay dev-perl/Authen-PAM dev-perl/Sys-Hostname-Long >=net-dns/dnssec-tools-1.13 !minimal? ( mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) ldap? ( dev-perl/perl-ldap ) dev-perl/XML-Generator dev-perl/XML-Parser )
-SLOT=0
-SRC_URI=minimal? ( mirror://sourceforge/webadmin/webmin-1.730-minimal.tar.gz ) !minimal? ( mirror://sourceforge/webadmin/webmin-1.730.tar.gz )
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	pam	05f80e6013406d68612a7493314e3777	ssl-cert	e90a74de57c48ea6c058b1cb3a735907	systemd	6b4f0cefa642270eded7e6ca816fd181	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=54e4cf946d36ade9e7318067efc33084
diff --git a/metadata/md5-cache/app-backup/spideroak-bin-6.0.1 b/metadata/md5-cache/app-backup/spideroak-bin-6.0.1
new file mode 100644
index 000000000000..83e6c0336f18
--- /dev/null
+++ b/metadata/md5-cache/app-backup/spideroak-bin-6.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prepare unpack
+DEPEND=dev-util/patchelf
+DESCRIPTION=An easy, secure and consolidated free online backup, storage, access and sharing system
+EAPI=5
+HOMEPAGE=https://spideroak.com
+IUSE=dbus X
+KEYWORDS=~amd64 ~x86
+LICENSE=spideroak
+RDEPEND=app-crypt/mit-krb5[keyutils] dbus? ( sys-apps/dbus ) X? ( media-libs/fontconfig media-libs/freetype:2 dev-libs/glib:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXrender x11-libs/libXt )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=x86? ( https://spideroak.com/getbuild?platform=ubuntu&arch=i386&version=6.0.1 -> spideroak-bin-6.0.1_x86.deb ) amd64? ( https://spideroak.com/getbuild?platform=ubuntu&arch=x86_64&version=6.0.1 -> spideroak-bin-6.0.1_amd64.deb )
+_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	unpacker	1ca344bd9b922a7f8084a3fa02933b79
+_md5_=201078c52cc3d2f4cf20129e2db83268
diff --git a/metadata/md5-cache/app-misc/screen-9999 b/metadata/md5-cache/app-misc/screen-9999
index 05ea5aad8789..4e26b3e04874 100644
--- a/metadata/md5-cache/app-misc/screen-9999
+++ b/metadata/md5-cache/app-misc/screen-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2:0= pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen )
 SLOT=0
 _eclasses_=autotools	7feb275d850f45095537e76c5aa80494	eutils	351a78113be5b393c09a2c948701ad36	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	git-2	1bb87192831f668cd20d93ffb1689c94	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	pam	05f80e6013406d68612a7493314e3777	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=28e5275fd8c318aabc85f635d5db07a2
+_md5_=aba9416c403f0d3083351979b7defd6c
diff --git a/metadata/md5-cache/dev-dotnet/log4net-1.2.11 b/metadata/md5-cache/dev-dotnet/log4net-1.2.11
index 4a0cdfd6eeda..987194e919a1 100644
--- a/metadata/md5-cache/dev-dotnet/log4net-1.2.11
+++ b/metadata/md5-cache/dev-dotnet/log4net-1.2.11
@@ -9,4 +9,4 @@ RDEPEND=>=dev-lang/mono-2.0
 SLOT=0
 SRC_URI=mirror://apache/logging/log4net/source/log4net-1.2.11-src.zip https://dev.gentoo.org/~pacho/dotnet/log4net.snk
 _eclasses_=eutils	351a78113be5b393c09a2c948701ad36	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=074aa16da415d3baba782fbed5e7a6d8
+_md5_=d952584f78a408e95935c662fde99a85
diff --git a/metadata/md5-cache/dev-games/ogre-1.9.0-r1 b/metadata/md5-cache/dev-games/ogre-1.9.0-r1
index 1dba5d7158c2..bfc95e64905a 100644
--- a/metadata/md5-cache/dev-games/ogre-1.9.0-r1
+++ b/metadata/md5-cache/dev-games/ogre-1.9.0-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0/1.9.0
 SRC_URI=https://bitbucket.org/sinbad/ogre/get/v1-9-0.tar.bz2 -> ogre-1.9.0.tar.bz2
 _eclasses_=cmake-utils	f474224ef49d530640a43a04ae94928e	eutils	351a78113be5b393c09a2c948701ad36	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	vcs-snapshot	2ecbc36efd3f6b8486f63fcf8530c1bd
-_md5_=592f35be5f203289d95c4ede3bee0d20
+_md5_=1d2c2a62d732e28e04893bcb123b89e7
diff --git a/metadata/md5-cache/dev-lang/python-2.7.10 b/metadata/md5-cache/dev-lang/python-2.7.10
index 0e211fdbcc6e..534a8c13baff 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.10
+++ b/metadata/md5-cache/dev-lang/python-2.7.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.2 sys-libs/db:5.1 sys-libs/db:5.0 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1 ) ) !!<sys-apps/portage-2.1.9 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69
+DEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl xml? ( >=dev-libs/expat-2.1 ) !build? ( berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.2 sys-libs/db:5.1 sys-libs/db:5.0 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) ) !!<sys-apps/portage-2.1.9 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=4
 HOMEPAGE=http://www.python.org/
@@ -7,8 +7,8 @@ IUSE=-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readli
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=PSF-2
 PDEPEND=app-eselect/eselect-python app-admin/python-updater
-RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.2 sys-libs/db:5.1 sys-libs/db:5.0 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1 ) ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.7 )
+RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl xml? ( >=dev-libs/expat-2.1 ) !build? ( berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.2 sys-libs/db:5.1 sys-libs/db:5.0 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.7 )
 SLOT=2.7
 SRC_URI=http://www.python.org/ftp/python/2.7.10/Python-2.7.10.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-2.7.10-0.tar.xz
 _eclasses_=autotools	7feb275d850f45095537e76c5aa80494	eutils	351a78113be5b393c09a2c948701ad36	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	pax-utils	4f1280c0d4dcd8340f731827007c0a53	python-utils-r1	39c6b012a0512678e698e712b5b7ecc2	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=d59bea2302e161f47176e53d5e2961bd
+_md5_=f429777506d1b830d6a9e1dd30801f45
diff --git a/metadata/md5-cache/dev-lang/python-2.7.9-r1 b/metadata/md5-cache/dev-lang/python-2.7.9-r1
index 6ab684004474..5213cad9cf0b 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.9-r1
+++ b/metadata/md5-cache/dev-lang/python-2.7.9-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.2 sys-libs/db:5.1 sys-libs/db:5.0 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1 ) ) !!<sys-apps/portage-2.1.9 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi] !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69
+DEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl xml? ( >=dev-libs/expat-2.1 ) !build? ( berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.2 sys-libs/db:5.1 sys-libs/db:5.0 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) ) !!<sys-apps/portage-2.1.9 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi] !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=4
 HOMEPAGE=http://www.python.org/
@@ -7,8 +7,8 @@ IUSE=-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readli
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=PSF-2
 PDEPEND=app-eselect/eselect-python app-admin/python-updater
-RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.2 sys-libs/db:5.1 sys-libs/db:5.0 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1 ) ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.7 )
+RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl xml? ( >=dev-libs/expat-2.1 ) !build? ( berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.2 sys-libs/db:5.1 sys-libs/db:5.0 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.7 )
 SLOT=2.7
 SRC_URI=http://www.python.org/ftp/python/2.7.9/Python-2.7.9.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-2.7.9-0.tar.xz
 _eclasses_=autotools	7feb275d850f45095537e76c5aa80494	eutils	351a78113be5b393c09a2c948701ad36	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	pax-utils	4f1280c0d4dcd8340f731827007c0a53	python-utils-r1	39c6b012a0512678e698e712b5b7ecc2	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=8c31015747fd6d26311d51a47b8fd308
+_md5_=e2cb057acb4ea793d43f8913366ca058
diff --git a/metadata/md5-cache/dev-lang/python-3.4.1 b/metadata/md5-cache/dev-lang/python-3.4.1
index 432d2d5e0c1b..6c7d6f6a2959 100644
--- a/metadata/md5-cache/dev-lang/python-3.4.1
+++ b/metadata/md5-cache/dev-lang/python-3.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2 app-arch/xz-utils >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1 ) ) !!<sys-apps/sandbox-2.6-r1 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi] !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69
+DEPEND=app-arch/bzip2 app-arch/xz-utils >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl xml? ( >=dev-libs/expat-2.1 ) !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) ) !!<sys-apps/sandbox-2.6-r1 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi] !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=4
 HOMEPAGE=http://www.python.org/
@@ -7,8 +7,8 @@ IUSE=build elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +s
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=PSF-2
 PDEPEND=app-eselect/eselect-python app-admin/python-updater
-RDEPEND=app-arch/bzip2 app-arch/xz-utils >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1 ) ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
+RDEPEND=app-arch/bzip2 app-arch/xz-utils >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl xml? ( >=dev-libs/expat-2.1 ) !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
 SLOT=3.4
 SRC_URI=http://www.python.org/ftp/python/3.4.1/Python-3.4.1.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.4.1-0.tar.xz
 _eclasses_=autotools	7feb275d850f45095537e76c5aa80494	eutils	351a78113be5b393c09a2c948701ad36	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	pax-utils	4f1280c0d4dcd8340f731827007c0a53	python-utils-r1	39c6b012a0512678e698e712b5b7ecc2	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=0aa085bd5623b32cebfe55b9c23ef3c2
+_md5_=5d9633e346259a1a6364d2d9ec2a89c9
diff --git a/metadata/md5-cache/dev-lang/python-3.4.3 b/metadata/md5-cache/dev-lang/python-3.4.3
index 9a589fa0254e..b2209a369bbd 100644
--- a/metadata/md5-cache/dev-lang/python-3.4.3
+++ b/metadata/md5-cache/dev-lang/python-3.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2 app-arch/xz-utils >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1 ) ) !!<sys-apps/sandbox-2.6-r1 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69
+DEPEND=app-arch/bzip2 app-arch/xz-utils >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl xml? ( >=dev-libs/expat-2.1 ) !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) ) !!<sys-apps/sandbox-2.6-r1 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=4
 HOMEPAGE=http://www.python.org/
@@ -7,8 +7,8 @@ IUSE=build elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +s
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=PSF-2
 PDEPEND=app-eselect/eselect-python app-admin/python-updater
-RDEPEND=app-arch/bzip2 app-arch/xz-utils >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1 ) ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
+RDEPEND=app-arch/bzip2 app-arch/xz-utils >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl xml? ( >=dev-libs/expat-2.1 ) !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
 SLOT=3.4
 SRC_URI=http://www.python.org/ftp/python/3.4.3/Python-3.4.3.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.4.3-0.tar.xz
 _eclasses_=autotools	7feb275d850f45095537e76c5aa80494	eutils	351a78113be5b393c09a2c948701ad36	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	pax-utils	4f1280c0d4dcd8340f731827007c0a53	python-utils-r1	39c6b012a0512678e698e712b5b7ecc2	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=1e51aeb52748e7aa1569f0028a2f5fdb
+_md5_=146560cd6bc668862228838afc964005
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2d b/metadata/md5-cache/dev-libs/openssl-1.0.2d
index 20deb06d1b51..82091ec4618b 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.0.2d
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.2d
@@ -4,7 +4,7 @@ DESCRIPTION=full-strength general purpose cryptography library (including SSL an
 EAPI=4
 HOMEPAGE=http://www.openssl.org/
 IUSE=+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla 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
-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=openssl
 PDEPEND=app-misc/ca-certificates
 RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !<net-misc/openssh-5.9_p1-r4 !<net-libs/neon-0.29.6-r1
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=mirror://openssl/source/openssl-1.0.2d.tar.gz http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl-c_rehash.sh?rev=1.7 -> openssl-c_rehash.sh.1.7
 _eclasses_=eutils	351a78113be5b393c09a2c948701ad36	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multilib-build	c47eec09e82c8a750127ff2abf0745b1	multilib-minimal	a93a9b4153a5f1c746bdd3b20ef9d834	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=78d2b3e53ca4472b90733f1ead35d5cd
+_md5_=a8415fad9b62f8f06441776f25ce6533
diff --git a/metadata/md5-cache/dev-python/cachetools-1.1.0 b/metadata/md5-cache/dev-python/cachetools-1.1.0
new file mode 100644
index 000000000000..bf28435e342c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cachetools-1.1.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 ) 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(-)]
+DESCRIPTION=Extensible memoizing collections and decorators
+EAPI=5
+HOMEPAGE=https://pypi.python.org/pypi/cachetools
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=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 )
+SLOT=0
+SRC_URI=mirror://pypi/c/cachetools/cachetools-1.1.0.tar.gz
+_eclasses_=distutils-r1	1375d7df3597739c70e997d7508c6f79	eutils	351a78113be5b393c09a2c948701ad36	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	32b376cbb100a3a8083b3a0de023e117	python-utils-r1	39c6b012a0512678e698e712b5b7ecc2	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
+_md5_=05ba5b692e33101fcec1c06f01e6bd22
diff --git a/metadata/md5-cache/dev-python/futurist-0.4.0 b/metadata/md5-cache/dev-python/futurist-0.4.0
new file mode 100644
index 000000000000..f33972893379
--- /dev/null
+++ b/metadata/md5-cache/dev-python/futurist-0.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools >=dev-python/pbr-1.4[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-python/pbr-2.0[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(-)] 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(-)]
+DESCRIPTION=Useful additions to futures, from the future.
+EAPI=5
+HOMEPAGE=https://pypi.python.org/pypi/futurist
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-1.4[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-python/pbr-2.0[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-python/six-1.9.0[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-python/monotonic-0.3[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(-)] virtual/python-futures[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-python/contextlib2-0.4.0[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(-)] 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 )
+SLOT=0
+SRC_URI=mirror://pypi/f/futurist/futurist-0.4.0.tar.gz
+_eclasses_=distutils-r1	1375d7df3597739c70e997d7508c6f79	eutils	351a78113be5b393c09a2c948701ad36	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	32b376cbb100a3a8083b3a0de023e117	python-utils-r1	39c6b012a0512678e698e712b5b7ecc2	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
+_md5_=76dee16999fd194b60f3de5aefac3e21
diff --git a/metadata/md5-cache/dev-python/keystonemiddleware-2.2.0 b/metadata/md5-cache/dev-python/keystonemiddleware-2.2.0
new file mode 100644
index 000000000000..062e848956b7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/keystonemiddleware-2.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.2[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/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-messaging-1.16.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-messaging-1.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-messaging-1.17.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-mock-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testresources-0.2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-memcached-1.56[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/bandit-0.13.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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=A middleware for the OpenStack Keystone API
+EAPI=5
+HOMEPAGE=https://github.com/openstack/keystonemiddleware
+IUSE=doc examples test python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-2.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycadf-0.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.5.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] 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 )
+SLOT=0
+SRC_URI=mirror://pypi/k/keystonemiddleware/keystonemiddleware-2.2.0.tar.gz
+_eclasses_=distutils-r1	1375d7df3597739c70e997d7508c6f79	eutils	351a78113be5b393c09a2c948701ad36	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	32b376cbb100a3a8083b3a0de023e117	python-utils-r1	39c6b012a0512678e698e712b5b7ecc2	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
+_md5_=1b90ea188753a69b4c1308d3397600ac
diff --git a/metadata/md5-cache/dev-python/oslo-messaging-2.4.0 b/metadata/md5-cache/dev-python/oslo-messaging-2.4.0
new file mode 100644
index 000000000000..9d69996984f7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-messaging-2.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[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-python/pbr-1.4[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-python/pbr-2.0[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(-)] test? ( >=dev-python/fixtures-1.3.1[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-python/mock-1.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(-)] >=dev-python/mox3-0.7.0[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-python/subunit-0.0.18[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-python/testrepository-0.0.18[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-python/testscenarios-0.4[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-python/testtools-1.4.0[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-python/oslotest-1.10.0[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-python/qpid-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/redis-py-2.10.0[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-python/pyzmq-14.3.1[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-python/coverage-3.6[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-python/sphinx-1.1.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(-)] !~dev-python/sphinx-1.2.0[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-python/sphinx-1.3.0[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-python/oslo-sphinx-2.5.0[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(-)] ) 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(-)]
+DESCRIPTION=Messaging API for RPC and notifications over a number of different messaging transports
+EAPI=5
+HOMEPAGE=https://pypi.python.org/pypi/oslo.messaging
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-1.4[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-python/pbr-2.0[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-python/futurist-0.1.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(-)] >=dev-python/oslo-config-2.1.0[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-python/oslo-context-0.2.0[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-python/oslo-log-1.8.0[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-python/oslo-utils-2.0.0[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-python/oslo-serialization-1.4.0[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-python/oslo-service-0.6.0[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-python/oslo-i18n-1.5.0[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-python/stevedore-1.5.0[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-python/six-1.9.0[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-python/cachetools-1.0.0[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-python/eventlet-0.17.4[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-python/greenlet-0.3.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(-)] >=dev-python/pyyaml-3.1.0[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-python/py-amqp-1.4.0[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-python/kombu-3.0.7[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-python/oslo-middleware-2.4.0[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-python/oslo-middleware-2.6.0[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-python/aioeventlet-0.4[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-python/trollius-1.0.0[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(-)] 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 )
+SLOT=0
+SRC_URI=mirror://pypi/o/oslo.messaging/oslo.messaging-2.4.0.tar.gz
+_eclasses_=distutils-r1	1375d7df3597739c70e997d7508c6f79	eutils	351a78113be5b393c09a2c948701ad36	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	32b376cbb100a3a8083b3a0de023e117	python-utils-r1	39c6b012a0512678e698e712b5b7ecc2	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
+_md5_=7a2a55f6c9f95d365b0faeb4d9dcbf85
diff --git a/metadata/md5-cache/dev-python/oslo-middleware-2.8.0 b/metadata/md5-cache/dev-python/oslo-middleware-2.8.0
new file mode 100644
index 000000000000..e7e2a7bcca16
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-middleware-2.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[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-python/pbr-1.6[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-python/pbr-2.0[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(-)] test? ( >=dev-python/fixtures-1.3.1[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-python/mock-1.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(-)] >=dev-python/oslo-sphinx-2.5.0[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-python/oslotest-1.10.0[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-python/sphinx-1.1.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(-)] !~dev-python/sphinx-1.2.0[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-python/sphinx-1.3.0[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-python/testtools-1.4.0[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-python/coverage-3.6[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(-)] ) 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(-)]
+DESCRIPTION=Library includes components to be injected into wsgi pipelines to intercept request/response flows.
+EAPI=5
+HOMEPAGE=https://pypi.python.org/pypi/oslo.middleware
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-1.6[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-python/pbr-2.0[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-python/Babel-1.3[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-python/oslo-config-2.3.0[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-python/oslo-context-0.2.0[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-python/oslo-i18n-1.5.0[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-python/six-1.9.0[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-python/stevedore-1.5.0[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-python/webob-1.2.3[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(-)] 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 )
+SLOT=0
+SRC_URI=mirror://pypi/o/oslo.middleware/oslo.middleware-2.8.0.tar.gz
+_eclasses_=distutils-r1	1375d7df3597739c70e997d7508c6f79	eutils	351a78113be5b393c09a2c948701ad36	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	32b376cbb100a3a8083b3a0de023e117	python-utils-r1	39c6b012a0512678e698e712b5b7ecc2	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
+_md5_=e2c28e28f9766e14066fb06501a7e9a6
diff --git a/metadata/md5-cache/dev-python/oslo-service-0.9.0 b/metadata/md5-cache/dev-python/oslo-service-0.9.0
new file mode 100644
index 000000000000..de0292ac1ac0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-service-0.9.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[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-python/pbr-1.3[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-python/pbr-2.0[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(-)] test? ( >=dev-python/mock-1.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(-)] >=dev-python/oslotest-1.10.0[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-python/oslo-sphinx-2.5.0[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-python/sphinx-1.1.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(-)] !~dev-python/sphinx-1.2.0[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-python/sphinx-1.3.0[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(-)] ) 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(-)]
+DESCRIPTION=Library for running OpenStack services
+EAPI=5
+HOMEPAGE=https://pypi.python.org/pypi/oslo.service
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-1.3[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-python/pbr-2.0[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-python/Babel-1.3[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-python/webob-1.2.3[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-python/eventlet-0.17.4[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-python/greenlet-0.3.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(-)] >=dev-python/monotonic-0.3[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-python/oslo-utils-2.0.0[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-python/oslo-concurrency-2.3.0[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-python/oslo-config-2.3.0[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-python/oslo-log-1.8.0[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-python/six-1.9.0[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-python/oslo-i18n-1.5.0[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-python/pastedeploy-1.5.0[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-python/routes-1.12.3[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-python/paste[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(-)] 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 )
+SLOT=0
+SRC_URI=mirror://pypi/o/oslo.service/oslo.service-0.9.0.tar.gz
+_eclasses_=distutils-r1	1375d7df3597739c70e997d7508c6f79	eutils	351a78113be5b393c09a2c948701ad36	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	32b376cbb100a3a8083b3a0de023e117	python-utils-r1	39c6b012a0512678e698e712b5b7ecc2	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
+_md5_=6b709f593e5084013824c32152fc9bd6
diff --git a/metadata/md5-cache/dev-python/pypax-0.9.1 b/metadata/md5-cache/dev-python/pypax-0.9.1
new file mode 100644
index 000000000000..58cd39223760
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypax-0.9.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ptpax? ( dev-libs/elfutils ) xtpax? ( sys-apps/attr ) 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+DESCRIPTION=Python module to get or set either PT_PAX and/or XATTR_PAX flags
+EAPI=5
+HOMEPAGE=https://dev.gentoo.org/~blueness/elfix/ https://www.gentoo.org/proj/en/hardened/pax-quickstart.xml
+IUSE=+ptpax +xtpax python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=ptpax? ( dev-libs/elfutils ) xtpax? ( sys-apps/attr ) 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( ptpax xtpax ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~blueness/elfix/elfix-0.9.1.tar.gz
+_eclasses_=distutils-r1	1375d7df3597739c70e997d7508c6f79	eutils	351a78113be5b393c09a2c948701ad36	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	32b376cbb100a3a8083b3a0de023e117	python-utils-r1	39c6b012a0512678e698e712b5b7ecc2	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
+_md5_=ceb01f805adf391fc1740dc50c2d32e6
diff --git a/metadata/md5-cache/dev-python/pypax-9999 b/metadata/md5-cache/dev-python/pypax-9999
new file mode 100644
index 000000000000..0f19182757f5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypax-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ptpax? ( dev-libs/elfutils ) xtpax? ( sys-apps/attr ) 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-vcs/git
+DESCRIPTION=Python module to get or set either PT_PAX and/or XATTR_PAX flags
+EAPI=5
+HOMEPAGE=https://dev.gentoo.org/~blueness/elfix/ https://www.gentoo.org/proj/en/hardened/pax-quickstart.xml
+IUSE=+ptpax +xtpax python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
+LICENSE=GPL-3
+RDEPEND=ptpax? ( dev-libs/elfutils ) xtpax? ( sys-apps/attr ) 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( ptpax xtpax ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
+SLOT=0
+_eclasses_=distutils-r1	1375d7df3597739c70e997d7508c6f79	eutils	351a78113be5b393c09a2c948701ad36	git-2	1bb87192831f668cd20d93ffb1689c94	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	32b376cbb100a3a8083b3a0de023e117	python-utils-r1	39c6b012a0512678e698e712b5b7ecc2	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
+_md5_=ceb01f805adf391fc1740dc50c2d32e6
diff --git a/metadata/md5-cache/dev-python/python-memcached-1.57 b/metadata/md5-cache/dev-python/python-memcached-1.57
new file mode 100644
index 000000000000..d6dfd3ae276e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-memcached-1.57
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] test? ( net-misc/memcached dev-python/nose[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
+DESCRIPTION=Pure python memcached client
+EAPI=5
+HOMEPAGE=http://www.tummy.com/Community/software/python-memcached/ https://pypi.python.org/pypi/python-memcached
+IUSE=test python_targets_python2_7 python_targets_pypy
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=OSL-2.0
+RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/p/python-memcached/python-memcached-1.57.tar.gz
+_eclasses_=distutils-r1	1375d7df3597739c70e997d7508c6f79	eutils	351a78113be5b393c09a2c948701ad36	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	32b376cbb100a3a8083b3a0de023e117	python-utils-r1	39c6b012a0512678e698e712b5b7ecc2	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
+_md5_=ebf56bbea865f1fda80e82837a5f3998
diff --git a/metadata/md5-cache/dev-ruby/amq-protocol-2.0.0 b/metadata/md5-cache/dev-ruby/amq-protocol-2.0.0
new file mode 100644
index 000000000000..94551f99012a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/amq-protocol-2.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec-its[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/rspec:3[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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=An AMQP 0.9.1 serialization library for Ruby
+EAPI=5
+HOMEPAGE=https://github.com/ruby-amqp/amq-protocol
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+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 )
+SLOT=2
+SRC_URI=mirror://rubygems/amq-protocol-2.0.0.gem
+_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	java-utils-2	7c8af272d218f7b7df22fd16bb0bfb63	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	ruby-fakegem	b34b8f1debda62e461897a3f85df97e4	ruby-ng	497a8201c1d4a4129a8ac57a2bf2abb5	ruby-utils	97c910cb6b087c64260df641a9b3de0c	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=3c1ee56ba8ca72ca9c79050973f1a1c6
diff --git a/metadata/md5-cache/dev-ruby/mixlib-shellout-2.0.1 b/metadata/md5-cache/dev-ruby/mixlib-shellout-2.0.1
deleted file mode 100644
index fb52628e356f..000000000000
--- a/metadata/md5-cache/dev-ruby/mixlib-shellout-2.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[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=Run external commands on Unix or Windows
-EAPI=5
-HOMEPAGE=https://github.com/opscode/mixlib-shellout
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-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 )
-SLOT=0
-SRC_URI=https://github.com/opscode/mixlib-shellout/archive/2.0.1.tar.gz -> mixlib-shellout-2.0.1.tar.gz
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	java-utils-2	7c8af272d218f7b7df22fd16bb0bfb63	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	ruby-fakegem	b34b8f1debda62e461897a3f85df97e4	ruby-ng	497a8201c1d4a4129a8ac57a2bf2abb5	ruby-utils	97c910cb6b087c64260df641a9b3de0c	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0b476de57cf5dcd9e594c187cd9efc59
diff --git a/metadata/md5-cache/dev-ruby/mixlib-shellout-1.6.1 b/metadata/md5-cache/dev-ruby/mixlib-shellout-2.2.0
similarity index 55%
rename from metadata/md5-cache/dev-ruby/mixlib-shellout-1.6.1
rename to metadata/md5-cache/dev-ruby/mixlib-shellout-2.2.0
index 489b734bb4db..5d86430335df 100644
--- a/metadata/md5-cache/dev-ruby/mixlib-shellout-1.6.1
+++ b/metadata/md5-cache/dev-ruby/mixlib-shellout-2.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[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=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/rspec:3[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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=Run external commands on Unix or Windows
 EAPI=5
 HOMEPAGE=https://github.com/opscode/mixlib-shellout
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 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 )
 SLOT=0
-SRC_URI=https://github.com/opscode/mixlib-shellout/archive/1.6.1.tar.gz -> mixlib-shellout-1.6.1.tar.gz
+SRC_URI=https://github.com/opscode/mixlib-shellout/archive/2.2.0.tar.gz -> mixlib-shellout-2.2.0.tar.gz
 _eclasses_=eutils	351a78113be5b393c09a2c948701ad36	java-utils-2	7c8af272d218f7b7df22fd16bb0bfb63	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	ruby-fakegem	b34b8f1debda62e461897a3f85df97e4	ruby-ng	497a8201c1d4a4129a8ac57a2bf2abb5	ruby-utils	97c910cb6b087c64260df641a9b3de0c	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0b476de57cf5dcd9e594c187cd9efc59
+_md5_=f2423a419185d63cdc3940cd197663b9
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-5.0.1 b/metadata/md5-cache/dev-ruby/sass-rails-5.0.1
deleted file mode 100644
index 9a1961fc39f9..000000000000
--- a/metadata/md5-cache/dev-ruby/sass-rails-5.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/sass-3.1[ruby_targets_ruby19] =dev-ruby/sass-3*[ruby_targets_ruby19] =dev-ruby/railties-4*[ruby_targets_ruby19] >=dev-ruby/sprockets-rails-2.0[ruby_targets_ruby19] <dev-ruby/sprockets-rails-4[ruby_targets_ruby19] >=dev-ruby/sprockets-2.8[ruby_targets_ruby19] <dev-ruby/sprockets-4[ruby_targets_ruby19] >=dev-ruby/tilt-1.1[ruby_targets_ruby19] =dev-ruby/tilt-1*[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/sass-3.1[ruby_targets_ruby20] =dev-ruby/sass-3*[ruby_targets_ruby20] =dev-ruby/railties-4*[ruby_targets_ruby20] >=dev-ruby/sprockets-rails-2.0[ruby_targets_ruby20] <dev-ruby/sprockets-rails-4[ruby_targets_ruby20] >=dev-ruby/sprockets-2.8[ruby_targets_ruby20] <dev-ruby/sprockets-4[ruby_targets_ruby20] >=dev-ruby/tilt-1.1[ruby_targets_ruby20] =dev-ruby/tilt-1*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/sass-3.1[ruby_targets_ruby21] =dev-ruby/sass-3*[ruby_targets_ruby21] =dev-ruby/railties-4*[ruby_targets_ruby21] >=dev-ruby/sprockets-rails-2.0[ruby_targets_ruby21] <dev-ruby/sprockets-rails-4[ruby_targets_ruby21] >=dev-ruby/sprockets-2.8[ruby_targets_ruby21] <dev-ruby/sprockets-4[ruby_targets_ruby21] >=dev-ruby/tilt-1.1[ruby_targets_ruby21] =dev-ruby/tilt-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? ( 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=Official Ruby-on-Rails Integration with Sass
-EAPI=5
-HOMEPAGE=https://github.com/rails/sass-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/sass-3.1[ruby_targets_ruby19] =dev-ruby/sass-3*[ruby_targets_ruby19] =dev-ruby/railties-4*[ruby_targets_ruby19] >=dev-ruby/sprockets-rails-2.0[ruby_targets_ruby19] <dev-ruby/sprockets-rails-4[ruby_targets_ruby19] >=dev-ruby/sprockets-2.8[ruby_targets_ruby19] <dev-ruby/sprockets-4[ruby_targets_ruby19] >=dev-ruby/tilt-1.1[ruby_targets_ruby19] =dev-ruby/tilt-1*[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/sass-3.1[ruby_targets_ruby20] =dev-ruby/sass-3*[ruby_targets_ruby20] =dev-ruby/railties-4*[ruby_targets_ruby20] >=dev-ruby/sprockets-rails-2.0[ruby_targets_ruby20] <dev-ruby/sprockets-rails-4[ruby_targets_ruby20] >=dev-ruby/sprockets-2.8[ruby_targets_ruby20] <dev-ruby/sprockets-4[ruby_targets_ruby20] >=dev-ruby/tilt-1.1[ruby_targets_ruby20] =dev-ruby/tilt-1*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/sass-3.1[ruby_targets_ruby21] =dev-ruby/sass-3*[ruby_targets_ruby21] =dev-ruby/railties-4*[ruby_targets_ruby21] >=dev-ruby/sprockets-rails-2.0[ruby_targets_ruby21] <dev-ruby/sprockets-rails-4[ruby_targets_ruby21] >=dev-ruby/sprockets-2.8[ruby_targets_ruby21] <dev-ruby/sprockets-4[ruby_targets_ruby21] >=dev-ruby/tilt-1.1[ruby_targets_ruby21] =dev-ruby/tilt-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 )
-RESTRICT=test
-SLOT=5.0
-SRC_URI=mirror://rubygems/sass-rails-5.0.1.gem
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	java-utils-2	7c8af272d218f7b7df22fd16bb0bfb63	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	ruby-fakegem	b34b8f1debda62e461897a3f85df97e4	ruby-ng	497a8201c1d4a4129a8ac57a2bf2abb5	ruby-utils	97c910cb6b087c64260df641a9b3de0c	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=40ea61b30aaff80b85ef05d97d57e6e0
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-5.0.2 b/metadata/md5-cache/dev-ruby/sass-rails-5.0.2
deleted file mode 100644
index f78a72ff98f6..000000000000
--- a/metadata/md5-cache/dev-ruby/sass-rails-5.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/sass-3.1[ruby_targets_ruby19] =dev-ruby/sass-3*[ruby_targets_ruby19] =dev-ruby/railties-4*[ruby_targets_ruby19] >=dev-ruby/sprockets-rails-2.0[ruby_targets_ruby19] <dev-ruby/sprockets-rails-4[ruby_targets_ruby19] >=dev-ruby/sprockets-2.8[ruby_targets_ruby19] <dev-ruby/sprockets-4[ruby_targets_ruby19] >=dev-ruby/tilt-1.1[ruby_targets_ruby19] =dev-ruby/tilt-1*[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/sass-3.1[ruby_targets_ruby20] =dev-ruby/sass-3*[ruby_targets_ruby20] =dev-ruby/railties-4*[ruby_targets_ruby20] >=dev-ruby/sprockets-rails-2.0[ruby_targets_ruby20] <dev-ruby/sprockets-rails-4[ruby_targets_ruby20] >=dev-ruby/sprockets-2.8[ruby_targets_ruby20] <dev-ruby/sprockets-4[ruby_targets_ruby20] >=dev-ruby/tilt-1.1[ruby_targets_ruby20] =dev-ruby/tilt-1*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/sass-3.1[ruby_targets_ruby21] =dev-ruby/sass-3*[ruby_targets_ruby21] =dev-ruby/railties-4*[ruby_targets_ruby21] >=dev-ruby/sprockets-rails-2.0[ruby_targets_ruby21] <dev-ruby/sprockets-rails-4[ruby_targets_ruby21] >=dev-ruby/sprockets-2.8[ruby_targets_ruby21] <dev-ruby/sprockets-4[ruby_targets_ruby21] >=dev-ruby/tilt-1.1[ruby_targets_ruby21] =dev-ruby/tilt-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? ( 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=Official Ruby-on-Rails Integration with Sass
-EAPI=5
-HOMEPAGE=https://github.com/rails/sass-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/sass-3.1[ruby_targets_ruby19] =dev-ruby/sass-3*[ruby_targets_ruby19] =dev-ruby/railties-4*[ruby_targets_ruby19] >=dev-ruby/sprockets-rails-2.0[ruby_targets_ruby19] <dev-ruby/sprockets-rails-4[ruby_targets_ruby19] >=dev-ruby/sprockets-2.8[ruby_targets_ruby19] <dev-ruby/sprockets-4[ruby_targets_ruby19] >=dev-ruby/tilt-1.1[ruby_targets_ruby19] =dev-ruby/tilt-1*[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/sass-3.1[ruby_targets_ruby20] =dev-ruby/sass-3*[ruby_targets_ruby20] =dev-ruby/railties-4*[ruby_targets_ruby20] >=dev-ruby/sprockets-rails-2.0[ruby_targets_ruby20] <dev-ruby/sprockets-rails-4[ruby_targets_ruby20] >=dev-ruby/sprockets-2.8[ruby_targets_ruby20] <dev-ruby/sprockets-4[ruby_targets_ruby20] >=dev-ruby/tilt-1.1[ruby_targets_ruby20] =dev-ruby/tilt-1*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/sass-3.1[ruby_targets_ruby21] =dev-ruby/sass-3*[ruby_targets_ruby21] =dev-ruby/railties-4*[ruby_targets_ruby21] >=dev-ruby/sprockets-rails-2.0[ruby_targets_ruby21] <dev-ruby/sprockets-rails-4[ruby_targets_ruby21] >=dev-ruby/sprockets-2.8[ruby_targets_ruby21] <dev-ruby/sprockets-4[ruby_targets_ruby21] >=dev-ruby/tilt-1.1[ruby_targets_ruby21] =dev-ruby/tilt-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 )
-RESTRICT=test
-SLOT=5.0
-SRC_URI=https://github.com/rails/sass-rails/archive/v5.0.2.tar.gz -> sass-rails-5.0.2.tar.gz
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	java-utils-2	7c8af272d218f7b7df22fd16bb0bfb63	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	ruby-fakegem	b34b8f1debda62e461897a3f85df97e4	ruby-ng	497a8201c1d4a4129a8ac57a2bf2abb5	ruby-utils	97c910cb6b087c64260df641a9b3de0c	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b7122e7b8c44bbe83fe8a4d9e41433a7
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-5.0.4 b/metadata/md5-cache/dev-ruby/sass-rails-5.0.4
new file mode 100644
index 000000000000..7a9f38096385
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/sass-rails-5.0.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby19] =dev-ruby/sass-3*:*[ruby_targets_ruby19] =dev-ruby/railties-4*:*[ruby_targets_ruby19] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby19] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby19] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby19] <dev-ruby/sprockets-4:*[ruby_targets_ruby19] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby19] <dev-ruby/tilt-3:*[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby20] =dev-ruby/sass-3*:*[ruby_targets_ruby20] =dev-ruby/railties-4*:*[ruby_targets_ruby20] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby20] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby20] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby20] <dev-ruby/sprockets-4:*[ruby_targets_ruby20] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby20] <dev-ruby/tilt-3:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby21] =dev-ruby/sass-3*:*[ruby_targets_ruby21] =dev-ruby/railties-4*:*[ruby_targets_ruby21] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby21] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby21] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby21] <dev-ruby/sprockets-4:*[ruby_targets_ruby21] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby21] <dev-ruby/tilt-3:*[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? ( 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=Official Ruby-on-Rails Integration with Sass
+EAPI=5
+HOMEPAGE=https://github.com/rails/sass-rails
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby19] =dev-ruby/sass-3*:*[ruby_targets_ruby19] =dev-ruby/railties-4*:*[ruby_targets_ruby19] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby19] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby19] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby19] <dev-ruby/sprockets-4:*[ruby_targets_ruby19] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby19] <dev-ruby/tilt-3:*[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby20] =dev-ruby/sass-3*:*[ruby_targets_ruby20] =dev-ruby/railties-4*:*[ruby_targets_ruby20] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby20] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby20] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby20] <dev-ruby/sprockets-4:*[ruby_targets_ruby20] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby20] <dev-ruby/tilt-3:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby21] =dev-ruby/sass-3*:*[ruby_targets_ruby21] =dev-ruby/railties-4*:*[ruby_targets_ruby21] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby21] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby21] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby21] <dev-ruby/sprockets-4:*[ruby_targets_ruby21] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby21] <dev-ruby/tilt-3:*[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 )
+RESTRICT=test
+SLOT=5.0
+SRC_URI=https://github.com/rails/sass-rails/archive/v5.0.4.tar.gz -> sass-rails-5.0.4.tar.gz
+_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	java-utils-2	7c8af272d218f7b7df22fd16bb0bfb63	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	ruby-fakegem	b34b8f1debda62e461897a3f85df97e4	ruby-ng	497a8201c1d4a4129a8ac57a2bf2abb5	ruby-utils	97c910cb6b087c64260df641a9b3de0c	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=74aee971ed30bd704e68b8fdfb9b8707
diff --git a/metadata/md5-cache/dev-util/catalyst-2.9999 b/metadata/md5-cache/dev-util/catalyst-2.9999
index 4997b16166ad..5582139ef078 100644
--- a/metadata/md5-cache/dev-util/catalyst-2.9999
+++ b/metadata/md5-cache/dev-util/catalyst-2.9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-text/asciidoc >=dev-python/snakeoil-0.5.2 <dev-python/snakeoil-0.6.5 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-vcs/git
+DEPEND=app-text/asciidoc >=dev-python/snakeoil-0.5.2 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-vcs/git
 DESCRIPTION=Release metatool used for creating releases based on Gentoo Linux
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/proj/en/releng/catalyst/
 IUSE=ccache doc kernel_linux python_targets_python2_7
 LICENSE=GPL-2
-RDEPEND=app-arch/lbzip2 app-crypt/shash virtual/cdrtools amd64? ( >=sys-boot/syslinux-3.72 ) ia64? ( sys-fs/dosfstools ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) 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(-)]
+RDEPEND==dev-python/pyDeComp-9999 app-arch/lbzip2 app-crypt/shash virtual/cdrtools amd64? ( >=sys-boot/syslinux-3.72 ) ia64? ( sys-fs/dosfstools ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) 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 )
 SLOT=0
 _eclasses_=distutils-r1	1375d7df3597739c70e997d7508c6f79	eutils	351a78113be5b393c09a2c948701ad36	git-2	1bb87192831f668cd20d93ffb1689c94	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	32b376cbb100a3a8083b3a0de023e117	python-utils-r1	39c6b012a0512678e698e712b5b7ecc2	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=57e0493c7b4b9809648fc5ed9004fa69
+_md5_=e36e3b62676ee8086e60943b3aead96b
diff --git a/metadata/md5-cache/games-roguelike/adom-1.1.1-r1 b/metadata/md5-cache/games-roguelike/adom-1.1.1-r1
index 4f3ec1c57db0..209565957ae6 100644
--- a/metadata/md5-cache/games-roguelike/adom-1.1.1-r1
+++ b/metadata/md5-cache/games-roguelike/adom-1.1.1-r1
@@ -4,9 +4,9 @@ EAPI=5
 HOMEPAGE=http://www.adom.de/
 KEYWORDS=amd64 x86
 LICENSE=adom
-RDEPEND=>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] games-misc/games-envd
+RDEPEND=|| ( >=sys-libs/ncurses-5.9-r3:0/5[abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3:5/5[abi_x86_32(-)] ) games-misc/games-envd
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://www.adom.de/adom/download/linux/adom-111-elf.tar.gz
 _eclasses_=base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	games	9c0a2dd4a6a25b6b7851fa01019cc809	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=9c1c0dc52a2757660953c9a1bea678f0
+_md5_=56243d8957c10d47ad2348a64fbb7142
diff --git a/metadata/md5-cache/games-rpg/freedink-108.4 b/metadata/md5-cache/games-rpg/freedink-108.4
index a3d15b33b5b6..38e7db604ddf 100644
--- a/metadata/md5-cache/games-rpg/freedink-108.4
+++ b/metadata/md5-cache/games-rpg/freedink-108.4
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=media-libs/fontconfig-2.4 >=media-libs/libsdl-1.2[X,sound,joystick,video] >=media-libs/sdl-gfx-2.0 >=media-libs/sdl-image-1.2 >=media-libs/sdl-mixer-1.2[midi,vorbis,wav] >=media-libs/sdl-ttf-2.0.9 ~games-rpg/freedink-data-1.08.20140901 games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://gnu/freedink/freedink-108.4.tar.gz
-_eclasses_=base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	games	9c0a2dd4a6a25b6b7851fa01019cc809	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=04af0426dea89ad0caa7c196bb511804
+_eclasses_=base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	games	9c0a2dd4a6a25b6b7851fa01019cc809	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	user	906f3c8eb3a2350a4f1191a89baa3e46
+_md5_=e8a66d9c31bd53934cf30ed5dec523f6
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.4.0 b/metadata/md5-cache/kde-plasma/plasma-nm-5.4.0
index 68fed161e87e..7cf0d488a60f 100644
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.4.0
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.4.0
@@ -6,8 +6,8 @@ HOMEPAGE=http://www.kde.org/
 IUSE=modemmanager openconnect teamd debug
 KEYWORDS=~amd64
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=kde-frameworks/kcompletion-5.13.0:5 >=kde-frameworks/kconfig-5.13.0:5 >=kde-frameworks/kconfigwidgets-5.13.0:5 >=kde-frameworks/kcoreaddons-5.13.0:5 >=kde-frameworks/kdbusaddons-5.13.0:5 >=kde-frameworks/kdeclarative-5.13.0:5 >=kde-frameworks/kdelibs4support-5.13.0:5 >=kde-frameworks/ki18n-5.13.0:5 >=kde-frameworks/kiconthemes-5.13.0:5 >=kde-frameworks/kio-5.13.0:5 >=kde-frameworks/kitemviews-5.13.0:5 >=kde-frameworks/knotifications-5.13.0:5 >=kde-frameworks/kservice-5.13.0:5 >=kde-frameworks/kwallet-5.13.0:5 >=kde-frameworks/kwidgetsaddons-5.13.0:5 >=kde-frameworks/kwindowsystem-5.13.0:5 >=kde-frameworks/kxmlgui-5.13.0:5 >=kde-frameworks/networkmanager-qt-5.13.0:5[teamd=] >=kde-frameworks/plasma-5.13.0:5 >=kde-frameworks/solid-5.13.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-misc/mobile-broadband-provider-info >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.13.0:5 dev-qt/qtxml:5 ) openconnect? ( dev-qt/qtxml:5 net-misc/networkmanager-openconnect net-misc/openconnect:= ) !kde-base/plasma-nm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-frameworks/kcompletion-5.13.0:5 >=kde-frameworks/kconfig-5.13.0:5 >=kde-frameworks/kconfigwidgets-5.13.0:5 >=kde-frameworks/kcoreaddons-5.13.0:5 >=kde-frameworks/kdbusaddons-5.13.0:5 >=kde-frameworks/kdeclarative-5.13.0:5 >=kde-frameworks/kdelibs4support-5.13.0:5 >=kde-frameworks/ki18n-5.13.0:5 >=kde-frameworks/kiconthemes-5.13.0:5 >=kde-frameworks/kio-5.13.0:5 >=kde-frameworks/kitemviews-5.13.0:5 >=kde-frameworks/knotifications-5.13.0:5 >=kde-frameworks/kservice-5.13.0:5 >=kde-frameworks/kwallet-5.13.0:5 >=kde-frameworks/kwidgetsaddons-5.13.0:5 >=kde-frameworks/kwindowsystem-5.13.0:5 >=kde-frameworks/kxmlgui-5.13.0:5 >=kde-frameworks/networkmanager-qt-5.13.0:5[teamd=] >=kde-frameworks/plasma-5.13.0:5 >=kde-frameworks/solid-5.13.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-misc/mobile-broadband-provider-info >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.13.0:5 dev-qt/qtxml:5 ) openconnect? ( dev-qt/qtxml:5 net-misc/networkmanager-openconnect net-misc/openconnect:= ) !kde-misc/plasma-nm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.0/plasma-nm-5.4.0.tar.xz
 _eclasses_=cmake-utils	f474224ef49d530640a43a04ae94928e	eutils	351a78113be5b393c09a2c948701ad36	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	44555579e85afa5c035d2bd5428252da	kde5	6c098ba6c0c7cd9aef820f4e394f2e79	kde5-functions	8d35a2afa9dbf82a1f95578e7b849572	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	7d550983f9b6adb3e7091f4090ddae2f
-_md5_=e61ff669d1d1c45bebd4c0b4b259cc4f
+_md5_=e1d81e6b3fd8724f948fad949621550a
diff --git a/metadata/md5-cache/net-analyzer/wireshark-1.99.8 b/metadata/md5-cache/net-analyzer/wireshark-1.99.9
similarity index 98%
rename from metadata/md5-cache/net-analyzer/wireshark-1.99.8
rename to metadata/md5-cache/net-analyzer/wireshark-1.99.9
index 9fc21da55875..a7cb3e508366 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-1.99.8
+++ b/metadata/md5-cache/net-analyzer/wireshark-1.99.9
@@ -7,7 +7,7 @@ IUSE=adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap p
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk3? ( x11-libs/gdk-pixbuf x11-libs/pango x11-misc/xdg-utils x11-libs/gtk+:3 ) kerberos? ( virtual/krb5 ) lua? ( >=dev-lang/lua-5.1:* ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] x11-misc/xdg-utils ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) gtk3? ( virtual/freedesktop-icon-theme ) qt4? ( virtual/freedesktop-icon-theme ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
 REQUIRED_USE=ssl? ( crypt ) ?? ( qt4 qt5 )
-SLOT=0/1.99.8
-SRC_URI=http://www.wireshark.org/download/src/all-versions/wireshark-1.99.8.tar.bz2
+SLOT=0/1.99.9
+SRC_URI=http://www.wireshark.org/download/src/all-versions/wireshark-1.99.9.tar.bz2
 _eclasses_=autotools	7feb275d850f45095537e76c5aa80494	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	fcaps	3a17f16a21cfbb14acca5c05e5c130eb	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	qmake-utils	05b63bb5c708c5903a9de5c58c8e43c8	qt4-r2	cb2cb5856695b300266b425da70e82d8	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	user	906f3c8eb3a2350a4f1191a89baa3e46
 _md5_=cb6ee4df7397d1e34ce4865e055cded1
diff --git a/metadata/md5-cache/net-irc/limnoria-20150429 b/metadata/md5-cache/net-irc/limnoria-20150829
similarity index 99%
rename from metadata/md5-cache/net-irc/limnoria-20150429
rename to metadata/md5-cache/net-irc/limnoria-20150829
index f2082f3ecbfb..26ea7173a2d5 100644
--- a/metadata/md5-cache/net-irc/limnoria-20150429
+++ b/metadata/md5-cache/net-irc/limnoria-20150829
@@ -9,6 +9,6 @@ LICENSE=BSD
 RDEPEND=dev-python/chardet[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-python/ecdsa[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-python/feedparser[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-python/python-dateutil[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-python/pytz[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-python/socksipy[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-python/sqlalchemy[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(-)] crypt? ( dev-python/python-gnupg[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(-)] ) ssl? ( dev-python/pyopenssl[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(-)] ) !net-irc/supybot !net-irc/supybot-plugins 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 )
 SLOT=0
-SRC_URI=https://github.com/ProgVal/Limnoria/archive/master-2015-04-29.tar.gz -> limnoria-20150429.tar.gz
+SRC_URI=https://github.com/ProgVal/Limnoria/archive/master-2015-08-29.tar.gz -> limnoria-20150829.tar.gz
 _eclasses_=distutils-r1	1375d7df3597739c70e997d7508c6f79	eutils	351a78113be5b393c09a2c948701ad36	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	32b376cbb100a3a8083b3a0de023e117	python-utils-r1	39c6b012a0512678e698e712b5b7ecc2	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
 _md5_=418264acd2963ac829869f7d3a9f5631
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.42 b/metadata/md5-cache/net-nds/openldap-2.4.42
new file mode 100644
index 000000000000..7f8be3641c87
--- /dev/null
+++ b/metadata/md5-cache/net-nds/openldap-2.4.42
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-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(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,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/libgcrypt-1.5.3: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(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.14 tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build(-)] ) samba? ( dev-libs/openssl ) berkdb? ( <sys-libs/db-6.0:= || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 ) ) smbkrb5passwd? ( dev-libs/openssl kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl:= ) ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) sys-apps/groff ssl? ( dev-libs/openssl ) !<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=LDAP suite of application and development tools
+EAPI=5
+HOMEPAGE=http://www.OpenLDAP.org/
+IUSE=crypt icu samba slp tcpd experimental minimal +berkdb overlays perl gnutls iodbc sasl ssl odbc debug ipv6 +syslog selinux static-libs smbkrb5passwd kerberos -cxx abi_x86_32 abi_x86_64 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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=OPENLDAP GPL-2
+RDEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-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(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,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/libgcrypt-1.5.3: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(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.14 tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build(-)] ) samba? ( dev-libs/openssl ) berkdb? ( <sys-libs/db-6.0:= || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 ) ) smbkrb5passwd? ( dev-libs/openssl kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl:= ) ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) selinux? ( sec-policy/selinux-ldap )
+REQUIRED_USE=cxx? ( sasl )
+SLOT=0
+SRC_URI=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.42.tgz mirror://gentoo/rfc2307bis.schema-20140524
+_eclasses_=autotools	7feb275d850f45095537e76c5aa80494	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	351a78113be5b393c09a2c948701ad36	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	7f78cd7d403808a350c9ae23f5821fb4	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multilib-build	c47eec09e82c8a750127ff2abf0745b1	multilib-minimal	a93a9b4153a5f1c746bdd3b20ef9d834	ssl-cert	e90a74de57c48ea6c058b1cb3a735907	systemd	6b4f0cefa642270eded7e6ca816fd181	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=f2dcdd3fb181a5a4d42ea7deeb50b45c
diff --git a/metadata/md5-cache/sci-geosciences/qmapshack-1.3.0 b/metadata/md5-cache/sci-geosciences/qmapshack-1.3.0
new file mode 100644
index 000000000000..69191eb3ab94
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/qmapshack-1.3.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtwebkit:5 dev-qt/linguist-tools:5 dev-qt/qtscript:5 dev-qt/qtprintsupport:5 dev-qt/qtdbus:5 sci-libs/gdal sci-libs/proj sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=GPS mapping utility
+EAPI=5
+HOMEPAGE=https://bitbucket.org/maproom/qmapshack/wiki/Home
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-qt/qtwebkit:5 dev-qt/linguist-tools:5 dev-qt/qtscript:5 dev-qt/qtprintsupport:5 dev-qt/qtdbus:5 sci-libs/gdal sci-libs/proj
+SLOT=0
+SRC_URI=https://bitbucket.org/maproom/qmapshack/downloads/qmapshack-1.3.0.tar.gz
+_eclasses_=cmake-utils	f474224ef49d530640a43a04ae94928e	eutils	351a78113be5b393c09a2c948701ad36	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
+_md5_=459cf9d7d022fae626fb481694b9f9e1
diff --git a/metadata/md5-cache/sci-mathematics/maxima-5.37.1 b/metadata/md5-cache/sci-mathematics/maxima-5.37.1-r1
similarity index 98%
rename from metadata/md5-cache/sci-mathematics/maxima-5.37.1
rename to metadata/md5-cache/sci-mathematics/maxima-5.37.1-r1
index 908bf11e0105..acb340a4b501 100644
--- a/metadata/md5-cache/sci-mathematics/maxima-5.37.1
+++ b/metadata/md5-cache/sci-mathematics/maxima-5.37.1-r1
@@ -11,4 +11,4 @@ RDEPEND=X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk:
 SLOT=0
 SRC_URI=mirror://sourceforge/maxima/maxima-5.37.1.tar.gz
 _eclasses_=autotools	7feb275d850f45095537e76c5aa80494	elisp-common	73c48c11ad6a6494eda0d0cca848c8fa	eutils	351a78113be5b393c09a2c948701ad36	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=fee4d1484de1ec46d4ca8f231c60443c
+_md5_=3bdd893c11bef2dffcf29299c97d2262
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-0.99.473 b/metadata/md5-cache/sci-mathematics/rstudio-0.99.473
deleted file mode 100644
index 0e2c504b1c83..000000000000
--- a/metadata/md5-cache/sci-mathematics/rstudio-0.99.473
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-text/pandoc dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.50:= >=dev-libs/mathjax-2.3 dev-libs/openssl:0 sys-apps/util-linux >=sys-devel/clang-3.5.0 <sys-devel/clang-3.6.0 sys-libs/zlib || ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= ) x11-libs/pango !dedicated? ( >=dev-qt/qtcore-5.4:5 >=dev-qt/qtdbus-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtpositioning-5.4:5 >=dev-qt/qtsensors-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 server? ( virtual/pam ) ) dedicated? ( virtual/pam ) app-arch/unzip dev-java/ant-core || ( =virtual/jdk-1.7*:= =virtual/jdk-1.8*:= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4 >=dev-java/java-config-2.2.0
-DESCRIPTION=IDE for the R language
-EAPI=5
-HOMEPAGE=http://www.rstudio.org https://github.com/rstudio/rstudio/
-IUSE=dedicated server elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=AGPL-3
-RDEPEND=app-text/pandoc dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.50:= >=dev-libs/mathjax-2.3 dev-libs/openssl:0 sys-apps/util-linux >=sys-devel/clang-3.5.0 <sys-devel/clang-3.6.0 sys-libs/zlib || ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= ) x11-libs/pango !dedicated? ( >=dev-qt/qtcore-5.4:5 >=dev-qt/qtdbus-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtpositioning-5.4:5 >=dev-qt/qtsensors-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 server? ( virtual/pam ) ) dedicated? ( virtual/pam ) >=dev-java/java-config-2.2.0
-SLOT=0
-SRC_URI=https://github.com/rstudio/rstudio/archive/v0.99.473.tar.gz -> rstudio-0.99.473.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.7.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-java-2.37.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-2.37.0.jar https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip https://dev.gentoo.org/~gienah/distfiles/packrat-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rmarkdown-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/shinyapps-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz
-_eclasses_=cmake-utils	f474224ef49d530640a43a04ae94928e	eutils	351a78113be5b393c09a2c948701ad36	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	44555579e85afa5c035d2bd5428252da	java-pkg-2	bb9b8157d2a348d9ec42ce34a107fe0d	java-utils-2	7c8af272d218f7b7df22fd16bb0bfb63	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	pam	05f80e6013406d68612a7493314e3777	pax-utils	4f1280c0d4dcd8340f731827007c0a53	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ca872ef94961f61eabb9f774ce52f424
diff --git a/metadata/md5-cache/sci-mathematics/wxmaxima-15.08.1 b/metadata/md5-cache/sci-mathematics/wxmaxima-15.08.1
new file mode 100644
index 000000000000..538dbca84c34
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/wxmaxima-15.08.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=dev-libs/libxml2:2 x11-libs/wxGTK:3.0 >=sys-apps/sed-4
+DESCRIPTION=Graphical frontend to Maxima, using the wxWidgets toolkit
+EAPI=5
+HOMEPAGE=http://andrejv.github.io/wxmaxima/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libxml2:2 x11-libs/wxGTK:3.0 media-fonts/jsmath sci-visualization/gnuplot[wxwidgets] sci-mathematics/maxima
+SLOT=0
+SRC_URI=mirror://sourceforge/wxmaxima/wxmaxima-15.08.1.tar.gz https://dev.gentoo.org/~grozin/wxmaxima-15.08.1-missing.tar.bz2
+_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	44555579e85afa5c035d2bd5428252da	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	wxwidgets	e0c7fd61275cea7156be4143ba8c673a
+_md5_=46d978e56877f7fa43c21acdf7d55f64
diff --git a/metadata/md5-cache/sys-apps/elfix-0.9.1 b/metadata/md5-cache/sys-apps/elfix-0.9.1
new file mode 100644
index 000000000000..98dd603a5a94
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/elfix-0.9.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=~dev-python/pypax-0.9.1[ptpax=,xtpax=] ptpax? ( dev-libs/elfutils ) xtpax? ( sys-apps/attr )
+DESCRIPTION=A suite of tools to work with ELF objects on Hardened Gentoo
+EAPI=5
+HOMEPAGE=https://www.gentoo.org/proj/en/hardened/pax-quickstart.xml https://dev.gentoo.org/~blueness/elfix/
+IUSE=+ptpax +xtpax
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=~dev-python/pypax-0.9.1[ptpax=,xtpax=] ptpax? ( dev-libs/elfutils ) xtpax? ( sys-apps/attr )
+REQUIRED_USE=|| ( ptpax xtpax )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~blueness/elfix/elfix-0.9.1.tar.gz
+_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
+_md5_=4ad43855d7cf93abb291620572947c75
diff --git a/metadata/md5-cache/sys-apps/elfix-9999 b/metadata/md5-cache/sys-apps/elfix-9999
new file mode 100644
index 000000000000..f807053be328
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/elfix-9999
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=~dev-python/pypax-9999[ptpax=,xtpax=] ptpax? ( dev-libs/elfutils ) xtpax? ( sys-apps/attr ) dev-vcs/git
+DESCRIPTION=A suite of tools to work with ELF objects on Hardened Gentoo
+EAPI=5
+HOMEPAGE=https://www.gentoo.org/proj/en/hardened/pax-quickstart.xml https://dev.gentoo.org/~blueness/elfix/
+IUSE=+ptpax +xtpax
+LICENSE=GPL-3
+RDEPEND=~dev-python/pypax-9999[ptpax=,xtpax=] ptpax? ( dev-libs/elfutils ) xtpax? ( sys-apps/attr )
+REQUIRED_USE=|| ( ptpax xtpax )
+RESTRICT=test
+SLOT=0
+_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	git-2	1bb87192831f668cd20d93ffb1689c94	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
+_md5_=4ad43855d7cf93abb291620572947c75
diff --git a/metadata/md5-cache/sys-libs/libsemanage-2.4-r2 b/metadata/md5-cache/sys-libs/libsemanage-2.4-r2
new file mode 100644
index 000000000000..9144db0fe002
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libsemanage-2.4-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=sys-libs/libsepol-2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libselinux-2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-process/audit-2.2.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(-)?] >=dev-libs/ustr-1.0.4-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(-)?] sys-devel/bison sys-devel/flex python? ( >=dev-lang/swig-2.0.4-r1 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(-)] )
+DESCRIPTION=SELinux kernel and policy management library
+EAPI=5
+HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
+IUSE=python python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/libsepol-2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libselinux-2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-process/audit-2.2.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(-)?] >=dev-libs/ustr-1.0.4-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(-)?]
+RESTRICT=test
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20150202/libsemanage-2.4.tar.gz
+_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multilib-build	c47eec09e82c8a750127ff2abf0745b1	multilib-minimal	a93a9b4153a5f1c746bdd3b20ef9d834	python-r1	32b376cbb100a3a8083b3a0de023e117	python-utils-r1	39c6b012a0512678e698e712b5b7ecc2	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
+_md5_=cdd0b68406194ba242b7441e2021a566
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index e783419d0824..a5b315089543 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 03 Sep 2015 17:11:22 +0000
+Fri, 04 Sep 2015 05:41:12 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 4e109aa1002d..dc575b038258 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Sep  3 17:11:21 UTC 2015
+Fri Sep  4 05:41:12 UTC 2015
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 35a22c842c16..b07e8d5959fb 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -3291,6 +3291,7 @@
 1508241401 ./net-nds/openldap/openldap-2.3.43-r4.ebuild
 1508241401 ./net-nds/openldap/openldap-2.4.38-r2.ebuild
 1508241401 ./net-nds/openldap/openldap-2.3.43-r3.ebuild
+1509032301 ./net-nds/openldap/openldap-2.4.42.ebuild
 1508241401 ./net-nds/openldap/openldap-2.4.39.ebuild
 1508241401 ./net-nds/openldap/openldap-2.4.40.ebuild
 1508092334 ./net-nds/yp-tools/yp-tools-2.12-r1.ebuild
@@ -5542,6 +5543,7 @@
 1508172331 ./sci-geosciences/libtcd/libtcd-2.2.7.ebuild
 1508092334 ./sci-geosciences/libtcd/libtcd-2.2.6.ebuild
 1508092334 ./sci-geosciences/libtcd/libtcd-2.2.5_p2.ebuild
+1509032031 ./sci-geosciences/qmapshack/qmapshack-1.3.0.ebuild
 1508092334 ./sci-geosciences/opencpn-plugin-weather_routing/opencpn-plugin-weather_routing-1.2.ebuild
 1508092334 ./sci-geosciences/qgis/qgis-1.7.0.ebuild
 1508092334 ./sci-geosciences/qgis/qgis-1.8.0.ebuild
@@ -6242,6 +6244,7 @@
 1508092334 ./app-backup/reoback/reoback-1.0_p3-r1.ebuild
 1508092334 ./app-backup/spideroak-bin/spideroak-bin-5.2.0.ebuild
 1508092334 ./app-backup/spideroak-bin/spideroak-bin-5.1.8-r2.ebuild
+1509040401 ./app-backup/spideroak-bin/spideroak-bin-6.0.1.ebuild
 1508181431 ./app-backup/spideroak-bin/spideroak-bin-6.0.ebuild
 1508092334 ./app-backup/spideroak-bin/spideroak-bin-5.1.10.ebuild
 1508241501 ./app-backup/deja-dup/deja-dup-32.0-r1.ebuild
@@ -6602,7 +6605,6 @@
 1508092334 ./app-admin/cronolog/cronolog-1.6.2-r4.ebuild
 1508092334 ./app-admin/cronolog/cronolog-1.6.2-r3.ebuild
 1508180631 ./app-admin/webmin/webmin-1.760.ebuild
-1508092334 ./app-admin/webmin/webmin-1.730.ebuild
 1508092334 ./app-admin/superadduser/superadduser-1.0.9.ebuild
 1508241401 ./app-admin/389-console/389-console-1.1.7-r1.ebuild
 1508092334 ./app-admin/xtail/xtail-2.1.ebuild
@@ -8167,7 +8169,7 @@
 1508241501 ./dev-dotnet/gkeyfile-sharp/gkeyfile-sharp-0.1.ebuild
 1508092334 ./dev-dotnet/gsf-sharp/gsf-sharp-0.8.1.ebuild
 1508092334 ./dev-dotnet/mono-zeroconf/mono-zeroconf-0.9.0.ebuild
-1508241401 ./dev-dotnet/log4net/log4net-1.2.11.ebuild
+1509032301 ./dev-dotnet/log4net/log4net-1.2.11.ebuild
 1508092334 ./dev-dotnet/ndesk-dbus/ndesk-dbus-0.6.1a.ebuild
 1508092334 ./dev-dotnet/mono-addins/mono-addins-0.6.2.ebuild
 1508241401 ./dev-dotnet/mono-addins/mono-addins-1.0-r1.ebuild
@@ -9181,7 +9183,7 @@
 1508241401 ./app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-2.2.1.ebuild
 1508241431 ./app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-2.1.0.ebuild
 1508241401 ./app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-9999.ebuild
-1508261001 ./app-misc/screen/screen-9999.ebuild
+1509040831 ./app-misc/screen/screen-9999.ebuild
 1508261001 ./app-misc/screen/screen-4.2.1-r2.ebuild
 1508241701 ./app-misc/screen/screen-4.0.3-r7.ebuild
 1508241701 ./app-misc/screen/screen-4.0.3-r6.ebuild
@@ -10040,7 +10042,7 @@
 1508092334 ./dev-libs/apr/apr-1.5.0-r2.ebuild
 1508092334 ./dev-libs/openssl/openssl-0.9.8z_p7.ebuild
 1508092334 ./dev-libs/openssl/openssl-1.0.2b.ebuild
-1509022301 ./dev-libs/openssl/openssl-1.0.2d.ebuild
+1509040101 ./dev-libs/openssl/openssl-1.0.2d.ebuild
 1508092334 ./dev-libs/openssl/openssl-1.0.2c.ebuild
 1508092334 ./dev-libs/openssl/openssl-1.0.1p.ebuild
 1508092334 ./dev-libs/openssl/openssl-1.0.2a.ebuild
@@ -12172,6 +12174,7 @@
 1508241701 ./sys-libs/gdbm/gdbm-1.8.3-r4.ebuild
 1508092334 ./sys-libs/libsemanage/libsemanage-2.2-r2.ebuild
 1508092334 ./sys-libs/libsemanage/libsemanage-2.4-r1.ebuild
+1509040601 ./sys-libs/libsemanage/libsemanage-2.4-r2.ebuild
 1508092334 ./sys-libs/libsemanage/libsemanage-9999.ebuild
 1508092334 ./sys-libs/libsemanage/libsemanage-2.3-r4.ebuild
 1508092334 ./sys-libs/mars/mars-1.0.1.ebuild
@@ -12984,6 +12987,7 @@
 1508241401 ./dev-python/dulwich/dulwich-0.9.9.ebuild
 1508241401 ./dev-python/dulwich/dulwich-0.10.1a.ebuild
 1508241401 ./dev-python/dulwich/dulwich-0.10.0.ebuild
+1509040031 ./dev-python/futurist/futurist-0.4.0.ebuild
 1508241701 ./dev-python/libextractor-python/libextractor-python-0.6-r1.ebuild
 1508241401 ./dev-python/m2crypto/m2crypto-0.22.3-r4.ebuild
 1508092334 ./dev-python/paramunittest/paramunittest-0.2.ebuild
@@ -13171,6 +13175,7 @@
 1509021931 ./dev-python/path-py/path-py-8.1.ebuild
 1508101731 ./dev-python/path-py/path-py-7.4.ebuild
 1508212031 ./dev-python/path-py/path-py-7.6.1.ebuild
+1509040501 ./dev-python/oslo-middleware/oslo-middleware-2.8.0.ebuild
 1508092334 ./dev-python/oslo-middleware/oslo-middleware-0.5.0.ebuild
 1508092334 ./dev-python/oslo-middleware/oslo-middleware-1.0.0.ebuild
 1508092334 ./dev-python/oslo-middleware/oslo-middleware-0.4.0.ebuild
@@ -13516,6 +13521,7 @@
 1508241431 ./dev-python/pyregion/pyregion-1.1.2.ebuild
 1508241431 ./dev-python/pyregion/pyregion-1.1.4.ebuild
 1508092334 ./dev-python/keystonemiddleware/keystonemiddleware-1.5.2.ebuild
+1509040031 ./dev-python/keystonemiddleware/keystonemiddleware-2.2.0.ebuild
 1508092334 ./dev-python/keystonemiddleware/keystonemiddleware-1.5.0.ebuild
 1509021431 ./dev-python/rfc3986/rfc3986-0.2.2.ebuild
 1508092334 ./dev-python/rfc3986/rfc3986-0.2.0.ebuild
@@ -14137,6 +14143,8 @@
 1508092334 ./dev-python/mkdocs/mkdocs-0.12.2.ebuild
 1508092334 ./dev-python/mkdocs/mkdocs-0.14.0.ebuild
 1508092334 ./dev-python/mkdocs/mkdocs-0.11.1-r1.ebuild
+1509040331 ./dev-python/pypax/pypax-9999.ebuild
+1509040331 ./dev-python/pypax/pypax-0.9.1.ebuild
 1508241401 ./dev-python/pypax/pypax-0.8.4.ebuild
 1508241401 ./dev-python/pypax/pypax-0.9.0.ebuild
 1508092334 ./dev-python/humanfriendly/humanfriendly-1.33.ebuild
@@ -14355,6 +14363,7 @@
 1508092334 ./dev-python/imapclient/imapclient-0.13.ebuild
 1508241401 ./dev-python/neovim-python-client/neovim-python-client-0.0.37.ebuild
 1508241401 ./dev-python/zc-buildout/zc-buildout-2.3.1.ebuild
+1509040031 ./dev-python/cachetools/cachetools-1.1.0.ebuild
 1508092334 ./dev-python/wheel/wheel-0.24.0.ebuild
 1508202031 ./dev-python/wsgiproxy2/wsgiproxy2-0.4.1.ebuild
 1508092334 ./dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild
@@ -14757,6 +14766,7 @@
 1508241331 ./dev-python/retrying/retrying-1.3.3.ebuild
 1508092334 ./dev-python/retrying/retrying-1.3.2.ebuild
 1508092334 ./dev-python/miniupnpc/miniupnpc-1.8.ebuild
+1509040101 ./dev-python/oslo-service/oslo-service-0.9.0.ebuild
 1508092334 ./dev-python/dogpile-core/dogpile-core-0.4.1.ebuild
 1508241531 ./dev-python/python-geoclue/python-geoclue-0.1.0-r1.ebuild
 1508092334 ./dev-python/pyrfc3339/pyrfc3339-0.2.ebuild
@@ -15057,6 +15067,7 @@
 1508092334 ./dev-python/oslo-messaging/oslo-messaging-1.8.2.ebuild
 1508092334 ./dev-python/oslo-messaging/oslo-messaging-1.9.0.ebuild
 1508092334 ./dev-python/oslo-messaging/oslo-messaging-1.8.3.ebuild
+1509040101 ./dev-python/oslo-messaging/oslo-messaging-2.4.0.ebuild
 1508092334 ./dev-python/root_numpy/root_numpy-3.3.0.ebuild
 1508092334 ./dev-python/root_numpy/root_numpy-3.2.0.ebuild
 1508092334 ./dev-python/root_numpy/root_numpy-3.3.1.ebuild
@@ -15085,6 +15096,7 @@
 1508092334 ./dev-python/keyring/keyring-1.6.1.ebuild
 1508092334 ./dev-python/keyring/keyring-1.5-r1.ebuild
 1508241401 ./dev-python/python-memcached/python-memcached-1.53-r1.ebuild
+1509040031 ./dev-python/python-memcached/python-memcached-1.57.ebuild
 1508241401 ./dev-python/python-memcached/python-memcached-1.54.ebuild
 1508092334 ./dev-python/wehjit/wehjit-0.2.2-r1.ebuild
 1508092334 ./dev-python/datashape/datashape-0.4.2.ebuild
@@ -17165,8 +17177,8 @@
 1508241401 ./net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild
 1508092334 ./net-irc/irssi-xmpp/irssi-xmpp-0.52.ebuild
 1508092334 ./net-irc/limnoria/limnoria-20150523.ebuild
+1509040601 ./net-irc/limnoria/limnoria-20150829.ebuild
 1508092334 ./net-irc/limnoria/limnoria-99999999.ebuild
-1508092334 ./net-irc/limnoria/limnoria-20150429.ebuild
 1508092334 ./net-irc/epic5/epic5-1.1.10.ebuild
 1508092334 ./net-irc/epic5/epic5-1.1.10-r1.ebuild
 1508092334 ./net-irc/emech/emech-3.0.3-r1.ebuild
@@ -17295,11 +17307,11 @@
 1508241401 ./dev-lang/python/python-3.4.0.ebuild
 1508241401 ./dev-lang/python/python-2.7.9-r2.ebuild
 1508241401 ./dev-lang/python/python-3.4.2.ebuild
-1508241401 ./dev-lang/python/python-2.7.9-r1.ebuild
-1508241401 ./dev-lang/python/python-3.4.1.ebuild
-1508241401 ./dev-lang/python/python-2.7.10.ebuild
+1509040031 ./dev-lang/python/python-2.7.9-r1.ebuild
+1509040031 ./dev-lang/python/python-3.4.1.ebuild
+1509040031 ./dev-lang/python/python-2.7.10.ebuild
 1508241401 ./dev-lang/python/python-3.3.5-r1.ebuild
-1508241401 ./dev-lang/python/python-3.4.3.ebuild
+1509040031 ./dev-lang/python/python-3.4.3.ebuild
 1508092334 ./dev-lang/mono-basic/mono-basic-2.10.ebuild
 1508092334 ./dev-lang/falcon/falcon-0.9.6.4.ebuild
 1508092334 ./dev-lang/rebol-bin/rebol-bin-3_pre111.ebuild
@@ -18959,7 +18971,7 @@
 1508251731 ./kde-plasma/bluedevil/bluedevil-5.4.0.ebuild
 1508251731 ./kde-plasma/kwrited/kwrited-5.4.0.ebuild
 1508251731 ./kde-plasma/kwallet-pam/kwallet-pam-5.4.0.ebuild
-1508251731 ./kde-plasma/plasma-nm/plasma-nm-5.4.0.ebuild
+1509032231 ./kde-plasma/plasma-nm/plasma-nm-5.4.0.ebuild
 1508251731 ./kde-plasma/ksysguard/ksysguard-5.4.0.ebuild
 1508251731 ./kde-plasma/sddm-kcm/sddm-kcm-5.4.0.ebuild
 1508251731 ./kde-plasma/plasma-pa/plasma-pa-5.4.0.ebuild
@@ -19961,7 +19973,7 @@
 1508092334 ./dev-util/debhelper/debhelper-9.20150101.ebuild
 1508092334 ./dev-util/debhelper/debhelper-9.20150502.ebuild
 1508092334 ./dev-util/debhelper/debhelper-9.20150628.ebuild
-1508282031 ./dev-util/catalyst/catalyst-2.9999.ebuild
+1509040631 ./dev-util/catalyst/catalyst-2.9999.ebuild
 1508291931 ./dev-util/catalyst/catalyst-9999.ebuild
 1508241401 ./dev-util/catalyst/catalyst-2.0.9999.ebuild
 1508241401 ./dev-util/catalyst/catalyst-2.0.17.ebuild
@@ -20287,7 +20299,7 @@
 1508092334 ./dev-games/higan-ananke/higan-ananke-094.ebuild
 1508092334 ./dev-games/vamos/vamos-0.7.1.ebuild
 1508092334 ./dev-games/physfs/physfs-2.0.3-r1.ebuild
-1508092334 ./dev-games/ogre/ogre-1.9.0-r1.ebuild
+1509032131 ./dev-games/ogre/ogre-1.9.0-r1.ebuild
 1508092334 ./dev-games/hlsdk/hlsdk-2.3.ebuild
 1508092334 ./dev-games/clanlib/clanlib-0.8.1.ebuild
 1508092334 ./dev-games/clanlib/clanlib-2.3.7.ebuild
@@ -26617,6 +26629,7 @@
 1508092334 ./dev-ruby/stomp/stomp-1.3.2-r1.ebuild
 1508092334 ./dev-ruby/stomp/stomp-1.3.4.ebuild
 1508092334 ./dev-ruby/docile/docile-1.1.5.ebuild
+1509040831 ./dev-ruby/amq-protocol/amq-protocol-2.0.0.ebuild
 1508241401 ./dev-ruby/amq-protocol/amq-protocol-1.9.2.ebuild
 1508092334 ./dev-ruby/actionpack-action_caching/actionpack-action_caching-1.1.1.ebuild
 1508241401 ./dev-ruby/typed-array/typed-array-0.1.2-r1.ebuild
@@ -27057,9 +27070,8 @@
 1508092334 ./dev-ruby/simple-rss/simple-rss-1.3.1-r1.ebuild
 1508092334 ./dev-ruby/simple-rss/simple-rss-1.3.1.ebuild
 1508092334 ./dev-ruby/sass-rails/sass-rails-4.0.5.ebuild
-1508092334 ./dev-ruby/sass-rails/sass-rails-5.0.2.ebuild
+1509040831 ./dev-ruby/sass-rails/sass-rails-5.0.4.ebuild
 1508092334 ./dev-ruby/sass-rails/sass-rails-3.2.6.ebuild
-1508092334 ./dev-ruby/sass-rails/sass-rails-5.0.1.ebuild
 1508092334 ./dev-ruby/sass-rails/sass-rails-5.0.3.ebuild
 1508092334 ./dev-ruby/RubyInline/RubyInline-3.12.3.ebuild
 1508092334 ./dev-ruby/RubyInline/RubyInline-3.12.4.ebuild
@@ -27191,8 +27203,7 @@
 1508092334 ./dev-ruby/sprockets-rails/sprockets-rails-2.1.3.ebuild
 1508092334 ./dev-ruby/sprockets-rails/sprockets-rails-2.2.4.ebuild
 1508092334 ./dev-ruby/sprockets-rails/sprockets-rails-2.3.0.ebuild
-1508241401 ./dev-ruby/mixlib-shellout/mixlib-shellout-2.0.1.ebuild
-1508241401 ./dev-ruby/mixlib-shellout/mixlib-shellout-1.6.1.ebuild
+1509040831 ./dev-ruby/mixlib-shellout/mixlib-shellout-2.2.0.ebuild
 1508092334 ./dev-ruby/mixlib-shellout/mixlib-shellout-2.1.0.ebuild
 1508092334 ./dev-ruby/ammeter/ammeter-1.1.2.ebuild
 1508092334 ./dev-ruby/ruby-rc4/ruby-rc4-0.1.5-r1.ebuild
@@ -29497,8 +29508,8 @@
 1508092334 ./net-analyzer/httping/httping-2.4.ebuild
 1508092334 ./net-analyzer/wireshark/wireshark-99999999.ebuild
 1508092334 ./net-analyzer/wireshark/wireshark-1.12.6.ebuild
-1508092334 ./net-analyzer/wireshark/wireshark-1.99.8.ebuild
 1508261031 ./net-analyzer/wireshark/wireshark-1.12.7.ebuild
+1509040731 ./net-analyzer/wireshark/wireshark-1.99.9.ebuild
 1508092334 ./net-analyzer/scanssh/scanssh-2.1.ebuild
 1508092334 ./net-analyzer/cbm/cbm-0.1-r1.ebuild
 1508092334 ./net-analyzer/symon/symon-2.87.ebuild
@@ -31689,7 +31700,7 @@
 1508092334 ./games-roguelike/rogue/rogue-5.4.4.ebuild
 1508262001 ./games-roguelike/angband/angband-3.5.1.ebuild
 1508092334 ./games-roguelike/angband/angband-3.4.1.ebuild
-1508092334 ./games-roguelike/adom/adom-1.1.1-r1.ebuild
+1509032201 ./games-roguelike/adom/adom-1.1.1-r1.ebuild
 1508092334 ./games-roguelike/zangband/zangband-2.7.4c.ebuild
 1508092334 ./games-roguelike/mazesofmonad/mazesofmonad-1.0.9-r2.ebuild
 1508092334 ./games-roguelike/moria/moria-5.5.2.ebuild
@@ -32117,7 +32128,9 @@
 1508092334 ./sys-apps/tuned/tuned-2.5.0.ebuild
 1508092334 ./sys-apps/tuned/tuned-2.5.1.ebuild
 1508092334 ./sys-apps/syscriptor/syscriptor-1.5.15.ebuild
+1509040331 ./sys-apps/elfix/elfix-9999.ebuild
 1508241401 ./sys-apps/elfix/elfix-0.8.4.ebuild
+1509040331 ./sys-apps/elfix/elfix-0.9.1.ebuild
 1508241401 ./sys-apps/elfix/elfix-0.9.0-r1.ebuild
 1508241431 ./sys-apps/bleachbit/bleachbit-1.4.ebuild
 1508241431 ./sys-apps/bleachbit/bleachbit-1.2.ebuild
@@ -36254,7 +36267,7 @@
 1508092334 ./games-rpg/eternal-lands-data/eternal-lands-data-1.9.2-r1.ebuild
 1508092334 ./games-rpg/eternal-lands-data/eternal-lands-data-1.9.3-r1.ebuild
 1508092334 ./games-rpg/drascula/drascula-1.0-r2.ebuild
-1508092334 ./games-rpg/freedink/freedink-108.4.ebuild
+1509032131 ./games-rpg/freedink/freedink-108.4.ebuild
 1508092334 ./games-rpg/openglad/openglad-0.98.ebuild
 1508092334 ./games-rpg/freedink-data/freedink-data-1.08.20140901.ebuild
 1508241401 ./games-rpg/eschalon-book-1-demo/eschalon-book-1-demo-106.ebuild
@@ -36388,6 +36401,7 @@
 1508092334 ./sci-mathematics/wxmaxima/wxmaxima-15.04.0-r1.ebuild
 1508092334 ./sci-mathematics/wxmaxima/wxmaxima-13.04.2.ebuild
 1508291701 ./sci-mathematics/wxmaxima/wxmaxima-15.08.0.ebuild
+1509032131 ./sci-mathematics/wxmaxima/wxmaxima-15.08.1.ebuild
 1508092334 ./sci-mathematics/lpsolve/lpsolve-5.5.2.0.ebuild
 1508092334 ./sci-mathematics/num-utils/num-utils-0.3.ebuild
 1508092334 ./sci-mathematics/num-utils/num-utils-0.5-r1.ebuild
@@ -36456,7 +36470,6 @@
 1508092334 ./sci-mathematics/rstudio/rstudio-0.98.490-r1.ebuild
 1508241401 ./sci-mathematics/rstudio/rstudio-0.98.932.ebuild
 1508092334 ./sci-mathematics/rstudio/rstudio-0.97.336.ebuild
-1508270601 ./sci-mathematics/rstudio/rstudio-0.99.473.ebuild
 1508092334 ./sci-mathematics/rstudio/rstudio-0.98.490.ebuild
 1508301731 ./sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild
 1508092334 ./sci-mathematics/cvc3/cvc3-2.4.1.ebuild
@@ -36500,7 +36513,7 @@
 1508092334 ./sci-mathematics/gimps/gimps-27.9-r2.ebuild
 1508121031 ./sci-mathematics/gimps/gimps-28.7.ebuild
 1508092334 ./sci-mathematics/dataplot/dataplot-20090821.ebuild
-1509031731 ./sci-mathematics/maxima/maxima-5.37.1.ebuild
+1509032201 ./sci-mathematics/maxima/maxima-5.37.1-r1.ebuild
 1508261601 ./sci-mathematics/maxima/maxima-5.36.1.ebuild
 1508261601 ./sci-mathematics/maxima/maxima-5.34.1.ebuild
 1508092334 ./sci-mathematics/spin/spin-6.2.5.ebuild
@@ -40488,6 +40501,7 @@
 1508100525 metadata/md5-cache/net-nds/gosa-core-2.6.10
 1509020814 metadata/md5-cache/net-nds/openldap-2.4.40-r4
 1509012308 metadata/md5-cache/net-nds/nsscache-0.23
+1509032308 metadata/md5-cache/net-nds/openldap-2.4.42
 1508100525 metadata/md5-cache/net-nds/gosa-plugin-systems-2.6.11
 1508100525 metadata/md5-cache/net-nds/gosa-plugin-samba-2.6.11
 1508100525 metadata/md5-cache/net-nds/phpldapadmin-1.2.3-r1
@@ -42742,6 +42756,7 @@
 1508100526 metadata/md5-cache/sci-geosciences/osm2mp-0.80
 1508100526 metadata/md5-cache/sci-geosciences/libtcd-2.2.6
 1508100526 metadata/md5-cache/sci-geosciences/gdal-grass-1.4.3-r1
+1509032038 metadata/md5-cache/sci-geosciences/qmapshack-1.3.0
 1509020815 metadata/md5-cache/x11-apps/xauth-1.0.9
 1509020815 metadata/md5-cache/x11-apps/fstobdf-1.0.6
 1509020816 metadata/md5-cache/x11-apps/xvidtune-1.0.2-r1
@@ -43402,6 +43417,7 @@
 1509030947 metadata/md5-cache/app-backup/holland-lib-mysql-1.0.10
 1509020812 metadata/md5-cache/app-backup/burp-1.4.40
 1508100508 metadata/md5-cache/app-backup/backuppc-3.3.0-r1
+1509040408 metadata/md5-cache/app-backup/spideroak-bin-6.0.1
 1508152008 metadata/md5-cache/app-backup/tsm-7.1.0.0-r1
 1508201238 metadata/md5-cache/app-backup/duply-1.10.1
 1509010743 metadata/md5-cache/app-backup/dar-2.4.13
@@ -43713,7 +43729,6 @@
 1508100507 metadata/md5-cache/app-admin/puppetserver-2.1.1
 1509010743 metadata/md5-cache/app-admin/elektra-0.8.7
 1508231237 metadata/md5-cache/app-admin/newsyslog-1.1
-1509010743 metadata/md5-cache/app-admin/webmin-1.730
 1508241709 metadata/md5-cache/app-admin/ranpwd-1.2
 1508100907 metadata/md5-cache/app-admin/consul-template-0.9.0-r1
 1509010743 metadata/md5-cache/app-admin/elektra-9999
@@ -45351,7 +45366,7 @@
 1509020812 metadata/md5-cache/dev-dotnet/atk-sharp-2.12.10
 1508100511 metadata/md5-cache/dev-dotnet/ikvm-bin-7.1.4532.2
 1508241508 metadata/md5-cache/dev-dotnet/gudev-sharp-0.1
-1508241413 metadata/md5-cache/dev-dotnet/log4net-1.2.11
+1509032308 metadata/md5-cache/dev-dotnet/log4net-1.2.11
 1508100511 metadata/md5-cache/dev-dotnet/ikvm-7.1.4532.2
 1509020812 metadata/md5-cache/dev-dotnet/gconf-sharp-2.24.2
 1508100511 metadata/md5-cache/dev-dotnet/taglib-sharp-2.1.0.0
@@ -46190,7 +46205,7 @@
 1508100509 metadata/md5-cache/app-misc/emelfm2-0.9.1-r1
 1508100509 metadata/md5-cache/app-misc/actkbd-0.2.8-r1
 1508231237 metadata/md5-cache/app-misc/birthday-1.6.2
-1509020812 metadata/md5-cache/app-misc/screen-9999
+1509040838 metadata/md5-cache/app-misc/screen-9999
 1508100509 metadata/md5-cache/app-misc/joymouse-0.5
 1509010744 metadata/md5-cache/app-misc/symlinks-1.4-r2
 1509020812 metadata/md5-cache/app-misc/lcdproc-0.5.2-r1
@@ -47077,7 +47092,7 @@
 1509020813 metadata/md5-cache/dev-libs/libzip-1.0.1
 1508241709 metadata/md5-cache/dev-libs/leveldb-1.11.0-r1
 1508100513 metadata/md5-cache/dev-libs/OpenNI-9999
-1509022308 metadata/md5-cache/dev-libs/openssl-1.0.2d
+1509040108 metadata/md5-cache/dev-libs/openssl-1.0.2d
 1508140748 metadata/md5-cache/dev-libs/libnsfb-0.1.3-r1
 1509020813 metadata/md5-cache/dev-libs/libgcrypt-1.6.3-r4
 1509030947 metadata/md5-cache/dev-libs/libevdev-1.4.3
@@ -49321,6 +49336,7 @@
 1508241710 metadata/md5-cache/sys-libs/libraw1394-2.0.8
 1508100529 metadata/md5-cache/sys-libs/libhx-3.22
 1509030951 metadata/md5-cache/sys-libs/libcap-ng-0.7.6
+1509040608 metadata/md5-cache/sys-libs/libsemanage-2.4-r2
 1509010749 metadata/md5-cache/sys-libs/uclibc-0.9.33.2-r15
 1509030951 metadata/md5-cache/sys-libs/tdb-1.3.7
 1509030951 metadata/md5-cache/sys-libs/cracklib-2.9.5
@@ -49730,6 +49746,7 @@
 1509030949 metadata/md5-cache/dev-python/vobject-0.8.1c-r1
 1509030948 metadata/md5-cache/dev-python/boto-2.35.1
 1509030949 metadata/md5-cache/dev-python/pybloomfiltermmap-0.3.14
+1509040338 metadata/md5-cache/dev-python/pypax-0.9.1
 1509030948 metadata/md5-cache/dev-python/html5lib-0.999999
 1509030949 metadata/md5-cache/dev-python/pyspf-2.0.11
 1509030948 metadata/md5-cache/dev-python/cryptography-0.6.1
@@ -49897,6 +49914,7 @@
 1509030948 metadata/md5-cache/dev-python/django-discover-runner-1.0
 1509030948 metadata/md5-cache/dev-python/astropy-0.3.1
 1509030949 metadata/md5-cache/dev-python/pgmagick-0.5.10
+1509040508 metadata/md5-cache/dev-python/oslo-middleware-2.8.0
 1508100516 metadata/md5-cache/dev-python/kaa-imlib2-0.2.3-r1
 1509030949 metadata/md5-cache/dev-python/twilio-3.6.9
 1509030948 metadata/md5-cache/dev-python/numexpr-2.4.1
@@ -50078,6 +50096,7 @@
 1509030949 metadata/md5-cache/dev-python/pyflakes-0.7.3
 1509030949 metadata/md5-cache/dev-python/python-fastimport-0.9.2-r1
 1509030948 metadata/md5-cache/dev-python/flask-evolution-0.5-r1
+1509040338 metadata/md5-cache/dev-python/pypax-9999
 1509030949 metadata/md5-cache/dev-python/winpdb-1.4.8-r1
 1509030949 metadata/md5-cache/dev-python/pyphen-0.8
 1508100516 metadata/md5-cache/dev-python/kaa-display-0.1.0
@@ -50237,6 +50256,7 @@
 1509030949 metadata/md5-cache/dev-python/reportlab-3.2.0
 1509030948 metadata/md5-cache/dev-python/SaltTesting-2015.2.16
 1509030950 metadata/md5-cache/dev-python/yenc-0.4.0-r1
+1509040038 metadata/md5-cache/dev-python/keystonemiddleware-2.2.0
 1509030949 metadata/md5-cache/dev-python/statsmodels-0.5.0
 1509030948 metadata/md5-cache/dev-python/hgtools-6.3
 1509030948 metadata/md5-cache/dev-python/colorama-0.3.3
@@ -50575,9 +50595,11 @@
 1509030949 metadata/md5-cache/dev-python/posix_ipc-0.9.8
 1509030948 metadata/md5-cache/dev-python/django-select2-4.0.0
 1509030949 metadata/md5-cache/dev-python/wstools-0.4.3
+1509040038 metadata/md5-cache/dev-python/futurist-0.4.0
 1509030948 metadata/md5-cache/dev-python/lupy-0.2.1-r2
 1509030949 metadata/md5-cache/dev-python/python-heatclient-0.4.0
 1509030949 metadata/md5-cache/dev-python/python-daemon-2.0.4
+1509040038 metadata/md5-cache/dev-python/cachetools-1.1.0
 1509030948 metadata/md5-cache/dev-python/django-haystack-2.3.1
 1509030948 metadata/md5-cache/dev-python/botocore-1.1.8
 1509030948 metadata/md5-cache/dev-python/pbr-1.3.0
@@ -51095,6 +51117,7 @@
 1509030949 metadata/md5-cache/dev-python/setuptools_scm-1.5.5
 1509030949 metadata/md5-cache/dev-python/pyparsing-2.0.1
 1509030949 metadata/md5-cache/dev-python/pywcs-1.11-r1
+1509040108 metadata/md5-cache/dev-python/oslo-service-0.9.0
 1509030948 metadata/md5-cache/dev-python/jsonschema-2.5.1
 1509030948 metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-1.8-r1
 1509030948 metadata/md5-cache/dev-python/jinja-2.7.3
@@ -51415,6 +51438,7 @@
 1509030948 metadata/md5-cache/dev-python/fpconst-0.7.3-r1
 1509030948 metadata/md5-cache/dev-python/mock-1.2.0
 1509030948 metadata/md5-cache/dev-python/encore-0.4.0
+1509040108 metadata/md5-cache/dev-python/oslo-messaging-2.4.0
 1509030949 metadata/md5-cache/dev-python/rax-default-network-flags-python-novaclient-ext-0.1.3
 1509030949 metadata/md5-cache/dev-python/twisted-lore-13.0.0-r1
 1509030949 metadata/md5-cache/dev-python/pypy3-2.4.0
@@ -51891,6 +51915,7 @@
 1509030949 metadata/md5-cache/dev-python/ply-3.6-r1
 1509030949 metadata/md5-cache/dev-python/pydns-2.3.6-r1
 1509030949 metadata/md5-cache/dev-python/tabulate-0.7.3
+1509040038 metadata/md5-cache/dev-python/python-memcached-1.57
 1509030949 metadata/md5-cache/dev-python/wcsaxes-0.3
 1509030948 metadata/md5-cache/dev-python/networkx-1.9.1
 1509030949 metadata/md5-cache/dev-python/pyoembed-9999
@@ -54280,7 +54305,6 @@
 1508100524 metadata/md5-cache/net-irc/ninja-1.5.9_pre14-r1
 1508100524 metadata/md5-cache/net-irc/iip-1.2
 1508100524 metadata/md5-cache/net-irc/ptlink-ircd-6.19.6-r2
-1509030950 metadata/md5-cache/net-irc/limnoria-20150429
 1509020814 metadata/md5-cache/net-irc/charybdis-3.3.0
 1509010747 metadata/md5-cache/net-irc/irc-server-2.11.1_p1-r2
 1509030950 metadata/md5-cache/net-irc/znc-9999
@@ -54311,6 +54335,7 @@
 1508100524 metadata/md5-cache/net-irc/sic-1.1
 1508231238 metadata/md5-cache/net-irc/srvx-1.3.1
 1508241439 metadata/md5-cache/net-irc/inspircd-2.0.17
+1509040608 metadata/md5-cache/net-irc/limnoria-20150829
 1508100524 metadata/md5-cache/net-irc/iroffer-dinoex-3.29
 1509010747 metadata/md5-cache/net-irc/irssi-otr-0.2
 1508231238 metadata/md5-cache/net-irc/dccserver-0.5
@@ -54579,7 +54604,7 @@
 1508231237 metadata/md5-cache/dev-lang/snobol-0.99.4
 1509030947 metadata/md5-cache/dev-lang/yasm-9999
 1509020812 metadata/md5-cache/dev-lang/erlang-18.0
-1509020813 metadata/md5-cache/dev-lang/python-2.7.10
+1509040038 metadata/md5-cache/dev-lang/python-2.7.10
 1509010744 metadata/md5-cache/dev-lang/rubinius-2.5.5
 1508241414 metadata/md5-cache/dev-lang/julia-0.2.1-r2
 1508100513 metadata/md5-cache/dev-lang/rakudo-2015.02
@@ -54588,7 +54613,7 @@
 1508100513 metadata/md5-cache/dev-lang/moarvm-2015.01
 1508231237 metadata/md5-cache/dev-lang/gwydion-dylan-bin-2.4.0-r1
 1508100513 metadata/md5-cache/dev-lang/idb-13.0.0.079
-1509020813 metadata/md5-cache/dev-lang/python-3.4.3
+1509040038 metadata/md5-cache/dev-lang/python-3.4.3
 1509010744 metadata/md5-cache/dev-lang/perl-5.22.0
 1509020813 metadata/md5-cache/dev-lang/php-5.5.27
 1508100513 metadata/md5-cache/dev-lang/whitespace-0.3
@@ -54597,7 +54622,7 @@
 1508221838 metadata/md5-cache/dev-lang/luajit-2.0.2
 1508241414 metadata/md5-cache/dev-lang/julia-0.3.0
 1508231237 metadata/md5-cache/dev-lang/open-cobol-1.1
-1509020813 metadata/md5-cache/dev-lang/python-2.7.9-r1
+1509040037 metadata/md5-cache/dev-lang/python-2.7.9-r1
 1508100513 metadata/md5-cache/dev-lang/scala-bin-2.11.7
 1508100513 metadata/md5-cache/dev-lang/idb-14.0.2.144
 1509010744 metadata/md5-cache/dev-lang/ocaml-4.02.3
@@ -54654,7 +54679,7 @@
 1509020812 metadata/md5-cache/dev-lang/mono-3.12.1
 1508251038 metadata/md5-cache/dev-lang/scala-2.9.3
 1509010744 metadata/md5-cache/dev-lang/yap-6.3.3
-1509020813 metadata/md5-cache/dev-lang/python-3.4.1
+1509040038 metadata/md5-cache/dev-lang/python-3.4.1
 1509010744 metadata/md5-cache/dev-lang/perl-5.20.2-r1
 1509020812 metadata/md5-cache/dev-lang/ghc-7.6.3-r1
 1509020813 metadata/md5-cache/dev-lang/php-5.6.12
@@ -56150,7 +56175,7 @@
 1509012138 metadata/md5-cache/kde-plasma/kscreen-5.4.0
 1509012138 metadata/md5-cache/kde-plasma/ksysguard-5.4.0
 1509012138 metadata/md5-cache/kde-plasma/kde-cli-tools-5.4.0
-1509012138 metadata/md5-cache/kde-plasma/plasma-nm-5.4.0
+1509032238 metadata/md5-cache/kde-plasma/plasma-nm-5.4.0
 1509012138 metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.4.0
 1509012138 metadata/md5-cache/kde-plasma/plasma-pa-5.4.0
 1509012138 metadata/md5-cache/kde-plasma/plasma-desktop-5.4.0
@@ -57388,7 +57413,7 @@
 1508140751 metadata/md5-cache/dev-util/pkgconf-0.9.11
 1509020813 metadata/md5-cache/dev-util/cscope-15.8a
 1508100518 metadata/md5-cache/dev-util/cppi-1.18
-1509030950 metadata/md5-cache/dev-util/catalyst-2.9999
+1509040638 metadata/md5-cache/dev-util/catalyst-2.9999
 1508140751 metadata/md5-cache/dev-util/pycharm-professional-4.5.2
 1508241709 metadata/md5-cache/dev-util/idutils-4.2
 1508241415 metadata/md5-cache/dev-util/autodia-2.140.0-r1
@@ -57466,7 +57491,7 @@
 1508241538 metadata/md5-cache/dev-games/etrophy-0.5.1
 1508100511 metadata/md5-cache/dev-games/flatzebra-0.1.6
 1508140748 metadata/md5-cache/dev-games/cardpics-0.4
-1509010744 metadata/md5-cache/dev-games/ogre-1.9.0-r1
+1509032138 metadata/md5-cache/dev-games/ogre-1.9.0-r1
 1508100511 metadata/md5-cache/dev-games/paklib-0.3
 1509010744 metadata/md5-cache/dev-games/openscenegraph-3.2.1
 1508100511 metadata/md5-cache/dev-games/hdl_dump-0.8.6.20060901
@@ -63834,6 +63859,7 @@
 1508100518 metadata/md5-cache/dev-ruby/ruby-cairo-gobject-2.2.3
 1508100517 metadata/md5-cache/dev-ruby/narray-0.6.0.9
 1509020838 metadata/md5-cache/dev-ruby/jquery-rails-3.1.4
+1509040838 metadata/md5-cache/dev-ruby/amq-protocol-2.0.0
 1508100517 metadata/md5-cache/dev-ruby/msgpack-0.6.2
 1508241415 metadata/md5-cache/dev-ruby/rainbow-1.1.4
 1508100517 metadata/md5-cache/dev-ruby/atomic-1.1.16
@@ -64096,6 +64122,7 @@
 1508100517 metadata/md5-cache/dev-ruby/json-1.8.3
 1508100518 metadata/md5-cache/dev-ruby/shotgun-0.9.1
 1508100518 metadata/md5-cache/dev-ruby/sass-3.2.19-r2
+1509040838 metadata/md5-cache/dev-ruby/mixlib-shellout-2.2.0
 1508100518 metadata/md5-cache/dev-ruby/unf_ext-0.0.6-r2
 1508100517 metadata/md5-cache/dev-ruby/request_store-1.2.0
 1508241438 metadata/md5-cache/dev-ruby/rack-1.5.4
@@ -64149,7 +64176,6 @@
 1508241415 metadata/md5-cache/dev-ruby/rack-test-0.6.3
 1508100517 metadata/md5-cache/dev-ruby/fuubar-2.0.0
 1508241415 metadata/md5-cache/dev-ruby/rainbow-2.0.0
-1508241415 metadata/md5-cache/dev-ruby/mixlib-shellout-2.0.1
 1508100518 metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8-r2
 1508100517 metadata/md5-cache/dev-ruby/log4r-1.1.10-r2
 1508100518 metadata/md5-cache/dev-ruby/text-1.3.0
@@ -64239,6 +64265,7 @@
 1508241415 metadata/md5-cache/dev-ruby/thor-0.19.1
 1508100517 metadata/md5-cache/dev-ruby/nenv-0.2.0
 1508100518 metadata/md5-cache/dev-ruby/sprockets-rails-2.3.0
+1509040838 metadata/md5-cache/dev-ruby/sass-rails-5.0.4
 1508100517 metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.5
 1508241415 metadata/md5-cache/dev-ruby/will_paginate-3.0.7
 1508141608 metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.4
@@ -64494,7 +64521,6 @@
 1508100517 metadata/md5-cache/dev-ruby/activeresource-3.2.22
 1508100517 metadata/md5-cache/dev-ruby/rdoc-4.1.2
 1508100517 metadata/md5-cache/dev-ruby/color-1.7.1
-1508100518 metadata/md5-cache/dev-ruby/sass-rails-5.0.2
 1508241415 metadata/md5-cache/dev-ruby/capybara-2.2.1
 1508100518 metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r2
 1508100517 metadata/md5-cache/dev-ruby/hike-1.2.3
@@ -64853,7 +64879,6 @@
 1508100518 metadata/md5-cache/dev-ruby/rspec-3.3.0
 1508100517 metadata/md5-cache/dev-ruby/equalizer-0.0.9
 1508100518 metadata/md5-cache/dev-ruby/ttfunk-1.4.0
-1508241415 metadata/md5-cache/dev-ruby/mixlib-shellout-1.6.1
 1508100517 metadata/md5-cache/dev-ruby/multi_test-0.1.1
 1508100517 metadata/md5-cache/dev-ruby/coffee-script-2.2.0-r1
 1508100518 metadata/md5-cache/dev-ruby/rspec-rails-2.99.0
@@ -64892,7 +64917,6 @@
 1508100517 metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.9
 1508100517 metadata/md5-cache/dev-ruby/gruff-0.5.1
 1508100517 metadata/md5-cache/dev-ruby/heredoc_unindent-1.1.2-r3
-1508100518 metadata/md5-cache/dev-ruby/sass-rails-5.0.1
 1508250908 metadata/md5-cache/dev-ruby/rails-4.2.4
 1508100518 metadata/md5-cache/dev-ruby/rspec-2.14.1-r1
 1508100517 metadata/md5-cache/dev-ruby/deprecated-3.0.1-r1
@@ -66550,6 +66574,7 @@
 1508100523 metadata/md5-cache/net-analyzer/metasploit-4.9.3
 1509020814 metadata/md5-cache/net-analyzer/synscan-5.01
 1509010747 metadata/md5-cache/net-analyzer/ettercap-9999
+1509040738 metadata/md5-cache/net-analyzer/wireshark-1.99.9
 1508100523 metadata/md5-cache/net-analyzer/goaccess-0.9
 1509020814 metadata/md5-cache/net-analyzer/goaccess-0.6.1
 1508100523 metadata/md5-cache/net-analyzer/arpoison-0.6-r2
@@ -66764,7 +66789,6 @@
 1508100523 metadata/md5-cache/net-analyzer/tcpflow-1.3.0
 1509030950 metadata/md5-cache/net-analyzer/nmap-6.49_beta2
 1509020814 metadata/md5-cache/net-analyzer/argus-3.0.8.1
-1509020814 metadata/md5-cache/net-analyzer/wireshark-1.99.8
 1509030950 metadata/md5-cache/net-analyzer/fail2ban-99999999
 1508100523 metadata/md5-cache/net-analyzer/tsung-1.5.1
 1509020814 metadata/md5-cache/net-analyzer/thcrut-1.2.5-r1
@@ -68876,7 +68900,7 @@
 1509010745 metadata/md5-cache/games-roguelike/powder-117
 1509020813 metadata/md5-cache/games-roguelike/hengband-1.6.2-r1
 1508140751 metadata/md5-cache/games-roguelike/moria-5.5.2
-1508140751 metadata/md5-cache/games-roguelike/adom-1.1.1-r1
+1509032208 metadata/md5-cache/games-roguelike/adom-1.1.1-r1
 1508140751 metadata/md5-cache/games-roguelike/dwarf-fortress-0.40.24
 1508240141 metadata/md5-cache/games-roguelike/tomenet-4.5.9
 1508241415 metadata/md5-cache/games-roguelike/stone-soup-0.16.2
@@ -69155,6 +69179,7 @@
 1508280638 metadata/md5-cache/sys-apps/nvme-cli-0_pre20150821
 1509020815 metadata/md5-cache/sys-apps/qingy-1.0.0-r2
 1508100528 metadata/md5-cache/sys-apps/dtc-1.3.0
+1509040338 metadata/md5-cache/sys-apps/elfix-9999
 1508100528 metadata/md5-cache/sys-apps/rkflashtool-5.1
 1508100528 metadata/md5-cache/sys-apps/miscfiles-1.5-r1
 1509030951 metadata/md5-cache/sys-apps/entropy-254
@@ -69318,6 +69343,7 @@
 1508241439 metadata/md5-cache/sys-apps/proot-4.0.3
 1509010748 metadata/md5-cache/sys-apps/pcmciautils-018_p8-r1
 1509010748 metadata/md5-cache/sys-apps/sed-4.2.1-r1
+1509040338 metadata/md5-cache/sys-apps/elfix-0.9.1
 1509030951 metadata/md5-cache/sys-apps/etckeeper-1.18
 1509020815 metadata/md5-cache/sys-apps/hwloc-1.10.0-r2
 1509010748 metadata/md5-cache/sys-apps/flock-2.19
@@ -73443,7 +73469,7 @@
 1509010745 metadata/md5-cache/games-rpg/eternal-lands-1.9.2-r1
 1509010745 metadata/md5-cache/games-rpg/eternal-lands-1.9.3-r2
 1508140751 metadata/md5-cache/games-rpg/draci-historie-2012
-1508140751 metadata/md5-cache/games-rpg/freedink-108.4
+1509032138 metadata/md5-cache/games-rpg/freedink-108.4
 1508241415 metadata/md5-cache/games-rpg/eternal-lands-bloodsucker-3.0_p20110618
 1508270938 metadata/md5-cache/games-rpg/manaplus-1.5.8.15
 1508241415 metadata/md5-cache/games-rpg/eschalon-book-1-demo-106
@@ -73525,7 +73551,6 @@
 1508100526 metadata/md5-cache/sci-mathematics/ent-101202
 1508100526 metadata/md5-cache/sci-mathematics/coq-8.4_p3
 1508240143 metadata/md5-cache/sci-mathematics/genius-1.0.17
-1509031739 metadata/md5-cache/sci-mathematics/maxima-5.37.1
 1508231238 metadata/md5-cache/sci-mathematics/calc-2.12.2.2
 1509010748 metadata/md5-cache/sci-mathematics/polymake-2.14-r1
 1509010748 metadata/md5-cache/sci-mathematics/cado-nfs-2.1
@@ -73538,6 +73563,7 @@
 1508241415 metadata/md5-cache/sci-mathematics/isabelle-2013.2-r1
 1508100526 metadata/md5-cache/sci-mathematics/bertini-1.4
 1509020815 metadata/md5-cache/sci-mathematics/unuran-1.8.1
+1509032208 metadata/md5-cache/sci-mathematics/maxima-5.37.1-r1
 1508100526 metadata/md5-cache/sci-mathematics/flint-2.3
 1508100526 metadata/md5-cache/sci-mathematics/coq-8.4_p5
 1508100526 metadata/md5-cache/sci-mathematics/agda-2.4.0.1
@@ -73547,7 +73573,6 @@
 1509010748 metadata/md5-cache/sci-mathematics/cado-nfs-2.1.1
 1509010748 metadata/md5-cache/sci-mathematics/rstudio-0.98.1028
 1508240143 metadata/md5-cache/sci-mathematics/wxmaxima-13.04.2
-1509010748 metadata/md5-cache/sci-mathematics/rstudio-0.99.473
 1508100526 metadata/md5-cache/sci-mathematics/e-1.5
 1509010748 metadata/md5-cache/sci-mathematics/pari-2.5.4
 1508100526 metadata/md5-cache/sci-mathematics/gwnum-277
@@ -73692,6 +73717,7 @@
 1509030951 metadata/md5-cache/sci-mathematics/singular-3.1.6
 1508221838 metadata/md5-cache/sci-mathematics/gimps-28.7
 1508100526 metadata/md5-cache/sci-mathematics/ginac-1.5.8
+1509032138 metadata/md5-cache/sci-mathematics/wxmaxima-15.08.1
 1508100526 metadata/md5-cache/sci-mathematics/pari-data-20120726
 1508100526 metadata/md5-cache/sci-mathematics/octave-epstk-2.3
 1508100526 metadata/md5-cache/sci-mathematics/kodkodi-1.5.2
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 50af20d4e535..b33b19a93e2c 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 03 Sep 2015 17:30:01 +0000
+Fri, 04 Sep 2015 06:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 1a0a83430550..a127c0f32ed7 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1441300201 Thu 03 Sep 2015 05:10:01 PM UTC
+1441345201 Fri 04 Sep 2015 05:40:01 AM UTC
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 3daa4142c84c..4d7949e595ee 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -12,10 +12,10 @@ AUX wireshark-1.99.8-qtchooser.patch 296 SHA256 adfbd7ded334d51f805efb0bea412cba
 AUX wireshark-99999999-pkgconfig.patch 1558 SHA256 f055612c8ee727fe0c9ff26d5da6c89a09457d70e6d09e4cee9125e14806e5bd SHA512 fd691dc689317b5e7c3dd84ead9fdf8720c08893e46ba459e2bfbf473c000f4b8ba0008869b55e88f485e512c6ee9f622d2a31aa37c0934cd53e790f832f62cc WHIRLPOOL 9bad44f95991d09da20721cc2d8e0e053f1c655b4daedda1b865df9906cdbf400e6c3538f774083e9271e53ad88cff906b6cb72273872509e6a0e30c16704049
 DIST wireshark-1.12.6.tar.bz2 29166493 SHA256 22ac0cc872f12cef9bb2cacfe0720eed8533dc5cea102d21de511620606cb3b6 SHA512 a8fb576e359d6534fc2df3372f23c1f338aed393749786cde21d8593f50ccec154d05c9298f7ddfcaa3a0dcee921975c6a40070a8d0b84f6fbb7f8df16b2b17b WHIRLPOOL d6c8cc268e46ab59da1d06d73dc5a7e7e16f9b07297f04a6e997fbf72a5a8ceb71847f892ab0fc281e843e3f23e8ed3bf85580b19e76e2103b0cb388c2bc9850
 DIST wireshark-1.12.7.tar.bz2 29202490 SHA256 c74a1c14e72ce0f198a93d832e71742c7f312cbbe719e5def9ecef176860f92c SHA512 a4012fa56e8b99e5fb072c1fb82c783a547395ddb013a9473858fdf9fa99270313d6059f9ee210d56c00f420bbad9cab30bdd3c45e9ff07d4f5967c18d1d0f38 WHIRLPOOL 84c60871fb1d8022885108c97323a892bc9ee035fc421e1e96b76819291337e8d0026be6c77e62f03582fb854188535e5fceb50eb17830f5b1a3ff69b3474d4c
-DIST wireshark-1.99.8.tar.bz2 30291568 SHA256 6e03021a82cbc6b039210d37694ae51de101b7ffd4eb0e92a65ff84b4499e211 SHA512 daee99e9619b10900479c5f99ae4d33e12a2fbbc1a3065e88a77d907443e4b79a401206cf7c2dd81ffede7f1b55e97cc19faf232437334606d0cdbf0bafc98bf WHIRLPOOL 24f9270ba1ad38ef0a9a74e4c394208f27f5a05f98fc04fcc7223c92ae7259fb7022ca96867815c060ca9a76d5e76b1fb53a4757bd0cd6a1aedcfcb71649da4c
+DIST wireshark-1.99.9.tar.bz2 30495072 SHA256 be7ac8f8eb2c08e0e3d62da9f781db0dc5322a9cbcb024d3f86a66a06185e182 SHA512 d08348df7951ddc9c441bf9e80ab7ea281ccb92c7aa837dcae172037ee3486dcefaa28e8286a5e1654404a57bc0e004320f01c32c55af6f771dc20814d322066 WHIRLPOOL 09708dbe954dd72ae7b9295b57bcc420f36a5ae76ba27ace6c50cf85b19f295a2a10ffe3039018d0dbbba3c72cc3b0e4689512511b48a6ec706eab89f549e94c
 EBUILD wireshark-1.12.6.ebuild 6401 SHA256 d6adae10f08b9c1f3ab39ca28da768ca9952832089272766a2fa9a2bc245122c SHA512 3c9c73cd64f148ab14a556dbf063ff7f284f5ee1f3d47e3a12a58ee01b784193000bc0e9de1da5f6c3e35e405ae72743ebc47c1c83c9ed268ddb19c52d7d0a57 WHIRLPOOL 88e7e4aff47742ca6691517a3cbb030c4047bf2331f4010db0b7daa02e740177b11c97d33a1b5ed336a4ad8581d753165603b2745912549710945939d47f5449
 EBUILD wireshark-1.12.7.ebuild 6403 SHA256 68d165dd764c954928e2fa41981ee2f219cf6cdcdb4d64ec809a341df6738215 SHA512 a4162bfc4b100793053fc478e2a6dbe5432ff28310773fa52d09e40fbbb2a70e9801d2d40543c43de8d98bbe4ce45621e5631c6861a4f172aba120fccdd5f980 WHIRLPOOL f5ab8c8649ad67b9e42ab1524b34d1e1c30cdc01ac6356464178f77dde9cf60ea423cc31ccf080c2a5a6e87bdd10a2a6a1ca12928d0b8c07cbf672c1d9ff1460
-EBUILD wireshark-1.99.8.ebuild 6477 SHA256 c95564356fbb002df5c2d4f308ce50edfee301b8c3025bb265aff3e95fe73294 SHA512 f07e7d2f456420a064160ef35cfe780d3958c6b8771e9e211f2333fc02c499e386b5221cef929908edd2edd5bd25d9e9ff6fb843167ecd4d440cbef3e1cb71dc WHIRLPOOL beda44c9df3346725370b931b68ecfe30bb24379cd27af20f6d76f394e69b8af6a6ec4493ecc724f9bd4859afd9a6a1244c5b971062ba3bdc392d43f28237503
+EBUILD wireshark-1.99.9.ebuild 6477 SHA256 c95564356fbb002df5c2d4f308ce50edfee301b8c3025bb265aff3e95fe73294 SHA512 f07e7d2f456420a064160ef35cfe780d3958c6b8771e9e211f2333fc02c499e386b5221cef929908edd2edd5bd25d9e9ff6fb843167ecd4d440cbef3e1cb71dc WHIRLPOOL beda44c9df3346725370b931b68ecfe30bb24379cd27af20f6d76f394e69b8af6a6ec4493ecc724f9bd4859afd9a6a1244c5b971062ba3bdc392d43f28237503
 EBUILD wireshark-99999999.ebuild 6457 SHA256 083533842d6543a0afc37ff8eb02f5a40475e195492e76fa8865e0ccb76aaac7 SHA512 5661912ebd00d2cb74bf01710c5c0186a54f02f6b14759947ad493bb3953b84b0cb88599e17bd31811355db8b304aaca0992445ce8f1cd3640d8daf50186f238 WHIRLPOOL 2c0b01701d60a9cfaa77af9664fe24f70862afc7773568e731c6f3f9a76cc2f3b396cdfd5761fd68c65a45d29fd0565fe771ed91377868510ebf793358a527e1
 MISC ChangeLog 107469 SHA256 077b97e93bc0bcebd520af0c72ec9df8da0af9b004423b34190b15c201341b2b SHA512 ce81239e7a9731845ee59ef8206094263b501ab74130cf2a34f8e052e6bf431f019c116c732e2b290c1c61e65ab548e1e10009d1d269cc83fed7f295aee555bc WHIRLPOOL 936c3ea54e274000a61a4114c7d69415f7289183b7c7f75b72925fa9ca0f0f6d42a4ef367d625d4e5892587eee680bbf63eb2945fbc4a98e68b04907ed3fdbc5
 MISC metadata.xml 2463 SHA256 3b0614691f8157e2d2100f6ff2157575bc890866adc359935448ff59a2a606e3 SHA512 105867cbc7a73f1ea2ab6a1aa78fe680a970b951ac49d481c09b9bae79c5bbb5f1681e222fdb183ec2f226c3f69e9b5c06366d2eadadba73e262c93e460b5cf9 WHIRLPOOL ec61df7c59f0ccdc477dc7ecf996ec29a16e95912f1b019e5ac0faf0b601403e40c5937937f204a91b4a9c28aa5aefec953d742405e4b13972de154206033309
diff --git a/net-analyzer/wireshark/wireshark-1.99.8.ebuild b/net-analyzer/wireshark/wireshark-1.99.9.ebuild
similarity index 100%
rename from net-analyzer/wireshark/wireshark-1.99.8.ebuild
rename to net-analyzer/wireshark/wireshark-1.99.9.ebuild
diff --git a/net-irc/limnoria/Manifest b/net-irc/limnoria/Manifest
index cb70d4893327..95634d3e730e 100644
--- a/net-irc/limnoria/Manifest
+++ b/net-irc/limnoria/Manifest
@@ -1,7 +1,7 @@
-DIST limnoria-20150429.tar.gz 931326 SHA256 a9ad09f3820bad5ed57cdcfa39aa78cd4c698b1ce5860cecc7a722e5b44d287d SHA512 3e6d52463270624506b733364b212c784a730104f4c6760ddd002983e42a17b1815ec6bee785ab619fe1f17f62b90fa35b3d55dac412368d85c392adacca1620 WHIRLPOOL 0cfb169d371a5595b52a404424c5a2134f3a2a03da77ec507cff60e1dbc3f92f7c88c309807c34d58a0c168ad65245e8349e364f4be9e75aa92963640c2ab52f
 DIST limnoria-20150523.tar.gz 937583 SHA256 16d7e9ccfddfb67eca616997be938b268347be7b17ccc43d38aea6b48bb3cd0e SHA512 d94ea8fe64a648605e8e45317f3283fac837e8bfe1465407fa7522ea5e2259c64a0ea3aa4585313b5c21def735fa7b0e62d7774fabfc2647683efc2f4c38d599 WHIRLPOOL 40baeebf15051a5bc36a39645f984ba9aa4710e8da08cf53bb69e330b3ba6a62c40317919ba5a7ea0e3841187e89087054f1072862d512dff9443e812d4728b8
-EBUILD limnoria-20150429.ebuild 2636 SHA256 d7648008a0ade05aa1869bbd2f762b2871371ce5c21d81b2774c211e53ecd796 SHA512 68f43afeb254b38b80b4937657c579de731815b15130c08e748742139e15fbd126cd88f0076e822a920221dc1ffa0d1a18e5b2d418d80588f59769972ed36b53 WHIRLPOOL 16a095cbd5acc4a03c643a284af8c878c0454f7769f6b51cbc146784ac745b559d4917c58e699d0e99009f51fc8d98ae5143b9c18a1846268307aac4ec6c6758
+DIST limnoria-20150829.tar.gz 939733 SHA256 b86ca1cb24b6f54c9e892a978c1afad1df17cb9308883764f6cc7381e2d124dc SHA512 51c941adf596716a610f6233a606958eae39fb90ad2ab02fcde670596c174b99196da7d29d31c438db0eeb79bd2d8c1067fdf21f0e6e42ba25a80cd5249b89a2 WHIRLPOOL 118f532c2ec4c9b75a7194bc2ea65e9aa707601276fbb3abf7066f5e96d297a7454fb0d477aa9e595d9dadb4750f00a549e78f5408a15a3c264526a8b83dd507
 EBUILD limnoria-20150523.ebuild 2636 SHA256 d7648008a0ade05aa1869bbd2f762b2871371ce5c21d81b2774c211e53ecd796 SHA512 68f43afeb254b38b80b4937657c579de731815b15130c08e748742139e15fbd126cd88f0076e822a920221dc1ffa0d1a18e5b2d418d80588f59769972ed36b53 WHIRLPOOL 16a095cbd5acc4a03c643a284af8c878c0454f7769f6b51cbc146784ac745b559d4917c58e699d0e99009f51fc8d98ae5143b9c18a1846268307aac4ec6c6758
+EBUILD limnoria-20150829.ebuild 2636 SHA256 d7648008a0ade05aa1869bbd2f762b2871371ce5c21d81b2774c211e53ecd796 SHA512 68f43afeb254b38b80b4937657c579de731815b15130c08e748742139e15fbd126cd88f0076e822a920221dc1ffa0d1a18e5b2d418d80588f59769972ed36b53 WHIRLPOOL 16a095cbd5acc4a03c643a284af8c878c0454f7769f6b51cbc146784ac745b559d4917c58e699d0e99009f51fc8d98ae5143b9c18a1846268307aac4ec6c6758
 EBUILD limnoria-99999999.ebuild 2636 SHA256 d7648008a0ade05aa1869bbd2f762b2871371ce5c21d81b2774c211e53ecd796 SHA512 68f43afeb254b38b80b4937657c579de731815b15130c08e748742139e15fbd126cd88f0076e822a920221dc1ffa0d1a18e5b2d418d80588f59769972ed36b53 WHIRLPOOL 16a095cbd5acc4a03c643a284af8c878c0454f7769f6b51cbc146784ac745b559d4917c58e699d0e99009f51fc8d98ae5143b9c18a1846268307aac4ec6c6758
 MISC ChangeLog 1505 SHA256 deb0c5d528ee4d5bdef0cf6edb38aa5760435c33ba2025f6c130f8a1eecd29e2 SHA512 3baafb869eac12f72acd69cd3c69eb7bf3e80cf1c274a76919b359a4b74fc3a3428cf09790ab2b2ff9d20c8d267cd54099237c27499dd9b0842223ad0aec0de4 WHIRLPOOL 592ef387efa193caa9b6660c43ac8fd10aeb2bcb01074631bc57c735cf1b8c789299f53755ae8be837ce2049d74e84a9c93510579964bf776a697341fe905e68
 MISC metadata.xml 394 SHA256 540f6eaceff92b5d9601c338d649bebcb899de62d32120ea1ae53e027deff94c SHA512 6efd6122806a68dc74e7cbb6ac80f71456f35eefb163ca17b024d70058efe01a2dea0113a333b1c9ea1ecdf9521666e55a03a470f26c992859de0eb979b6e38d WHIRLPOOL 1b96303dd2af832ec1dae4ed41a87e9e486ca558422da1f523394ca76be0d6f417500ab02de8efca0e1de54e5fde0f83f1de8ee351580dfa46b7dd5bd485dcaf
diff --git a/net-irc/limnoria/limnoria-20150429.ebuild b/net-irc/limnoria/limnoria-20150829.ebuild
similarity index 100%
rename from net-irc/limnoria/limnoria-20150429.ebuild
rename to net-irc/limnoria/limnoria-20150829.ebuild
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index fc234dd6c04b..53cb090843a8 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -19,6 +19,7 @@ AUX openldap-2.4.35-contrib-samba4.patch 1400 SHA256 64ca91d3edae25d392f39a7f538
 AUX openldap-2.4.35-contrib-smbk5pwd.patch 1626 SHA256 377b9204f51bb751d7311de3ee789386496372db2964ed2a929733099c23688a SHA512 c045c7605d25bab9eef8c12752f4952e3e6358124764ded91f5f98210686bc371f32ac20c56a63de80410f882f20e0889eec95474f1ee9d4c5bb4ed303ec8da0 WHIRLPOOL 64feead042fe22ec8bd36a23a11ea1af513702de2ab063324f0e49802635ca53b9f2f662159c8784877f6342d0a15cb231710be2ea69031c3df7459cd150cc47
 AUX openldap-2.4.40-mdb-unbundle.patch 3589 SHA256 43be88ef0810608232b2490e7f06f66272d17059c581f76d4de79c415365dd97 SHA512 ec123ff8cef6c32b1f29c2d0643433dd88dfa8ab62b4d7536de829475ff8b45b5c7376f3e17f3424aab326a573aa36a593630feecbd40c3e574c6c24f5dd83ec WHIRLPOOL 0eadd603e016506d3365f81c802561a0201122b989033935a5a6b4737db75ff6c1517bcca1c7c127b54bfd7c1ea2db0c11f65228ea6c4cbacf2f783af98dfddb
 AUX openldap-2.4.40-slapd-conf 2059 SHA256 306602d38cbbdc2203e9f838348cbe9b264738cf86bbebc60272658b92a1eff9 SHA512 7ce8a8262db74d86449a3d31b96b2efa9e8dae2f9992a1c3a6d6899fb65531eaf917f410d8728852cb74338d7ba3c8c3b52d2f6cdcbba4cb3b97f6c733099fa2 WHIRLPOOL 979a2802501ec22dd93032eb3bc1a3df322558013cd8038736bac436b33fdb666df5d93fbfcc4d99762c10aa9e1a1edef496fa364d2b4f0019b5dd702174b6f4
+AUX openldap-2.4.42-mdb-unbundle.patch 3589 SHA256 43be88ef0810608232b2490e7f06f66272d17059c581f76d4de79c415365dd97 SHA512 ec123ff8cef6c32b1f29c2d0643433dd88dfa8ab62b4d7536de829475ff8b45b5c7376f3e17f3424aab326a573aa36a593630feecbd40c3e574c6c24f5dd83ec WHIRLPOOL 0eadd603e016506d3365f81c802561a0201122b989033935a5a6b4737db75ff6c1517bcca1c7c127b54bfd7c1ea2db0c11f65228ea6c4cbacf2f783af98dfddb
 AUX openldap-2.4.6-evolution-ntlm.patch 5161 SHA256 3b79d9afaa7c76ca20c5e7aa856dea49931741a1022ae6c3bb264c38f4c22edb SHA512 a553231ad3e2d2ca3a3a195b20da6163c135a723e0a3ed39afcad5601ed4ef01e692533df3f8f96d5ec8cc74ca27cbd16508818007dc1343899a42b5595b980b WHIRLPOOL 624f11c996825bb248dd7c33f64afd3a4e8b9edbbe79c6fdffc7f2d8e57c5d8ac4c651eae7763dbc0a06144b916131b70e599771034bcb6bd8c586a9bf6a8209
 AUX slapd-confd 614 SHA256 901044908fbbbbf333f7f0f1efccd1f0e213aa1a9156b3e659eaf0a0c7fdfc89 SHA512 e4ae52d10294da787016cf39adfd68c6ad812ac1758b00845810ee7936d21734d2ef3793252b878d88f21788414071adffb5f484381d4dc6a29f71a8729486b7 WHIRLPOOL d45df7487a952f899e9098779edda82afd9fb5ca66e42bbaf4a94f9ebdda9be58a026c0358a521a2feb4cc04c1f8477fb034896054ca4575d717bec367e1e2e8
 AUX slapd-confd-2.4.28-r1 1072 SHA256 5bca003ec3b67c7c78519aede1d82002579006ccfecce8f87b559df719f82e92 SHA512 7426c04ee689bcfb29a9a3956367c571eac6bc9620efda938591d09382a05527454458f7a25bdc2fa2ac920f93bae516121e085408ffefbe8ace0c7d8c5da315 WHIRLPOOL b9cb4e249f224ce2435184922df8d053d4c6d058a6408b72ac3c393563bdc0d413f7310e74ef7dcdab6dedc3d25a77d5af0581334356a9b55be5c516d6ee71d4
@@ -36,6 +37,7 @@ DIST openldap-2.3.43.tgz 3803011 SHA256 d7d2dea05362c8ac7e11bb7bf1da4cdeb07225ba
 DIST openldap-2.4.38.tgz 5506085 SHA256 88209a3599ec5d9354fc09bbe29b99db1ffa1b612127c06bad0c5265d0b31fd1 SHA512 df7b6b2b84102ba996f84575396c7505ada851b5f09841fd821d34fd8d62580f85ecc655e2cd3965730b44d6919d64864f56b23791f38b411d142d345f250666 WHIRLPOOL bb6a19b353f9dcde07afe78052ce9d5db5a2aaa09236b69d22da0879e74c4de8587312bad66939702db30af779f7ee9720ad792b73d225f004a1a90d80a6fed1
 DIST openldap-2.4.39.tgz 5509060 SHA256 8267c87347103fef56b783b24877c0feda1063d3cb85d070e503d076584bf8a7 SHA512 7b5ef2a69f79f0901a06f8be4ab50afc3b3e98ab1ea74a421569443d32cb43d3cf773d3f028fb5fb39908c09ee172cb4770ecc5882754877a59d29bf8f8cc059 WHIRLPOOL 90ac4cff185855d569a8033a3e35a251d75e4a2805bcfa5ba5b3605ec88b2fc244b0e95aabd33c47c9846f29c95a17e1be43650442987f6abc043667e06f15cd
 DIST openldap-2.4.40.tgz 5641865 SHA256 d12611a5c25b6499293c2bb7b435dc2b174db73e83f5a8cb7e34f2ce5fa6dadb SHA512 c803c4a82878891d60414d64dcb54a7c3f08675106ba13f50cba06034a97b3eee1c238761dd5ddad97d8c3f6675d9bbbec176d0340eb4a3bcd808f940baabab5 WHIRLPOOL 82cb6033798ac69faf4a0d1f5d7716316f5fbfc67e0f3a013b5bae461a01e3029aa6fb7d510bc14eed4f40ef83632561a3fa39aebf2be2785e3d0e0038db048c
+DIST openldap-2.4.42.tgz 5645925 SHA256 eeb7b0e2c5852bfd2650e83909bb6152835c0b862fab10b63954dc1bcbba8e63 SHA512 52d6af7610c4fdc8f965ebea04d09c38f73773a02c2e484dc111100f3d472f8b2f766ca32d9c80f5815a57745095cc7c33ad62d9165eec5b9e252ae172e7782c WHIRLPOOL e151c63bfd10f5e96c60f216925315ed788d426ba2c15ee2793a4de4bb25d01717e7bb5144814a0e6a053a5d5a0aab75213a495aa47aa13f7c3e70716c01633e
 DIST rfc2307bis.schema-20140524 12262 SHA256 6cd8154ad86be1d6bb88a79c303dc10a49bce4ce7d21bb417a951d6496df30b1 SHA512 83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e WHIRLPOOL 40cef24529fb4bfc1661d03088eccdb17d9056d696b2bf0e698fa248d03f508ba776784bf8abbaffb5f4c2c59b59b29525b4be2babc978fed681e5e3c88073de
 EBUILD openldap-2.3.43-r3.ebuild 18020 SHA256 74ae0e03243cb3d5e715d43f5f7eac15b9f928572195d364da47f7c4753c7623 SHA512 7e4819e8893aacf0b5d91b76d048e2c9465ada4a4886726482b058269ec280a2c400502d96db17c25041d18406eb81ae7d081efbfb5cea50d595627a0d9100f2 WHIRLPOOL 720d273446c5a1a86f3a2bb5ec36151684a516d38c5eee390dab10c1d38f30cf8500226c0c221c0d9179359ce69a14308f2a302709586cf6dffb49f92ce464d8
 EBUILD openldap-2.3.43-r4.ebuild 18212 SHA256 151676cd5d269e4d08f37b669c026f018a1666c60fad5eb2266f98579c288209 SHA512 1a00db27e4a3102dea89eb7ffca08d0a5fd9db914ad7d99d263863a31dd20e7cc869b16d11b29ab237f2faab1dc07facae257bc09e6f2235277838f7ba6c1e97 WHIRLPOOL 6216146b6d16cfe642163c0b3f39f1823d8c9c6bd0cbefb12300d22dbe7f765f4443be391d0524f47fe0ff3975de2bf4a391a1bb21e40baca94b7f32131e23db
@@ -44,5 +46,6 @@ EBUILD openldap-2.4.39.ebuild 23907 SHA256 66fd19c6e91fd67dcfdbacb7dabaa0bce0e88
 EBUILD openldap-2.4.40-r2.ebuild 26119 SHA256 2314abf85593796e7ba2a881919bac06e3d52b3432068701b26999b74dd2c497 SHA512 8bfa9ee86b25e5d6b245155b44db050a000914329fb7e8a8a0546302c32a1020dbaf5adca73639cc922ebda428fe250f233bd738aa891692035ecce35004e976 WHIRLPOOL b890177fa58767c69dfce6f93cc79aaec69cc950a9936219ae88404c2bd7df128479b9e3991580a3a20aeac85a09d16c40da60001b141df27b8dea5cb501003a
 EBUILD openldap-2.4.40-r4.ebuild 26126 SHA256 db9cd32073812567d2292a39e39b87231e94b8cc649a8849609c3de852a726be SHA512 3384889e40001c4b6121a6a18eba33f9e5ff6e099c01d5920ed78fb72395a8ee4113eee9ca226516e32425dff0560d1fa3ccb0773680a6fed286f4c421f9917b WHIRLPOOL 9d27157dfdb4ba8770118f71984c09fd84a1fb6470bdc79226b4ce89a96b8ff9bbdcf474b4dad2c432259abf0b25fbac1af3bde065da785ed46368e7f64f61dd
 EBUILD openldap-2.4.40.ebuild 26560 SHA256 1c2bf719a10adaf5fccf6a293f851c5d98f87bedffa31b5b4823ce9e3363c010 SHA512 e96f13802b48fbfb5df4b08c49400418570ace1233cc85b0d8e344c186f174268b77393e31eb78696280ddc5d9a4a1ab09be62aa23e1336263fc1250764a764b WHIRLPOOL c6526d927b0b687898081447c0baf4bba8756dafcfddff04da02577907a5184c7351d2175e4f35c2d77af301852774c1de1beef168428e921a6cddee5e3c8fe7
+EBUILD openldap-2.4.42.ebuild 26051 SHA256 3064832645a401453c80118248153b3bfb13a5d741cc7914b3b026fc5fb97d10 SHA512 5a35cea059dc40fc31d162cce000965a7bc35500caace56e385535aefb58b2f4965726aec33316ecf00de30bb60c6862d3c3b33a918f6a038897337831b3c595 WHIRLPOOL 5cb54bd5229132dedd82592d3f45a695b8254b2be9c89d7b91e0d25c63643863d778ccb187ce2572a5804d1df2b0241e0fd77fb2c7796d3f523829297fb7ada2
 MISC ChangeLog 87821 SHA256 29dc9d2d86f5c0de89ee44162332ee4390220ea9e546895100bd413bc60a0a30 SHA512 7c98e1dfe9ea30d7a31a7187cd913e6997bd8f8d5d74747c85f989a61b702272ce120588874257f2653343c2134c94dc405710f82957169a6f7bac01854d3611 WHIRLPOOL 2b657cb4f1f302e90eea233e401c6ca379b605c697443b36280153eb7419695ed2040ada6505b2c38c86832bda3efa74a4bfeda267d644639148ca6954cd10e9
 MISC metadata.xml 664 SHA256 70c2b3ca29517c6cafffef5802fcd6a513517d320a118bf2205b0033ffa384ea SHA512 55e576a18ae7c71f3fa413b252a40945059d9f9308f4036739124bd241cc6c409816124c7e4fd30df965963d93907bce03ee117489fdb3443e62bf00dac9da25 WHIRLPOOL ce3c30df03e9026415bd72d5f3c132bb3273a597a6ca8e8928957baae1b4bc6d80ab8f7f0698d72cd8d5773a957ee2a929d3c2bdd4f5a6cd6ba88f9b9e0aa4c7
diff --git a/net-nds/openldap/files/openldap-2.4.42-mdb-unbundle.patch b/net-nds/openldap/files/openldap-2.4.42-mdb-unbundle.patch
new file mode 100644
index 000000000000..9265a01701ab
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.4.42-mdb-unbundle.patch
@@ -0,0 +1,136 @@
+--- ./build/top.mk.orig	2014-10-24 14:34:59.260827298 +0200
++++ ./build/top.mk	2014-10-24 14:35:25.281168893 +0200
+@@ -160,6 +160,7 @@
+ LTHREAD_LIBS = @LTHREAD_LIBS@
+ 
+ BDB_LIBS = @BDB_LIBS@
++MDB_LIBS = @MDB_LIBS@
+ SLAPD_NDB_LIBS = @SLAPD_NDB_LIBS@
+ 
+ LDAP_LIBLBER_LA = $(LDAP_LIBDIR)/liblber/liblber.la
+--- ./build/openldap.m4.orig	2014-10-24 10:52:02.837221734 +0200
++++ ./build/openldap.m4	2014-10-24 11:31:02.748087966 +0200
+@@ -563,6 +563,38 @@
+ 	], [ol_cv_bdb_compat=yes], [ol_cv_bdb_compat=no])])
+ ])
+ 
++dnl --------------------------------------------------------------------
++dnl Check for version compatility with back-mdb
++AC_DEFUN([OL_MDB_COMPAT],
++[AC_CACHE_CHECK([if LMDB version supported by MDB backends], [ol_cv_mdb_compat],[
++	AC_EGREP_CPP(__mdb_version_compat,[
++#include <lmdb.h>
++
++/* require 0.9.14 or later */
++#if MDB_VERSION_FULL >= 0x00000009000E
++	__mdb_version_compat
++#endif
++	], [ol_cv_mdb_compat=yes], [ol_cv_mdb_compat=no])])
++])
++
++dnl
++dnl --------------------------------------------------------------------
++dnl Find any MDB
++AC_DEFUN([OL_MDB],
++[ol_cv_mdb=no
++AC_CHECK_HEADERS(lmdb.h)
++if test $ac_cv_header_lmdb_h = yes; then
++	OL_MDB_COMPAT
++
++	if test $ol_cv_mdb_compat != yes ; then
++		AC_MSG_ERROR([LMDB version incompatible with MDB backends])
++	fi
++
++	ol_cv_lib_mdb=-llmdb
++	ol_cv_mdb=yes
++fi
++])
++
+ dnl
+ dnl ====================================================================
+ dnl Check POSIX Thread version 
+--- ./servers/slapd/back-mdb/Makefile.in.orig	2014-10-24 10:31:30.860931076 +0200
++++ ./servers/slapd/back-mdb/Makefile.in	2014-10-24 14:33:33.803705424 +0200
+@@ -25,11 +25,10 @@
+ 	extended.lo operational.lo \
+ 	attr.lo index.lo key.lo filterindex.lo \
+ 	dn2entry.lo dn2id.lo id2entry.lo idl.lo \
+-	nextid.lo monitor.lo mdb.lo midl.lo
++	nextid.lo monitor.lo
+ 
+ LDAP_INCDIR= ../../../include       
+ LDAP_LIBDIR= ../../../libraries
+-MDB_SUBDIR = $(srcdir)/$(LDAP_LIBDIR)/liblmdb
+ 
+ BUILD_OPT = "--enable-mdb"
+ BUILD_MOD = @BUILD_MDB@
+@@ -44,7 +43,7 @@
+ 
+ LIBBASE = back_mdb
+ 
+-XINCPATH = -I.. -I$(srcdir)/.. -I$(MDB_SUBDIR)
++XINCPATH = -I.. -I$(srcdir)/..
+ XDEFS = $(MODULES_CPPFLAGS)
+ 
+ all-local-lib:	../.backend
+@@ -52,11 +51,5 @@
+ ../.backend: lib$(LIBBASE).a
+ 	@touch $@
+ 
+-mdb.lo:	$(MDB_SUBDIR)/mdb.c
+-	$(LTCOMPILE_MOD) $(MDB_SUBDIR)/mdb.c
+-
+-midl.lo:	$(MDB_SUBDIR)/midl.c
+-	$(LTCOMPILE_MOD) $(MDB_SUBDIR)/midl.c
+-
+ veryclean-local-lib: FORCE
+ 	$(RM) $(XXHEADERS) $(XXSRCS) .links
+--- ./configure.in.orig	2014-10-24 10:46:53.289139847 +0200
++++ ./configure.in	2014-10-24 10:51:34.372846374 +0200
+@@ -519,6 +519,7 @@
+ dnl Initialize vars
+ LDAP_LIBS=
+ BDB_LIBS=
++MDB_LIBS=
+ SLAPD_NDB_LIBS=
+ SLAPD_NDB_INCS=
+ LTHREAD_LIBS=
+@@ -1905,6 +1906,30 @@
+ fi
+ 
+ dnl ----------------------------------------------------------------
++ol_link_mdb=no 
++
++if test $ol_enable_mdb != no; then
++	OL_MDB
++
++	if test $ol_cv_mdb = no ; then
++		AC_MSG_ERROR(MDB: LMDB not available)
++	fi
++
++	AC_DEFINE(HAVE_MDB,1,
++		[define this if LMDB is available])
++
++	dnl $ol_cv_lib_mdb should be yes or -llmdb
++	dnl (it could be no, but that would be an error
++	if test $ol_cv_lib_mdb != yes ; then
++		MDB_LIBS="$MDB_LIBS $ol_cv_lib_mdb"
++	fi
++
++	SLAPD_LIBS="$SLAPD_LIBS \$(MDB_LIBS)"
++
++	ol_link_mdb=yes 
++fi
++
++dnl ----------------------------------------------------------------
+ 
+ if test $ol_enable_dynamic = yes && test $enable_shared = yes ; then
+ 	BUILD_LIBS_DYNAMIC=shared
+@@ -3133,6 +3158,7 @@
+ AC_SUBST(LDAP_LIBS)
+ AC_SUBST(SLAPD_LIBS)
+ AC_SUBST(BDB_LIBS)
++AC_SUBST(MDB_LIBS)
+ AC_SUBST(SLAPD_NDB_LIBS)
+ AC_SUBST(SLAPD_NDB_INCS)
+ AC_SUBST(LTHREAD_LIBS)
diff --git a/net-nds/openldap/openldap-2.4.42.ebuild b/net-nds/openldap/openldap-2.4.42.ebuild
new file mode 100644
index 000000000000..35e79b62d7e5
--- /dev/null
+++ b/net-nds/openldap/openldap-2.4.42.ebuild
@@ -0,0 +1,809 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit db-use eutils flag-o-matic multilib multilib-minimal ssl-cert versionator toolchain-funcs autotools user systemd
+
+BIS_PN=rfc2307bis.schema
+BIS_PV=20140524
+BIS_P="${BIS_PN}-${BIS_PV}"
+
+DESCRIPTION="LDAP suite of application and development tools"
+HOMEPAGE="http://www.OpenLDAP.org/"
+
+# mirrors are mostly not working, using canonical URI
+SRC_URI="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz
+		 mirror://gentoo/${BIS_P}"
+
+LICENSE="OPENLDAP GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+IUSE_DAEMON="crypt icu samba slp tcpd experimental minimal"
+IUSE_BACKEND="+berkdb"
+IUSE_OVERLAY="overlays perl"
+IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 +syslog selinux static-libs"
+IUSE_CONTRIB="smbkrb5passwd kerberos"
+IUSE_CONTRIB="${IUSE_CONTRIB} -cxx"
+IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
+
+REQUIRED_USE="cxx? ( sasl )"
+
+# always list newer first
+# Do not add any AGPL-3 BDB here!
+# See bug 525110, comment 15.
+BDB_SLOTS='5.3 5.1 4.8 4.7 4.6 4.5 4.4'
+BDB_PKGS=''
+for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done
+
+# openssl is needed to generate lanman-passwords required by samba
+CDEPEND="icu? ( dev-libs/icu:= )
+	ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+		gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) )
+	sasl? ( dev-libs/cyrus-sasl:= )
+	!minimal? (
+		sys-devel/libtool
+		sys-libs/e2fsprogs-libs
+		>=dev-db/lmdb-0.9.14
+		tcpd? ( sys-apps/tcp-wrappers )
+		odbc? ( !iodbc? ( dev-db/unixODBC )
+			iodbc? ( dev-db/libiodbc ) )
+		slp? ( net-libs/openslp )
+		perl? ( dev-lang/perl[-build(-)] )
+		samba? ( dev-libs/openssl )
+		berkdb? (
+			<sys-libs/db-6.0:=
+			|| ( ${BDB_PKGS} )
+			)
+		smbkrb5passwd? (
+			dev-libs/openssl
+			kerberos? ( app-crypt/heimdal )
+			)
+		kerberos? ( virtual/krb5 )
+		cxx? ( dev-libs/cyrus-sasl:= )
+	)
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r3
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${CDEPEND}
+	sys-apps/groff"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-ldap )
+"
+# for tracking versions
+OPENLDAP_VERSIONTAG=".version-tag"
+OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# USE=cxx
+	/usr/include/LDAPAsynConnection.h
+	/usr/include/LDAPAttrType.h
+	/usr/include/LDAPAttribute.h
+	/usr/include/LDAPAttributeList.h
+	/usr/include/LDAPConnection.h
+	/usr/include/LDAPConstraints.h
+	/usr/include/LDAPControl.h
+	/usr/include/LDAPControlSet.h
+	/usr/include/LDAPEntry.h
+	/usr/include/LDAPEntryList.h
+	/usr/include/LDAPException.h
+	/usr/include/LDAPExtResult.h
+	/usr/include/LDAPMessage.h
+	/usr/include/LDAPMessageQueue.h
+	/usr/include/LDAPModList.h
+	/usr/include/LDAPModification.h
+	/usr/include/LDAPObjClass.h
+	/usr/include/LDAPRebind.h
+	/usr/include/LDAPRebindAuth.h
+	/usr/include/LDAPReferenceList.h
+	/usr/include/LDAPResult.h
+	/usr/include/LDAPSaslBindResult.h
+	/usr/include/LDAPSchema.h
+	/usr/include/LDAPSearchReference.h
+	/usr/include/LDAPSearchResult.h
+	/usr/include/LDAPSearchResults.h
+	/usr/include/LDAPUrl.h
+	/usr/include/LDAPUrlList.h
+	/usr/include/LdifReader.h
+	/usr/include/LdifWriter.h
+	/usr/include/SaslInteraction.h
+	/usr/include/SaslInteractionHandler.h
+	/usr/include/StringList.h
+	/usr/include/TlsOptions.h
+)
+
+openldap_filecount() {
+	local dir="$1"
+	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG*' | wc -l
+}
+
+openldap_find_versiontags() {
+	# scan for all datadirs
+	openldap_datadirs=""
+	if [ -f "${EROOT}"/etc/openldap/slapd.conf ]; then
+		openldap_datadirs="$(awk '{if($1 == "directory") print $2 }' ${EROOT}/etc/openldap/slapd.conf)"
+	fi
+	openldap_datadirs="${openldap_datadirs} ${OPENLDAP_DEFAULTDIR_VERSIONTAG}"
+
+	einfo
+	einfo "Scanning datadir(s) from slapd.conf and"
+	einfo "the default installdir for Versiontags"
+	einfo "(${OPENLDAP_DEFAULTDIR_VERSIONTAG} may appear twice)"
+	einfo
+
+	# scan datadirs if we have a version tag
+	openldap_found_tag=0
+	have_files=0
+	for each in ${openldap_datadirs}; do
+		CURRENT_TAGDIR=${ROOT}`echo ${each} | sed "s:\/::"`
+		CURRENT_TAG=${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG}
+		if [ -d ${CURRENT_TAGDIR} ] &&	[ ${openldap_found_tag} == 0 ] ; then
+			einfo "- Checking ${each}..."
+			if [ -r ${CURRENT_TAG} ] ; then
+				# yey, we have one :)
+				einfo "   Found Versiontag in ${each}"
+				source ${CURRENT_TAG}
+				if [ "${OLDPF}" == "" ] ; then
+					eerror "Invalid Versiontag found in ${CURRENT_TAGDIR}"
+					eerror "Please delete it"
+					eerror
+					die "Please kill the invalid versiontag in ${CURRENT_TAGDIR}"
+				fi
+
+				OLD_MAJOR=`get_version_component_range 2-3 ${OLDPF}`
+
+				[ $(openldap_filecount ${CURRENT_TAGDIR}) -gt 0 ] && have_files=1
+
+				# are we on the same branch?
+				if [ "${OLD_MAJOR}" != "${PV:0:3}" ] ; then
+					ewarn "   Versiontag doesn't match current major release!"
+					if [[ "${have_files}" == "1" ]] ; then
+						eerror "   Versiontag says other major and you (probably) have datafiles!"
+						echo
+						openldap_upgrade_howto
+					else
+						einfo "   No real problem, seems there's no database."
+					fi
+				else
+					einfo "   Versiontag is fine here :)"
+				fi
+			else
+				einfo "   Non-tagged dir ${each}"
+				[ $(openldap_filecount ${each}) -gt 0 ] && have_files=1
+				if [[ "${have_files}" == "1" ]] ; then
+					einfo "   EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files"
+					echo
+
+					eerror
+					eerror "Your OpenLDAP Installation has a non tagged datadir that"
+					eerror "possibly contains a database at ${CURRENT_TAGDIR}"
+					eerror
+					eerror "Please export data if any entered and empty or remove"
+					eerror "the directory, installation has been stopped so you"
+					eerror "can take required action"
+					eerror
+					eerror "For a HOWTO on exporting the data, see instructions in the ebuild"
+					eerror
+					openldap_upgrade_howto
+					die "Please move the datadir ${CURRENT_TAGDIR} away"
+				fi
+			fi
+			einfo
+		fi
+	done
+	[ "${have_files}" == "1" ] && einfo "DB files present" || einfo "No DB files present"
+
+	# Now we must check for the major version of sys-libs/db linked against.
+	SLAPD_PATH=${EROOT}/usr/$(get_libdir)/openldap/slapd
+	if [ "${have_files}" == "1" -a -f "${SLAPD_PATH}" ]; then
+		OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \
+			| awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')"
+		if use berkdb; then
+			# find which one would be used
+			for bdb_slot in $BDB_SLOTS ; do
+				NEWVER="$(db_findver "=sys-libs/db-${bdb_slot}*")"
+				[[ -n "$NEWVER" ]] && break
+			done
+		fi
+		local fail=0
+		if [ -z "${OLDVER}" -a -z "${NEWVER}" ]; then
+			:
+			# Nothing wrong here.
+		elif [ -z "${OLDVER}" -a -n "${NEWVER}" ]; then
+			eerror "	Your existing version of OpenLDAP was not built against"
+			eerror "	any version of sys-libs/db, but the new one will build"
+			eerror "	against	${NEWVER} and your database may be inaccessible."
+			echo
+			fail=1
+		elif [ -n "${OLDVER}" -a -z "${NEWVER}" ]; then
+			eerror "	Your existing version of OpenLDAP was built against"
+			eerror "	sys-libs/db:${OLDVER}, but the new one will not be"
+			eerror "	built against any version and your database may be"
+			eerror "	inaccessible."
+			echo
+			fail=1
+		elif [ "${OLDVER}" != "${NEWVER}" ]; then
+			eerror "	Your existing version of OpenLDAP was built against"
+			eerror "	sys-libs/db:${OLDVER}, but the new one will build against"
+			eerror "	${NEWVER} and your database would be inaccessible."
+			echo
+			fail=1
+		fi
+		[ "${fail}" == "1" ] && openldap_upgrade_howto
+	fi
+
+	echo
+	einfo
+	einfo "All datadirs are fine, proceeding with merge now..."
+	einfo
+}
+
+openldap_upgrade_howto() {
+	eerror
+	eerror "A (possible old) installation of OpenLDAP was detected,"
+	eerror "installation will not proceed for now."
+	eerror
+	eerror "As major version upgrades can corrupt your database,"
+	eerror "you need to dump your database and re-create it afterwards."
+	eerror
+	eerror "Additionally, rebuilding against different major versions of the"
+	eerror "sys-libs/db libraries will cause your database to be inaccessible."
+	eerror ""
+	d="$(date -u +%s)"
+	l="/root/ldapdump.${d}"
+	i="${l}.raw"
+	eerror " 1. /etc/init.d/slurpd stop ; /etc/init.d/slapd stop"
+	eerror " 2. slapcat -l ${i}"
+	eerror " 3. egrep -v '^(entry|context)CSN:' <${i} >${l}"
+	eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
+	eerror " 5. emerge --update \=net-nds/${PF}"
+	eerror " 6. etc-update, and ensure that you apply the changes"
+	eerror " 7. slapadd -l ${l}"
+	eerror " 8. chown ldap:ldap /var/lib/openldap-data/*"
+	eerror " 9. /etc/init.d/slapd start"
+	eerror "10. check that your data is intact."
+	eerror "11. set up the new replication system."
+	eerror
+	if [ "${FORCE_UPGRADE}" != "1" ]; then
+		die "You need to upgrade your database first"
+	else
+		eerror "You have the magical FORCE_UPGRADE=1 in place."
+		eerror "Don't say you weren't warned about data loss."
+	fi
+}
+
+pkg_setup() {
+	if ! use sasl && use cxx ; then
+		die "To build the ldapc++ library you must emerge openldap with sasl support"
+	fi
+	# Bug #322787
+	if use minimal && ! has_version "net-nds/openldap" ; then
+		einfo "No datadir scan needed, openldap not installed"
+	elif use minimal && has_version "net-nds/openldap" && built_with_use net-nds/openldap minimal ; then
+		einfo "Skipping scan for previous datadirs as requested by minimal useflag"
+	else
+		openldap_find_versiontags
+	fi
+
+	enewgroup ldap 439
+	enewuser ldap 439 -1 /usr/$(get_libdir)/openldap ldap
+}
+
+src_prepare() {
+	# ensure correct SLAPI path by default
+	sed -i -e 's,\(#define LDAPI_SOCK\).*,\1 "'"${EPREFIX}"'/var/run/openldap/slapd.sock",' \
+		"${S}"/include/ldap_defaults.h
+
+	epatch "${FILESDIR}"/${PN}-2.4.17-gcc44.patch
+
+	epatch \
+		"${FILESDIR}"/${PN}-2.2.14-perlthreadsfix.patch \
+		"${FILESDIR}"/${PN}-2.4.15-ppolicy.patch
+
+	# bug #116045 - still present in 2.4.28
+	epatch "${FILESDIR}"/${PN}-2.4.35-contrib-smbk5pwd.patch
+	# bug #408077 - samba4
+	epatch "${FILESDIR}"/${PN}-2.4.35-contrib-samba4.patch
+
+	# bug #189817
+	epatch "${FILESDIR}"/${PN}-2.4.11-libldap_r.patch
+
+	# bug #233633
+	epatch "${FILESDIR}"/${PN}-2.4.17-fix-lmpasswd-gnutls-symbols.patch
+
+	# bug #281495
+	epatch "${FILESDIR}"/${PN}-2.4.28-gnutls-gcrypt.patch
+
+	# bug #294350
+	epatch "${FILESDIR}"/${PN}-2.4.6-evolution-ntlm.patch
+
+	# unbreak /bin/sh -> dash
+	epatch "${FILESDIR}"/${PN}-2.4.28-fix-dash.patch
+
+	# bug #420959
+	epatch "${FILESDIR}"/${PN}-2.4.31-gcc47.patch
+
+	# bug #421463
+	#epatch "${FILESDIR}"/${PN}-2.4.33-gnutls.patch # merged upstream
+
+	# unbundle lmdb
+	epatch "${FILESDIR}"/${P}-mdb-unbundle.patch
+	rm -rf "${S}"/libraries/liblmdb
+
+	cd "${S}"/build || die
+	einfo "Making sure upstream build strip does not do stripping too early"
+	sed -i.orig \
+		-e '/^STRIP/s,-s,,g' \
+		top.mk || die "Failed to block stripping"
+
+	# wrong assumption that /bin/sh is /bin/bash
+	sed -i \
+		-e 's|/bin/sh|/bin/bash|g' \
+		"${S}"/tests/scripts/* || die "sed failed"
+
+	cd "${S}" || die
+
+	AT_NOEAUTOMAKE=yes eautoreconf
+}
+
+build_contrib_module() {
+	# <dir> <sources> <outputname>
+	cd "${S}/contrib/slapd-modules/$1" || die
+	einfo "Compiling contrib-module: $3"
+	# Make sure it's uppercase
+	local define_name="$(echo "SLAPD_OVER_${1}" | LC_ALL=C tr '[:lower:]' '[:upper:]')"
+	"${lt}" --mode=compile --tag=CC \
+		"${CC}" \
+		-D${define_name}=SLAPD_MOD_DYNAMIC \
+		-I"${BUILD_DIR}"/include \
+		-I../../../include -I../../../servers/slapd ${CFLAGS} \
+		-o ${2%.c}.lo -c $2 || die "compiling $3 failed"
+	einfo "Linking contrib-module: $3"
+	"${lt}" --mode=link --tag=CC \
+		"${CC}" -module \
+		${CFLAGS} \
+		${LDFLAGS} \
+		-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
+		-o $3.la ${2%.c}.lo || die "linking $3 failed"
+}
+
+src_configure() {
+	# Bug 408001
+	use elibc_FreeBSD && append-cppflags -DMDB_DSYNC=O_SYNC -DMDB_FDATASYNC=fsync
+
+	# connectionless ldap per bug #342439
+	append-cppflags -DLDAP_CONNECTIONLESS
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	use debug && myconf+=( $(use_enable debug) )
+
+	# ICU usage is not configurable
+	export ac_cv_header_unicode_utypes_h="$(multilib_is_native_abi && use icu && echo yes || echo no)"
+
+	if ! use minimal && multilib_is_native_abi; then
+		local CPPFLAGS=${CPPFLAGS}
+
+		# re-enable serverside overlay chains per bug #296567
+		# see ldap docs chaper 12.3.1 for details
+		myconf+=( --enable-ldap )
+
+		# backends
+		myconf+=( --enable-slapd )
+		if use berkdb ; then
+			einfo "Using Berkeley DB for local backend"
+			myconf+=( --enable-bdb --enable-hdb )
+			DBINCLUDE=$(db_includedir $BDB_SLOTS)
+			einfo "Using $DBINCLUDE for sys-libs/db version"
+			# We need to include the slotted db.h dir for FreeBSD
+			append-cppflags -I${DBINCLUDE}
+		else
+			myconf+=( --disable-bdb --disable-hdb )
+		fi
+		for backend in dnssrv ldap mdb meta monitor null passwd relay shell sock; do
+			myconf+=( --enable-${backend}=mod )
+		done
+
+		myconf+=( $(use_enable perl perl mod) )
+
+		myconf+=( $(use_enable odbc sql mod) )
+		if use odbc ; then
+			local odbc_lib="unixodbc"
+			if use iodbc ; then
+				odbc_lib="iodbc"
+				append-cppflags -I"${EPREFIX}"/usr/include/iodbc
+			fi
+			myconf+=( --with-odbc=${odbc_lib} )
+		fi
+
+		# slapd options
+		myconf+=(
+			$(use_enable crypt)
+			$(use_enable slp)
+			$(use_enable samba lmpasswd)
+			$(use_enable syslog)
+		)
+		if use experimental ; then
+			myconf+=(
+				--enable-dynacl
+				--enable-aci=mod
+			)
+		fi
+		for option in aci cleartext modules rewrite rlookups slapi; do
+			myconf+=( --enable-${option} )
+		done
+
+		# slapd overlay options
+		# Compile-in the syncprov, the others as module
+		myconf+=( --enable-syncprov=yes )
+		use overlays && myconf+=( --enable-overlays=mod )
+
+	else
+		myconf+=(
+			--disable-backends
+			--disable-slapd
+			--disable-bdb
+			--disable-hdb
+			--disable-mdb
+			--disable-overlays
+			--disable-syslog
+		)
+	fi
+
+	# basic functionality stuff
+	myconf+=(
+		$(use_enable ipv6)
+		$(multilib_native_use_with sasl cyrus-sasl)
+		$(multilib_native_use_enable sasl spasswd)
+		$(use_enable tcpd wrappers)
+	)
+
+	local ssl_lib="no"
+	if use ssl || ( ! use minimal && use samba ) ; then
+		ssl_lib="openssl"
+		use gnutls && ssl_lib="gnutls"
+	fi
+
+	myconf+=( --with-tls=${ssl_lib} )
+
+	for basicflag in dynamic local proctitle shared; do
+		myconf+=( --enable-${basicflag} )
+	done
+
+	tc-export AR CC CXX
+	ECONF_SOURCE=${S} \
+	STRIP=/bin/true \
+	econf \
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/openldap \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	emake depend
+}
+
+src_configure_cxx() {
+	# This needs the libraries built by the first build run.
+	# So we have to run it AFTER the main build, not just after the main
+	# configure.
+	local myconf_ldapcpp=(
+		--with-ldap-includes="${S}"/include
+	)
+
+	mkdir -p "${BUILD_DIR}"/contrib/ldapc++ || die
+	cd "${BUILD_DIR}/contrib/ldapc++" || die
+
+	local LDFLAGS=${LDFLAGS} CPPFLAGS=${CPPFLAGS}
+	append-ldflags -L"${BUILD_DIR}"/libraries/liblber/.libs \
+		-L"${BUILD_DIR}"/libraries/libldap/.libs
+	append-cppflags -I"${BUILD_DIR}"/include
+	ECONF_SOURCE=${S}/contrib/ldapc++ \
+	econf "${myconf_ldapcpp[@]}" \
+		CC="${CC}" \
+		CXX="${CXX}"
+}
+
+multilib_src_compile() {
+	tc-export AR CC CXX
+	emake CC="${CC}" AR="${AR}" SHELL="${EPREFIX}"/bin/bash
+	local lt="${BUILD_DIR}/libtool"
+	export echo="echo"
+
+	if ! use minimal && multilib_is_native_abi ; then
+		if use cxx ; then
+			einfo "Building contrib library: ldapc++"
+			src_configure_cxx
+			cd "${BUILD_DIR}/contrib/ldapc++" || die
+			emake \
+				CC="${CC}" CXX="${CXX}"
+		fi
+
+		if use smbkrb5passwd ; then
+			einfo "Building contrib-module: smbk5pwd"
+			cd "${S}/contrib/slapd-modules/smbk5pwd" || die
+
+			MY_DEFS="-DDO_SHADOW"
+			if use samba ; then
+				MY_DEFS="${MY_DEFS} -DDO_SAMBA"
+				MY_KRB5_INC=""
+			fi
+			if use kerberos ; then
+				MY_DEFS="${MY_DEFS} -DDO_KRB5"
+				MY_KRB5_INC="$(krb5-config --cflags)"
+			fi
+
+			emake \
+				DEFS="${MY_DEFS}" \
+				KRB5_INC="${MY_KRB5_INC}" \
+				LDAP_BUILD="${BUILD_DIR}" \
+				CC="${CC}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap"
+		fi
+
+		if use overlays ; then
+			einfo "Building contrib-module: samba4"
+			cd "${S}/contrib/slapd-modules/samba4" || die
+
+			emake \
+				LDAP_BUILD="${BUILD_DIR}" \
+				CC="${CC}" libexecdir="/usr/$(get_libdir)/openldap"
+		fi
+
+		if use kerberos ; then
+			build_contrib_module "kinit" "kinit.c" "kinit"
+			cd "${S}/contrib/slapd-modules/passwd" || die
+			einfo "Compiling contrib-module: pw-kerberos"
+			"${lt}" --mode=compile --tag=CC \
+				"${CC}" \
+				-I"${BUILD_DIR}"/include \
+				-I../../../include \
+				${CFLAGS} \
+				$(krb5-config --cflags) \
+				-DHAVE_KRB5 \
+				-o kerberos.lo \
+				-c kerberos.c || die "compiling pw-kerberos failed"
+			einfo "Linking contrib-module: pw-kerberos"
+			"${lt}" --mode=link --tag=CC \
+				"${CC}" -module \
+				${CFLAGS} \
+				${LDFLAGS} \
+				-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
+				-o pw-kerberos.la \
+				kerberos.lo || die "linking pw-kerberos failed"
+		fi
+		# We could build pw-radius if GNURadius would install radlib.h
+		cd "${S}/contrib/slapd-modules/passwd" || die
+		einfo "Compiling contrib-module: pw-netscape"
+		"${lt}" --mode=compile --tag=CC \
+			"${CC}" \
+			-I"${BUILD_DIR}"/include \
+			-I../../../include \
+			${CFLAGS} \
+			-o netscape.lo \
+			-c netscape.c || die "compiling pw-netscape failed"
+		einfo "Linking contrib-module: pw-netscape"
+		"${lt}" --mode=link --tag=CC \
+			"${CC}" -module \
+			${CFLAGS} \
+			${LDFLAGS} \
+			-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
+			-o pw-netscape.la \
+			netscape.lo || die "linking pw-netscape failed"
+
+		#build_contrib_module "acl" "posixgroup.c" "posixGroup" # example code only
+		#build_contrib_module "acl" "gssacl.c" "gss" # example code only, also needs kerberos
+		build_contrib_module "addpartial" "addpartial-overlay.c" "addpartial-overlay"
+		build_contrib_module "allop" "allop.c" "overlay-allop"
+		build_contrib_module "allowed" "allowed.c" "allowed"
+		build_contrib_module "autogroup" "autogroup.c" "autogroup"
+		build_contrib_module "cloak" "cloak.c" "cloak"
+		# build_contrib_module "comp_match" "comp_match.c" "comp_match" # really complex, adds new external deps, questionable demand
+		build_contrib_module "denyop" "denyop.c" "denyop-overlay"
+		build_contrib_module "dsaschema" "dsaschema.c" "dsaschema-plugin"
+		build_contrib_module "dupent" "dupent.c" "dupent"
+		build_contrib_module "lastbind" "lastbind.c" "lastbind"
+		# lastmod may not play well with other overlays
+		build_contrib_module "lastmod" "lastmod.c" "lastmod"
+		build_contrib_module "noopsrch" "noopsrch.c" "noopsrch"
+		build_contrib_module "nops" "nops.c" "nops-overlay"
+		#build_contrib_module "nssov" "nssov.c" "nssov-overlay" RESO:LATER
+		build_contrib_module "trace" "trace.c" "trace"
+		# build slapi-plugins
+		cd "${S}/contrib/slapi-plugins/addrdnvalues" || die
+		einfo "Building contrib-module: addrdnvalues plugin"
+		"${CC}" -shared \
+			-I"${BUILD_DIR}"/include \
+			-I../../../include \
+			${CFLAGS} \
+			-fPIC \
+			${LDFLAGS} \
+			-o libaddrdnvalues-plugin.so \
+			addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed"
+
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		cd tests || die
+		emake tests || die "make tests failed"
+	fi
+}
+
+multilib_src_install() {
+	local lt="${BUILD_DIR}/libtool"
+	emake DESTDIR="${D}" SHELL="${EPREFIX}"/bin/bash install
+	use static-libs || prune_libtool_files --all
+
+	if ! use minimal && multilib_is_native_abi; then
+		# openldap modules go here
+		# TODO: write some code to populate slapd.conf with moduleload statements
+		keepdir /usr/$(get_libdir)/openldap/openldap/
+
+		# initial data storage dir
+		keepdir /var/lib/openldap-data
+		use prefix || fowners ldap:ldap /var/lib/openldap-data
+		fperms 0700 /var/lib/openldap-data
+
+		echo "OLDPF='${PF}'" > "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+		echo "# do NOT delete this. it is used"	>> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+		echo "# to track versions for upgrading." >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+
+		# use our config
+		rm "${ED}"etc/openldap/slapd.conf
+		insinto /etc/openldap
+		newins "${FILESDIR}"/${PN}-2.4.40-slapd-conf slapd.conf
+		configfile="${ED}"etc/openldap/slapd.conf
+
+		# populate with built backends
+		ebegin "populate config with built backends"
+		for x in "${ED}"usr/$(get_libdir)/openldap/openldap/back_*.so; do
+			einfo "Adding $(basename ${x})"
+			sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}"
+		done
+		sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t${EPREFIX}/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}"
+		use prefix || fowners root:ldap /etc/openldap/slapd.conf
+		fperms 0640 /etc/openldap/slapd.conf
+		cp "${configfile}" "${configfile}".default
+		eend
+
+		# install our own init scripts and systemd unit files
+		einfo "Install init scripts"
+		newinitd "${FILESDIR}"/slapd-initd-2.4.40-r2 slapd
+		newconfd "${FILESDIR}"/slapd-confd-2.4.28-r1 slapd
+		einfo "Install systemd service"
+		systemd_dounit "${FILESDIR}"/slapd.service
+		systemd_install_serviced "${FILESDIR}"/slapd.service.conf
+		systemd_newtmpfilesd "${FILESDIR}"/slapd.tmpfilesd slapd.conf
+
+		if [[ $(get_libdir) != lib ]]; then
+			sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i \
+				"${ED}"/etc/init.d/slapd \
+				"${ED}"/usr/lib/systemd/system/slapd.service || die
+		fi
+		# If built without SLP, we don't need to be before avahi
+		use slp \
+			|| sed -i \
+				-e '/before/{s/avahi-daemon//g}' \
+				"${ED}"etc/init.d/slapd
+
+		if use cxx ; then
+			einfo "Install the ldapc++ library"
+			cd "${BUILD_DIR}/contrib/ldapc++" || die
+			emake DESTDIR="${D}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
+			cd "${S}"/contrib/ldapc++ || die
+			newdoc README ldapc++-README
+		fi
+
+		if use smbkrb5passwd ; then
+			einfo "Install the smbk5pwd module"
+			cd "${S}/contrib/slapd-modules/smbk5pwd" || die
+			emake DESTDIR="${D}" \
+				LDAP_BUILD="${BUILD_DIR}" \
+				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
+			newdoc README smbk5pwd-README
+		fi
+
+		if use overlays ; then
+			einfo "Install the samba4 module"
+			cd "${S}/contrib/slapd-modules/samba4" || die
+			emake DESTDIR="${D}" \
+				LDAP_BUILD="${BUILD_DIR}" \
+				libexecdir="/usr/$(get_libdir)/openldap" install
+			newdoc README samba4-README
+		fi
+
+		einfo "Installing contrib modules"
+		cd "${S}/contrib/slapd-modules" || die
+		for l in */*.la; do
+			"${lt}" --mode=install cp ${l} \
+				"${ED}"usr/$(get_libdir)/openldap/openldap || \
+				die "installing ${l} failed"
+		done
+
+		dodoc "${FILESDIR}"/DB_CONFIG.fast.example
+		docinto contrib
+		doman */*.5
+		#newdoc acl/README*
+		newdoc addpartial/README addpartial-README
+		newdoc allop/README allop-README
+		newdoc allowed/README  allowed-README
+		newdoc autogroup/README autogroup-README
+		newdoc dsaschema/README dsaschema-README
+		newdoc passwd/README passwd-README
+		cd "${S}/contrib/slapi-plugins" || die
+		insinto /usr/$(get_libdir)/openldap/openldap
+		doins  */*.so
+		docinto contrib
+		newdoc addrdnvalues/README addrdnvalues-README
+
+		insinto /etc/openldap/schema
+		newins "${DISTDIR}"/${BIS_P} ${BIS_PN}
+
+		docinto back-sock ; dodoc "${S}"/servers/slapd/back-sock/searchexample*
+		docinto back-shell ; dodoc "${S}"/servers/slapd/back-shell/searchexample*
+		docinto back-perl ; dodoc "${S}"/servers/slapd/back-perl/SampleLDAP.pm
+
+		dosbin "${S}"/contrib/slapd-tools/statslog
+		newdoc "${S}"/contrib/slapd-tools/README README.statslog
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README
+	docinto rfc ; dodoc doc/rfc/*.txt
+}
+
+pkg_preinst() {
+	# keep old libs if any
+	preserve_old_lib /usr/$(get_libdir)/{liblber,libldap_r,liblber}-2.3$(get_libname 0)
+	# bug 440470, only display the getting started help there was no openldap before,
+	# or we are going to a non-minimal build
+	! has_version net-nds/openldap || has_version 'net-nds/openldap[minimal]'
+	OPENLDAP_PRINT_MESSAGES=$((! $?))
+}
+
+pkg_postinst() {
+	if ! use minimal ; then
+		# You cannot build SSL certificates during src_install that will make
+		# binary packages containing your SSL key, which is both a security risk
+		# and a misconfiguration if multiple machines use the same key and cert.
+		if use ssl; then
+			install_cert /etc/openldap/ssl/ldap
+			use prefix || chown ldap:ldap "${EROOT}"etc/openldap/ssl/ldap.*
+			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
+			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
+			ewarn "add 'TLS_REQCERT allow' if you want to use them."
+		fi
+
+		if use prefix; then
+			# Warn about prefix issues with slapd
+			eerror "slapd might NOT be usable on Prefix systems as it requires root privileges"
+			eerror "to start up, and requires that certain files directories be owned by"
+			eerror "ldap:ldap.  As Prefix does not support changing ownership of files and"
+			eerror "directories, you will have to manually fix this yourself."
+		fi
+
+		# These lines force the permissions of various content to be correct
+		use prefix || chown ldap:ldap "${EROOT}"var/run/openldap
+		chmod 0755 "${EROOT}"var/run/openldap
+		use prefix || chown root:ldap "${EROOT}"etc/openldap/slapd.conf{,.default}
+		chmod 0640 "${EROOT}"etc/openldap/slapd.conf{,.default}
+		use prefix || chown ldap:ldap "${EROOT}"var/lib/openldap-data
+	fi
+
+	if has_version 'net-nds/openldap[-minimal]' && ((${OPENLDAP_PRINT_MESSAGES})); then
+		elog "Getting started using OpenLDAP? There is some documentation available:"
+		elog "Gentoo Guide to OpenLDAP Authentication"
+		elog "(https://www.gentoo.org/doc/en/ldap-howto.xml)"
+		elog "---"
+		elog "An example file for tuning BDB backends with openldap is"
+		elog "DB_CONFIG.fast.example in /usr/share/doc/${PF}/"
+	fi
+
+	preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3$(get_libname 0)
+}
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
new file mode 100644
index 000000000000..256f8c1f4b76
--- /dev/null
+++ b/sci-geosciences/qmapshack/Manifest
@@ -0,0 +1,3 @@
+DIST qmapshack-1.3.0.tar.gz 4306608 SHA256 8eb9b07e2170d435aa086930e8c12f53cc9f89e7617adcf6a73b5a76f4081b0d SHA512 bf58bc7a2b9612cddb63801737c31b5910f8cbf255ebbc4abac42cb7404040074436ac6fa9a85982a31c1499cedc21fb13885e4daa650eb3567f8115528db385 WHIRLPOOL d85bbc15df93a9d86c57126f8b8c85dce5e10fcac1ca2b9bb8c32b8abd9f8796e3e4c415d712bf7dc8aa9c8542715f45ca81aca9cfd6d67685fe6984180c5ddd
+EBUILD qmapshack-1.3.0.ebuild 526 SHA256 9ecee8e2b4d63fee1185e78599ff1be04b56869b9493cff73f60f4440323598a SHA512 3119c7e3c81c0dfad6a74353d781a623e5113c094d3e188c0fbeeba1aa8696795eb19d1d4ed34d3406be1019e2a01c5522b4371a1de28d384cccfb19272bf2aa WHIRLPOOL 0709ded1afade2f94e20df7152fd3b8b0f7b9512fd8290e3a5b83401b779b5d5544cff0891c34590407a291978a51313551a2e40718171753dc76938a311c47c
+MISC metadata.xml 556 SHA256 597e4bdefc023273dba75f4cfd0ac13b7f3abdb507b87ec4222032848240b2fa SHA512 0129d44f43329f10c82395283d45c778afe29a86ff215bee517197333e829c35bf16a941ebcc79e7b3fdf105296569a138770f66132c50cea6acfeb5dba0754e WHIRLPOOL 6851bc35149d6b12bd76b1fbf4aa598daeba038a1340149c647b81a010f556b8b31f162865ce0d5421ba274edbebf6e6d8d5ed0a7ed1050d675f0a9708d08d1e
diff --git a/sci-geosciences/qmapshack/metadata.xml b/sci-geosciences/qmapshack/metadata.xml
new file mode 100644
index 000000000000..b9960f615da4
--- /dev/null
+++ b/sci-geosciences/qmapshack/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci</herd>
+<maintainer>
+  <email>grozin@gentoo.org</email>
+  <name>Andrey Grozin</name>
+</maintainer>
+<longdescription lang="en">
+  Use QMapShack to plan your next outdoor trip or to visualize and archive
+  all the GPS recordings of your past exciting adventures.
+  QMapShack is the next generation of the famous QLandkarte GT application.
+  And of course it's even better and easier to use.
+</longdescription>
+</pkgmetadata>
diff --git a/sci-geosciences/qmapshack/qmapshack-1.3.0.ebuild b/sci-geosciences/qmapshack/qmapshack-1.3.0.ebuild
new file mode 100644
index 000000000000..9a118c749d0f
--- /dev/null
+++ b/sci-geosciences/qmapshack/qmapshack-1.3.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+inherit cmake-utils
+
+DESCRIPTION="GPS mapping utility"
+HOMEPAGE="https://bitbucket.org/maproom/qmapshack/wiki/Home"
+SRC_URI="https://bitbucket.org/maproom/${PN}/downloads/${P}.tar.gz"
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="dev-qt/qtwebkit:5
+	dev-qt/linguist-tools:5
+	dev-qt/qtscript:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtdbus:5
+	sci-libs/gdal
+	sci-libs/proj"
+DEPEND="${RDEPEND}"
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 7ad487e11617..2ab545f0c022 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -6,6 +6,7 @@ AUX clozurecl-1.patch 1825 SHA256 28a236bd143975c111ff0756f7d59b93ea24bcc15796d5
 AUX clozurecl-2.patch 1505 SHA256 5fb15195d8864a32a9f5c271a1ddedfaa331589898674901ea91d8709e49394d SHA512 41664b77eae0f2c3cc0e551bd2c26c02769faed339b5725dc790691929094cd5d5008169eba9788515392d9fed00919aaacbb24ee91b76f5d51eb6468335cf9c WHIRLPOOL 5dc9a53536e354292a4a18e479053f9fd52f7fb086aa363a152164740aa29cb623581eb72ab62c25d13ba42a76790d43b16f563e51f04052f26031131a182a71
 AUX cmucl-0.patch 2296 SHA256 41cf164c04119854d05892c39c65a918c63ae8b900dbf5e513ce27719bedee51 SHA512 cc1056cd131521a6dcf321c45bf6a6e0b39a626f810ce978237cbb3188bb3b136ffa8afa56d93d573e271c02e010cad410345bf599fd4f50480766063a2bd197 WHIRLPOOL 03cdc4cdad4859966768e8e691ab517d0b635adf95a2125c9c26623e507800b9a70fd1c164b98a213c5e39fbc03ac320b3fddfe565db97bf578cdcf11561c1c3
 AUX cmucl-1.patch 1336 SHA256 178218d3ead339d721c7b8f819cb34170e025ebfb00b6d2f927347a26bed6924 SHA512 3b8c01ecbbcd87101e4e31356293216d9c2a018ddabc076905a8b87eeda27bea6cd36242ab6b9caf7553fb9187544beb620b739211c63e21afa1b2f050ef318e WHIRLPOOL ad923ce5460aaada4622d7401fdc81cee8028c010abe8f57ceb79ca9d8857eb91f40a3a570cdcc76cd64cfb6b2f9532db2ad9d0950596579a811e5d8eb06214c
+AUX db-0.patch 529 SHA256 470f7b590f390afd31bd6deb8f7fa51af89651ad360e06f3511a6433522ce169 SHA512 c3a196c2192be23c7551c1b4dd893c8304926318234ef06cf438c24f425f7fc93d8ebed4a9b4708852bb2e8ca7284afa03dfe53548cec8ebd6ba89e73a901cfa WHIRLPOOL 8c9d2c5e96231e09272467fe134a6775f0e4cc8d939735168ebc468f9778d2d0d620ec2fc3c1358ed3aafb5bb6346a72cc96e51934e3325d181e4a7341b9db57
 AUX ecls-1.patch 1724 SHA256 55b6843474cc2e8f74fdb2552c5c31668ee24ca7f5f9531ecdb2c16fc84ef95e SHA512 4270c89eebd98783241bc6a193a91ce47a795c2b51c2d6b8288ce95f06b7dd739592fd8f76709e7b1164d71f783b531e348321358f987b402cb4cc6af9f8063d WHIRLPOOL 7cac48bf6dad9359a51eba8ff8243defd2337a2cef6024e8492949988f1816891d450b07f821d5f2b39fdf9da1f4facdc0285bb76c9f67f113dc5e895807000d
 AUX ecls-2.patch 1612 SHA256 719b07457b3eccdfe2694b3d92f2c882f1ecb14e0ab1544d9a8243fb231cdfcd SHA512 cd37e62c24f24e49f264d63526615537cb088386cfc48f3eac8fcc746d16f6d79c585dee6f24c664fca355f539728a1a23cc75f3672c240a210a407e87b73141 WHIRLPOOL 14ef102a7f90ec87ebca7b1cf2983a0e63244128bd96da6b7cfaffa6216f327833ce5c40c27fc11e611e44bce88ca66b1b0ec4fe3bec914a8b37b702d19d511d
 AUX imaxima-0.patch 211 SHA256 b1d07af716f477dedfb011cb8c4fdf154d146db5172664865efc1ec025bfa2ce SHA512 48b66de8b6a77c60033cfc04fecbca410ecf87aa52fd08326d2535af0261047b79fbe8515d8c7d73087fc98af2b6d8c436fe44941256a0d2ba8edff24ce7df9f WHIRLPOOL ebb601a3be816ef37eb43368f5ba46e0a47dd48fc2eee1a4c6c31869d9bbc3c448ccf01c807ddca8798258c069b2b627b3ae5063afc03ee6a50f9521158e4711
@@ -20,6 +21,6 @@ DIST maxima-5.36.1.tar.gz 29615673 SHA256 400bf83000b84d280d75e200e078582fe44f23
 DIST maxima-5.37.1.tar.gz 29952404 SHA256 511477cbdf4645a6abd49596d59ed449ec8e012f90b59b1ddffc783c697bf744 SHA512 523f2768e18e7e368dee63f5f6350afc87c3f5a51ef317b1bf3d9c662c1326a40a5035c09c44ed2e1388d31b5450802b802088e95dc7a3e10343bc55daefd878 WHIRLPOOL 0d7fad832a145d38fc0106540ba17d270da64495b2c739c215c07fcefeba2ecb769e609a2e7c1dd516e58b8e128776f5365bf10273c5031f5750b5c250d78bc2
 EBUILD maxima-5.34.1.ebuild 4288 SHA256 c3d446014b57858efacd7953cd86664818a3b72fdb0871d37547149c6ab8ce5e SHA512 73c061e0c0d9d4a3e33c8cbdc7e6afc2f6b737ba82780dfe79ae481989e0c2bcc01a11d88bcd98c0b522869d31c3585c09eb7342de4dc012c5ab1bf78b9c65ee WHIRLPOOL 7f122590f4ce065eeae9bc40508ac22ca8deb861b9567cf575e255fbe23429ae35418bbecdb4abffa5569002bbae6c67a6364e74fadbccddf4ece7ee714fd4dc
 EBUILD maxima-5.36.1.ebuild 4291 SHA256 b873ee1d03c11c9cb60a5f496b8370df6918ad4bae16a5aa5cf822b335d1cc22 SHA512 032d266e304585294f0ef22241e55f03867b22da8f68b63c9f7759a02629c117f4b75f2dd1812bb6671f1d76efa3d14753ea226f7a620ca371794991ca381348 WHIRLPOOL 01e49c7db48b87ccf80c7808fd6fc0a41c5c51a7b3301c62b3603e38f2d5968fb7e12c4be34415a997bcf44c8eb60007e00a9666b33399d00ff09f005b37f65e
-EBUILD maxima-5.37.1.ebuild 4291 SHA256 99cfb85b9eca799c7cbc4d4f21dfe3f2e53a1d08ff14937d184a685b2e7d5d07 SHA512 bd7ab7b00a98ea3e7f55047a22aa16917a721619c5231e6f6d41bc21fe04d0896e42cc6a85c7e042979fc4835a001749337bf09e00e7491c7246f1b6407d34b6 WHIRLPOOL 9280be9a18180958f8df31f01f39d43a7a52633f23c9e8d08ed04fb70936d58f67898fe084693e2794ec808f679fde8ab041165b67b08a7a025f5e2997a3be20
+EBUILD maxima-5.37.1-r1.ebuild 4296 SHA256 d77c3297576c62c36060c49f8c54df1f678e479160b9f738992a043e47482f27 SHA512 7ff0341ab3431dff774cbf760b78d752493ae1c67b713fc5a7c42bb4ae426f2023ade940d75c7738c7a39b866f9aa8b316ec0aac3c229f5422c357c304e18cd1 WHIRLPOOL c8b2cb09d022551cf9c406ff3721319413eef0da7bc7dafb6a452bfcd05d30c7ad37616b03a5ec082e05c26bc0ac3e030f872b6689cd69946c83cf22fae4f664
 MISC ChangeLog 26867 SHA256 928928dc8eb994e97729bc32db4f8c018edc7fa47f865b9ff7c5f306c859afa4 SHA512 b193def6b27345190771f51ff3e96f5b6fe36eca890ee5825effccd7d9ed01eb009f71663f8745862eb48b1a63eb324c433c55e7dafc8e8c1711397255b2b970 WHIRLPOOL 66906b06d9b1a21acda62ae8910298718ff82bf40998a8b96d23759cc1b452c9284b37039c79d631bb9a504f06aa393cd0a9add86604b69ffc15e8aaf5767a2e
 MISC metadata.xml 1416 SHA256 32e61ae605874acb7c7c0c9edd4447175d784033f9ffadc0ce63f4e39da09858 SHA512 b84b6646230585763f40d026a2f6368e0bfaa75fd38e1b8341d73b580661e84b3a3eb342308812bf576098b9d225ecb6c260eb20e5d5d6bf5cb623897e2371b6 WHIRLPOOL 47925a44512abe88c57368c8fdbf99e9c89c66140f4f19b060b310ad92c604a54d78241714bade0a079deca0804ad993f66657ed4f851ec0b29a6253c168eb83
diff --git a/sci-mathematics/maxima/files/db-0.patch b/sci-mathematics/maxima/files/db-0.patch
new file mode 100644
index 000000000000..d6cc18617cc5
--- /dev/null
+++ b/sci-mathematics/maxima/files/db-0.patch
@@ -0,0 +1,20 @@
+diff -r -U2 maxima-5.37.1.orig/src/db.lisp maxima-5.37.1/src/db.lisp
+--- maxima-5.37.1.orig/src/db.lisp	2015-08-11 01:01:13.000000000 +0600
++++ maxima-5.37.1/src/db.lisp	2015-09-04 00:21:43.596685564 +0600
+@@ -389,10 +389,14 @@
+ 
+ (defmfun isp (pat)
+-  (let ((isp 'unknown))
++  (let ((isp 'unknown) #+ccl (err t))
+     (ignore-errors
+       (setq isp
+ 	    (cond ((truep pat))
+ 		  ((falsep pat) nil)
+-		  (t 'unknown))))
++		  (t 'unknown)))
++      (setq err nil))
++    #+ccl
++    (when err
++      (setq +labs nil))
+     isp))
+ 
diff --git a/sci-mathematics/maxima/maxima-5.37.1.ebuild b/sci-mathematics/maxima/maxima-5.37.1-r1.ebuild
similarity index 98%
rename from sci-mathematics/maxima/maxima-5.37.1.ebuild
rename to sci-mathematics/maxima/maxima-5.37.1-r1.ebuild
index a0988d86e903..8f2f1640c635 100644
--- a/sci-mathematics/maxima/maxima-5.37.1.ebuild
+++ b/sci-mathematics/maxima/maxima-5.37.1-r1.ebuild
@@ -101,7 +101,7 @@ pkg_setup() {
 
 src_prepare() {
 	local n PATCHES v
-	PATCHES=( imaxima-0 rmaxima-0 wish-1 xdg-utils-0 )
+	PATCHES=( imaxima-0 rmaxima-0 wish-1 xdg-utils-0 db-0 )
 
 	n=${#PATCHES[*]}
 	for ((n--; n >= 0; n--)); do
diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index 693d616a1bd6..21ec3b562b3c 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -54,6 +54,5 @@ EBUILD rstudio-0.98.490.ebuild 3837 SHA256 df48f193cd4583d50c92f872f2ec602397901
 EBUILD rstudio-0.98.932.ebuild 5086 SHA256 ee5a1d44707af8ffad0586e83bb2633e7c175c2ce505cdf1159e01fa93b59d33 SHA512 dc34ac5d69716f548d7652eb5906f9baf586b00a1d60908e6ba0b932bc4e012e93f371c23b910d20b5e9ac1943e9924ba094b623540deb1e08328a072c6d4b0f WHIRLPOOL 5d174398f664c83c8225def99741a3b71c91d1849d958fa07f2cf7ec4ad3c98a86326270185c724611a74bb9a4d979f031621413ce8b3e74f7f91809f36b4f47
 EBUILD rstudio-0.98.953.ebuild 5127 SHA256 5e759034aab2e932aca2add2db9e6084708eb7c5348834096a2156777a76c8d9 SHA512 1a0159a1e502e4d94bfa3c6982032faf6cbe0fa7b0d8a74f14c08dd3c9f6c207c255a86a46f7aa3e101fde8b38c7b5d6fc33a5d64d600548f778372c3f084138 WHIRLPOOL 465d8b1eed585b6576605ce530629d70dcdfc2e561df033e2243ed92259d210fe2e13b64e1d4b89a78ebd99826467709af0d948dbbe5499c1065a1d059308e86
 EBUILD rstudio-0.99.473-r1.ebuild 7515 SHA256 37bea963e08b2594c19acb24da447791f6e3eda4e5f19b7be6c665230ceafc28 SHA512 6411c557a5a0ca9f18122e0cec84697272335ecab8b30f304eb6d064a3169d9fae025d22a432463fc5a2add1c9b3ce57daff7f2afd7a0684b56265b4dcf34856 WHIRLPOOL 5588ab2936702a6af71695c06afb832edb5c169056570f06078981f8b79b20ebe2534ed45205edc875d5bd61762526cc8516246226972f563f3af1ea465c62aa
-EBUILD rstudio-0.99.473.ebuild 6324 SHA256 2d62085d86c334a4180d2414e131c4a8de4c143b01c6f0b7f43326fa2439cb51 SHA512 102fa13491bee9dccc55759be79ab08c29b98bbbd1f1604dd633f5338c745344ac914514c8915fcef1e36c0aeb5927d6d092595f7660bdc4230c1fbdf82a43d4 WHIRLPOOL 9d2ed427c56172422182ee8925392ceb2ffa12b32daece2d0b428eada20a5e43aa3000739f56eebdb28345977f078bc1e88466f75ebd6ce3830d4e580737086a
 MISC ChangeLog 5297 SHA256 b7d149869d58c687ab524a33726c4f4df1163475ed6af648fd5eba8e88bc1910 SHA512 cb38d57dc56ec46860e738aa1cd5a8206cc1d74758181900b2cfe60c837160365fec38e68fedf071a16c2296499da7b438cb435487d192b0d52d81e20a7605f2 WHIRLPOOL b3d4cb4b14afeae885e1265bfdc1700061b583152a62db5c4e64add96f0e2e9e3dc3ad6f53397283c85b7eea9fecce589373d392f2f4f3ea94f73267439d3927
 MISC metadata.xml 575 SHA256 3abd1d6794c2bb01b7a5c29b98b893665c4ed1609af74944407d18845c6cc249 SHA512 d34bf61db3d01610bedbbcb43401586d7356ac88a7ab0c4604148ef5cf3dba7c16655c9f7b43c46257108c11304377d702ece2df4653e90e772f8d1ac4bfddd2 WHIRLPOOL ce6cf6d24b801e5ba5489482b0928a4d1746cbfdf24e7e348d0ac23e2071214c5de90dc3de769c28c62ac2dfae5ab0b01cc9ab49295d2a23a3d04614ef8d0610
diff --git a/sci-mathematics/rstudio/rstudio-0.99.473.ebuild b/sci-mathematics/rstudio/rstudio-0.99.473.ebuild
deleted file mode 100644
index a5221e797634..000000000000
--- a/sci-mathematics/rstudio/rstudio-0.99.473.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils
-
-# TODO
-# * package gin and gwt
-# * use dict from tree, linguas
-# * do src_test (use junit from tree?)
-
-# update from scripts in dependencies/common
-GWT_VER=2.7.0
-GIN_VER=1.5
-SELENIUM_VER=2.37.0
-CHROMEDRIVER_VER=2.7
-PANDOC_VER=1.13.1
-PACKRAT_VER=0.98.1000
-RMARKDOWN_VER=0.98.1000
-SHINYAPPS_VER=0.98.1000
-RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
-
-DESCRIPTION="IDE for the R language"
-HOMEPAGE="http://www.rstudio.org
-	https://github.com/rstudio/rstudio/"
-SRC_URI="https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip
-	https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
-	https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
-	https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar
-	https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux
-	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
-	https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz
-	https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz
-	https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz
-	https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz
-"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="dedicated server"
-
-QT_VER=5.4
-QT_SLOT=5
-RDEPEND="
-	app-text/pandoc
-	dev-haskell/pandoc-citeproc
-	>=dev-lang/R-2.11.1
-	>=dev-libs/boost-1.50:=
-	>=dev-libs/mathjax-2.3
-	dev-libs/openssl:0
-	sys-apps/util-linux
-	>=sys-devel/clang-3.5.0 <sys-devel/clang-3.6.0
-	sys-libs/zlib
-	|| ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= )
-	x11-libs/pango
-	!dedicated? (
-		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
-		server? ( virtual/pam )
-	)
-	dedicated? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-java/ant-core
-	|| ( =virtual/jdk-1.7*:= =virtual/jdk-1.8*:= )
-	virtual/pkgconfig"
-#	test? ( dev-java/junit:4 )
-
-src_unpack() {
-	unpack ${P}.tar.gz gwt-${GWT_VER}.zip
-	cd "${S}" || die
-	mkdir -p src/gwt/lib/{gin,gwt} \
-		dependencies/common/dictionaries \
-		src/gwt/lib/selenium/${SELENIUM_VER} \
-		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die
-	mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die
-	unzip -qd src/gwt/lib/gin/${GIN_VER} \
-		"${DISTDIR}"/gin-${GIN_VER}.zip || die
-	unzip -qd dependencies/common/dictionaries \
-		"${DISTDIR}"/core-dictionaries.zip || die
-	unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \
-		"${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die
-	cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \
-		src/gwt/lib/selenium/${SELENIUM_VER}/ || die
-	cp "${DISTDIR}"/chromedriver-linux \
-		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die
-	cd dependencies/common || die
-	unpack packrat-${PACKRAT_VER}.tar.gz
-	unpack rmarkdown-${RMARKDOWN_VER}.tar.gz
-	unpack shinyapps-${SHINYAPPS_VER}.tar.gz
-	unpack rsconnect_${RSCONNECT_VER}.tar.gz
-	cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \
-		. || die
-	cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \
-		. || die
-	cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \
-		. || die
-	cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \
-		. || die
-}
-
-src_prepare() {
-	java-pkg-2_src_prepare
-
-	find . -name .gitignore -delete || die
-
-	epatch "${FILESDIR}"/${PN}-0.98.490-prefs.patch \
-		"${FILESDIR}"/${PN}-0.99.473-paths.patch \
-		"${FILESDIR}"/${PN}-0.99.473-clang-pandoc.patch \
-		"${FILESDIR}"/${PN}-0.98.490-linker_flags.patch \
-		"${FILESDIR}"/${PN}-0.98.1091-boost-1.57.patch
-
-	# Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using
-	# this sed hack for now. ~RMH
-	sed -i \
-		-e "s|DISTRO_SHARE|\"share/${PN}\"|g" \
-		src/cpp/server/ServerOptions.cpp \
-		src/cpp/session/SessionOptions.cpp || die
-
-	# use mathjax from system
-	ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-23 || die
-
-	# make sure icons and mime stuff are with prefix
-	sed -i \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
-
-	# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
-	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \
-		-i src/cpp/server/ServerOptions.cpp \
-		|| die
-
-	# Set the rsession.conf file location for Gentoo prefix
-	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \
-		-i src/cpp/session/SessionOptions.cpp \
-		|| die
-}
-
-src_configure() {
-	export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1)
-	export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2)
-	export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3)
-
-	local mycmakeargs=(
-		-DDISTRO_SHARE=share/${PN}
-		$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP)
-		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
-		-DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake
-		)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	pax-mark m "${ED}usr/bin/rstudio"
-	doconfd "${FILESDIR}"/rstudio-server.conf
-	dodir /etc/rstudio
-	insinto /etc/rstudio
-	doins "${FILESDIR}"/rsession.conf
-	dosym /etc/conf.d/rstudio-server.conf /etc/rstudio/rserver.conf
-	if use dedicated || use server; then
-		dopamd src/cpp/server/extras/pam/rstudio
-		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
-	fi
-}
-
-pkg_preinst() {
-	use dedicated || gnome2_icon_savelist
-	java-pkg-2_pkg_preinst
-}
-
-pkg_postinst() {
-	use dedicated || { fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
-		gnome2_icon_cache_update ;}
-
-	if use dedicated || use server; then
-		enewgroup rstudio-server
-		enewuser rstudio-server -1 -1 -1 rstudio-server
-	fi
-}
-
-pkg_postrm() {
-	use dedicated || { fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
-		gnome2_icon_cache_update ;}
-}
diff --git a/sci-mathematics/wxmaxima/Manifest b/sci-mathematics/wxmaxima/Manifest
index bb8e925f2ca4..a145c479c8aa 100644
--- a/sci-mathematics/wxmaxima/Manifest
+++ b/sci-mathematics/wxmaxima/Manifest
@@ -2,8 +2,11 @@ DIST wxMaxima-13.04.2.tar.gz 1652680 SHA256 29352db75dd3ff27393ab0971543fd0b3c3a
 DIST wxmaxima-15.04.0.tar.gz 4990313 SHA256 c178067a2f75d91dd378f88b4d0f87af6b2705ca32bea509d63e7347b2a1d21e SHA512 1a899259698da38f97a1859ba0526406cbc654a130dc1d18e01cf248ac4d7292c82cb00dd92ce2fac2c3cfc002788fdef0a6a4f95eca54b9096efc73c6aa45b7 WHIRLPOOL 225456c073b1aa87d2e599b9c63244ff7c97378fb6b5a60fcb8730655d193a0f032b27a1264e12eefb4abf08389f2337a11c380b6d89af2de9a4fb6e14f614dc
 DIST wxmaxima-15.08.0-missing.tar.bz2 16172 SHA256 d39d1a7937db05a4ae3e6a6d38a4079e93fb95b5533db7254de7dec7d24527db SHA512 195de1bcc4b469094716e0e417cf6431abe9f67e467c71fe51c4bed9990c613d5487cbcdda18d1df7f50e5e1b0abec7578e1091cc4999d95ba6a5f8849d826e2 WHIRLPOOL 34964f7ba5a1c9e5f2ab05b857c31b441eee43a127dc123337174509c71b7f80313e111b967abba47579021c52f27c71812c85efdf7a8429ad4e1e6c51f62db8
 DIST wxmaxima-15.08.0.tar.gz 5555560 SHA256 e6905b8e306b575e8e38b02a0e81de38be6d154d1349a455e01fbec28b21b27c SHA512 b13df571978c354ef420c613717149e3235bd5343746c12f2193eb0599f417b04cdb01e87e97ef2ed72bfd090b6ec6871c834fdb74074a3d5fb0f68bbe942263 WHIRLPOOL a2a1ae200eebb6d54a3c96cbd1c304b37c4a759ccc15983b3910d3aad1864d6c80d39e7e688198d4f3dd7c36bb9a8b2795a9610475858207b90482887219906a
+DIST wxmaxima-15.08.1-missing.tar.bz2 14699 SHA256 62a84bf32e61d39f66787a7fb2cdbf67f322ddee2d7734c23650739476e97b17 SHA512 de64163643652a288fd6f65076df94074a28895a13ae8766a1913e12833d3dbb1ae4bbdbcd6a69221e5bde7000b93e3a86a223b1320d25581d32c61ea6ab3b98 WHIRLPOOL e96dac6ffd227597721a7e8fa200d99422e722ec5d3c1733c29904fdf1f6e2bae2ba1a2c8e98e217e7a089c5857c1ccf5d10950bd98cdbde0dfb19039a60262d
+DIST wxmaxima-15.08.1.tar.gz 5577228 SHA256 82ad5314a88e53ff41dc431afb44ef1a47738686786e8cc8b4c48e0c147f4ffd SHA512 4ab7a8e992904e18e571b716d35f0d5286363b287853e3ebacc64e63df901fe192abdef16db8dc8defabb26a25f8f8956a7bad466862ee0d19d8846d4e3fec94 WHIRLPOOL 492c6ccf79640c9bfdb8d7aad283f5e0941bba8b38d037285712603112026e0feaf8873025657486df44ff718e559d9e690076e78f86e560f5d6b73ecd096ad9
 EBUILD wxmaxima-13.04.2.ebuild 1661 SHA256 55e651e9128f7dfe2a854cabcc25f6b3ba7784b1fbf566116e48f554f1ad2468 SHA512 0b35d3b96e9978bc0f3d0faabb76bd5df80b249b255b353f1c802a71ebffdf8e47081b40fb6b9395d4dd9d3791eb05eb516355549577524c5ffba06410cfc0b0 WHIRLPOOL f0b4f9ea3a8b57000095747fb16e962310c6daab2707a5a6b50a1acbc6d699970c9ff1cbf30444316f1a660c14be9adba2b1490f1bb189120f794b82513f4172
 EBUILD wxmaxima-15.04.0-r1.ebuild 1707 SHA256 ba39f5fe5d25528ff970d45380a02f3d42bee7ca93c7fc2f013dc7c46bd37934 SHA512 c3c69481eb6c9965cfcf73adc3adf72b8a689225a1dd05f814b86058c2c3c7b65119142a951b70621ea0aa164611845b96757ce27ee8edda47bde0024b9e782b WHIRLPOOL 47e65a8597abf212c3004855a1ba0569f731dc46b74547ec5b5b8aa325dca5ba194df2eb37f963d377bae15c6a6e8105ae9f16d53f06f012062850e5c6f8c556
 EBUILD wxmaxima-15.08.0.ebuild 1716 SHA256 5958239f7164a1578d516cc7c80dfe11dddcd5f73681236b1aa04917b1099f9c SHA512 b95cbe2c08cd15b62129f6b2b39d0c54dfaa581d91a1aa31dacbdc2a89fe868a55072478c627ee323124dac938637ccd1d3635215cdd1ed0978c60c3d44c7ed5 WHIRLPOOL 126833006d6e8780be15c57e44f518a6140fb7a95897bf8dd63f46079689e08b23bd62295260f8fb3bb11a814ac5226a36d7b2e115375f8dc1df3bb9d84ca4e6
+EBUILD wxmaxima-15.08.1.ebuild 1716 SHA256 5958239f7164a1578d516cc7c80dfe11dddcd5f73681236b1aa04917b1099f9c SHA512 b95cbe2c08cd15b62129f6b2b39d0c54dfaa581d91a1aa31dacbdc2a89fe868a55072478c627ee323124dac938637ccd1d3635215cdd1ed0978c60c3d44c7ed5 WHIRLPOOL 126833006d6e8780be15c57e44f518a6140fb7a95897bf8dd63f46079689e08b23bd62295260f8fb3bb11a814ac5226a36d7b2e115375f8dc1df3bb9d84ca4e6
 MISC ChangeLog 7758 SHA256 1860b2af5a9aaf7e7e08837bf383febe68562ee6e9c81efb50ee8b5da0ecdbc5 SHA512 9f0ceee5bca2c382a42dfa2661e134103e203d34e32d3e32e69cf1977728b233c55970a009b18f7c53f0e826e063b69671ab8ae9ffbb084597730b6c1f2487d6 WHIRLPOOL 8a31b95332dbc0efd4f4d65af16ab500b4522af01226680d0500820e9f554459ab81e0caa8d36ddf71737b17ed3251ababf04b897c2989cd0a041d2346736f66
 MISC metadata.xml 603 SHA256 0d3fb6b82eec807969145710785939c87849b6cb1c2ae1d556f32671183fe976 SHA512 a996c2d46fb6d2559500fe1fcc9b8d48455af416e32f116491a05460aec9e213da281e25f5727cb7248e914375be33fb36a4614123892d68a99057092e851cbc WHIRLPOOL 81eaa2ae1da621b2ce852f5566c7db2b251a5a22762ef34f7504537d1b4d99f69ae48382d2fe40111930346a9854b7301591ac5e1447b8434fdf60d021a555a0
diff --git a/sci-mathematics/wxmaxima/wxmaxima-15.08.1.ebuild b/sci-mathematics/wxmaxima/wxmaxima-15.08.1.ebuild
new file mode 100644
index 000000000000..cdbdbcdf1c76
--- /dev/null
+++ b/sci-mathematics/wxmaxima/wxmaxima-15.08.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+
+inherit eutils gnome2-utils wxwidgets fdo-mime
+
+DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit"
+HOMEPAGE="http://andrejv.github.io/wxmaxima/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~grozin/${P}-missing.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="
+	dev-libs/libxml2:2
+	x11-libs/wxGTK:${WX_GTK_VER}"
+RDEPEND="${DEPEND}
+	media-fonts/jsmath
+	sci-visualization/gnuplot[wxwidgets]
+	sci-mathematics/maxima"
+
+src_prepare() {
+	local i
+
+	# consistent package names
+	sed -e "s:\${datadir}/wxMaxima:\${datadir}/${PN}:g" \
+		-i Makefile.in data/Makefile.in test/Makefile.in || die "sed failed"
+
+	sed -e 's:share/wxMaxima:share/wxmaxima:g' \
+		-i src/wxMaxima.cpp src/wxMaximaFrame.cpp src/Dirstructure.cpp src/Dirstructure.h \
+		|| die "sed failed"
+
+	# correct gettext behavior
+	if [[ -n "${LINGUAS+x}" ]] ; then
+		for i in $(cd "${S}"/locales ; echo *.mo) ; do
+			if ! has ${i%.mo} ${LINGUAS} ; then
+				sed -i \
+					-e "/^WXMAXIMA_LINGUAS/s# ${i%.mo}##" \
+					-e "/^WXWIN_LINGUAS/s# ${i%.mo}##" \
+					locales/Makefile.in || die
+			fi
+		done
+	fi
+}
+
+src_configure() {
+	econf \
+		--enable-printing \
+		--with-wx-config=${WX_CONFIG}
+}
+
+src_install () {
+	default
+	doicon -s 128 data/wxmaxima.png
+	make_desktop_entry wxmaxima wxMaxima wxmaxima
+	dosym /usr/share/${PN}/README /usr/share/doc/${PF}/README
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
diff --git a/sys-apps/elfix/Manifest b/sys-apps/elfix/Manifest
index c4cc7367f8d4..18005b921664 100644
--- a/sys-apps/elfix/Manifest
+++ b/sys-apps/elfix/Manifest
@@ -2,7 +2,10 @@ AUX elfix-0.9.0-backport-fix-paxmark_sh.patch 1596 SHA256 8f488a11e66db10bf6bcb3
 AUX elfix-0.9.0-backport-fix-revdep-pax.patch 820 SHA256 15d49661286083782ce3e8cccc6f54ce1075cb415fa2729d5af58eadbd0841e3 SHA512 7c1846d8d36d330bbbb659d7d2dcd0a81fd6510e7351889a9f7e79e1f43c4114e1d8de7e3581056eb8cc64bc5eeb5b6be702ca71943511dae791e124de799161 WHIRLPOOL 012fa48fce5932c872bd36b831a03c9214d6ed47f7fd4a6fb89f5a642fed640570103066e13f8b8a6f9cb9f1bb533929dee525dcd659a3c210b18d9602ce8bff
 DIST elfix-0.8.4.tar.gz 374742 SHA256 374be66da3dddef485bbb5e95bfcab6fd0c2db478255bddd10079730ada5260b SHA512 10aacc3fff33c934e2d4487d174a2b0cec10ffb7a35fc72b160c786f82f0355f3a2dea716bc7fb929d2919cc32a26844f37f9d73064b755098bdaa72e8075bda WHIRLPOOL b04e099f188c0b76d8c07abd76559c1313854aa83a03ad69afb72674d93cde6ce538ae10d0fea3be5495937e72a4b98fdd36efbb2e3aa8ff23c1d9f7f943c1ae
 DIST elfix-0.9.0.tar.gz 372014 SHA256 8b547d987edb2f7dc23ddf30f959d7d051a9ed49810f983b8fe6c489fe731cf0 SHA512 fd9bab90d745f77429c902acd2a14f615132731b3c38929dce764f1e5f7ee8f6478a6fef7ce0cb38e7ebd9181ba57965ff0c97da5e01d0fbf2cfb940ed691ebf WHIRLPOOL c09fa2193b990a506cae17f370ec10fa6302e17d2a165e42eceb88644f8a92e297c839ad788204e213d8205695b65557a7dcef5f6417177c434c8d0a34bd5eb7
+DIST elfix-0.9.1.tar.gz 398588 SHA256 0368d07bfdad4a14f039929a30d85a612dcd9d22ac87211f8e59d452bac23625 SHA512 28fdde7841263cee766434b5eda1a4151999526aa3a1acaacd2e6355502df4b56db9faf64ce81bdc89606d366d0a6dd28c5c135290fe7f0285cee480f6002527 WHIRLPOOL cd7dc6e191d97836f4b8859b73777e3b4b6fce5d290087400327f87a621e9879f5c233eef51bef981398d0d00ecc753f222655108994d25a4e0503799569ec82
 EBUILD elfix-0.8.4.ebuild 940 SHA256 38a60d16a9fd270625878b7cee1d4d1def2f3d798c051a7fe4e2de2cb0a3ff24 SHA512 1a2973c00113cc15be3489c6203888a6d3461ed3378b6c6473d5a4769c59284df002af99f4736d86eaa08bc72a31a1fc84d47a0c6915a3eccf1ac2abe7c8959b WHIRLPOOL 69e7a0dc30a329e87da5c106819b8780293e7a95941978673267e23bf09b4ba80c5683d6708c6e996fb44d7324ce0254b46c580acc74cea2a8fbe25b5a9f0aba
 EBUILD elfix-0.9.0-r1.ebuild 1089 SHA256 492478230ec7eca2524c019cdc1353f5025ac23c868c67242ac8f4b010ed4114 SHA512 a41be315ac15fb9415db58840900fe4e6ebc755971214d63a083b5ec9f39ccb5da55d9a4dba41d1ed740ebde7b4b672b93d3dc883d885d8650760a89544da390 WHIRLPOOL 050ba8ccaa676d0e2823c14ec0443f04bb544000012b38ad84e8b88386bc60ee37dca98dd013c57966f50644d7861101bd5298315eba30c63ace9d96d33aa01e
+EBUILD elfix-0.9.1.ebuild 1138 SHA256 98b211fd1e29fb8275d54b944ca04d3549dbd2c1845f1556c26c6e8af970cf24 SHA512 8fbd64126c8677f0cf6c2120c1dc8f0b89aa11dae23babd49dffee0b5727e557d9324e1744e18d25317f693991b095146f30f08a90edd59ae5d47da0ab2a9e24 WHIRLPOOL d117b059c6720f95d517121930ad77d6dc1863bc5472624317456d083b72ccbe777e2c03dacac721624a07daa17b893d590018670ac964d3676905731bcdbcc9
+EBUILD elfix-9999.ebuild 1138 SHA256 98b211fd1e29fb8275d54b944ca04d3549dbd2c1845f1556c26c6e8af970cf24 SHA512 8fbd64126c8677f0cf6c2120c1dc8f0b89aa11dae23babd49dffee0b5727e557d9324e1744e18d25317f693991b095146f30f08a90edd59ae5d47da0ab2a9e24 WHIRLPOOL d117b059c6720f95d517121930ad77d6dc1863bc5472624317456d083b72ccbe777e2c03dacac721624a07daa17b893d590018670ac964d3676905731bcdbcc9
 MISC ChangeLog 12780 SHA256 5a7b6fa8cb7286ccb37533b18b8d52b715e82b0937dd399b6166c50b3cb2b2d3 SHA512 bb56097843b102cc511c413afaca4b8e169c7cb0cc64c028316f2a31edb491743c8e2c98d36f7653b1e1bd88d7f35b0e9b67033bdb97da52051ed9b938ddc1c9 WHIRLPOOL 6395a4f6e07903db08c9d146e19fa8d2dd88c23551901ad7442bb99aecbbdbc96fd6cece842f8fbbe3b29f04332b9e629a9d13f6c7691f369caf215abddd9ff1
 MISC metadata.xml 393 SHA256 81a4b48fc98f0eaa825c15e5aab31a9c2eb0557d7c47d7453963d5f1d247a7ef SHA512 970b25df4289226f1a5e22a98f97f413f14c00c2454100b0e56d96d8f6ba4cc592aef36af569549bf884d49278cbe3de91799d4fdf1d38c318aae414610a075f WHIRLPOOL aa59e113a09a9b16fb579800b695c11c6d63626362db57098544eafff52cb34b3470256ce7ff392f10226e1546f2f60a9737f0ea32ed3875000f0566c82eb270
diff --git a/sys-apps/elfix/elfix-0.9.1.ebuild b/sys-apps/elfix/elfix-0.9.1.ebuild
new file mode 100644
index 000000000000..f303c412cd30
--- /dev/null
+++ b/sys-apps/elfix/elfix-0.9.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/elfix.git"
+	inherit git-2
+else
+	SRC_URI="https://dev.gentoo.org/~blueness/elfix/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="A suite of tools to work with ELF objects on Hardened Gentoo"
+HOMEPAGE="https://www.gentoo.org/proj/en/hardened/pax-quickstart.xml
+	https://dev.gentoo.org/~blueness/elfix/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+ptpax +xtpax"
+
+REQUIRED_USE="|| ( ptpax xtpax )"
+
+# These only work with a properly configured PaX kernel
+RESTRICT="test"
+
+DEPEND="~dev-python/pypax-${PV}[ptpax=,xtpax=]
+	ptpax? ( dev-libs/elfutils )
+	xtpax? ( sys-apps/attr )"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	[[ ${PV} == "9999" ]] && ./autogen.sh
+}
+
+src_configure() {
+	rm -f "${S}/scripts/setup.py"
+	econf --disable-tests \
+		$(use_enable ptpax) \
+		$(use_enable xtpax)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog INSTALL README THANKS TODO
+}
diff --git a/sys-apps/elfix/elfix-9999.ebuild b/sys-apps/elfix/elfix-9999.ebuild
new file mode 100644
index 000000000000..f303c412cd30
--- /dev/null
+++ b/sys-apps/elfix/elfix-9999.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/elfix.git"
+	inherit git-2
+else
+	SRC_URI="https://dev.gentoo.org/~blueness/elfix/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="A suite of tools to work with ELF objects on Hardened Gentoo"
+HOMEPAGE="https://www.gentoo.org/proj/en/hardened/pax-quickstart.xml
+	https://dev.gentoo.org/~blueness/elfix/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+ptpax +xtpax"
+
+REQUIRED_USE="|| ( ptpax xtpax )"
+
+# These only work with a properly configured PaX kernel
+RESTRICT="test"
+
+DEPEND="~dev-python/pypax-${PV}[ptpax=,xtpax=]
+	ptpax? ( dev-libs/elfutils )
+	xtpax? ( sys-apps/attr )"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	[[ ${PV} == "9999" ]] && ./autogen.sh
+}
+
+src_configure() {
+	rm -f "${S}/scripts/setup.py"
+	econf --disable-tests \
+		$(use_enable ptpax) \
+		$(use_enable xtpax)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog INSTALL README THANKS TODO
+}
diff --git a/sys-libs/libsemanage/Manifest b/sys-libs/libsemanage/Manifest
index 02bac6e5e5ba..049292e80f7e 100644
--- a/sys-libs/libsemanage/Manifest
+++ b/sys-libs/libsemanage/Manifest
@@ -1,10 +1,15 @@
 AUX 0001-libsemanage-do-not-copy-contexts-in-semanage_migrate.patch 7190 SHA256 5746fe5b4f85bb2ca4fdd50b29de98a8561c6a88e66dfb067c3e393eb1399b4d SHA512 ad9923ccad7a0d975b850eaeb5a801b3f933c0a26112226fa19112dd8aa07de9766845dfec44680799a577175c3a564e9c222f7b0968871fd1f69c3140ab569b WHIRLPOOL dda70c907d5ec766886f08e43da0a417ac67652f1682e629c06ce175f37d3db63e9ab257874435a26f4bc1ae7436421a5414b89b997f181a4ff9fe6434c77a2d
+AUX 0002-libsemanage-Add-policy-binary-and-file_contexts.loca.patch 11042 SHA256 2b8cac510621efcfeacc0f59d89cd471b9b248d2d9fe455bcf9b9af2a94e9fb8 SHA512 6537ea1d3d9eee3882b26e29271068a72a0c0e7812ac85393e95164a71fb94e441fcd5e49020470ee5e5f8e308ecfe8d66abf0cd3f956124a4692312d50807b3 WHIRLPOOL 3bb3c108ea673b80704ed957f774c71a6ae6239595f2387abfee8c7612b79d8be94aad9431aced93d655c3402149109dbb9faf0d2df534b5b67f5cfa7ad63176
+AUX 0003-libsemanage-Add-file_contexts-and-seusers-to-the-sto.patch 8839 SHA256 3ec6094a5395774ee737400698bbccf49ab6cc48999b37765de0565e78006534 SHA512 5b597efb663a1c1b736a6da43b29831bd49ae59be60939691c16d2a167730b809f9b61d25ac36e29faa97dd4efeaa8b2ea9189f8afecf3a7a8eb8289ca892b9f WHIRLPOOL 7d675e98c7e2ecea1c4ec40ccbd8f90970b282b969cf1786fdff84007b4c987e13adff42705c4a5bb6a3b7906acae785335c6d50fd1192860a6f71a82445b610
+AUX 0004-libsemanage-save-homedir_template-in-the-policy-stor.patch 2163 SHA256 0491b38cd5c31b204e46459527e35d94827e7c787eefe76daf6096b2989abd70 SHA512 ca844ad1720868ab695a365a9cd3e0c18bc47366761719c7fbbfd154cd40d0652a86d4f11eceb231ce855825c844f37b23afd2f6ffb0d2403ee33e9945a24aac WHIRLPOOL 77601baba57c58c9da52544753e58f19ba11f3aeb7edbeec7c475d7bf626044d7e09b3cb1bcc62bfbf648fe8a41dac58452dc1a82dc0e271351e3ac17cac7385
+AUX 0005-libsemanage-store-users_extra-in-the-policy-store.patch 2057 SHA256 f8fc94ca7cf650093e0197359a450dfd8d79fdae45f6158504ea6f50b417abe1 SHA512 be33c38bea905209ab32da082711a25ffe07fbf3de22167a16582b2527526099449c466e340de4c3a56959d68ebf6db676382bd392698f672d7cbc5d3d3d211c WHIRLPOOL a8c64b41f299cbe5791f747bbda50d4d2246af733cf9bac34ab285b4ca50dfbd7c54f23675e01e02120562bb0cd1573df254d09ad0cfb1b35a2637f06e18d5af
 DIST libsemanage-2.2.tar.gz 138208 SHA256 11f60bfa0f1c6063cd9bd99ce0cb4acc9d6d9e9b8d7743d39e847bcd7803bd75 SHA512 09032b1b322fec7346164939ade118034812cb538ebc72121640d4ac5c89d2a66b59caa465027cfbebb590dee039a26d4345eafedf365d7f6ad0b5e90377d50f WHIRLPOOL 49170c5ee9ff57dcc4a15aa72386f37993f76436f0da25808c60dab2d03ba52932d0d4fa753c326900d83d2fae30f8bcf659251f17327783f2e2be3deb4842f4
 DIST libsemanage-2.3.tar.gz 138231 SHA256 03e09e35e611c286e446bef92b6023ef2623815996f5a53394bb02e49a312e4b SHA512 defe3bbdbe51abdaa13a39f693c33446d8a1a8509ac1eb25c7770da2df6487bcb0ca31259d02b4531d4c81db5e221e94e95bec97f6a1a155e1de2f65e6f0da34 WHIRLPOOL 943d4d300aa8ad49c411b10b41c0c3e751c46dbcbbe129bdd1d2e975e231c58391d6ecdee6b27699fff9f6e6facf5b48fc8d57c2ff68692694c7de430750fac9
 DIST libsemanage-2.4.tar.gz 151173 SHA256 1a4cace4ef16786531ec075c0e7b2f961e2fee5dc86c5f983a689058899a6484 SHA512 54f993253b22207b053daf4d34e72c65c72279866416089b6c0f047ef77bca3e307eac0ce6dfe40bd14e2e47e79841b358d5607501779f38d9b5f7c35f3b7729 WHIRLPOOL 7303c06515ed59b5756a87d08aff07671e51d26ce9fa452ca75643dd0ce4658571dc69d86434c943d691a4ab0d90cbdccdaa27e5aaec5fdf8057cf2d5d30631e
 EBUILD libsemanage-2.2-r2.ebuild 3087 SHA256 220e52e62caa7cc9e471c9138f2fa323824948a661f27af7ab2df28303cd1595 SHA512 3c77b723a72eae33084ef2205d368707f77479889df640fb4de0b41edd5aaa13d19f7180bc058fb5dc89d86475ef9b896396741a51365c2cba889a90f767ee5d WHIRLPOOL 78195b55c58444efb4d31204cd8e6fc6fdaafc70929cff4921c6927256986aba0f213abd9210b56dd04158f1f88ae514dc5bc3beb1fb09aa3e380b50730beb55
 EBUILD libsemanage-2.3-r4.ebuild 3446 SHA256 aab0dcacf8b625fe3c8911ff25a730668e5c0eaa0f81480a8002e739b235be46 SHA512 c9ee98a0f09ae07fa6cc7303125fa9238652b44a18a46f1c0a90a0030a83cbfb11b82a6a6bcd7e1187bcbac447d8cff3289e6e0ceaf0543f67e22a4ceed33383 WHIRLPOOL 0c1cae9d29af978acaef1316e5b7c5f369d6f5631fb3d8de44f68e7cf2a7da732f1cf749b3009b7dcb4f488e650b61d8e9fd8019c0c602b1262dea81fa199707
 EBUILD libsemanage-2.4-r1.ebuild 4561 SHA256 1dcb6f99c02dde224171c0ced2e4396b61489fd007c2ef02ac2a3dbe2cf29be2 SHA512 edd3612e2f26fc26dcad3e55736ff9c769875c6f3e83fc361b6c7d993698875523970bc7b15749c5f1223d7228c4067b92249d02e705f7affcac77a8547e216d WHIRLPOOL a9c7eb7e2d9ade49be9fb37d8dc4748265632f2ac7e0309366e42f0c30973c4100f66339a041aecaee2595bf9bd6cc73c5287955058ef01151a31d090aa755a8
+EBUILD libsemanage-2.4-r2.ebuild 4888 SHA256 88adeeed340942f8a7bf041be6590c3dcc0bdc0de5d3975287a7953551e76a51 SHA512 e29fafe4a562e419b649871a183b5ffc84871354ce3b09504c632fce7a3f398d660eaf7e362aa3d97250059b5fb4a42735aeea44d8ad81e38431adf2d78f4bec WHIRLPOOL 1f08effc8ac0ed73b237776e1a4e9e2a84b544d71bbf4bc28eefbcd22de78da77a9f3ef7c4d72fea7fa8c83503df1f1cd03f698a37b714fb185c27a6c7708d60
 EBUILD libsemanage-9999.ebuild 4838 SHA256 80cdd924e432f9f39890db13c3164a802a1156dd1227e9feb99aa6ec604b8b9c SHA512 ad7e0fe9814c42790a2f8dd18c936271d3b9746b5e62113b32568678d94ebe5b7ce1606c3029e376dc27c27e34073d51a5bb8719beb53628b2d3145e77609109 WHIRLPOOL ccf43e73551dc22701ad023ce5e1893bffcaf8dd6ac270c6c128bb11f57aafcf8ff68cb1408fb7127e07c734d88b8806f8ef299a197d5fe6221fc5f8b1d3c71f
 MISC ChangeLog 13938 SHA256 d7938bb036a37dc37a0d2654be04c655b30cf54cb8c4f019e4f6549ffe3179da SHA512 e006775684003b4a7bd9e77f9fdf173bc1402e3cf05aad684b2e31c1942e8d2a268e7ffa19164a94e04e07f7977c1fdefbaaabf021f4ea4e6e8e8e463f69be3c WHIRLPOOL e87415fff3ee0136db7905a45881fdeed6a46b5dbbbf487fc62adba321a99f747f4eb5c549feb8093ffa22bc8369a60e5370638674a4db2c0aa2a4c020cf4230
 MISC metadata.xml 320 SHA256 b26802e71a0f815c4dadc9ec5122bf91ee5007bdd3f508908fb06fb489148ecb SHA512 80b83887b0eb131738dafdc65ba16bdf17793381fe23956ae44393d63333d22c1a45a5ceb8d4ee993825fa06e873e6bdf35f80996951f11924f09ddc28fba43b WHIRLPOOL 0b6f26f333782f25a6cc069dfb5df7bbd63cb9574a1ac29dce9abbd82aee2be4ba6a1146a346402d4e21854f664e9ef70986155d3782c7a9bf25b3a4da853d77
diff --git a/sys-libs/libsemanage/files/0002-libsemanage-Add-policy-binary-and-file_contexts.loca.patch b/sys-libs/libsemanage/files/0002-libsemanage-Add-policy-binary-and-file_contexts.loca.patch
new file mode 100644
index 000000000000..e5e821e6976e
--- /dev/null
+++ b/sys-libs/libsemanage/files/0002-libsemanage-Add-policy-binary-and-file_contexts.loca.patch
@@ -0,0 +1,318 @@
+From 9638af24a1e890d673549f0b25d854458e07032e Mon Sep 17 00:00:00 2001
+From: Yuli Khodorkovskiy <ykhodorkovskiy@tresys.com>
+Date: Thu, 2 Jul 2015 09:27:36 -0400
+Subject: [PATCH] libsemanage: Add policy binary and file_contexts.local to the
+ store
+
+This patch writes policy.kern and file_contexts.local to the policy store as
+well as /etc/selinux/. Additionally, policy.kern and file_contexts.local
+are now parsed from the store rather than the final directory which was
+the old behavior. This allows all policy related files to be kept in the
+policy store.
+
+This patch also renames /var/lib/selinux/tmp to 'final' and changes
+policy.kern in the store to longer be a symlink.
+
+Signed-off-by: Yuli Khodorkovskiy <ykhodorkovskiy@tresys.com>
+---
+ libsemanage/src/booleans_policydb.c      |  6 ++--
+ libsemanage/src/direct_api.c             | 33 +++++++++++++++----
+ libsemanage/src/interfaces_policydb.c    |  6 ++--
+ libsemanage/src/nodes_policydb.c         |  6 ++--
+ libsemanage/src/ports_policydb.c         |  6 ++--
+ libsemanage/src/semanage_store.c         | 55 ++++++++++++++++++++++++--------
+ libsemanage/src/semanage_store.h         |  5 +++
+ libsemanage/src/users_base_policydb.c    |  6 ++--
+ libsemanage/utils/semanage_migrate_store |  3 +-
+ 9 files changed, 86 insertions(+), 40 deletions(-)
+
+diff --git a/libsemanage/src/booleans_policydb.c b/libsemanage/src/booleans_policydb.c
+index 74af2a3..6869d6c 100644
+--- a/libsemanage/src/booleans_policydb.c
++++ b/libsemanage/src/booleans_policydb.c
+@@ -55,10 +55,8 @@ int bool_policydb_dbase_init(semanage_handle_t * handle,
+ {
+ 
+ 	if (dbase_policydb_init(handle,
+-				semanage_final_path(SEMANAGE_FINAL_SELINUX,
+-						    SEMANAGE_KERNEL),
+-				semanage_final_path(SEMANAGE_FINAL_TMP,
+-						    SEMANAGE_KERNEL),
++				semanage_path(SEMANAGE_ACTIVE, SEMANAGE_STORE_KERNEL),
++				semanage_path(SEMANAGE_TMP, SEMANAGE_STORE_KERNEL),
+ 				&SEMANAGE_BOOL_RTABLE,
+ 				&SEMANAGE_BOOL_POLICYDB_RTABLE,
+ 				&dconfig->dbase) < 0)
+diff --git a/libsemanage/src/direct_api.c b/libsemanage/src/direct_api.c
+index d57f934..3c6b168 100644
+--- a/libsemanage/src/direct_api.c
++++ b/libsemanage/src/direct_api.c
+@@ -196,10 +196,8 @@ int semanage_direct_connect(semanage_handle_t * sh)
+ 		goto err;
+ 
+ 	if (fcontext_file_dbase_init(sh,
+-				     semanage_final_path(SEMANAGE_FINAL_SELINUX,
+-							 SEMANAGE_FC_LOCAL),
+-				     semanage_final_path(SEMANAGE_FINAL_TMP,
+-							 SEMANAGE_FC_LOCAL),
++				     semanage_path(SEMANAGE_ACTIVE, SEMANAGE_STORE_FC_LOCAL),
++				     semanage_path(SEMANAGE_TMP, SEMANAGE_STORE_FC_LOCAL),
+ 				     semanage_fcontext_dbase_local(sh)) < 0)
+ 		goto err;
+ 
+@@ -1041,7 +1039,7 @@ static int semanage_direct_commit(semanage_handle_t * sh)
+ 	size_t fc_buffer_len = 0;
+ 	const char *ofilename = NULL;
+ 	const char *path;
+-	int retval = -1, num_modinfos = 0, i;
++	int retval = -1, num_modinfos = 0, i, missing_policy_kern = 0;
+ 	sepol_policydb_t *out = NULL;
+ 	struct cil_db *cildb = NULL;
+ 	semanage_module_info_t *modinfos = NULL;
+@@ -1143,8 +1141,20 @@ static int semanage_direct_commit(semanage_handle_t * sh)
+ 	modified |= dontaudit_modified;
+ 	modified |= preserve_tunables_modified;
+ 
++	/* This is for systems that have already migrated with an older version
++	 * of semanage_migrate_store. The older version did not copy policy.kern so
++	 * the policy binary must be rebuilt here.
++	 */
++	if (!sh->do_rebuild && !modified) {
++		path = semanage_path(SEMANAGE_TMP, SEMANAGE_STORE_KERNEL);
++
++		if (access(path, F_OK) != 0) {
++			missing_policy_kern = 1;
++		}
++	}
++
+ 	/* If there were policy changes, or explicitly requested, rebuild the policy */
+-	if (sh->do_rebuild || modified) {
++	if (sh->do_rebuild || modified || missing_policy_kern) {
+ 		/* =================== Module expansion =============== */
+ 
+ 		retval = semanage_get_active_modules(sh, &modinfos, &num_modinfos);
+@@ -1302,6 +1312,17 @@ static int semanage_direct_commit(semanage_handle_t * sh)
+ 	if (retval < 0)
+ 		goto cleanup;
+ 
++	retval = semanage_copy_policydb(sh);
++	if (retval < 0)
++		goto cleanup;
++
++	path = semanage_path(SEMANAGE_TMP, SEMANAGE_STORE_FC_LOCAL);
++	if (access(path, F_OK) == 0) {
++		retval = semanage_copy_fc_local(sh);
++		if (retval < 0)
++			goto cleanup;
++	}
++
+ 	/* run genhomedircon if its enabled, this should be the last operation
+ 	 * which requires the out policydb */
+ 	if (!sh->conf->disable_genhomedircon) {
+diff --git a/libsemanage/src/interfaces_policydb.c b/libsemanage/src/interfaces_policydb.c
+index 6a42eed..552ce7d 100644
+--- a/libsemanage/src/interfaces_policydb.c
++++ b/libsemanage/src/interfaces_policydb.c
+@@ -51,10 +51,8 @@ int iface_policydb_dbase_init(semanage_handle_t * handle,
+ {
+ 
+ 	if (dbase_policydb_init(handle,
+-				semanage_final_path(SEMANAGE_FINAL_SELINUX,
+-						    SEMANAGE_KERNEL),
+-				semanage_final_path(SEMANAGE_FINAL_TMP,
+-						    SEMANAGE_KERNEL),
++				semanage_path(SEMANAGE_ACTIVE, SEMANAGE_STORE_KERNEL),
++				semanage_path(SEMANAGE_TMP, SEMANAGE_STORE_KERNEL),
+ 				&SEMANAGE_IFACE_RTABLE,
+ 				&SEMANAGE_IFACE_POLICYDB_RTABLE,
+ 				&dconfig->dbase) < 0)
+diff --git a/libsemanage/src/nodes_policydb.c b/libsemanage/src/nodes_policydb.c
+index 56012fb..7224f00 100644
+--- a/libsemanage/src/nodes_policydb.c
++++ b/libsemanage/src/nodes_policydb.c
+@@ -50,10 +50,8 @@ int node_policydb_dbase_init(semanage_handle_t * handle,
+ {
+ 
+ 	if (dbase_policydb_init(handle,
+-				semanage_final_path(SEMANAGE_FINAL_SELINUX,
+-						    SEMANAGE_KERNEL),
+-				semanage_final_path(SEMANAGE_FINAL_TMP,
+-						    SEMANAGE_KERNEL),
++				semanage_path(SEMANAGE_ACTIVE, SEMANAGE_STORE_KERNEL),
++				semanage_path(SEMANAGE_TMP, SEMANAGE_STORE_KERNEL),
+ 				&SEMANAGE_NODE_RTABLE,
+ 				&SEMANAGE_NODE_POLICYDB_RTABLE,
+ 				&dconfig->dbase) < 0)
+diff --git a/libsemanage/src/ports_policydb.c b/libsemanage/src/ports_policydb.c
+index b9600f0..37d7deb 100644
+--- a/libsemanage/src/ports_policydb.c
++++ b/libsemanage/src/ports_policydb.c
+@@ -50,10 +50,8 @@ int port_policydb_dbase_init(semanage_handle_t * handle,
+ {
+ 
+ 	if (dbase_policydb_init(handle,
+-				semanage_final_path(SEMANAGE_FINAL_SELINUX,
+-						    SEMANAGE_KERNEL),
+-				semanage_final_path(SEMANAGE_FINAL_TMP,
+-						    SEMANAGE_KERNEL),
++				semanage_path(SEMANAGE_ACTIVE, SEMANAGE_STORE_KERNEL),
++				semanage_path(SEMANAGE_TMP, SEMANAGE_STORE_KERNEL),
+ 				&SEMANAGE_PORT_RTABLE,
+ 				&SEMANAGE_PORT_POLICYDB_RTABLE,
+ 				&dconfig->dbase) < 0)
+diff --git a/libsemanage/src/semanage_store.c b/libsemanage/src/semanage_store.c
+index 6051691..2856aaf 100644
+--- a/libsemanage/src/semanage_store.c
++++ b/libsemanage/src/semanage_store.c
+@@ -110,10 +110,12 @@ static const char *semanage_sandbox_paths[SEMANAGE_STORE_NUM_PATHS] = {
+ 	"/disable_dontaudit",
+ 	"/preserve_tunables",
+ 	"/modules/disabled",
++	"/policy.kern",
++	"/file_contexts.local"
+ };
+ 
+ static char const * const semanage_final_prefix[SEMANAGE_FINAL_NUM] = {
+-	"/tmp",
++	"/final",
+ 	"",
+ };
+ 
+@@ -943,9 +945,7 @@ int semanage_make_final(semanage_handle_t *sh)
+ 		goto cleanup;
+ 	}
+ 
+-	/* Copy in exported databases.
+-	 * i = 1 to avoid copying the top level directory.
+-	 */
++	// Build final directory structure
+ 	int i;
+ 	for (i = 1; i < SEMANAGE_FINAL_PATH_NUM; i++) {
+ 		if (strlen(semanage_final_path(SEMANAGE_FINAL_TMP, i)) >= sizeof(fn)) {
+@@ -959,12 +959,6 @@ int semanage_make_final(semanage_handle_t *sh)
+ 			status = -1;
+ 			goto cleanup;
+ 		}
+-
+-		semanage_copy_file(
+-			semanage_final_path(SEMANAGE_FINAL_SELINUX, i),
+-			semanage_final_path(SEMANAGE_FINAL_TMP, i),
+-			sh->conf->file_mode);
+-		/* ignore errors, these files may not exist */
+ 	}
+ 
+ cleanup:
+@@ -2019,8 +2013,7 @@ int semanage_read_policydb(semanage_handle_t * sh, sepol_policydb_t * in)
+ 	FILE *infile = NULL;
+ 
+ 	if ((kernel_filename =
+-	     semanage_final_path(SEMANAGE_FINAL_SELINUX,
+-				 SEMANAGE_KERNEL)) == NULL) {
++	     semanage_path(SEMANAGE_ACTIVE, SEMANAGE_STORE_KERNEL)) == NULL) {
+ 		goto cleanup;
+ 	}
+ 	if ((infile = fopen(kernel_filename, "r")) == NULL) {
+@@ -2061,7 +2054,7 @@ int semanage_write_policydb(semanage_handle_t * sh, sepol_policydb_t * out)
+ 	FILE *outfile = NULL;
+ 
+ 	if ((kernel_filename =
+-	     semanage_final_path(SEMANAGE_FINAL_TMP, SEMANAGE_KERNEL)) == NULL) {
++	     semanage_path(SEMANAGE_TMP, SEMANAGE_STORE_KERNEL)) == NULL) {
+ 		goto cleanup;
+ 	}
+ 	if ((outfile = fopen(kernel_filename, "wb")) == NULL) {
+@@ -2921,3 +2914,39 @@ int semanage_nc_sort(semanage_handle_t * sh, const char *buf, size_t buf_len,
+ 
+ 	return 0;
+ }
++
++int semanage_copy_policydb(semanage_handle_t *sh)
++{
++	const char *src = NULL;
++	const char *dst = NULL;
++	int rc = -1;
++
++	src = semanage_path(SEMANAGE_TMP, SEMANAGE_STORE_KERNEL);
++	dst = semanage_final_path(SEMANAGE_FINAL_TMP, SEMANAGE_KERNEL);
++
++	rc = semanage_copy_file(src, dst, sh->conf->file_mode);
++	if (rc != 0) {
++		goto cleanup;
++	}
++
++cleanup:
++	return rc;
++}
++
++int semanage_copy_fc_local(semanage_handle_t *sh)
++{
++	const char *src = NULL;
++	const char *dst = NULL;
++	int rc = -1;
++
++	src = semanage_path(SEMANAGE_TMP, SEMANAGE_STORE_FC_LOCAL);
++	dst = semanage_final_path(SEMANAGE_FINAL_TMP, SEMANAGE_FC_LOCAL);
++
++	rc = semanage_copy_file(src, dst, sh->conf->file_mode);
++	if (rc != 0) {
++		goto cleanup;
++	}
++
++cleanup:
++	return rc;
++}
+diff --git a/libsemanage/src/semanage_store.h b/libsemanage/src/semanage_store.h
+index 62c7079..ade43f2 100644
+--- a/libsemanage/src/semanage_store.h
++++ b/libsemanage/src/semanage_store.h
+@@ -55,6 +55,8 @@ enum semanage_sandbox_defs {
+ 	SEMANAGE_DISABLE_DONTAUDIT,
+ 	SEMANAGE_PRESERVE_TUNABLES,
+ 	SEMANAGE_MODULES_DISABLED,
++	SEMANAGE_STORE_KERNEL,
++	SEMANAGE_STORE_FC_LOCAL,
+ 	SEMANAGE_STORE_NUM_PATHS
+ };
+ 
+@@ -148,4 +150,7 @@ int semanage_nc_sort(semanage_handle_t * sh,
+ 		     size_t buf_len,
+ 		     char **sorted_buf, size_t * sorted_buf_len);
+ 
++int semanage_copy_policydb(semanage_handle_t *sh);
++int semanage_copy_fc_local(semanage_handle_t *sh);
++
+ #endif
+diff --git a/libsemanage/src/users_base_policydb.c b/libsemanage/src/users_base_policydb.c
+index 0a6ab9c..b42279c 100644
+--- a/libsemanage/src/users_base_policydb.c
++++ b/libsemanage/src/users_base_policydb.c
+@@ -50,10 +50,8 @@ int user_base_policydb_dbase_init(semanage_handle_t * handle,
+ {
+ 
+ 	if (dbase_policydb_init(handle,
+-				semanage_final_path(SEMANAGE_FINAL_SELINUX,
+-						    SEMANAGE_KERNEL),
+-				semanage_final_path(SEMANAGE_FINAL_TMP,
+-						    SEMANAGE_KERNEL),
++				semanage_path(SEMANAGE_ACTIVE, SEMANAGE_STORE_KERNEL),
++				semanage_path(SEMANAGE_TMP, SEMANAGE_STORE_KERNEL),
+ 				&SEMANAGE_USER_BASE_RTABLE,
+ 				&SEMANAGE_USER_BASE_POLICYDB_RTABLE,
+ 				&dconfig->dbase) < 0)
+diff --git a/libsemanage/utils/semanage_migrate_store b/libsemanage/utils/semanage_migrate_store
+index 2f85e9c..b170eda 100755
+--- a/libsemanage/utils/semanage_migrate_store
++++ b/libsemanage/utils/semanage_migrate_store
+@@ -243,7 +243,8 @@ if __name__ == "__main__":
+ 		"users.local",
+ 		"users_extra.local",
+ 		"disable_dontaudit",
+-		"preserve_tunables" ]
++		"preserve_tunables",
++		"policy.kern" ]
+ 
+ 
+ 	create_dir(newroot_path(), 0o755)
+-- 
+2.4.6
+
diff --git a/sys-libs/libsemanage/files/0003-libsemanage-Add-file_contexts-and-seusers-to-the-sto.patch b/sys-libs/libsemanage/files/0003-libsemanage-Add-file_contexts-and-seusers-to-the-sto.patch
new file mode 100644
index 000000000000..24e9778015ab
--- /dev/null
+++ b/sys-libs/libsemanage/files/0003-libsemanage-Add-file_contexts-and-seusers-to-the-sto.patch
@@ -0,0 +1,265 @@
+From d56c2b434e99f60612c1290e82021ecbcbfaf5e6 Mon Sep 17 00:00:00 2001
+From: Yuli Khodorkovskiy <ykhodorkovskiy@tresys.com>
+Date: Tue, 21 Jul 2015 15:08:15 -0400
+Subject: [PATCH] libsemanage: Add file_contexts and seusers to the store
+
+This patch writes file_contexts and seusers to the policy store as well as
+/etc/selinux/. Additionally, file_contexts and seusers are now parsed from the
+store rather than the final directory which was the old behavior. This allows
+all policy related files to be kept in the policy store.
+
+Signed-off-by: Yuli Khodorkovskiy <ykhodorkovskiy@tresys.com>
+---
+ libsemanage/src/direct_api.c             | 69 +++++++++++++++++++++++++-------
+ libsemanage/src/semanage_store.c         | 49 ++++-------------------
+ libsemanage/src/semanage_store.h         |  5 ++-
+ libsemanage/utils/semanage_migrate_store |  3 +-
+ 4 files changed, 66 insertions(+), 60 deletions(-)
+
+diff --git a/libsemanage/src/direct_api.c b/libsemanage/src/direct_api.c
+index 3c6b168..b11f2ba 100644
+--- a/libsemanage/src/direct_api.c
++++ b/libsemanage/src/direct_api.c
+@@ -248,18 +248,14 @@ int semanage_direct_connect(semanage_handle_t * sh)
+ 		goto err;
+ 
+ 	if (fcontext_file_dbase_init(sh,
+-				     semanage_final_path(SEMANAGE_FINAL_SELINUX,
+-							 SEMANAGE_FC),
+-				     semanage_final_path(SEMANAGE_FINAL_TMP,
+-							 SEMANAGE_FC),
++				     semanage_path(SEMANAGE_ACTIVE, SEMANAGE_STORE_FC),
++				     semanage_path(SEMANAGE_TMP, SEMANAGE_STORE_FC),
+ 				     semanage_fcontext_dbase_policy(sh)) < 0)
+ 		goto err;
+ 
+ 	if (seuser_file_dbase_init(sh,
+-				   semanage_final_path(SEMANAGE_FINAL_SELINUX,
+-						       SEMANAGE_SEUSERS),
+-				   semanage_final_path(SEMANAGE_FINAL_TMP,
+-						       SEMANAGE_SEUSERS),
++				   semanage_path(SEMANAGE_ACTIVE, SEMANAGE_STORE_SEUSERS),
++				   semanage_path(SEMANAGE_TMP, SEMANAGE_STORE_SEUSERS),
+ 				   semanage_seuser_dbase_policy(sh)) < 0)
+ 		goto err;
+ 
+@@ -602,7 +598,7 @@ static int semanage_direct_update_seuser(semanage_handle_t * sh, cil_db_t *cildb
+ 	}
+ 
+ 	if (size > 0) {
+-		ofilename = semanage_final_path(SEMANAGE_FINAL_TMP, SEMANAGE_SEUSERS);
++		ofilename = semanage_path(SEMANAGE_TMP, SEMANAGE_STORE_SEUSERS);
+ 		if (ofilename == NULL) {
+ 			return -1;
+ 		}
+@@ -1039,7 +1035,8 @@ static int semanage_direct_commit(semanage_handle_t * sh)
+ 	size_t fc_buffer_len = 0;
+ 	const char *ofilename = NULL;
+ 	const char *path;
+-	int retval = -1, num_modinfos = 0, i, missing_policy_kern = 0;
++	int retval = -1, num_modinfos = 0, i, missing_policy_kern = 0,
++		missing_seusers = 0, missing_fc = 0, missing = 0;
+ 	sepol_policydb_t *out = NULL;
+ 	struct cil_db *cildb = NULL;
+ 	semanage_module_info_t *modinfos = NULL;
+@@ -1151,10 +1148,26 @@ static int semanage_direct_commit(semanage_handle_t * sh)
+ 		if (access(path, F_OK) != 0) {
+ 			missing_policy_kern = 1;
+ 		}
++
++		path = semanage_path(SEMANAGE_TMP, SEMANAGE_STORE_FC);
++
++		if (access(path, F_OK) != 0) {
++			missing_fc = 1;
++		}
++
++		path = semanage_path(SEMANAGE_TMP, SEMANAGE_STORE_SEUSERS);
++
++		if (access(path, F_OK) != 0) {
++			missing_seusers = 1;
++		}
+ 	}
+ 
++	missing |= missing_policy_kern;
++	missing |= missing_fc;
++	missing |= missing_seusers;
++
+ 	/* If there were policy changes, or explicitly requested, rebuild the policy */
+-	if (sh->do_rebuild || modified || missing_policy_kern) {
++	if (sh->do_rebuild || modified || missing) {
+ 		/* =================== Module expansion =============== */
+ 
+ 		retval = semanage_get_active_modules(sh, &modinfos, &num_modinfos);
+@@ -1312,15 +1325,41 @@ static int semanage_direct_commit(semanage_handle_t * sh)
+ 	if (retval < 0)
+ 		goto cleanup;
+ 
+-	retval = semanage_copy_policydb(sh);
+-	if (retval < 0)
++	retval = semanage_copy_file(semanage_path(SEMANAGE_TMP, SEMANAGE_STORE_KERNEL),
++			semanage_final_path(SEMANAGE_FINAL_TMP, SEMANAGE_KERNEL),
++			sh->conf->file_mode);
++	if (retval < 0) {
+ 		goto cleanup;
++	}
+ 
+ 	path = semanage_path(SEMANAGE_TMP, SEMANAGE_STORE_FC_LOCAL);
+ 	if (access(path, F_OK) == 0) {
+-		retval = semanage_copy_fc_local(sh);
+-		if (retval < 0)
++		retval = semanage_copy_file(semanage_path(SEMANAGE_TMP, SEMANAGE_STORE_FC_LOCAL),
++							semanage_final_path(SEMANAGE_FINAL_TMP, SEMANAGE_FC_LOCAL),
++							sh->conf->file_mode);
++		if (retval < 0) {
+ 			goto cleanup;
++		}
++	}
++
++	path = semanage_path(SEMANAGE_TMP, SEMANAGE_STORE_FC);
++	if (access(path, F_OK) == 0) {
++		retval = semanage_copy_file(semanage_path(SEMANAGE_TMP, SEMANAGE_STORE_FC),
++							semanage_final_path(SEMANAGE_FINAL_TMP, SEMANAGE_FC),
++							sh->conf->file_mode);
++		if (retval < 0) {
++			goto cleanup;
++		}
++	}
++
++	path = semanage_path(SEMANAGE_TMP, SEMANAGE_STORE_SEUSERS);
++	if (access(path, F_OK) == 0) {
++		retval = semanage_copy_file(semanage_path(SEMANAGE_TMP, SEMANAGE_STORE_SEUSERS),
++							semanage_final_path(SEMANAGE_FINAL_TMP, SEMANAGE_SEUSERS),
++							sh->conf->file_mode);
++		if (retval < 0) {
++			goto cleanup;
++		}
+ 	}
+ 
+ 	/* run genhomedircon if its enabled, this should be the last operation
+diff --git a/libsemanage/src/semanage_store.c b/libsemanage/src/semanage_store.c
+index 2856aaf..fa0876f 100644
+--- a/libsemanage/src/semanage_store.c
++++ b/libsemanage/src/semanage_store.c
+@@ -111,7 +111,9 @@ static const char *semanage_sandbox_paths[SEMANAGE_STORE_NUM_PATHS] = {
+ 	"/preserve_tunables",
+ 	"/modules/disabled",
+ 	"/policy.kern",
+-	"/file_contexts.local"
++	"/file_contexts.local",
++	"/file_contexts",
++	"/seusers"
+ };
+ 
+ static char const * const semanage_final_prefix[SEMANAGE_FINAL_NUM] = {
+@@ -666,7 +668,7 @@ static int semanage_filename_select(const struct dirent *d)
+ 
+ /* Copies a file from src to dst.  If dst already exists then
+  * overwrite it.  Returns 0 on success, -1 on error. */
+-static int semanage_copy_file(const char *src, const char *dst, mode_t mode)
++int semanage_copy_file(const char *src, const char *dst, mode_t mode)
+ {
+ 	int in, out, retval = 0, amount_read, n, errsv = errno;
+ 	char tmp[PATH_MAX];
+@@ -1425,11 +1427,11 @@ int semanage_split_fc(semanage_handle_t * sh)
+ 		goto cleanup;
+ 	}
+ 
+-	fc = open(semanage_final_path(SEMANAGE_FINAL_TMP, SEMANAGE_FC),
++	fc = open(semanage_path(SEMANAGE_TMP, SEMANAGE_STORE_FC),
+ 		  O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
+ 	if (fc < 0) {
+ 		ERR(sh, "Could not open %s for writing.",
+-		    semanage_final_path(SEMANAGE_FINAL_TMP, SEMANAGE_FC));
++		    semanage_path(SEMANAGE_TMP, SEMANAGE_STORE_FC));
+ 		goto cleanup;
+ 	}
+ 	hd = open(semanage_path(SEMANAGE_TMP, SEMANAGE_HOMEDIR_TMPL),
+@@ -1454,8 +1456,7 @@ int semanage_split_fc(semanage_handle_t * sh)
+ 		} else {
+ 			if (write(fc, buf, strlen(buf)) < 0) {
+ 				ERR(sh, "Write to %s failed.",
+-				    semanage_final_path(SEMANAGE_FINAL_TMP,
+-							SEMANAGE_FC));
++				    semanage_path(SEMANAGE_TMP, SEMANAGE_STORE_FC));
+ 				goto cleanup;
+ 			}
+ 		}
+@@ -2914,39 +2915,3 @@ int semanage_nc_sort(semanage_handle_t * sh, const char *buf, size_t buf_len,
+ 
+ 	return 0;
+ }
+-
+-int semanage_copy_policydb(semanage_handle_t *sh)
+-{
+-	const char *src = NULL;
+-	const char *dst = NULL;
+-	int rc = -1;
+-
+-	src = semanage_path(SEMANAGE_TMP, SEMANAGE_STORE_KERNEL);
+-	dst = semanage_final_path(SEMANAGE_FINAL_TMP, SEMANAGE_KERNEL);
+-
+-	rc = semanage_copy_file(src, dst, sh->conf->file_mode);
+-	if (rc != 0) {
+-		goto cleanup;
+-	}
+-
+-cleanup:
+-	return rc;
+-}
+-
+-int semanage_copy_fc_local(semanage_handle_t *sh)
+-{
+-	const char *src = NULL;
+-	const char *dst = NULL;
+-	int rc = -1;
+-
+-	src = semanage_path(SEMANAGE_TMP, SEMANAGE_STORE_FC_LOCAL);
+-	dst = semanage_final_path(SEMANAGE_FINAL_TMP, SEMANAGE_FC_LOCAL);
+-
+-	rc = semanage_copy_file(src, dst, sh->conf->file_mode);
+-	if (rc != 0) {
+-		goto cleanup;
+-	}
+-
+-cleanup:
+-	return rc;
+-}
+diff --git a/libsemanage/src/semanage_store.h b/libsemanage/src/semanage_store.h
+index ade43f2..acb6e3f 100644
+--- a/libsemanage/src/semanage_store.h
++++ b/libsemanage/src/semanage_store.h
+@@ -57,6 +57,8 @@ enum semanage_sandbox_defs {
+ 	SEMANAGE_MODULES_DISABLED,
+ 	SEMANAGE_STORE_KERNEL,
+ 	SEMANAGE_STORE_FC_LOCAL,
++	SEMANAGE_STORE_FC,
++	SEMANAGE_STORE_SEUSERS,
+ 	SEMANAGE_STORE_NUM_PATHS
+ };
+ 
+@@ -150,7 +152,6 @@ int semanage_nc_sort(semanage_handle_t * sh,
+ 		     size_t buf_len,
+ 		     char **sorted_buf, size_t * sorted_buf_len);
+ 
+-int semanage_copy_policydb(semanage_handle_t *sh);
+-int semanage_copy_fc_local(semanage_handle_t *sh);
++int semanage_copy_file(const char *src, const char *dst, mode_t mode);
+ 
+ #endif
+diff --git a/libsemanage/utils/semanage_migrate_store b/libsemanage/utils/semanage_migrate_store
+index b170eda..6443002 100755
+--- a/libsemanage/utils/semanage_migrate_store
++++ b/libsemanage/utils/semanage_migrate_store
+@@ -244,7 +244,8 @@ if __name__ == "__main__":
+ 		"users_extra.local",
+ 		"disable_dontaudit",
+ 		"preserve_tunables",
+-		"policy.kern" ]
++		"policy.kern",
++		"file_contexts"]
+ 
+ 
+ 	create_dir(newroot_path(), 0o755)
+-- 
+2.4.6
+
diff --git a/sys-libs/libsemanage/files/0004-libsemanage-save-homedir_template-in-the-policy-stor.patch b/sys-libs/libsemanage/files/0004-libsemanage-save-homedir_template-in-the-policy-stor.patch
new file mode 100644
index 000000000000..3bc1370ccb10
--- /dev/null
+++ b/sys-libs/libsemanage/files/0004-libsemanage-save-homedir_template-in-the-policy-stor.patch
@@ -0,0 +1,54 @@
+From 75dd8c062d1f6f0e0a7a9f1856c0957b423e8a02 Mon Sep 17 00:00:00 2001
+From: Steve Lawrence <slawrence@tresys.com>
+Date: Thu, 3 Sep 2015 09:28:08 -0400
+Subject: [PATCH 1/3] libsemanage: save homedir_template in the policy store
+ for genhomedircon
+
+We don't currently store homedir_template in the policy store, which
+means genhomedircon only has a template file to use if the
+homedir_template was generated from the file contexts in the same
+transaction.  But homedir_template isn't always generated, as in the
+case with setsebool -P. In this and other cases, genhomedircon will not
+have a template file resulting in an empty file_contexts.homedir file.
+
+This commit changes this so that homedir_template is always stored in
+the policy store so it can be used by genhomedircon regardless of how
+policy was built. Also add the homedir_template file to the migration
+script.
+
+Signed-off by: Steve Lawrence <slawrence@tresys.com>
+Acked-by:  Stephen Smalley <sds@tycho.nsa.gov>
+---
+ libsemanage/src/direct_api.c             | 1 -
+ libsemanage/utils/semanage_migrate_store | 3 ++-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libsemanage/src/direct_api.c b/libsemanage/src/direct_api.c
+index 90a7b22..6e49cae 100644
+--- a/libsemanage/src/direct_api.c
++++ b/libsemanage/src/direct_api.c
+@@ -1415,7 +1415,6 @@ static int semanage_direct_commit(semanage_handle_t * sh)
+ 
+ 	/* remove files that are automatically generated and no longer needed */
+ 	unlink(semanage_path(SEMANAGE_TMP, SEMANAGE_FC_TMPL));
+-	unlink(semanage_path(SEMANAGE_TMP, SEMANAGE_HOMEDIR_TMPL));
+ 	unlink(semanage_path(SEMANAGE_TMP, SEMANAGE_USERS_EXTRA));
+ 
+ 	if (sh->do_rebuild || modified || bools_modified || fcontexts_modified) {
+diff --git a/libsemanage/utils/semanage_migrate_store b/libsemanage/utils/semanage_migrate_store
+index 539f469..297c71b 100755
+--- a/libsemanage/utils/semanage_migrate_store
++++ b/libsemanage/utils/semanage_migrate_store
+@@ -251,7 +251,8 @@ if __name__ == "__main__":
+ 		"disable_dontaudit",
+ 		"preserve_tunables",
+ 		"policy.kern",
+-		"file_contexts"]
++		"file_contexts",
++		"homedir_template"]
+ 
+ 
+ 	create_dir(newroot_path(), 0o755)
+-- 
+2.4.6
+
diff --git a/sys-libs/libsemanage/files/0005-libsemanage-store-users_extra-in-the-policy-store.patch b/sys-libs/libsemanage/files/0005-libsemanage-store-users_extra-in-the-policy-store.patch
new file mode 100644
index 000000000000..1aca2addb67c
--- /dev/null
+++ b/sys-libs/libsemanage/files/0005-libsemanage-store-users_extra-in-the-policy-store.patch
@@ -0,0 +1,57 @@
+From dbc639a35af71eec1a1b386b74a822d794bb59df Mon Sep 17 00:00:00 2001
+From: Steve Lawrence <slawrence@tresys.com>
+Date: Thu, 3 Sep 2015 13:07:36 -0400
+Subject: [PATCH 2/3] libsemanage: store users_extra in the policy store
+
+users_extra is needed by genhomedircon and when listing seusers, so it
+must be kept in the policy store. Also move the FC_TMPL unlink() closer
+to where the FC_TMPL is created; not a functional change, but eaiser to
+follow.
+
+Signed-off-by: Steve Lawrence <slawrence@tresys.com>
+Acked-by:  Stephen Smalley <sds@tycho.nsa.gov>
+---
+ libsemanage/src/direct_api.c             | 7 +++----
+ libsemanage/utils/semanage_migrate_store | 1 +
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/libsemanage/src/direct_api.c b/libsemanage/src/direct_api.c
+index 6e49cae..68dd0d1 100644
+--- a/libsemanage/src/direct_api.c
++++ b/libsemanage/src/direct_api.c
+@@ -1272,6 +1272,9 @@ static int semanage_direct_commit(semanage_handle_t * sh)
+ 		if (retval < 0)
+ 			goto cleanup;
+ 
++		/* remove FC_TMPL now that it is now longer needed */
++		unlink(semanage_path(SEMANAGE_TMP, SEMANAGE_FC_TMPL));
++
+ 		pfcontexts->dtable->drop_cache(pfcontexts->dbase);
+ 
+ 		/* SEUsers */
+@@ -1413,10 +1416,6 @@ static int semanage_direct_commit(semanage_handle_t * sh)
+ 	sepol_policydb_free(out);
+ 	out = NULL;
+ 
+-	/* remove files that are automatically generated and no longer needed */
+-	unlink(semanage_path(SEMANAGE_TMP, SEMANAGE_FC_TMPL));
+-	unlink(semanage_path(SEMANAGE_TMP, SEMANAGE_USERS_EXTRA));
+-
+ 	if (sh->do_rebuild || modified || bools_modified || fcontexts_modified) {
+ 		retval = semanage_install_sandbox(sh);
+ 	}
+diff --git a/libsemanage/utils/semanage_migrate_store b/libsemanage/utils/semanage_migrate_store
+index 297c71b..b5eefaa 100755
+--- a/libsemanage/utils/semanage_migrate_store
++++ b/libsemanage/utils/semanage_migrate_store
+@@ -247,6 +247,7 @@ if __name__ == "__main__":
+ 		"file_contexts.local",
+ 		"seusers",
+ 		"users.local",
++		"users_extra",
+ 		"users_extra.local",
+ 		"disable_dontaudit",
+ 		"preserve_tunables",
+-- 
+2.4.6
+
diff --git a/sys-libs/libsemanage/libsemanage-2.4-r2.ebuild b/sys-libs/libsemanage/libsemanage-2.4-r2.ebuild
new file mode 100644
index 000000000000..5e14e7d668f9
--- /dev/null
+++ b/sys-libs/libsemanage/libsemanage-2.4-r2.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit multilib python-r1 toolchain-funcs eutils multilib-minimal
+
+MY_P="${P//_/-}"
+
+SEPOL_VER="${PV}"
+SELNX_VER="${PV}"
+
+DESCRIPTION="SELinux kernel and policy management library"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20150202/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="python"
+
+RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
+	>=sys-libs/libselinux-${SELNX_VER}[${MULTILIB_USEDEP}]
+	>=sys-process/audit-2.2.2[${MULTILIB_USEDEP}]
+	>=dev-libs/ustr-1.0.4-r2[${MULTILIB_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	python? (
+		>=dev-lang/swig-2.0.4-r1
+		virtual/pkgconfig
+		${PYTHON_DEPS}
+	)"
+
+# tests are not meant to be run outside of the
+# full SELinux userland repo
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	echo "# Set this to true to save the linked policy." >> "${S}/src/semanage.conf"
+	echo "# This is normally only useful for analysis" >> "${S}/src/semanage.conf"
+	echo "# or debugging of policy." >> "${S}/src/semanage.conf"
+	echo "save-linked=false" >> "${S}/src/semanage.conf"
+	echo >> "${S}/src/semanage.conf"
+	echo "# Set this to 0 to disable assertion checking." >> "${S}/src/semanage.conf"
+	echo "# This should speed up building the kernel policy" >> "${S}/src/semanage.conf"
+	echo "# from policy modules, but may leave you open to" >> "${S}/src/semanage.conf"
+	echo "# dangerous rules which assertion checking" >> "${S}/src/semanage.conf"
+	echo "# would catch." >> "${S}/src/semanage.conf"
+	echo "expand-check=1" >> "${S}/src/semanage.conf"
+	echo >> "${S}/src/semanage.conf"
+	echo "# Modules in the module store can be compressed" >> "${S}/src/semanage.conf"
+	echo "# with bzip2.  Set this to the bzip2 blocksize" >> "${S}/src/semanage.conf"
+	echo "# 1-9 when compressing.  The higher the number," >> "${S}/src/semanage.conf"
+	echo "# the more memory is traded off for disk space." >> "${S}/src/semanage.conf"
+	echo "# Set to 0 to disable bzip2 compression." >> "${S}/src/semanage.conf"
+	echo "bzip-blocksize=0" >> "${S}/src/semanage.conf"
+	echo >> "${S}/src/semanage.conf"
+	echo "# Reduce memory usage for bzip2 compression and" >> "${S}/src/semanage.conf"
+	echo "# decompression of modules in the module store." >> "${S}/src/semanage.conf"
+	echo "bzip-small=true" >> "${S}/src/semanage.conf"
+
+	epatch "${FILESDIR}/0001-libsemanage-do-not-copy-contexts-in-semanage_migrate.patch" \
+		"${FILESDIR}/0002-libsemanage-Add-policy-binary-and-file_contexts.loca.patch" \
+		"${FILESDIR}/0003-libsemanage-Add-file_contexts-and-seusers-to-the-sto.patch" \
+		"${FILESDIR}/0004-libsemanage-save-homedir_template-in-the-policy-stor.patch" \
+		"${FILESDIR}/0005-libsemanage-store-users_extra-in-the-policy-store.patch"
+
+	epatch_user
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	emake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		all
+
+	if multilib_is_native_abi && use python; then
+		building_py() {
+			python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH
+			emake CC="$(tc-getCC)" PYINC="-I${PYTHON_INCLUDEDIR}" PYTHONLBIDIR="${PYTHON_LIBPATH}" PYPREFIX="${EPYTHON##*/}" "$@"
+		}
+		python_foreach_impl building_py swigify
+		python_foreach_impl building_py pywrap
+	fi
+}
+
+multilib_src_install() {
+	emake \
+		LIBDIR="${ED}/usr/$(get_libdir)" \
+		SHLIBDIR="${ED}/usr/$(get_libdir)" \
+		DESTDIR="${ED}" install
+
+	if multilib_is_native_abi && use python; then
+		installation_py() {
+			emake DESTDIR="${ED}" LIBDIR="${ED}/usr/$(get_libdir)" \
+				SHLIBDIR="${ED}/usr/$(get_libdir)" install-pywrap
+			python_optimize # bug 531638
+		}
+		python_foreach_impl installation_py
+	fi
+}
+
+pkg_postinst() {
+	# Migrate the SELinux semanage configuration store if not done already
+	local selinuxtype=$(awk -F'=' '/SELINUXTYPE=/ {print $2}' /etc/selinux/config);
+	if [ -n "${selinuxtype}" ] && [ ! -d /var/lib/selinux/${mcs}/active ] ; then
+		ewarn "Since the 2.4 SELinux userspace, the policy module store is moved"
+		ewarn "from /etc/selinux to /var/lib/selinux. The migration will be run now."
+		ewarn "If there are any issues, it can be done manually by running:"
+		ewarn "/usr/libexec/selinux/semanage_migrate_store"
+		ewarn "For more information, please see"
+		ewarn "- https://github.com/SELinuxProject/selinux/wiki/Policy-Store-Migration"
+	fi
+
+	# Run the store migration without rebuilds
+	for POLICY_TYPE in ${POLICY_TYPES} ; do
+		if [ ! -d "${ROOT}/var/lib/selinux/${POLICY_TYPE}/active" ] ; then
+			einfo "Migrating store ${POLICY_TYPE} (without policy rebuild)."
+			/usr/libexec/selinux/semanage_migrate_store -n -s "${POLICY_TYPE}" || die "Failed to migrate store ${POLICY_TYPE}"
+		fi
+	done
+}