Merge https://github.com/gentoo/gentoo.git
diff --git a/app-admin/glance/files/CVE-2015-5286_2015.1.1.patch b/app-admin/glance/files/CVE-2015-5286_2015.1.1.patch
deleted file mode 100644
index 0478135..0000000
--- a/app-admin/glance/files/CVE-2015-5286_2015.1.1.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From 5bebd513fa71edcdb84f7dec7b16f3523c0c1092 Mon Sep 17 00:00:00 2001
-From: Mike Fedosin <mfedosin@mirantis.com>
-Date: Sun, 20 Sep 2015 17:01:22 +0300
-Subject: Cleanup chunks for deleted image if token expired
-
-In patch I47229b366c25367ec1bd48aec684e0880f3dfe60 it was
-introduced the logic that if image was deleted during file
-upload when we want to update image status from 'saving'
-to 'active' it's expected to get Duplicate error and delete
-stale chunks after that. But if user's token is expired
-there will be Unathorized exception and chunks will stay
-in store and clog it.
-And when, the upload operation for such an image is
-completed the operator configured quota can be exceeded.
-
-This patch fixes the issue of left over chunks for an image
-which was deleted from saving status, by correctly handle
-auth exceptions from registry server.
-
-Partial-bug: #1498163
-
-Conflicts:
-	glance/api/v1/upload_utils.py
-        (Kilo catches NotFound instead of ImagenotFound)
-
-Change-Id: I17a66eca55bfb83107046910e69c4da01415deec
-(cherry picked from commit 98a8832777a0639a4031e52c69f0d565b3f500c5)
-
-diff --git a/glance/api/v1/upload_utils.py b/glance/api/v1/upload_utils.py
-index 7adb2dc..ad4f724 100644
---- a/glance/api/v1/upload_utils.py
-+++ b/glance/api/v1/upload_utils.py
-@@ -171,6 +171,14 @@ def upload_data_to_store(req, image_meta, image_data, store, notifier):
-                     raise exception.NotFound()
-                 else:
-                     raise
-+
-+        except exception.NotAuthenticated as e:
-+            # Delete image data due to possible token expiration.
-+            LOG.debug("Authentication error - the token may have "
-+                      "expired during file upload. Deleting image data for "
-+                      " %s " % image_id)
-+            initiate_deletion(req, location_data, image_id)
-+            raise webob.exc.HTTPUnauthorized(explanation=e.msg, request=req)
-         except exception.NotFound:
-             msg = _LI("Image %s could not be found after upload. The image may"
-                       " have been deleted during the upload.") % image_id
-diff --git a/glance/api/v2/image_data.py b/glance/api/v2/image_data.py
-index 4025eeb..9967662 100644
---- a/glance/api/v2/image_data.py
-+++ b/glance/api/v2/image_data.py
-@@ -88,7 +88,19 @@ class ImageDataController(object):
-                 raise webob.exc.HTTPGone(explanation=msg,
-                                          request=req,
-                                          content_type='text/plain')
--
-+            except exception.NotAuthenticated:
-+                msg = (_("Authentication error - the token may have "
-+                         "expired during file upload. Deleting image data for "
-+                         "%s.") % image_id)
-+                LOG.debug(msg)
-+                try:
-+                    image.delete()
-+                except exception.NotAuthenticated:
-+                    # NOTE: Ignore this exception
-+                    pass
-+                raise webob.exc.HTTPUnauthorized(explanation=msg,
-+                                                 request=req,
-+                                                 content_type='text/plain')
-         except ValueError as e:
-             LOG.debug("Cannot save data for image %(id)s: %(e)s",
-                       {'id': image_id, 'e': utils.exception_to_str(e)})
-diff --git a/glance/tests/unit/v1/test_upload_utils.py b/glance/tests/unit/v1/test_upload_utils.py
-index 1afaf00..8d05515 100644
---- a/glance/tests/unit/v1/test_upload_utils.py
-+++ b/glance/tests/unit/v1/test_upload_utils.py
-@@ -323,3 +323,29 @@ class TestUploadUtils(base.StoreClearingUnitTest):
-                                   'metadata': {}}, image_meta['id'])
-                         mock_safe_kill.assert_called_once_with(
-                             req, image_meta['id'], 'saving')
-+
-+    @mock.patch.object(registry, 'update_image_metadata',
-+                       side_effect=exception.NotAuthenticated)
-+    @mock.patch.object(upload_utils, 'initiate_deletion')
-+    def test_activate_image_with_expired_token(
-+            self, mocked_delete, mocked_update):
-+        """Test token expiration during image upload.
-+
-+        If users token expired before image was uploaded then if auth error
-+        was caught from registry during changing image status from 'saving'
-+        to 'active' then it's required to delete all image data.
-+        """
-+        context = mock.Mock()
-+        req = mock.Mock()
-+        req.context = context
-+        with self._get_store_and_notifier() as (location, checksum, image_meta,
-+                                                image_data, store, notifier,
-+                                                update_data):
-+            self.assertRaises(webob.exc.HTTPUnauthorized,
-+                              upload_utils.upload_data_to_store,
-+                              req, image_meta, image_data, store, notifier)
-+            self.assertEqual(2, mocked_update.call_count)
-+            mocked_delete.assert_called_once_with(
-+                req,
-+                {'url': 'file://foo/bar', 'status': 'active', 'metadata': {}},
-+                'c80a1a6c-bd1f-41c5-90ee-81afedb1d58d')
-diff --git a/glance/tests/unit/v2/test_image_data_resource.py b/glance/tests/unit/v2/test_image_data_resource.py
-index bc8891e..7458eda 100644
---- a/glance/tests/unit/v2/test_image_data_resource.py
-+++ b/glance/tests/unit/v2/test_image_data_resource.py
-@@ -192,6 +192,23 @@ class TestImagesController(base.StoreClearingUnitTest):
-         self.assertRaises(webob.exc.HTTPBadRequest, self.controller.upload,
-                           request, unit_test_utils.UUID1, 'YYYY', 4)
- 
-+    def test_upload_with_expired_token(self):
-+        def side_effect(image, from_state=None):
-+            if from_state == 'saving':
-+                raise exception.NotAuthenticated()
-+
-+        mocked_save = mock.Mock(side_effect=side_effect)
-+        mocked_delete = mock.Mock()
-+        request = unit_test_utils.get_fake_request()
-+        image = FakeImage('abcd')
-+        image.delete = mocked_delete
-+        self.image_repo.result = image
-+        self.image_repo.save = mocked_save
-+        self.assertRaises(webob.exc.HTTPUnauthorized, self.controller.upload,
-+                          request, unit_test_utils.UUID1, 'YYYY', 4)
-+        self.assertEqual(3, mocked_save.call_count)
-+        mocked_delete.assert_called_once_with()
-+
-     def test_upload_non_existent_image_during_save_initiates_deletion(self):
-         def fake_save_not_found(self):
-             raise exception.NotFound()
--- 
-cgit v0.10.2
-
diff --git a/app-admin/glance/files/cve-2015-5163-stable-kilo.patch b/app-admin/glance/files/cve-2015-5163-stable-kilo.patch
deleted file mode 100644
index 91507c9..0000000
--- a/app-admin/glance/files/cve-2015-5163-stable-kilo.patch
+++ /dev/null
@@ -1,260 +0,0 @@
-From eb99e45829a1b4c93db5692bdbf636a86faa56c4 Mon Sep 17 00:00:00 2001
-From: Flavio Percoco <flaper87@gmail.com>
-Date: Thu, 9 Jul 2015 14:44:04 +0200
-Subject: Don't import files with backed files
-
-There's a security issue where it'd be possible to import images with
-backed files using the task engine and then use/convert those to access
-system files or any other file in the system. An example of an attack
-would be to import an image with a backing file pointing to
-`/etc/passwd`, then convert it to raw and download the generated image.
-
-This patch forbids importing files with baking files entirely. It does
-that in the `_ImportToFS` task, which is the one that imports the image
-locally to then execute other tasks on it. It's not necessary for the
-`_ImportToStore` task because other tasks won't be executed when the
-image is imported in the final store.
-
-Change-Id: I35f43c3b3f326942fb53b7dadb94700ac4513494
-Closes-bug: #1471912
-(cherry picked from commit d529863a1e8d2307526bdb395b4aebe97f81603d)
-
-diff --git a/glance/async/flows/base_import.py b/glance/async/flows/base_import.py
-index 7656bde..d216aa8 100644
---- a/glance/async/flows/base_import.py
-+++ b/glance/async/flows/base_import.py
-@@ -13,12 +13,15 @@
- #    License for the specific language governing permissions and limitations
- #    under the License.
- 
-+import json
- import logging
- import os
- 
- import glance_store as store_api
- from glance_store import backend
-+from oslo_concurrency import processutils as putils
- from oslo_config import cfg
-+from oslo_utils import excutils
- import six
- from stevedore import named
- from taskflow.patterns import linear_flow as lf
-@@ -146,6 +149,29 @@ class _ImportToFS(task.Task):
-         data = script_utils.get_image_data_iter(self.uri)
- 
-         path = self.store.add(image_id, data, 0, context=None)[0]
-+
-+        try:
-+            # NOTE(flaper87): Consider moving this code to a common
-+            # place that other tasks can consume as well.
-+            stdout, stderr = putils.trycmd('qemu-img', 'info',
-+                                           '--output=json', path,
-+                                           log_errors=putils.LOG_ALL_ERRORS)
-+        except OSError as exc:
-+            with excutils.save_and_reraise_exception():
-+                msg = (_LE('Failed to execute security checks on the image '
-+                           '%(task_id)s: %(exc)s') %
-+                       {'task_id': self.task_id, 'exc': exc.message})
-+                LOG.error(msg)
-+
-+        metadata = json.loads(stdout)
-+
-+        backing_file = metadata.get('backing-filename')
-+        if backing_file is not None:
-+            msg = _("File %(path)s has invalid backing file "
-+                    "%(bfile)s, aborting.") % {'path': path,
-+                                               'bfile': backing_file}
-+            raise RuntimeError(msg)
-+
-         return path
- 
-     def revert(self, image_id, result=None, **kwargs):
-diff --git a/glance/tests/unit/async/flows/test_import.py b/glance/tests/unit/async/flows/test_import.py
-index 70f790c..4cf3d13 100644
---- a/glance/tests/unit/async/flows/test_import.py
-+++ b/glance/tests/unit/async/flows/test_import.py
-@@ -13,14 +13,17 @@
- #    License for the specific language governing permissions and limitations
- #    under the License.
- 
-+import json
- import mock
- import os
- import urllib2
- 
- import glance_store
-+from oslo_concurrency import processutils as putils
- from oslo_config import cfg
- from six.moves import cStringIO
- from taskflow import task
-+from taskflow.types import failure
- 
- import glance.async.flows.base_import as import_flow
- from glance.async import taskflow_executor
-@@ -106,16 +109,23 @@ class TestImportTask(test_utils.BaseTestCase):
- 
-         with mock.patch.object(script_utils, 'get_image_data_iter') as dmock:
-             dmock.return_value = cStringIO("TEST_IMAGE")
--            executor.begin_processing(self.task.task_id)
--            image_path = os.path.join(self.test_dir, self.image.image_id)
--            tmp_image_path = os.path.join(self.work_dir,
--                                          "%s.tasks_import" % image_path)
--            self.assertFalse(os.path.exists(tmp_image_path))
--            self.assertTrue(os.path.exists(image_path))
--            self.assertEqual(1, len(list(self.image.locations)))
--            self.assertEqual("file://%s/%s" % (self.test_dir,
--                                               self.image.image_id),
--                             self.image.locations[0]['url'])
-+
-+            with mock.patch.object(putils, 'trycmd') as tmock:
-+                tmock.return_value = (json.dumps({
-+                    'format': 'qcow2',
-+                }), None)
-+
-+                executor.begin_processing(self.task.task_id)
-+                image_path = os.path.join(self.test_dir, self.image.image_id)
-+                tmp_image_path = os.path.join(self.work_dir,
-+                                              "%s.tasks_import" % image_path)
-+
-+                self.assertFalse(os.path.exists(tmp_image_path))
-+                self.assertTrue(os.path.exists(image_path))
-+                self.assertEqual(1, len(list(self.image.locations)))
-+                self.assertEqual("file://%s/%s" % (self.test_dir,
-+                                                   self.image.image_id),
-+                                 self.image.locations[0]['url'])
- 
-     def test_import_flow_missing_work_dir(self):
-         self.config(engine_mode='serial', group='taskflow_executor')
-@@ -151,6 +161,54 @@ class TestImportTask(test_utils.BaseTestCase):
-                 self.assertFalse(os.path.exists(tmp_image_path))
-                 self.assertTrue(os.path.exists(image_path))
- 
-+    def test_import_flow_backed_file_import_to_fs(self):
-+        self.config(engine_mode='serial', group='taskflow_executor')
-+
-+        img_factory = mock.MagicMock()
-+
-+        executor = taskflow_executor.TaskExecutor(
-+            self.context,
-+            self.task_repo,
-+            self.img_repo,
-+            img_factory)
-+
-+        self.task_repo.get.return_value = self.task
-+
-+        def create_image(*args, **kwargs):
-+            kwargs['image_id'] = UUID1
-+            return self.img_factory.new_image(*args, **kwargs)
-+
-+        self.img_repo.get.return_value = self.image
-+        img_factory.new_image.side_effect = create_image
-+
-+        with mock.patch.object(script_utils, 'get_image_data_iter') as dmock:
-+            dmock.return_value = cStringIO("TEST_IMAGE")
-+
-+            with mock.patch.object(putils, 'trycmd') as tmock:
-+                tmock.return_value = (json.dumps({
-+                    'backing-filename': '/etc/password'
-+                }), None)
-+
-+                with mock.patch.object(import_flow._ImportToFS,
-+                                       'revert') as rmock:
-+                    self.assertRaises(RuntimeError,
-+                                      executor.begin_processing,
-+                                      self.task.task_id)
-+                    self.assertTrue(rmock.called)
-+                    self.assertIsInstance(rmock.call_args[1]['result'],
-+                                          failure.Failure)
-+
-+                    image_path = os.path.join(self.test_dir,
-+                                              self.image.image_id)
-+
-+                    fname = "%s.tasks_import" % image_path
-+                    tmp_image_path = os.path.join(self.work_dir, fname)
-+
-+                    self.assertFalse(os.path.exists(tmp_image_path))
-+                    # Note(sabari): The image should not have been uploaded to
-+                    # the store as the flow failed before ImportToStore Task.
-+                    self.assertFalse(os.path.exists(image_path))
-+
-     def test_import_flow_revert(self):
-         self.config(engine_mode='serial',
-                     group='taskflow_executor')
-@@ -175,20 +233,31 @@ class TestImportTask(test_utils.BaseTestCase):
-         with mock.patch.object(script_utils, 'get_image_data_iter') as dmock:
-             dmock.return_value = cStringIO("TEST_IMAGE")
- 
--            with mock.patch.object(import_flow, "_get_import_flows") as imock:
--                imock.return_value = (x for x in [_ErrorTask()])
--                self.assertRaises(RuntimeError,
--                                  executor.begin_processing, self.task.task_id)
--                image_path = os.path.join(self.test_dir, self.image.image_id)
--                tmp_image_path = os.path.join(self.work_dir,
--                                              "%s.tasks_import" % image_path)
--                self.assertFalse(os.path.exists(tmp_image_path))
--
--                # NOTE(flaper87): Eventually, we want this to be assertTrue.
--                # The current issue is there's no way to tell taskflow to
--                # continue on failures. That is, revert the subflow but keep
--                # executing the parent flow. Under discussion/development.
--                self.assertFalse(os.path.exists(image_path))
-+            with mock.patch.object(putils, 'trycmd') as tmock:
-+                tmock.return_value = (json.dumps({
-+                    'format': 'qcow2',
-+                }), None)
-+
-+                with mock.patch.object(import_flow,
-+                                       "_get_import_flows") as imock:
-+                    imock.return_value = (x for x in [_ErrorTask()])
-+                    self.assertRaises(RuntimeError,
-+                                      executor.begin_processing,
-+                                      self.task.task_id)
-+
-+                    image_path = os.path.join(self.test_dir,
-+                                              self.image.image_id)
-+                    tmp_image_path = os.path.join(self.work_dir,
-+                                                  ("%s.tasks_import" %
-+                                                   image_path))
-+                    self.assertFalse(os.path.exists(tmp_image_path))
-+
-+                    # NOTE(flaper87): Eventually, we want this to be assertTrue
-+                    # The current issue is there's no way to tell taskflow to
-+                    # continue on failures. That is, revert the subflow but
-+                    # keep executing the parent flow. Under
-+                    # discussion/development.
-+                    self.assertFalse(os.path.exists(image_path))
- 
-     def test_import_flow_no_import_flows(self):
-         self.config(engine_mode='serial',
-@@ -271,15 +340,20 @@ class TestImportTask(test_utils.BaseTestCase):
-         with mock.patch.object(script_utils, 'get_image_data_iter') as dmock:
-             dmock.return_value = "test"
- 
--            image_id = UUID1
--            path = import_fs.execute(image_id)
--            reader, size = glance_store.get_from_backend(path)
--            self.assertEqual(4, size)
--            self.assertEqual(dmock.return_value, "".join(reader))
-+            with mock.patch.object(putils, 'trycmd') as tmock:
-+                tmock.return_value = (json.dumps({
-+                    'format': 'qcow2',
-+                }), None)
-+
-+                image_id = UUID1
-+                path = import_fs.execute(image_id)
-+                reader, size = glance_store.get_from_backend(path)
-+                self.assertEqual(4, size)
-+                self.assertEqual(dmock.return_value, "".join(reader))
- 
--            image_path = os.path.join(self.work_dir, image_id)
--            tmp_image_path = os.path.join(self.work_dir, image_path)
--            self.assertTrue(os.path.exists(tmp_image_path))
-+                image_path = os.path.join(self.work_dir, image_id)
-+                tmp_image_path = os.path.join(self.work_dir, image_path)
-+                self.assertTrue(os.path.exists(tmp_image_path))
- 
-     def test_delete_from_fs(self):
-         delete_fs = import_flow._DeleteFromFS(self.task.task_id,
--- 
-cgit v0.10.2
-
diff --git a/app-admin/glance/files/cve-2015-5251-stable-kilo.patch b/app-admin/glance/files/cve-2015-5251-stable-kilo.patch
deleted file mode 100644
index f868645..0000000
--- a/app-admin/glance/files/cve-2015-5251-stable-kilo.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-From 9beca533f42ae1fc87418de0c360e19bc59b24b5 Mon Sep 17 00:00:00 2001
-From: Stuart McLaren <stuart.mclaren@hp.com>
-Date: Tue, 11 Aug 2015 10:37:09 +0000
-Subject: [PATCH] Prevent image status being directly modified via v1
-
-Users shouldn't be able to change an image's status directly via the
-v1 API.
-
-Some existing consumers of Glance set the x-image-meta-status header in
-requests to the Glance API, eg:
-
-https://github.com/openstack/nova/blob/master/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance#L184
-
-We should try to prevent users setting 'status' via v1, but without breaking
-existing benign API calls such as these.
-
-I've adopted the following approach (which has some prior art in 'protected properties').
-
-If a PUT request is received which contains an x-image-meta-status header:
-
-* The user provided status is ignored if it matches the current image
-  status (this prevents benign calls such as the nova one above from
-  breaking). The usual code (eg 200) will be returned.
-
-* If the user provided status doesn't match the current image status (ie
-  there is a real attempt to change the value) 403 will be returned. This
-  will break any calls which currently intentionally change the status.
-
-APIImpact
-
-Closes-bug: 1482371
-
-Change-Id: I44fadf32abb57c962b67467091c3f51c1ccc25e6
-(cherry picked from commit 4d08db5b6d42323ac1958ef3b7417d875e7bea8c)
----
- glance/api/v1/__init__.py                          |  3 +
- glance/api/v1/images.py                            |  9 +++
- glance/tests/functional/v1/test_api.py             | 89 ++++++++++++++++++++++
- .../integration/legacy_functional/test_v1_api.py   |  2 +
- 4 files changed, 103 insertions(+)
-
-diff --git a/glance/api/v1/__init__.py b/glance/api/v1/__init__.py
-index 74de9aa1411d8e926770b67f7d851cf14e794414..9306bbb4fe78f77a26bb539c717fdfd2b38767c8 100644
---- a/glance/api/v1/__init__.py
-+++ b/glance/api/v1/__init__.py
-@@ -21,3 +21,6 @@ SUPPORTED_PARAMS = ('limit', 'marker', 'sort_key', 'sort_dir')
- 
- # Metadata which only an admin can change once the image is active
- ACTIVE_IMMUTABLE = ('size', 'checksum')
-+
-+# Metadata which cannot be changed (irrespective of the current image state)
-+IMMUTABLE = ('status',)
-diff --git a/glance/api/v1/images.py b/glance/api/v1/images.py
-index e33b91fbca79377e78ccfd329fa542ad422f5ffc..95e32949d958d0f57a3b60c141b91784a5801f5a 100644
---- a/glance/api/v1/images.py
-+++ b/glance/api/v1/images.py
-@@ -57,6 +57,7 @@ _LW = i18n._LW
- SUPPORTED_PARAMS = glance.api.v1.SUPPORTED_PARAMS
- SUPPORTED_FILTERS = glance.api.v1.SUPPORTED_FILTERS
- ACTIVE_IMMUTABLE = glance.api.v1.ACTIVE_IMMUTABLE
-+IMMUTABLE = glance.api.v1.IMMUTABLE
- 
- CONF = cfg.CONF
- CONF.import_opt('disk_formats', 'glance.common.config', group='image_format')
-@@ -912,6 +913,14 @@ class Controller(controller.BaseController):
-                                         request=req,
-                                         content_type="text/plain")
- 
-+        for key in IMMUTABLE:
-+            if (image_meta.get(key) is not None and
-+                    image_meta.get(key) != orig_image_meta.get(key)):
-+                msg = _("Forbidden to modify '%s' of image.") % key
-+                raise HTTPForbidden(explanation=msg,
-+                                    request=req,
-+                                    content_type="text/plain")
-+
-         # The default behaviour for a PUT /images/<IMAGE_ID> is to
-         # override any properties that were previously set. This, however,
-         # leads to a number of issues for the common use case where a caller
-diff --git a/glance/tests/functional/v1/test_api.py b/glance/tests/functional/v1/test_api.py
-index 9fba3bb5e40c8742530691228c7b436b385fc2ca..6b3bfbb4270f1eb0f50418504e65be30ea23d10b 100644
---- a/glance/tests/functional/v1/test_api.py
-+++ b/glance/tests/functional/v1/test_api.py
-@@ -715,3 +715,92 @@ class TestApi(functional.FunctionalTest):
-         self.assertEqual(404, response.status)
- 
-         self.stop_servers()
-+
-+    def test_status_cannot_be_manipulated_directly(self):
-+        self.cleanup()
-+        self.start_servers(**self.__dict__.copy())
-+        headers = minimal_headers('Image1')
-+
-+        # Create a 'queued' image
-+        http = httplib2.Http()
-+        headers = {'Content-Type': 'application/octet-stream',
-+                   'X-Image-Meta-Disk-Format': 'raw',
-+                   'X-Image-Meta-Container-Format': 'bare'}
-+        path = "http://%s:%d/v1/images" % ("127.0.0.1", self.api_port)
-+        response, content = http.request(path, 'POST', headers=headers,
-+                                         body=None)
-+        self.assertEqual(201, response.status)
-+        image = jsonutils.loads(content)['image']
-+        self.assertEqual('queued', image['status'])
-+
-+        # Ensure status of 'queued' image can't be changed
-+        path = "http://%s:%d/v1/images/%s" % ("127.0.0.1", self.api_port,
-+                                              image['id'])
-+        http = httplib2.Http()
-+        headers = {'X-Image-Meta-Status': 'active'}
-+        response, content = http.request(path, 'PUT', headers=headers)
-+        self.assertEqual(403, response.status)
-+        response, content = http.request(path, 'HEAD')
-+        self.assertEqual(200, response.status)
-+        self.assertEqual('queued', response['x-image-meta-status'])
-+
-+        # We allow 'setting' to the same status
-+        http = httplib2.Http()
-+        headers = {'X-Image-Meta-Status': 'queued'}
-+        response, content = http.request(path, 'PUT', headers=headers)
-+        self.assertEqual(200, response.status)
-+        response, content = http.request(path, 'HEAD')
-+        self.assertEqual(200, response.status)
-+        self.assertEqual('queued', response['x-image-meta-status'])
-+
-+        # Make image active
-+        http = httplib2.Http()
-+        headers = {'Content-Type': 'application/octet-stream'}
-+        response, content = http.request(path, 'PUT', headers=headers,
-+                                         body='data')
-+        self.assertEqual(200, response.status)
-+        image = jsonutils.loads(content)['image']
-+        self.assertEqual('active', image['status'])
-+
-+        # Ensure status of 'active' image can't be changed
-+        http = httplib2.Http()
-+        headers = {'X-Image-Meta-Status': 'queued'}
-+        response, content = http.request(path, 'PUT', headers=headers)
-+        self.assertEqual(403, response.status)
-+        response, content = http.request(path, 'HEAD')
-+        self.assertEqual(200, response.status)
-+        self.assertEqual('active', response['x-image-meta-status'])
-+
-+        # We allow 'setting' to the same status
-+        http = httplib2.Http()
-+        headers = {'X-Image-Meta-Status': 'active'}
-+        response, content = http.request(path, 'PUT', headers=headers)
-+        self.assertEqual(200, response.status)
-+        response, content = http.request(path, 'HEAD')
-+        self.assertEqual(200, response.status)
-+        self.assertEqual('active', response['x-image-meta-status'])
-+
-+        # Create a 'queued' image, ensure 'status' header is ignored
-+        http = httplib2.Http()
-+        path = "http://%s:%d/v1/images" % ("127.0.0.1", self.api_port)
-+        headers = {'Content-Type': 'application/octet-stream',
-+                   'X-Image-Meta-Status': 'active'}
-+        response, content = http.request(path, 'POST', headers=headers,
-+                                         body=None)
-+        self.assertEqual(201, response.status)
-+        image = jsonutils.loads(content)['image']
-+        self.assertEqual('queued', image['status'])
-+
-+        # Create an 'active' image, ensure 'status' header is ignored
-+        http = httplib2.Http()
-+        path = "http://%s:%d/v1/images" % ("127.0.0.1", self.api_port)
-+        headers = {'Content-Type': 'application/octet-stream',
-+                   'X-Image-Meta-Disk-Format': 'raw',
-+                   'X-Image-Meta-Status': 'queued',
-+                   'X-Image-Meta-Container-Format': 'bare'}
-+        response, content = http.request(path, 'POST', headers=headers,
-+                                         body='data')
-+        self.assertEqual(201, response.status)
-+        image = jsonutils.loads(content)['image']
-+        self.assertEqual('active', image['status'])
-+        self.stop_servers()
-diff --git a/glance/tests/integration/legacy_functional/test_v1_api.py b/glance/tests/integration/legacy_functional/test_v1_api.py
-index dff436465919569480bdbac537d20a6d61c98f46..511d46dfe18028bb430504784cc9d24c58736c3b 100644
---- a/glance/tests/integration/legacy_functional/test_v1_api.py
-+++ b/glance/tests/integration/legacy_functional/test_v1_api.py
-@@ -358,6 +358,8 @@ class TestApi(base.ApiTest):
-         path = "/v1/images"
-         response, content = self.http.request(path, 'POST', headers=headers)
-         self.assertEqual(201, response.status)
-+        image = jsonutils.loads(content)['image']
-+        self.assertEqual('active', image['status'])
- 
-         # 2. HEAD image-location
-         # Verify image size is zero and the status is active
--- 
-2.5.0
-
diff --git a/app-admin/glance/files/cve-2016-0757-stable-liberty.patch b/app-admin/glance/files/cve-2016-0757-stable-liberty.patch
new file mode 100644
index 0000000..19c8365
--- /dev/null
+++ b/app-admin/glance/files/cve-2016-0757-stable-liberty.patch
@@ -0,0 +1,332 @@
+From c6021e9b3642340036347026a3f251e066e53094 Mon Sep 17 00:00:00 2001
+From: Erno Kuvaja <jokke@usr.fi>
+Date: Tue, 19 Jan 2016 13:37:05 +0000
+Subject: [PATCH] Prevent user to remove last location of the image
+
+If the last location of the image is removed, image transitions back to queued.
+This allows user to upload new data into the existing image record. By
+preventing removal of the last location we prevent the image transition back to
+queued.
+
+This change also prevents doing the same operation via replacing the locations
+with empty list.
+
+SecurityImpact
+DocImpact
+APIImpact
+
+Conflicts:
+	glance/tests/unit/v2/test_images_resource.py
+
+Change-Id: Ieb03aaba887492819f9c58aa67f7acfcea81720e
+Closes-Bug: #1525915
+(cherry picked from commit 2f4504da2149697bcdb93ed855e15025d2a08f8c)
+---
+ glance/api/v2/images.py                            |  19 +++-
+ glance/tests/functional/v2/test_images.py          |  14 ---
+ glance/tests/unit/v2/test_images_resource.py       | 122 ++++-----------------
+ ...oving-last-image-location-d5ee3e00efe14f34.yaml |  10 ++
+ 4 files changed, 44 insertions(+), 121 deletions(-)
+ create mode 100644 releasenotes/notes/Prevent-removing-last-image-location-d5ee3e00efe14f34.yaml
+
+diff --git a/glance/api/v2/images.py b/glance/api/v2/images.py
+index 17678f2..cf667bf 100644
+--- a/glance/api/v2/images.py
++++ b/glance/api/v2/images.py
+@@ -181,7 +181,10 @@ class ImagesController(object):
+         path = change['path']
+         path_root = path[0]
+         value = change['value']
+-        if path_root == 'locations':
++        if path_root == 'locations' and value == []:
++            msg = _("Cannot set locations to empty list.")
++            raise webob.exc.HTTPForbidden(message=msg)
++        elif path_root == 'locations' and value != []:
+             self._do_replace_locations(image, value)
+         elif path_root == 'owner' and req.context.is_admin == False:
+             msg = _("Owner can't be updated by non admin.")
+@@ -217,7 +220,10 @@ class ImagesController(object):
+         path = change['path']
+         path_root = path[0]
+         if path_root == 'locations':
+-            self._do_remove_locations(image, path[1])
++            try:
++                self._do_remove_locations(image, path[1])
++            except exception.Forbidden as e:
++                raise webob.exc.HTTPForbidden(e.msg)
+         else:
+             if hasattr(image, path_root):
+                 msg = _("Property %s may not be removed.")
+@@ -306,6 +312,11 @@ class ImagesController(object):
+                 explanation=encodeutils.exception_to_unicode(ve))
+ 
+     def _do_remove_locations(self, image, path_pos):
++        if len(image.locations) == 1:
++            LOG.debug("User forbidden to remove last location of image %s",
++                      image.image_id)
++            msg = _("Cannot remove last location in the image.")
++            raise exception.Forbidden(message=msg)
+         pos = self._get_locations_op_pos(path_pos,
+                                          len(image.locations), False)
+         if pos is None:
+@@ -315,11 +326,11 @@ class ImagesController(object):
+             # NOTE(zhiyan): this actually deletes the location
+             # from the backend store.
+             image.locations.pop(pos)
++        # TODO(jokke): Fix this, we should catch what store throws and
++        # provide definitely something else than IternalServerError to user.
+         except Exception as e:
+             raise webob.exc.HTTPInternalServerError(
+                 explanation=encodeutils.exception_to_unicode(e))
+-        if len(image.locations) == 0 and image.status == 'active':
+-            image.status = 'queued'
+ 
+ 
+ class RequestDeserializer(wsgi.JSONRequestDeserializer):
+diff --git a/glance/tests/functional/v2/test_images.py b/glance/tests/functional/v2/test_images.py
+index aabc567..f199787 100644
+--- a/glance/tests/functional/v2/test_images.py
++++ b/glance/tests/functional/v2/test_images.py
+@@ -522,20 +522,6 @@ class TestImages(functional.FunctionalTest):
+         response = requests.patch(path, headers=headers, data=data)
+         self.assertEqual(200, response.status_code, response.text)
+ 
+-        # Remove all locations of the image then the image size shouldn't be
+-        # able to access
+-        path = self._url('/v2/images/%s' % image2_id)
+-        media_type = 'application/openstack-images-v2.1-json-patch'
+-        headers = self._headers({'content-type': media_type})
+-        doc = [{'op': 'replace', 'path': '/locations', 'value': []}]
+-        data = jsonutils.dumps(doc)
+-        response = requests.patch(path, headers=headers, data=data)
+-        self.assertEqual(200, response.status_code, response.text)
+-        image = jsonutils.loads(response.text)
+-        self.assertIsNone(image['size'])
+-        self.assertIsNone(image['virtual_size'])
+-        self.assertEqual('queued', image['status'])
+-
+         # Deletion should work. Deleting image-1
+         path = self._url('/v2/images/%s' % image_id)
+         response = requests.delete(path, headers=self._headers())
+diff --git a/glance/tests/unit/v2/test_images_resource.py b/glance/tests/unit/v2/test_images_resource.py
+index 698c284..ee09ee7 100644
+--- a/glance/tests/unit/v2/test_images_resource.py
++++ b/glance/tests/unit/v2/test_images_resource.py
+@@ -1417,26 +1417,6 @@ class TestImagesController(base.IsolatedUnitTest):
+         self.assertRaises(webob.exc.HTTPConflict, self.controller.update,
+                           another_request, created_image.image_id, changes)
+ 
+-    def test_update_replace_locations(self):
+-        self.stubs.Set(store, 'get_size_from_backend',
+-                       unit_test_utils.fake_get_size_from_backend)
+-        request = unit_test_utils.get_fake_request()
+-        changes = [{'op': 'replace', 'path': ['locations'], 'value': []}]
+-        output = self.controller.update(request, UUID1, changes)
+-        self.assertEqual(UUID1, output.image_id)
+-        self.assertEqual(0, len(output.locations))
+-        self.assertEqual('queued', output.status)
+-        self.assertIsNone(output.size)
+-
+-        new_location = {'url': '%s/fake_location' % BASE_URI, 'metadata': {}}
+-        changes = [{'op': 'replace', 'path': ['locations'],
+-                    'value': [new_location]}]
+-        output = self.controller.update(request, UUID1, changes)
+-        self.assertEqual(UUID1, output.image_id)
+-        self.assertEqual(1, len(output.locations))
+-        self.assertEqual(new_location, output.locations[0])
+-        self.assertEqual('active', output.status)
+-
+     def test_update_replace_locations_non_empty(self):
+         new_location = {'url': '%s/fake_location' % BASE_URI, 'metadata': {}}
+         request = unit_test_utils.get_fake_request()
+@@ -1448,35 +1428,9 @@ class TestImagesController(base.IsolatedUnitTest):
+     def test_update_replace_locations_invalid(self):
+         request = unit_test_utils.get_fake_request()
+         changes = [{'op': 'replace', 'path': ['locations'], 'value': []}]
+-        output = self.controller.update(request, UUID1, changes)
+-        self.assertEqual(UUID1, output.image_id)
+-        self.assertEqual(0, len(output.locations))
+-        self.assertEqual('queued', output.status)
+-
+-        request = unit_test_utils.get_fake_request()
+-        changes = [{'op': 'replace', 'path': ['locations'],
+-                    'value': [{'url': 'unknow://foo', 'metadata': {}}]}]
+-        self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update,
++        self.assertRaises(webob.exc.HTTPForbidden, self.controller.update,
+                           request, UUID1, changes)
+ 
+-    def test_update_replace_locations_status_exception(self):
+-        self.stubs.Set(store, 'get_size_from_backend',
+-                       unit_test_utils.fake_get_size_from_backend)
+-        request = unit_test_utils.get_fake_request()
+-        changes = [{'op': 'replace', 'path': ['locations'], 'value': []}]
+-        output = self.controller.update(request, UUID2, changes)
+-        self.assertEqual(UUID2, output.image_id)
+-        self.assertEqual(0, len(output.locations))
+-        self.assertEqual('queued', output.status)
+-
+-        self.db.image_update(None, UUID2, {'disk_format': None})
+-
+-        new_location = {'url': '%s/fake_location' % BASE_URI, 'metadata': {}}
+-        changes = [{'op': 'replace', 'path': ['locations'],
+-                    'value': [new_location]}]
+-        self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update,
+-                          request, UUID2, changes)
+-
+     def test_update_add_property(self):
+         request = unit_test_utils.get_fake_request()
+ 
+@@ -1600,24 +1554,6 @@ class TestImagesController(base.IsolatedUnitTest):
+         self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update,
+                           request, UUID1, changes)
+ 
+-    def test_update_add_locations_status_exception(self):
+-        self.stubs.Set(store, 'get_size_from_backend',
+-                       unit_test_utils.fake_get_size_from_backend)
+-        request = unit_test_utils.get_fake_request()
+-        changes = [{'op': 'replace', 'path': ['locations'], 'value': []}]
+-        output = self.controller.update(request, UUID2, changes)
+-        self.assertEqual(UUID2, output.image_id)
+-        self.assertEqual(0, len(output.locations))
+-        self.assertEqual('queued', output.status)
+-
+-        self.db.image_update(None, UUID2, {'disk_format': None})
+-
+-        new_location = {'url': '%s/fake_location' % BASE_URI, 'metadata': {}}
+-        changes = [{'op': 'add', 'path': ['locations', '-'],
+-                    'value': new_location}]
+-        self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update,
+-                          request, UUID2, changes)
+-
+     def test_update_add_duplicate_locations(self):
+         new_location = {'url': '%s/fake_location' % BASE_URI, 'metadata': {}}
+         request = unit_test_utils.get_fake_request()
+@@ -1631,23 +1567,6 @@ class TestImagesController(base.IsolatedUnitTest):
+         self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update,
+                           request, UUID1, changes)
+ 
+-    def test_update_replace_duplicate_locations(self):
+-        self.stubs.Set(store, 'get_size_from_backend',
+-                       unit_test_utils.fake_get_size_from_backend)
+-        request = unit_test_utils.get_fake_request()
+-        changes = [{'op': 'replace', 'path': ['locations'], 'value': []}]
+-        output = self.controller.update(request, UUID1, changes)
+-        self.assertEqual(UUID1, output.image_id)
+-        self.assertEqual(0, len(output.locations))
+-        self.assertEqual('queued', output.status)
+-
+-        new_location = {'url': '%s/fake_location' % BASE_URI, 'metadata': {}}
+-        changes = [{'op': 'replace', 'path': ['locations'],
+-                    'value': [new_location, new_location]}]
+-
+-        self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update,
+-                          request, UUID1, changes)
+-
+     def test_update_add_too_many_locations(self):
+         self.config(image_location_quota=1)
+         request = unit_test_utils.get_fake_request()
+@@ -1748,9 +1667,12 @@ class TestImagesController(base.IsolatedUnitTest):
+             {'op': 'add', 'path': ['locations', '-'],
+              'value': {'url': '%s/fake_location_1' % BASE_URI,
+                        'metadata': {}}},
++            {'op': 'add', 'path': ['locations', '-'],
++             'value': {'url': '%s/fake_location_2' % BASE_URI,
++                       'metadata': {}}},
+         ]
+         self.controller.update(request, UUID1, changes)
+-        self.config(image_location_quota=1)
++        self.config(image_location_quota=2)
+ 
+         # We must remove two properties to avoid being
+         # over the limit of 1 property
+@@ -1763,8 +1685,8 @@ class TestImagesController(base.IsolatedUnitTest):
+         ]
+         output = self.controller.update(request, UUID1, changes)
+         self.assertEqual(UUID1, output.image_id)
+-        self.assertEqual(1, len(output.locations))
+-        self.assertIn('fake_location_3', output.locations[0]['url'])
++        self.assertEqual(2, len(output.locations))
++        self.assertIn('fake_location_3', output.locations[1]['url'])
+         self.assertNotEqual(output.created_at, output.updated_at)
+ 
+     def test_update_remove_base_property(self):
+@@ -1805,24 +1727,23 @@ class TestImagesController(base.IsolatedUnitTest):
+                        unit_test_utils.fake_get_size_from_backend)
+ 
+         request = unit_test_utils.get_fake_request()
+-        changes = [{'op': 'remove', 'path': ['locations', '0']}]
+-        output = self.controller.update(request, UUID1, changes)
+-        self.assertEqual(output.image_id, UUID1)
+-        self.assertEqual(0, len(output.locations))
+-        self.assertEqual('queued', output.status)
+-        self.assertIsNone(output.size)
+-
+         new_location = {'url': '%s/fake_location' % BASE_URI, 'metadata': {}}
+         changes = [{'op': 'add', 'path': ['locations', '-'],
+                     'value': new_location}]
++        self.controller.update(request, UUID1, changes)
++        changes = [{'op': 'remove', 'path': ['locations', '0']}]
+         output = self.controller.update(request, UUID1, changes)
+         self.assertEqual(UUID1, output.image_id)
+         self.assertEqual(1, len(output.locations))
+-        self.assertEqual(new_location, output.locations[0])
+         self.assertEqual('active', output.status)
+ 
+     def test_update_remove_location_invalid_pos(self):
+         request = unit_test_utils.get_fake_request()
++        changes = [
++            {'op': 'add', 'path': ['locations', '-'],
++             'value': {'url': '%s/fake_location' % BASE_URI,
++                       'metadata': {}}}]
++        self.controller.update(request, UUID1, changes)
+         changes = [{'op': 'remove', 'path': ['locations', None]}]
+         self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update,
+                           request, UUID1, changes)
+@@ -1844,6 +1765,11 @@ class TestImagesController(base.IsolatedUnitTest):
+                        fake_delete_image_location_from_backend)
+ 
+         request = unit_test_utils.get_fake_request()
++        changes = [
++            {'op': 'add', 'path': ['locations', '-'],
++             'value': {'url': '%s/fake_location' % BASE_URI,
++                       'metadata': {}}}]
++        self.controller.update(request, UUID1, changes)
+         changes = [{'op': 'remove', 'path': ['locations', '0']}]
+         self.assertRaises(webob.exc.HTTPInternalServerError,
+                           self.controller.update, request, UUID1, changes)
+@@ -2137,16 +2063,6 @@ class TestImagesControllerPolicies(base.IsolatedUnitTest):
+         self.assertRaises(webob.exc.HTTPForbidden, self.controller.update,
+                           request, UUID1, changes)
+ 
+-        self.stubs.Set(self.store_utils, 'delete_image_location_from_backend',
+-                       fake_delete_image_location_from_backend)
+-
+-        changes = [{'op': 'replace', 'path': ['locations'], 'value': []}]
+-        self.controller.update(request, UUID1, changes)
+-        changes = [{'op': 'replace', 'path': ['locations'],
+-                    'value': [new_location]}]
+-        self.assertRaises(webob.exc.HTTPForbidden, self.controller.update,
+-                          request, UUID1, changes)
+-
+     def test_update_delete_image_location_unauthorized(self):
+         rules = {"delete_image_location": False}
+         self.policy.set_rules(rules)
+diff --git a/releasenotes/notes/Prevent-removing-last-image-location-d5ee3e00efe14f34.yaml b/releasenotes/notes/Prevent-removing-last-image-location-d5ee3e00efe14f34.yaml
+new file mode 100644
+index 0000000..344e6e5
+--- /dev/null
++++ b/releasenotes/notes/Prevent-removing-last-image-location-d5ee3e00efe14f34.yaml
+@@ -0,0 +1,10 @@
++---
++security:
++  - Fixing bug 1525915; image might be transitioning
++    from active to queued by regular user by removing
++    last location of image (or replacing locations
++    with empty list). This allows user to re-upload
++    data to the image breaking Glance's promise of
++    image data immutability. From now on, last
++    location cannot be removed and locations cannot
++    be replaced with empty list.
+-- 
+1.9.1
+
diff --git a/app-admin/glance/files/glance-2013.2-sphinx_mapping.patch b/app-admin/glance/files/glance-2013.2-sphinx_mapping.patch
deleted file mode 100644
index 0a0f575..0000000
--- a/app-admin/glance/files/glance-2013.2-sphinx_mapping.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur glance-2013.2.orig/doc/source/conf.py glance-2013.2/doc/source/conf.py
---- doc/source/conf.py	2013-10-17 21:39:46.000000000 +0800
-+++ doc/source/conf.py	2013-11-13 18:51:29.099839976 +0800
-@@ -250,8 +250,3 @@
- 
- # If false, no module index is generated.
- #latex_use_modindex = True
--
--# Example configuration for intersphinx: refer to the Python standard library.
--intersphinx_mapping = {'python': ('http://docs.python.org/', None),
--                       'nova': ('http://nova.openstack.org', None),
--                       'swift': ('http://swift.openstack.org', None)}
diff --git a/app-admin/glance/glance-11.0.1-r1.ebuild b/app-admin/glance/glance-11.0.1-r1.ebuild
new file mode 100644
index 0000000..1126feb
--- /dev/null
+++ b/app-admin/glance/glance-11.0.1-r1.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 user
+
+DESCRIPTION="Services for discovering, registering, and retrieving VM images"
+HOMEPAGE="https://launchpad.net/glance"
+SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc mysql postgres +sqlite +swift test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-1.6.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		${RDEPEND}
+		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+		<=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		<=dev-python/coverage-4.0.3[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		<=dev-python/fixtures-1.4.0-r9999[${PYTHON_USEDEP}]
+		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+		<=dev-python/mox3-0.12.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		<=dev-python/mock-1.3.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/requests-2.5.2[${PYTHON_USEDEP}]
+		!~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
+		<=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		<=dev-python/testrepository-0.0.20[${PYTHON_USEDEP}]
+		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+		<=dev-python/testresources-1.0.0-r9999[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		<=dev-python/testscenarios-0.5[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		<=dev-python/testtools-1.8.1[${PYTHON_USEDEP}]
+		>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
+		<dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		<=dev-python/oslotest-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
+		<=dev-python/pymysql-0.6.7[${PYTHON_USEDEP}]
+		>=dev-python/psycopg-2.5[${PYTHON_USEDEP}]
+		<=dev-python/psycopg-2.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pysendfile-2.0.0[${PYTHON_USEDEP}]
+		<=dev-python/pysendfile-2.0.1[${PYTHON_USEDEP}]
+		<=dev-python/qpid-python-0.32[$(python_gen_usedep 'python2_7')]
+		>=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
+		>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
+		<=dev-python/python-swiftclient-2.7.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		<=dev-python/oslo-sphinx-4.1.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
+	)"
+
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+RDEPEND="
+	${CDEPEND}
+	sqlite? (
+		>=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		dev-python/mysql-python
+		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+	)
+	~dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+	~dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/pastedeploy-1.5.2[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
+	<=dev-python/routes-2.2[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+	<=dev-python/webob-1.5.1[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
+	<=dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+	<=dev-python/httplib2-0.9.2[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+	<=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	<=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-config-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-concurrency-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-context-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-service-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-utils-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/stevedore-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/futurist-0.1.2[${PYTHON_USEDEP}]
+	<=dev-python/futurist-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-1.16.0[${PYTHON_USEDEP}]
+	<=dev-python/taskflow-1.25.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/keystonemiddleware-2.4.0[${PYTHON_USEDEP}]
+	<=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/WSME-0.7[${PYTHON_USEDEP}]
+	<=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
+	<=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+	!~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
+	<=dev-python/python-keystoneclient-2.0.0-r9999[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+	<=dev-python/pyopenssl-0.15.1-r9999[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	<=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
+	<=dev-python/oslo-db-4.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-i18n-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-log-2.1.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/oslo-messaging-2.6.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-2.6.1[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-2.7.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-2.8.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-2.8.1[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-2.9.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-3.1.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-messaging-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-middleware-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-policy-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-serialization-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	<=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
+	<=dev-python/osprofiler-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/glance_store-0.7.1[${PYTHON_USEDEP}]
+	!~dev-python/glance_store-0.9.0[${PYTHON_USEDEP}]
+	<=dev-python/glance_store-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
+	<=dev-python/semantic_version-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.2.0[${PYTHON_USEDEP}]
+	<=dev-python/castellan-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
+	<=dev-python/cryptography-1.1.2-r9999[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/cve-2016-0757-stable-liberty.patch"
+)
+
+pkg_setup() {
+	enewgroup glance
+	enewuser glance -1 -1 /var/lib/glance glance
+}
+
+python_prepare_all() {
+	sed -i '/xattr/d' test-requirements.txt || die
+	sed -i '/pysendfile/d' test-requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_test() {
+	# https://bugs.launchpad.net/glance/+bug/1251105
+	# https://bugs.launchpad.net/glance/+bug/1242501
+	testr init
+	testr run --parallel || die "failed testsuite under python2.7"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	for svc in api registry scrubber; do
+		newinitd "${FILESDIR}/glance.initd" glance-${svc}
+	done
+
+	diropts -m 0750 -o glance -g glance
+	dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
+	keepdir /etc/glance
+	keepdir /var/log/glance
+	keepdir /var/lib/glance/images
+	keepdir /var/lib/glance/scrubber
+
+	insinto /etc/glance
+	insopts -m 0640 -o glance -g glance
+	doins etc/*.ini
+	doins etc/*.conf
+	doins etc/*.sample
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/app-admin/monit/Manifest b/app-admin/monit/Manifest
index 1a5676a..c570d99 100644
--- a/app-admin/monit/Manifest
+++ b/app-admin/monit/Manifest
@@ -1,4 +1,2 @@
-DIST monit-5.12.2.tar.gz 1192066 SHA256 8ab0296d1aa2351b1573481592d7b5e06de1edd49dff1b5552839605a450914c SHA512 086f9af2c6d155c5375e7de5641025707f34577d4f2a4a76d1a104361b5d5793a4f04313cafb5d6884a01aba59f1bbb405b37294ba133d9a93c05e484e5933ff WHIRLPOOL 3d25ab0dc3cfe0e2c881f35e48b64355fe12ce1d3357450d2b1d2aba7344acbe55c031e4fd6b49f7c523b674ff650cbad5bbc91853ec15dd10e64f164504ea70
-DIST monit-5.14.tar.gz 1200131 SHA256 d0424c3ee8ed43d670ba039184a972ac9f3ad6f45b0806ec17c23820996256c6 SHA512 6491434e15fab6f92e29b9f490418332a7700d110c0bd825d65e1aadd68ea082a1d9a7e2b570075b35d6cdb64ae207567bdeb2580e6e5407ba277cc6d1693c78 WHIRLPOOL 8e7ba198f6048d8de06082a269a9f7fa8fbbcd95e14174010bdf54935db53f840d00744e35f4260e9de5d8d9a6ea47aa7c4b037998b035775bbbe212057d75e7
 DIST monit-5.15.tar.gz 1218043 SHA256 deada8153dc7e8755f572bc4d790143a92c7a8668dccb563ae4dbd73af56697c SHA512 7e2b011a89d9b1dc990faf413a38f0c68aea398e25efd5392d6aa1baf50d68ea2db087ea2093c84658a99b7a83d133b23562d5ad11e1197db7a54a2b961177cd WHIRLPOOL e305705583c79b8d861595cae4d000b5832e3288f3d0ec59e69ac811e1f402af489e44c8fe568941781d97c953ff181a8048f0b3dfaeec14a26fd4bbc8cff697
-DIST monit-5.8.tar.gz 1237958 SHA256 0c00573ebc0156c534a5952f392c2a7bedde194f8261c05497322055938847f5 SHA512 61f2cb4a6b2da8617adfd16ace4d9b246957385109fee9a3312272ac271003cd89a12872ac3a07b0148ad7bdbe544e447745033d2a9fab19908ef19b7a106dda WHIRLPOOL 0eb1f5b778264d7881281f7139037fa07c225a5c7ece7cae2149460036a58c008e16a3d883e1876a2dc08f092900e05d164e37714ec5fc19960d4127e13c6eeb
+DIST monit-5.16.tar.gz 1226329 SHA256 5b998e796113ce244c8b575da09d3a62bac1b2765484fe6416f224b4ba8f391f SHA512 09d3fa772c0749e0cb7fd057bcf9d057650601e09b746dd335ee040ba1f9f45693174aead065d50c7f43c2f5dc7f3cace252cf2c94ccdf767a14afdff57f808e WHIRLPOOL 9cbf7dd1f42ebb43f4e3ea1d5880f3229b147576d4ea4f856e38d1fffb20af539d31d52d7bdebcad9354a0ffd3c135760e585a673cb76e2b56f396e34d5dcfc9
diff --git a/app-admin/monit/files/monit.initd-5.0 b/app-admin/monit/files/monit.initd-5.0
deleted file mode 100644
index 0656bc5..0000000
--- a/app-admin/monit/files/monit.initd-5.0
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Id$
-
-extra_started_commands="reload"
-
-depend() {
-	use net
-}
-
-start() {
-	ebegin "Starting monit"
-	start-stop-daemon --start --quiet --exec /usr/bin/monit >/dev/null 2>&1
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping monit"
-	start-stop-daemon --stop --quiet --exec /usr/bin/monit
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading monit"
-	/usr/bin/monit -c /etc/monitrc reload >/dev/null 2>&1
-	eend $?
-}
diff --git a/app-admin/monit/files/monit.initd-5.0-r1 b/app-admin/monit/files/monit.initd-5.0-r1
index 2a6339f..b69241b 100644
--- a/app-admin/monit/files/monit.initd-5.0-r1
+++ b/app-admin/monit/files/monit.initd-5.0-r1
@@ -1,39 +1,41 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
 # $Id$
 
 extra_commands="configtest"
 extra_started_commands="reload"
 
+command="/usr/bin/monit"
+
 depend() {
 	use net
 }
 
 configtest() {
-        /usr/bin/monit -t 1>/dev/null 2>&1
+        ${command} -t 1>/dev/null 2>&1
         ret=$?
         if [ $ret -ne 0 ]; then
                 eerror "${SVCNAME} has detected an error in your setup:"
-                /usr/bin/monit -t
+                ${command} -t
         fi
         return $ret
 }
 
 start() {
 	ebegin "Starting monit"
-	start-stop-daemon --start --quiet --exec /usr/bin/monit >/dev/null 2>&1
+	start-stop-daemon --start --quiet --exec ${command} >/dev/null 2>&1
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping monit"
-	start-stop-daemon --stop --quiet --exec /usr/bin/monit
+	start-stop-daemon --stop --quiet --exec ${command}
 	eend $?
 }
 
 reload() {
 	ebegin "Reloading monit"
-	/usr/bin/monit -c /etc/monitrc reload >/dev/null 2>&1
+	${command} -c /etc/monitrc reload >/dev/null 2>&1
 	eend $?
 }
diff --git a/app-admin/monit/monit-5.12.2.ebuild b/app-admin/monit/monit-5.12.2.ebuild
deleted file mode 100644
index cae8f8f..0000000
--- a/app-admin/monit/monit-5.12.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-inherit pam systemd
-
-DESCRIPTION="a utility for monitoring and managing daemons or similar programs running on a Unix system"
-HOMEPAGE="http://mmonit.com/monit/"
-SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux"
-IUSE="pam ssl"
-
-RDEPEND="ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison
-	pam? ( virtual/pam )"
-
-src_prepare() {
-	sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in"
-}
-
-src_configure() {
-	econf $(use_with ssl) $(use_with pam)
-}
-
-src_install() {
-	default
-
-	dodoc README*
-	dohtml -r doc/*
-
-	insinto /etc; insopts -m600; doins monitrc
-	newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN}
-}
-
-pkg_postinst() {
-	elog "Sample configurations are available at:"
-	elog "http://mmonit.com/monit/documentation/"
-}
diff --git a/app-admin/monit/monit-5.14.ebuild b/app-admin/monit/monit-5.16.ebuild
similarity index 83%
rename from app-admin/monit/monit-5.14.ebuild
rename to app-admin/monit/monit-5.16.ebuild
index 1fe7bec..4789f1c 100644
--- a/app-admin/monit/monit-5.14.ebuild
+++ b/app-admin/monit/monit-5.16.ebuild
@@ -1,26 +1,32 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 inherit pam systemd
 
 DESCRIPTION="a utility for monitoring and managing daemons or similar programs running on a Unix system"
 HOMEPAGE="http://mmonit.com/monit/"
 SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="pam ssl"
+IUSE="libressl pam ssl"
 
-RDEPEND="ssl? ( dev-libs/openssl )"
+RDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)"
 DEPEND="${RDEPEND}
 	sys-devel/flex
 	sys-devel/bison
 	pam? ( virtual/pam )"
 
 src_prepare() {
+	default
+
 	sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in"
 }
 
diff --git a/app-admin/monit/monit-5.8.ebuild b/app-admin/monit/monit-5.8.ebuild
deleted file mode 100644
index 11cd9a3..0000000
--- a/app-admin/monit/monit-5.8.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-inherit systemd
-
-DESCRIPTION="a utility for monitoring and managing daemons or similar programs running on a Unix system"
-HOMEPAGE="http://mmonit.com/monit/"
-SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux"
-IUSE="pam ssl"
-
-RDEPEND="ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison
-	pam? ( virtual/pam )"
-
-src_prepare() {
-	sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in"
-}
-
-src_configure() {
-	econf $(use_with ssl) $(use_with pam) || die "econf failed"
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc README*
-	dohtml -r doc/*
-
-	insinto /etc; insopts -m600; doins monitrc || die "doins monitrc failed"
-	newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit || die "newinitd failed"
-	systemd_dounit "${FILESDIR}"/${PN}.service || die
-}
-
-pkg_postinst() {
-	elog "Sample configurations are available at:"
-	elog "http://mmonit.com/monit/documentation/"
-}
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 8b81b69..cfcd194 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -1,4 +1,4 @@
 DIST salt-2015.5.8.tar.gz 5741097 SHA256 07c3eb054ef214c17481fed1262a5e4fd3c429df3058b504eb2cfc36ce4ad2fc SHA512 969cfdfb82f40957d1fa923a4640596cd08529eb9159527365094a3ab0d3e5ad6ff023eea34ad3b1328102f5d03ec8bf7da0958c77dfaee058f5e361a3dc395a WHIRLPOOL bf6960fe18c5181253d428ae678ed3f2e8203cbfcf0d7105d19ac5c6ce1d3c7acdf131062cfca255839c95bfa8f692f6463c9b7d41ad62d80c7a738b758bad71
 DIST salt-2015.5.9.tar.gz 5689839 SHA256 71e1c31ebe73edf17b43afcee7de689bb39cc6e97742cd0e110386106fa3fc5b SHA512 389fa09e2e89bb0631f5a2f1d7ef363f8b3a260d466cd7b5fdf7bfc296f5fb64fa355dc56a401df326cefe43e63904061db4fc01a3b5c1cd54fa34ee102a6ad9 WHIRLPOOL 094350e78b96c2633dedb2c4ab0caa959a634e84bf2e92145880eec883ec076765c8b897c873e8f601325a69e7e3fe139163eec45fc6daa109edbd9a884b0dc2
 DIST salt-2015.8.3.tar.gz 6757678 SHA256 2e9a262789b018f3443513105c0c6ae98934c9bc105a04cf9e5c073ef706218a SHA512 18a2c63d5e54d09468189450557974e47f87d8b7dde52beaae678120da1da1e7aecfff18cf0fdfb63a11cd5f6bab102c229462f0afe5e3e858c0c467761c7121 WHIRLPOOL 5f1e1562904aecf97027688adbe9a2eb1b910065e52a2e20e7bad67fc4e91660e3e1e04612ee3b18d9632f3ff782837336cf1a5d85d771b67071422a3cea9861
-DIST salt-2015.8.4.tar.gz 6874756 SHA256 8a21a02e53a6ef9b6dad4145c70225b7ff17bbb4a436a131c7e32d42b428cf48 SHA512 07c7e68b5667e8310bda9733706cbd1d8402ce6886300065ca4b618dccfbf65aaf79aba3d34d87ccda453811f589f13b8da3599eae70c865b19e3d0da5a100d3 WHIRLPOOL 70f5dfcdccacc0592c2af178caa1f979a7b17c409ad3a5c67d96fc5140d592e9cb876c1b15087c6c06c6e81e15d403f6e3dad86f44883e73399d49d59e8f6ad5
+DIST salt-2015.8.5.tar.gz 6877624 SHA256 db395702f048ea384ccc440201c24d7044685977ae6a8588d0d0933246f0c673 SHA512 715709798fd1f4410ef204545a84e34d3ecc0f080905b7ae29ce19d273c1ed6865f56e025e59d2506301970ad05081ff119caec0ced03dcbe5803f9f00eb64f8 WHIRLPOOL 69dc332b21ade4735cd8e9d6a2cdfd61ee364a1c7aa3bf047c9d745b6135b94fdd6406117e056fbb6a8cb79dc3b07af5d2f7a781930255b1fe434838b8692de4
diff --git a/app-admin/salt/salt-2015.8.4.ebuild b/app-admin/salt/salt-2015.8.5.ebuild
similarity index 100%
rename from app-admin/salt/salt-2015.8.4.ebuild
rename to app-admin/salt/salt-2015.8.5.ebuild
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index b6a0505..e5ae1da 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -1,2 +1,4 @@
 DIST webmin-1.770-minimal.tar.gz 2612198 SHA256 e976091dcf0a68dfb02d5633d09da2ce9dc69d8ea2bde95c3cc57a0a25384488 SHA512 3661e37bbeb9f814862ff208d32ec4bfa15e8e826c15833e47c3a39cb0bb47d1f227c0c942f72aed4f3e9344556cc0ef8de42a5961c6795ef01986abafe9949b WHIRLPOOL 92a89623da8ba09d921ffec38c45c2c4bf04c8249178d9d13d34339ecc902d8d7184396ce29c04bfb6e9eba463c2942dc5d9d10d05af463b4dbf9337891bcc02
 DIST webmin-1.770.tar.gz 28441983 SHA256 eb84f1adbb099d0a2e633fbc4ea4838d1ddbcc84135d6a897803fbd0284719ba SHA512 460d9e06379df8d950874906589938077fd0fc70ed12948a685c1386c9995538d92387e252373398319469406b8ef0daab67dabe8c71b2f1961a5d5cb6848a7f WHIRLPOOL 4556f51001d010b66c6af265904b3f634f7bccf1afeb74be6de0824fefb2a5b2a5508d751bfa4abcfd0cb8b670659474ecf4e564505e446ed36a737e4f100dc0
+DIST webmin-1.780-minimal.tar.gz 2624841 SHA256 d4f51fcc448a881d568a32dce1712f4feb1d15bccb05005117179b8a6488e403 SHA512 a0fc61c202d94419f52572a95df23f4dd54c3b0552ce96df356b13b529988cb4be02e5f1165fbd5fbe30921697baac8b229d8d587860e3adabcbe2a4bfb11806 WHIRLPOOL f8b94e16b041cef115cfa7a49fbb34d432f9f96b28959e3f161df9de5805d4a38d7a019479e96ee886dd6f4c21e5884864a69b923ec3b0ac92422c530a95249c
+DIST webmin-1.780.tar.gz 28578888 SHA256 eb2613a4f4525cbbd04435580a843cb2a454bcf2712301105657cc114beda40e SHA512 1d5552fc09e0a42218881d2d028b8e73deadfca36022a6212e540e8dbbd2ff5fe23883fc4d3b4d63abee0a2aee570ce9710e4e1b75c2cc28f70724502d6680d7 WHIRLPOOL 7ef76b9e3f64d01978aa281d7e57db37078bab4ec101faa115f51ebf43bc0823d8a8bfa925dff5d1a39b0b9aabdada2218d543b14d3961b1346de05c46137d4b
diff --git a/app-admin/webmin/webmin-1.780.ebuild b/app-admin/webmin/webmin-1.780.ebuild
new file mode 100644
index 0000000..eb7f7a9
--- /dev/null
+++ b/app-admin/webmin/webmin-1.780.ebuild
@@ -0,0 +1,307 @@
+# 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_systemunitdir)/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', 'no_sslcompression',
+	# 'no_tls1' and 'no_tls1_1' for tightening security
+	export ssl=1
+	export no_ssl2=1
+	export no_ssl3=1
+	export ssl_redirect=1
+	export no_sslcompression=1
+	export no_tls1=1
+	export no_tls1_1=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-arch/xz-utils/xz-utils-5.2.2.ebuild b/app-arch/xz-utils/xz-utils-5.2.2.ebuild
index 4ca5eca..f144a45 100644
--- a/app-arch/xz-utils/xz-utils-5.2.2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.2.ebuild
@@ -17,7 +17,7 @@
 else
 	MY_P="${PN/-utils}-${PV/_}"
 	SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S=${WORKDIR}/${MY_P}
 	EXTRA_DEPEND=
 fi
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
new file mode 100644
index 0000000..b721fe8
--- /dev/null
+++ b/app-benchmarks/stress-ng/Manifest
@@ -0,0 +1 @@
+DIST stress-ng-0.05.12.tar.gz 280758 SHA256 081a597bc3b6b7f2993828a04048e5321a81ece6995c7bb9b202dd65e7fb055f SHA512 ee622b1d8fd1b3ddee6119f5a43cedb427e3524bb6ef10f7ac96c305567c9919574e9103949825e2bea3391c302b6e2b5871667bc8f8609844765b64ec760bc8 WHIRLPOOL b9f84501fcbe6494881947a44bbb42ba6fb00120ab6e7fc45ac6b5ece76f7dd95a98a588db9326f0e1bd879020a8ffdcc604dfc5a70f2858924bf85a8a4612c0
diff --git a/app-benchmarks/stress-ng/metadata.xml b/app-benchmarks/stress-ng/metadata.xml
new file mode 100644
index 0000000..dbd7f93
--- /dev/null
+++ b/app-benchmarks/stress-ng/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>brendan@horan.hk</email>
+		<name>Brendan Horan</name>
+		<description>Proxy - Maintainer. Assign bugs to him</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-benchmarks/stress-ng/stress-ng-0.05.12.ebuild b/app-benchmarks/stress-ng/stress-ng-0.05.12.ebuild
new file mode 100644
index 0000000..052c63b
--- /dev/null
+++ b/app-benchmarks/stress-ng/stress-ng-0.05.12.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="A tool to load and stress a computer system"
+HOMEPAGE="http://kernel.ubuntu.com/~cking/stress-ng/"
+SRC_URI="http://kernel.ubuntu.com/~cking/tarballs/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-apps/keyutils
+		sys-apps/attr"
+RDEPEND="${DEPEND}"
diff --git a/app-doc/pms/pms-6_p20151113.ebuild b/app-doc/pms/pms-6_p20151113.ebuild
index 3c351c1..f22d3c1 100644
--- a/app-doc/pms/pms-6_p20151113.ebuild
+++ b/app-doc/pms/pms-6_p20151113.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="binary html"
 
 DEPEND="!binary? (
diff --git a/app-editors/emacs/emacs-23.4-r14.ebuild b/app-editors/emacs/emacs-23.4-r14.ebuild
index b38d167..2b9ec20 100644
--- a/app-editors/emacs/emacs-23.4-r14.ebuild
+++ b/app-editors/emacs/emacs-23.4-r14.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="23"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
 REQUIRED_USE="?? ( aqua X )"
 
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.29.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.29.ebuild
index 7972e21..5d00a2a 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.29.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.29.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 DOCS="ChangeLog keyword-generation.sh"
 ELISP_TEXINFO="${PN}.texi"
diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest
index cf36a0d..b6d4228 100644
--- a/app-emacs/magit/Manifest
+++ b/app-emacs/magit/Manifest
@@ -3,3 +3,4 @@
 DIST magit-2.3.1.tar.gz 262976 SHA256 ee9574dc20cd078d62d669dc19caf8ffc29480a01184d6bc5e90cfa6c800ddf2 SHA512 3c640887263dd5284a446b396975495878b33f1f1b2a2d76f657beb921099acb27dd8a036cb38f2b00e21c0d30b3b412bec26921d3d960e8be79b28cd327c713 WHIRLPOOL a8d017f89cfb327e7ca5ef02ca6c0e90b67b6e80e5b403858a3c65d8c25d348f6a21f34a69ad4bdf06b0eaa5b850b0d107029a7915aef51f42a4f5a9c72ced23
 DIST magit-2.4.0.tar.gz 277515 SHA256 57b7198970d6f10f822964db67661313fed5c9ceff519c8eacc1003328a96af1 SHA512 5e06064c5baa38e279f4fcba7d133bf2e00d3eaed55af101f792f5ef894353aef1d71d0d62e4d5f10f6853f81f4d89daff026518476c465830ac51c221d94ec0 WHIRLPOOL 82f98830a93a3d36288aedfc4f7d30d7b8b26521f2b4c241c5f63acd8ed20fc1996ce4a505ba83cd36426d937dabf779fdc7351353eb4c5710cefdf906b28aa6
 DIST magit-2.4.1.tar.gz 275628 SHA256 f53fc3cb94692d3f3c157f1156be373c763cabefb9e524b4a3b5ccb56a74e8e3 SHA512 a2ae4749766f7353e4042fa4200a8575933516554ba64e5ea3a76d587cc002d2a89da089eb85776c9940171a2b8c09f60f10303ae5208610445357aa8c488224 WHIRLPOOL 4b9dd74c99a915ef0c92bcfc608c8bdb23acd1fa7f454ac994bf748b08fe67c873559ea4a5f0c9d494ca80c178c2bbe447dcbdf2e3e747352c1cbe31e3c4d1ed
+DIST magit-2.5.0.tar.gz 269518 SHA256 aaebcea4317c5f3a92f4d106e5196e5803171f6251c1c69c9f84fdaf4bbfd844 SHA512 02cc70bff28263351a781bf695bc3013e20bcdf027ce3495230928705ffdef9afd588d7de689cb40427ecc5fe4a6df1ccb2fb53321521db99dea2a2ddac2435f WHIRLPOOL a8d0cce7bcb9348f3ed7c53b7fe65a50b54c75507588235a1c5bd029c490ed4f61582cfb686fdb93e1d3c1a6c7ca42f5ef6afbb3b097a429deb4e89d62e73e4e
diff --git a/app-emacs/magit/magit-2.5.0.ebuild b/app-emacs/magit/magit-2.5.0.ebuild
new file mode 100644
index 0000000..cf776f7
--- /dev/null
+++ b/app-emacs/magit/magit-2.5.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="A Git porcelain inside Emacs"
+HOMEPAGE="http://magit.vc/"
+SRC_URI="https://github.com/magit/magit/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${P}/lisp"
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="../Documentation/*.texi"
+DOCS="../README.md ../Documentation/AUTHORS.md ../Documentation/${PV}.txt"
+
+DEPEND=">=app-emacs/dash-2.12.1 >=app-emacs/with-editor-2.5.0"
+RDEPEND="${DEPEND} >=dev-vcs/git-1.9.4"
diff --git a/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild b/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild
index 7bbb3c3..b231d1c 100644
--- a/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild
+++ b/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/${MY_P}/emacs"
 SITEFILE="50${PN}-gentoo-3.12.1.el"
diff --git a/app-emacs/with-editor/Manifest b/app-emacs/with-editor/Manifest
index ab254a9..1e71429 100644
--- a/app-emacs/with-editor/Manifest
+++ b/app-emacs/with-editor/Manifest
@@ -1 +1 @@
-DIST v2.5.0.tar.gz 14940 SHA256 8091465eefee4057a4a0daab72db1f2f0415e2abfe965d1e8b8206f3031aeba5 SHA512 aae01ebc2f5922af1742648eb5e25ccadcf460118c872caa2b79c2139ec85ae13a59ca63880c3d077eb846d333323d054341916b5439acd97fa3ca1a62847533 WHIRLPOOL 85c5959a5644cfd4f00200dac76dc8bc4e0598c144d3138bec72194bf4b5557dc2c9c6ec77c70a86c0c8e04bbebe0df1c34418387168ae5479936ac0c63140e2
+DIST with-editor-2.5.0.tar.gz 14940 SHA256 8091465eefee4057a4a0daab72db1f2f0415e2abfe965d1e8b8206f3031aeba5 SHA512 aae01ebc2f5922af1742648eb5e25ccadcf460118c872caa2b79c2139ec85ae13a59ca63880c3d077eb846d333323d054341916b5439acd97fa3ca1a62847533 WHIRLPOOL 85c5959a5644cfd4f00200dac76dc8bc4e0598c144d3138bec72194bf4b5557dc2c9c6ec77c70a86c0c8e04bbebe0df1c34418387168ae5479936ac0c63140e2
diff --git a/app-emacs/with-editor/with-editor-2.5.0.ebuild b/app-emacs/with-editor/with-editor-2.5.0-r1.ebuild
similarity index 80%
rename from app-emacs/with-editor/with-editor-2.5.0.ebuild
rename to app-emacs/with-editor/with-editor-2.5.0-r1.ebuild
index 8995923..91902d2 100644
--- a/app-emacs/with-editor/with-editor-2.5.0.ebuild
+++ b/app-emacs/with-editor/with-editor-2.5.0-r1.ebuild
@@ -9,7 +9,7 @@
 
 DESCRIPTION="Use the Emacsclient as the \$EDITOR of child processes"
 HOMEPAGE="http://magit.vc/manual/with-editor"
-SRC_URI="https://github.com/magit/with-editor/archive/v${PV}.tar.gz"
+SRC_URI="https://github.com/magit/with-editor/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
@@ -18,3 +18,6 @@
 SITEFILE="50${PN}-gentoo.el"
 ELISP_TEXINFO="*.texi"
 DOCS="README.md with-editor.org"
+
+# Versions of magit before 2.5.0 bundled with-editor
+RDEPEND="!!<app-emacs/magit-2.5.0"
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index a7622e1..16ca1d0 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -2,3 +2,4 @@
 DIST libvirt-1.2.21.tar.gz 29848954 SHA256 8d406582f5fe88d739d1d83e0ba7ac7f91f5a8da4be82162ab85631744d8925b SHA512 5c15d0ba5d75c13f735c6a60dfdbad007426f77e113f95894d520f7fc358fa4361d5cce7bb9a548a436f323b845f13b8940abbad568b8b146418430068bb970e WHIRLPOOL d53bbb07c85b3aa2d9b0f38ff2edd3cd0a2a5300627f3e2f0a82bc057303617cab9d6f1d8a9a771bd968b0496d38d3a39a0154f88bdca44dda359a65fdc2c650
 DIST libvirt-1.3.0-20151222.tar.xz 1684 SHA256 3628c3398862eae2966ccf0e55822e4cb8f47e6e8c1b0d17b6fdb9f69dc5490b SHA512 71c8dabc9cb8ead2858bf2d77d3831db59ac34076c99a4ae607c7bb4678b0af28a9f31fdca047ee174237f0e91fbb8db3a843e605256514e1d0ad527fc412275 WHIRLPOOL 47ebd21dd7d17812b8e97ebb70453574550cac18b0cf88cd38c152565d1e01f725a6da90878c41c7836a59318c1294859870e5bb523981954618fdde6704360e
 DIST libvirt-1.3.0.tar.gz 30114683 SHA256 ebcf5645fa565e3fe2fe94a86e841db9b768cf0e0a7e6cf395c6327f9a23bd64 SHA512 e252390a05b76e9cd9ed02caadd0ee0d674505f60940bb6ced955e17f69c7dd55fe5b38204ae5c25b6e5703415a0f6a12fc545d138d0e8b016457a85dc8fa2b8 WHIRLPOOL 852c592b27be86d3fb2ec75ca5debf9a1e0ac5de6d1ab06c55c2d70e83de125d10c2fc967b7578fba9137ed7a30b7a7e195f4e5f8d35708deeeddc97424d5e40
+DIST libvirt-1.3.1.tar.gz 29900143 SHA256 a5d43fbed34d31eeffc641d2ac9b6026a57bf1a4fa74d0fa19a9891d9ec2c21a SHA512 a109c09d947f7c5e924fdbc9c9b6c0a9d6ff64d9411aedd9a3e710d20f749b088ff9895e882dd888b88bfea7724a8933534be4078f16cb9d2047da761515e804 WHIRLPOOL 62fb8486bfa53d55b397d9a90750d32a83f0a73cf2e6685f296489390abf9c62efc69fecd6d011fc51e9f562f75f5b8ce03208c350e98d20de0a5560721c675e
diff --git a/app-emulation/libvirt/files/libvirt-1.2.17-fix_paths_for_apparmor.patch b/app-emulation/libvirt/files/libvirt-1.2.17-fix_paths_for_apparmor.patch
index 8e19c0f..c608295 100644
--- a/app-emulation/libvirt/files/libvirt-1.2.17-fix_paths_for_apparmor.patch
+++ b/app-emulation/libvirt/files/libvirt-1.2.17-fix_paths_for_apparmor.patch
@@ -1,18 +1,3 @@
-From bde898de482645f6963b673e8ff0b486a0a6db25 Mon Sep 17 00:00:00 2001
-From: Matthias Maier <tamiko@kyomu.43-1.org>
-Date: Tue, 28 Jul 2015 11:10:59 -0500
-Subject: [PATCH] adapt paths for gentoo's fs layout
-
-https://bugs.gentoo.org/show_bug.cgi?id=554628
----
- examples/apparmor/Makefile.am                    |  4 +-
- examples/apparmor/usr.lib.libvirt.virt-aa-helper | 48 ------------------------
- examples/apparmor/usr.libexec.virt-aa-helper     | 48 ++++++++++++++++++++++++
- examples/apparmor/usr.sbin.libvirtd              |  4 +-
- 4 files changed, 52 insertions(+), 52 deletions(-)
- delete mode 100644 examples/apparmor/usr.lib.libvirt.virt-aa-helper
- create mode 100644 examples/apparmor/usr.libexec.virt-aa-helper
-
 diff --git a/examples/apparmor/Makefile.am b/examples/apparmor/Makefile.am
 index 7a20e16..c3c67b6 100644
 --- a/examples/apparmor/Makefile.am
diff --git a/app-emulation/libvirt/files/libvirt-1.3.1-fix_paths_for_apparmor.patch b/app-emulation/libvirt/files/libvirt-1.3.1-fix_paths_for_apparmor.patch
new file mode 100644
index 0000000..990fbac
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-1.3.1-fix_paths_for_apparmor.patch
@@ -0,0 +1,147 @@
+diff --git a/examples/Makefile.am b/examples/Makefile.am
+index 2adcefb..cdee23b 100644
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
+@@ -23,7 +23,7 @@ EXTRA_DIST = \
+ 	apparmor/TEMPLATE.lxc \
+ 	apparmor/libvirt-qemu \
+ 	apparmor/libvirt-lxc \
+-	apparmor/usr.lib.libvirt.virt-aa-helper \
++	apparmor/usr.libexec.virt-aa-helper \
+ 	apparmor/usr.sbin.libvirtd \
+ 	lxcconvert/virt-lxc-convert \
+ 	polkit/libvirt-acl.rules \
+@@ -55,7 +55,7 @@ rename_rename_SOURCES = rename/rename.c
+ if WITH_APPARMOR_PROFILES
+ apparmordir = $(sysconfdir)/apparmor.d/
+ apparmor_DATA = \
+-	apparmor/usr.lib.libvirt.virt-aa-helper \
++	apparmor/usr.libexec.virt-aa-helper \
+ 	apparmor/usr.sbin.libvirtd \
+ 	$(NULL)
+ 
+diff --git a/examples/apparmor/usr.lib.libvirt.virt-aa-helper b/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+deleted file mode 100644
+index b34fb35..0000000
+--- a/examples/apparmor/usr.lib.libvirt.virt-aa-helper
++++ /dev/null
+@@ -1,48 +0,0 @@
+-# Last Modified: Mon Apr  5 15:10:27 2010
+-#include <tunables/global>
+-
+-profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper {
+-  #include <abstractions/base>
+-
+-  # needed for searching directories
+-  capability dac_override,
+-  capability dac_read_search,
+-
+-  # needed for when disk is on a network filesystem
+-  network inet,
+-
+-  deny @{PROC}/[0-9]*/mounts r,
+-  @{PROC}/[0-9]*/net/psched r,
+-  owner @{PROC}/[0-9]*/status r,
+-  @{PROC}/filesystems r,
+-
+-  # for hostdev
+-  /sys/devices/ r,
+-  /sys/devices/** r,
+-
+-  /usr/{lib,lib64}/libvirt/virt-aa-helper mr,
+-  /sbin/apparmor_parser Ux,
+-
+-  /etc/apparmor.d/libvirt/* r,
+-  /etc/apparmor.d/libvirt/libvirt-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]* rw,
+-
+-  # for backingstore -- allow access to non-hidden files in @{HOME} as well
+-  # as storage pools
+-  audit deny @{HOME}/.* mrwkl,
+-  audit deny @{HOME}/.*/ rw,
+-  audit deny @{HOME}/.*/** mrwkl,
+-  audit deny @{HOME}/bin/ rw,
+-  audit deny @{HOME}/bin/** mrwkl,
+-  @{HOME}/ r,
+-  @{HOME}/** r,
+-  /var/lib/libvirt/images/ r,
+-  /var/lib/libvirt/images/** r,
+-  /{media,mnt,opt,srv}/** r,
+-
+-  /**.img r,
+-  /**.qcow{,2} r,
+-  /**.qed r,
+-  /**.vmdk r,
+-  /**.[iI][sS][oO] r,
+-  /**/disk{,.*} r,
+-}
+diff --git a/examples/apparmor/usr.libexec.virt-aa-helper b/examples/apparmor/usr.libexec.virt-aa-helper
+new file mode 100644
+index 0000000..08b871a
+--- /dev/null
++++ b/examples/apparmor/usr.libexec.virt-aa-helper
+@@ -0,0 +1,48 @@
++# Last Modified: Mon Apr  5 15:10:27 2010
++#include <tunables/global>
++
++profile virt-aa-helper /usr/libexec/virt-aa-helper {
++  #include <abstractions/base>
++
++  # needed for searching directories
++  capability dac_override,
++  capability dac_read_search,
++
++  # needed for when disk is on a network filesystem
++  network inet,
++
++  deny @{PROC}/[0-9]*/mounts r,
++  @{PROC}/[0-9]*/net/psched r,
++  owner @{PROC}/[0-9]*/status r,
++  @{PROC}/filesystems r,
++
++  # for hostdev
++  /sys/devices/ r,
++  /sys/devices/** r,
++
++  /usr/libexec/virt-aa-helper mr,
++  /sbin/apparmor_parser Ux,
++
++  /etc/apparmor.d/libvirt/* r,
++  /etc/apparmor.d/libvirt/libvirt-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]* rw,
++
++  # for backingstore -- allow access to non-hidden files in @{HOME} as well
++  # as storage pools
++  audit deny @{HOME}/.* mrwkl,
++  audit deny @{HOME}/.*/ rw,
++  audit deny @{HOME}/.*/** mrwkl,
++  audit deny @{HOME}/bin/ rw,
++  audit deny @{HOME}/bin/** mrwkl,
++  @{HOME}/ r,
++  @{HOME}/** r,
++  /var/lib/libvirt/images/ r,
++  /var/lib/libvirt/images/** r,
++  /{media,mnt,opt,srv}/** r,
++
++  /**.img r,
++  /**.qcow{,2} r,
++  /**.qed r,
++  /**.vmdk r,
++  /**.[iI][sS][oO] r,
++  /**/disk{,.*} r,
++}
+diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd
+index 5d606e6..b2cd8c6 100644
+--- a/examples/apparmor/usr.sbin.libvirtd
++++ b/examples/apparmor/usr.sbin.libvirtd
+@@ -58,8 +58,10 @@
+   audit deny /sys/kernel/security/apparmor/.* rwxl,
+   /sys/kernel/security/apparmor/profiles r,
+   /usr/{lib,lib64}/libvirt/* PUxr,
+-  /usr/{lib,lib64}/libvirt/libvirt_parthelper ix,
+-  /usr/{lib,lib64}/libvirt/libvirt_iohelper ix,
++  /usr/libexec/virt-aa-helper PUxr,
++  /usr/libexec/libvirt_lxc PUxr,
++  /usr/libexec/libvirt_parthelper ix,
++  /usr/libexec/libvirt_iohelper ix,
+   /etc/libvirt/hooks/** rmix,
+   /etc/xen/scripts/** rmix,
+ 
diff --git a/app-emulation/libvirt/libvirt-1.3.0.ebuild b/app-emulation/libvirt/libvirt-1.3.1.ebuild
similarity index 95%
rename from app-emulation/libvirt/libvirt-1.3.0.ebuild
rename to app-emulation/libvirt/libvirt-1.3.1.ebuild
index 0f03ffa..d1be49b 100644
--- a/app-emulation/libvirt/libvirt-1.3.0.ebuild
+++ b/app-emulation/libvirt/libvirt-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@
 
 inherit eutils user autotools-utils linux-info systemd readme.gentoo
 
-BACKPORTS="20151222" # CVE-2015-5313
+BACKPORTS=""
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
@@ -218,9 +218,9 @@
 	fi
 
 	epatch \
-		"${FILESDIR}"/${P}-do_not_use_sysconf.patch \
+		"${FILESDIR}"/${PN}-1.3.0-do_not_use_sysconf.patch \
 		"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \
-		"${FILESDIR}"/${PN}-1.2.17-fix_paths_for_apparmor.patch
+		"${FILESDIR}"/${P}-fix_paths_for_apparmor.patch
 
 	[[ -n ${BACKPORTS} ]] &&
 		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
@@ -229,11 +229,11 @@
 	epatch_user
 
 	# Tweak the init script:
-	cp "${FILESDIR}/libvirtd.init-r15" "${S}/libvirtd.init" || die
+	cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die
 	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-e "s/USE_FLAG_AVAHI/$(usex avahi avahi-daemon '')/" \
-		-e "s/USE_FLAG_ISCSI/$(usex iscsi iscsid '')/" \
-		-e "s/USE_FLAG_RBD/$(usex rbd  ceph '')/" \
+		-e "s/USE_FLAG_AVAHI/$(usex avahi 'use avahi-daemon' '')/" \
+		-e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \
+		-e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \
 		-i "${S}/libvirtd.init" || die "sed failed"
 
 	AUTOTOOLS_AUTORECONF=true
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index f07387f..22d4afb 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -220,7 +220,7 @@
 	epatch \
 		"${FILESDIR}"/${PN}-1.3.0-do_not_use_sysconf.patch \
 		"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \
-		"${FILESDIR}"/${PN}-1.2.17-fix_paths_for_apparmor.patch
+		"${FILESDIR}"/${PN}-1.3.1-fix_paths_for_apparmor.patch
 
 	[[ -n ${BACKPORTS} ]] &&
 		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index fcb60cb..d68b9fb 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,3 +1,3 @@
-DIST lxd-0.25.tar.bz2 1983043 SHA256 1cfdf1a5e8638060e2368e9e5cf8763406857309f08c4668fa0756e85ba7b89e SHA512 001e52826a3bbe00121115ddace14b3f552321f16e97700763ff6dd23b5babd3c1393cbc9b9b263b6a18c31e49c30d612e3d7153d4987644689989be0be50d00 WHIRLPOOL 496f3f19c50c1ee79ba8b5625cf34b6f57683f4066a09b3edc2cbd017cc5ebc2cc7ac9e569c94bcba0d699c6efb722b79ae43541e0dfddc2fb8d877131519b06
 DIST lxd-0.26.tar.bz2 1985288 SHA256 71079140946e3e66563cc3025c3e4f756fd45cc413af1d5396c56a608427d0aa SHA512 25aa73274b03163698646fe2f49c2401ae93a9b90be46f0ba0414521bc920e68c61db7e6617d75a19675e22a705afd5d3220e24a518e30819daf3dc75670b900 WHIRLPOOL d59471f02744efbe3d3dbb1ae32dcf17141f8414a1614535451e75c5422928d3c5d54dceebcf0d829f7395ae3cb49bf424ff7999d1e32b9384a3f81b3d3ab01e
 DIST lxd-0.27.tar.bz2 2247266 SHA256 290d05a792f2f146b302d500eadd3168822ed99aecb4ea96762570580f29910a SHA512 37d5fef677a943dc7e84c73836aa1d4e5f0353c165aa33cefcd87dcd1fdae574760e74fb290404182badfee96e04ef929a81d6633d2c0f91c458ccd19996b9c3 WHIRLPOOL d1d0c0fad0e604f41482c133f4425461546599aded2e948d5c58f7698eba963746ac8c3c3085ffbd244b0169cedb26ad8ec5d85babea6aa9a7688ee6ce342589
+DIST lxd-2.0.0_beta1.tar.bz2 2253384 SHA256 443d8004aea80a9295eeb28c81b930947163b5af5e7c5ec15e6123938268bd6c SHA512 21cc90e18173f832f7aa2f39762ba1c47ac54dbb947519302075d10f8c55cce766d436cb7f9ec96cb2fe538952b801398ce3b1320d878e8835d58e4fb3b81c86 WHIRLPOOL 85a11976fbf74f8b408c75aa7abf645d3e27eed3f82021fbcb7b2d8db95cc986fdf2cd6a38ef8749857027b380382e66678fb1f1656274159dbc2531c3860761
diff --git a/app-emulation/lxd/files/lxd-2.0.0_beta1-disregard-dev-subdirs.patch b/app-emulation/lxd/files/lxd-2.0.0_beta1-disregard-dev-subdirs.patch
new file mode 100644
index 0000000..9655e5e
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.0.0_beta1-disregard-dev-subdirs.patch
@@ -0,0 +1,17 @@
+--- a/lxd/container_lxc.go
++++ b/lxd/container_lxc.go
+@@ -3509,8 +3509,13 @@ func (c *containerLXC) getDiskLimits() (map[string]deviceBlockLimit, error) {
+ 
+ 		for _, block := range blocks {
+ 			dev := strings.TrimPrefix(block, "/dev/")
++
++			if strings.Contains(dev,"/") {
++			   continue
++			}
++
+ 			if !shared.PathExists(fmt.Sprintf("/sys/class/block/%s/dev", dev)) {
+-				return nil, fmt.Errorf("Disk is missing /sys/class/block entry")
++				return nil, fmt.Errorf("Disk %s is missing /sys/class/block entry", dev)
+ 			}
+ 
+ 			block, err := ioutil.ReadFile(fmt.Sprintf("/sys/class/block/%s/dev", dev))
diff --git a/app-emulation/lxd/files/lxd-0.25-dont-go-get.patch b/app-emulation/lxd/files/lxd-2.0.0_beta1-dont-go-get.patch
similarity index 100%
rename from app-emulation/lxd/files/lxd-0.25-dont-go-get.patch
rename to app-emulation/lxd/files/lxd-2.0.0_beta1-dont-go-get.patch
diff --git a/app-emulation/lxd/files/lxd-0.25-nc-binary-name.patch b/app-emulation/lxd/files/lxd-2.0.0_beta1-nc-binary-name.patch
similarity index 100%
rename from app-emulation/lxd/files/lxd-0.25-nc-binary-name.patch
rename to app-emulation/lxd/files/lxd-2.0.0_beta1-nc-binary-name.patch
diff --git a/app-emulation/lxd/files/lxd-0.25.confd b/app-emulation/lxd/files/lxd-2.0.0_beta1.confd
similarity index 100%
rename from app-emulation/lxd/files/lxd-0.25.confd
rename to app-emulation/lxd/files/lxd-2.0.0_beta1.confd
diff --git a/app-emulation/lxd/files/lxd-0.25.initd b/app-emulation/lxd/files/lxd-2.0.0_beta1.initd
similarity index 100%
rename from app-emulation/lxd/files/lxd-0.25.initd
rename to app-emulation/lxd/files/lxd-2.0.0_beta1.initd
diff --git a/app-emulation/lxd/lxd-0.25.ebuild b/app-emulation/lxd/lxd-2.0.0_beta1.ebuild
similarity index 87%
rename from app-emulation/lxd/lxd-0.25.ebuild
rename to app-emulation/lxd/lxd-2.0.0_beta1.ebuild
index 549dff5..9ff9d90 100644
--- a/app-emulation/lxd/lxd-0.25.ebuild
+++ b/app-emulation/lxd/lxd-2.0.0_beta1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -68,6 +68,13 @@
 	# Gentoo installs that with a renamed binary
 	epatch "${FILESDIR}/${P}-nc-binary-name.patch"
 
+	# see https://github.com/lxc/lxd/pull/1562
+	epatch "${FILESDIR}/${P}-disregard-dev-subdirs.patch"
+
+	tmpgoroot="${T}/goroot"
+	mkdir -p "$tmpgoroot" || die "Failed to create temporary GOROOT"
+	cp -sR "$(get_golibdir_gopath)"/* "${tmpgoroot}" || die "Failed to copy files to temporary GOROOT"
+
 	# Warn on unhandled locale changes
 	l10n_find_plocales_changes po "" .po
 }
@@ -77,12 +84,13 @@
 
 	cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
 
+	tmpgoroot="${T}/goroot"
 	if use daemon; then
 		# Build binaries
-		GOPATH="${S}:$(get_golibdir_gopath)" emake
+		GOPATH="${S}:${tmpgoroot}" emake
 	else
 		# build client tool
-		GOPATH="${S}:$(get_golibdir_gopath)" emake client
+		GOPATH="${S}:${tmpgoroot}" emake client
 	fi
 
 	use nls && emake build-mo
@@ -120,7 +128,7 @@
 		systemd_dounit "${FILESDIR}"/lxd.service
 	fi
 
-	newbashcomp config/bash/lxc.in lxc
+	newbashcomp config/bash/lxd-client lxc
 
 	dodoc AUTHORS CONTRIBUTING.md README.md
 
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.3.32.103443.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.3.32.103443.ebuild
index eecb91f..8790327 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.3.32.103443.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.3.32.103443.ebuild
@@ -75,6 +75,7 @@
 	x11-libs/libSM
 	x11-libs/libICE
 	x11-libs/libXdmcp
+	sys-fs/lvm2
 	python? ( ${PYTHON_DEPS} )"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-misc/ca-certificates/ca-certificates-20151214.3.21.ebuild b/app-misc/ca-certificates/ca-certificates-20151214.3.21.ebuild
index 86a6882..01d8fee 100644
--- a/app-misc/ca-certificates/ca-certificates-20151214.3.21.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20151214.3.21.ebuild
@@ -57,7 +57,7 @@
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 ${PRECOMPILED} || IUSE+=" +cacert"
 
diff --git a/app-misc/media-player-info/media-player-info-22.ebuild b/app-misc/media-player-info/media-player-info-22.ebuild
index 57e5f6a..db343f8 100644
--- a/app-misc/media-player-info/media-player-info-22.ebuild
+++ b/app-misc/media-player-info/media-player-info-22.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{3_3,3_4} )
+PYTHON_COMPAT=( python3_{3,4,5} )
 
 inherit eutils python-any-r1
 
diff --git a/app-portage/conf-update/conf-update-1.0.3-r1.ebuild b/app-portage/conf-update/conf-update-1.0.3-r1.ebuild
new file mode 100644
index 0000000..821c39c
--- /dev/null
+++ b/app-portage/conf-update/conf-update-1.0.3-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="${PN} is a ncurses-based config management utility"
+HOMEPAGE="https://gitweb.gentoo.org/proj/conf-update.git/"
+SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="colordiff libressl"
+
+RDEPEND=">=dev-libs/glib-2.6
+		sys-libs/ncurses:0
+		libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+		colordiff? ( app-misc/colordiff )"
+DEPEND="virtual/pkgconfig
+		${RDEPEND}"
+
+src_prepare() {
+	sed -i -e "s/\$Rev:.*\\$/${PVR}/" "${S}"/"${PN}".h || die
+	if use colordiff ; then
+		sed -i -e "s/diff_tool=diff/diff_tool=colordiff/" ${PN}.conf  \ die 'colordiff-sed failed'
+	fi
+	tc-export PKG_CONFIG
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
diff --git a/app-portage/conf-update/metadata.xml b/app-portage/conf-update/metadata.xml
index 31347ae..cae82b3 100644
--- a/app-portage/conf-update/metadata.xml
+++ b/app-portage/conf-update/metadata.xml
@@ -16,5 +16,7 @@
 <use>
   <flag name="colordiff">Use colors when displaying diffs
     (<pkg>app-misc/colordiff</pkg>)</flag>
+<flag name="libressl">Enable SSL connections and crypto functions
+	using <pkg>dev-libs/libressl</pkg></flag>
 </use>
 </pkgmetadata>
diff --git a/app-shells/bash/bash-4.3_p42-r2.ebuild b/app-shells/bash/bash-4.3_p42-r2.ebuild
new file mode 100644
index 0000000..c914d04
--- /dev/null
+++ b/app-shells/bash/bash-4.3_p42-r2.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/
+PLEVEL=${PV##*_p}
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
+MY_P=${PN}-${MY_PV}
+[[ ${PV} != *_p* ]] && PLEVEL=0
+patches() {
+	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	[[ ${plevel} -eq 0 ]] && return 1
+	eval set -- {1..${plevel}}
+	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
+	if [[ ${opt} == -s ]] ; then
+		echo "${@/#/${DISTDIR}/}"
+	else
+		local u
+		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
+			printf "${u}/${pn}-${pv}-patches/%s " "$@"
+		done
+	fi
+}
+
+# The version of readline this bash normally ships with.
+READLINE_VER="6.3"
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
+SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
+[[ ${PV} == *_rc* ]] && SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla"
+
+DEPEND=">=sys-libs/ncurses-5.2-r2
+	readline? ( >=sys-libs/readline-${READLINE_VER} )
+	nls? ( virtual/libintl )"
+RDEPEND="${DEPEND}
+	!<sys-apps/portage-2.1.6.7_p1
+	!<sys-apps/paludis-0.26.0_alpha5"
+# we only need yacc when the .y files get patched (bash42-005)
+DEPEND+=" virtual/yacc"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if is-flag -malign-double ; then #7332
+		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
+		eerror "as it breaks LFS (struct stat64) on x86."
+		die "remove -malign-double from your CFLAGS mr ricer"
+	fi
+	if use bashlogger ; then
+		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
+		ewarn "This will log ALL output you enter into the shell, you have been warned."
+	fi
+}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+}
+
+src_prepare() {
+	# Include official patches
+	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+
+	# Clean out local libs so we know we use system ones w/releases.
+	if [[ ${PV} != *_rc* ]] ; then
+		rm -rf lib/{readline,termcap}/*
+		touch lib/{readline,termcap}/Makefile.in # for config.status
+		sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
+	fi
+
+	# Avoid regenerating docs after patches #407985
+	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
+	touch -r . doc/*
+
+	epatch "${FILESDIR}"/${PN}-4.3-compat-lvl.patch
+	epatch "${FILESDIR}"/${PN}-4.3-append-process-segfault.patch
+	epatch "${FILESDIR}"/${PN}-4.3-mapfile-improper-array-name-validation.patch
+	epatch "${FILESDIR}"/${PN}-4.3-arrayfunc.patch
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# For descriptions of these, see config-top.h
+	# bashrc/#26952 bash_logout/#90488 ssh/#24762
+	append-cppflags \
+		-DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \
+		-DSTANDARD_UTILS_PATH=\'\"/bin:/usr/bin:/sbin:/usr/sbin\"\' \
+		-DSYS_BASHRC=\'\"/etc/bash/bashrc\"\' \
+		-DSYS_BASH_LOGOUT=\'\"/etc/bash/bash_logout\"\' \
+		-DNON_INTERACTIVE_LOGIN_SHELLS \
+		-DSSH_SOURCE_BASHRC \
+		$(use bashlogger && echo -DSYSLOG_HISTORY)
+
+	# Don't even think about building this statically without
+	# reading Bug 7714 first.  If you still build it statically,
+	# don't come crying to us with bugs ;).
+	#use static && export LDFLAGS="${LDFLAGS} -static"
+	use nls || myconf+=( --disable-nls )
+
+	# Historically, we always used the builtin readline, but since
+	# our handling of SONAME upgrades has gotten much more stable
+	# in the PM (and the readline ebuild itself preserves the old
+	# libs during upgrades), linking against the system copy should
+	# be safe.
+	# Exact cached version here doesn't really matter as long as it
+	# is at least what's in the DEPEND up above.
+	export ac_cv_rl_version=${READLINE_VER}
+
+	# Force linking with system curses ... the bundled termcap lib
+	# sucks bad compared to ncurses.  For the most part, ncurses
+	# is here because readline needs it.  But bash itself calls
+	# ncurses in one or two small places :(.
+
+	if [[ ${PV} != *_rc* ]] ; then
+		# Use system readline only with released versions.
+		myconf+=( --with-installed-readline=. )
+	fi
+
+	if use plugins; then
+		append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
+	else
+		# Disable the plugins logic by hand since bash doesn't
+		# provide a way of doing it.
+		export ac_cv_func_dl{close,open,sym}=no \
+			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
+		sed -i \
+			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
+			configure || die
+	fi
+	tc-export AR #444070
+	econf \
+		--docdir='$(datarootdir)'/doc/${PF} \
+		--htmldir='$(docdir)/html' \
+		--with-curses \
+		$(use_with afs) \
+		$(use_enable net net-redirections) \
+		--disable-profiling \
+		$(use_enable mem-scramble) \
+		$(use_with mem-scramble bash-malloc) \
+		$(use_enable readline) \
+		$(use_enable readline history) \
+		$(use_enable readline bang-history) \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	emake
+
+	if use plugins ; then
+		emake -C examples/loadables all others
+	fi
+}
+
+src_install() {
+	local d f
+
+	default
+
+	dodir /bin
+	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
+	dosym bash /bin/rbash
+
+	insinto /etc/bash
+	doins "${FILESDIR}"/bash_logout
+	doins "${FILESDIR}"/bashrc
+	keepdir /etc/bash/bashrc.d
+	insinto /etc/skel
+	for f in bash{_logout,_profile,rc} ; do
+		newins "${FILESDIR}"/dot-${f} .${f}
+	done
+
+	local sed_args=(
+		-e "s:#${USERLAND}#@::"
+		-e '/#@/d'
+	)
+	if ! use readline ; then
+		sed_args+=( #432338
+			-e '/^shopt -s histappend/s:^:#:'
+			-e 's:use_color=true:use_color=false:'
+		)
+	fi
+	sed -i \
+		"${sed_args[@]}" \
+		"${ED}"/etc/skel/.bashrc \
+		"${ED}"/etc/bash/bashrc || die
+
+	if use plugins ; then
+		exeinto /usr/$(get_libdir)/bash
+		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
+		insinto /usr/include/bash-plugins
+		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
+	fi
+
+	if use examples ; then
+		for d in examples/{functions,misc,scripts,startup-files} ; do
+			exeinto /usr/share/doc/${PF}/${d}
+			insinto /usr/share/doc/${PF}/${d}
+			for f in ${d}/* ; do
+				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
+					doexe ${f}
+				else
+					doins ${f}
+				fi
+			done
+		done
+	fi
+
+	doman doc/*.1
+	newdoc CWRU/changelog ChangeLog
+	dosym bash.info /usr/share/info/bashref.info
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
+		mkdir -p "${EROOT}"/etc/bash
+		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
+	fi
+
+	if [[ -L ${EROOT}/bin/sh ]] ; then
+		# rewrite the symlink to ensure that its mtime changes. having /bin/sh
+		# missing even temporarily causes a fatal error with paludis.
+		local target=$(readlink "${EROOT}"/bin/sh)
+		local tmp=$(emktemp "${EROOT}"/bin)
+		ln -sf "${target}" "${tmp}"
+		mv -f "${tmp}" "${EROOT}"/bin/sh
+	fi
+}
+
+pkg_postinst() {
+	# If /bin/sh does not exist, provide it
+	if [[ ! -e ${EROOT}/bin/sh ]] ; then
+		ln -sf bash "${EROOT}"/bin/sh
+	fi
+}
diff --git a/app-shells/bash/files/bashrc b/app-shells/bash/files/bashrc
index c9bd88e..1107f43 100644
--- a/app-shells/bash/files/bashrc
+++ b/app-shells/bash/files/bashrc
@@ -38,7 +38,7 @@
 
 # Change the window title of X terminals 
 case ${TERM} in
-	xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix|konsole*)
+	[aEkx]term*|rxvt*|gnome*|konsole*|interix)
 		PS1='\[\033]0;\u@\h:\w\007\]'
 		;;
 	screen*)
@@ -49,37 +49,55 @@
 		;;
 esac
 
-use_color=false
-#BSD#@# BSD doesn't typically come with dircolors so we need
-#BSD#@# to hardcode some terminals in here.
-#BSD#@case ${TERM} in
-#BSD#@	xterm*|rxvt*|Eterm|aterm|kterm|gnome*|screen|cons25) use_color=true;;
-#BSD#@esac
-
 # Set colorful PS1 only on colorful terminals.
 # dircolors --print-database uses its own built-in database
 # instead of using /etc/DIR_COLORS.  Try to use the external file
-# first to take advantage of user additions.  Use internal bash
-# globbing instead of external grep binary.
-safe_term=${TERM//[^[:alnum:]]/?}   # sanitize TERM
-match_lhs=""
-[[ -f ~/.dir_colors   ]] && match_lhs="${match_lhs}$(<~/.dir_colors)"
-[[ -f /etc/DIR_COLORS ]] && match_lhs="${match_lhs}$(</etc/DIR_COLORS)"
-[[ -z ${match_lhs}    ]] \
-	&& type -P dircolors >/dev/null \
-	&& match_lhs=$(dircolors --print-database)
-[[ $'\n'${match_lhs} == *$'\n'"TERM "${safe_term}* ]] && use_color=true
+# first to take advantage of user additions.
+use_color=false
+if type -P dircolors >/dev/null ; then
+	# Enable colors for ls, etc.  Prefer ~/.dir_colors #64489
+	LS_COLORS=
+	if [[ -f ~/.dir_colors ]] ; then
+		# If you have a custom file, chances are high that it's not the default.
+		used_default_dircolors="no"
+		eval "$(dircolors -b ~/.dir_colors)"
+	elif [[ -f /etc/DIR_COLORS ]] ; then
+		# People might have customized the system database.
+		used_default_dircolors="maybe"
+		eval "$(dircolors -b /etc/DIR_COLORS)"
+	else
+		used_default_dircolors="yes"
+		eval "$(dircolors -b)"
+	fi
+	if [[ -n ${LS_COLORS:+set} ]] ; then
+		use_color=true
+
+		# The majority of systems out there do not customize these files, so we
+		# want to avoid always exporting the large $LS_COLORS variable.  This
+		# keeps the active env smaller, and it means we don't have to deal with
+		# running new/old (incompatible) versions of `ls` compared to when we
+		# last sourced this file.
+		case ${used_default_dircolors} in
+		no) ;;
+		yes) unset LS_COLORS ;;
+		*)
+			ls_colors=$(eval "$(dircolors -b)"; echo "${LS_COLORS}")
+			if [[ ${ls_colors} == "${LS_COLORS}" ]] ; then
+				unset LS_COLORS
+			fi
+			;;
+		esac
+	fi
+	unset used_default_dircolors
+else
+	# Some systems (e.g. BSD & embedded) don't typically come with
+	# dircolors so we need to hardcode some terminals in here.
+	case ${TERM} in
+	[aEkx]term*|rxvt*|gnome*|konsole*|screen|cons25|*color) use_color=true;;
+	esac
+fi
 
 if ${use_color} ; then
-	# Enable colors for ls, etc.  Prefer ~/.dir_colors #64489
-	if type -P dircolors >/dev/null ; then
-		if [[ -f ~/.dir_colors ]] ; then
-			eval $(dircolors -b ~/.dir_colors)
-		elif [[ -f /etc/DIR_COLORS ]] ; then
-			eval $(dircolors -b /etc/DIR_COLORS)
-		fi
-	fi
-
 	if [[ ${EUID} == 0 ]] ; then
 		PS1+='\[\033[01;31m\]\h\[\033[01;34m\] \W \$\[\033[00m\] '
 	else
@@ -105,4 +123,4 @@
 done
 
 # Try to keep environment pollution down, EPA loves us.
-unset use_color safe_term match_lhs sh
+unset use_color sh
diff --git a/app-text/txt2man/txt2man-1.5.6.ebuild b/app-text/txt2man/txt2man-1.5.6.ebuild
index 30e388d..30f253d 100644
--- a/app-text/txt2man/txt2man-1.5.6.ebuild
+++ b/app-text/txt2man/txt2man-1.5.6.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="app-shells/bash
diff --git a/app-text/zathura/zathura-0.3.4.ebuild b/app-text/zathura/zathura-0.3.4.ebuild
index 12a9027..1af5fd3 100644
--- a/app-text/zathura/zathura-0.3.4.ebuild
+++ b/app-text/zathura/zathura-0.3.4.ebuild
@@ -30,7 +30,7 @@
 	>=x11-libs/gtk+-3.6:3
 	magic? ( sys-apps/file:= )
 	sqlite? ( dev-db/sqlite:3= )
-	synctex? ( app-text/texlive-core )"
+	synctex? ( >=app-text/texlive-core-2015 )"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild
index 5abb1d2..6f5bd86 100644
--- a/app-text/zathura/zathura-9999.ebuild
+++ b/app-text/zathura/zathura-9999.ebuild
@@ -30,7 +30,7 @@
 	>=x11-libs/gtk+-3.6:3
 	magic? ( sys-apps/file:= )
 	sqlite? ( dev-db/sqlite:3= )
-	synctex? ( app-text/texlive-core )"
+	synctex? ( >=app-text/texlive-core-2015 )"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
diff --git a/dev-db/cdb/cdb-0.75-r4.ebuild b/dev-db/cdb/cdb-0.75-r4.ebuild
index 1025bee..7355577 100644
--- a/dev-db/cdb/cdb-0.75-r4.ebuild
+++ b/dev-db/cdb/cdb-0.75-r4.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 inherit eutils multilib toolchain-funcs
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
 
 DESCRIPTION="Fast, reliable, simple package for creating and reading constant databases"
 HOMEPAGE="http://cr.yp.to/cdb.html"
diff --git a/dev-db/mariadb/mariadb-10.0.23.ebuild b/dev-db/mariadb/mariadb-10.0.23.ebuild
index c9b9f36..eb0673b 100644
--- a/dev-db/mariadb/mariadb-10.0.23.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.23.ebuild
@@ -20,7 +20,7 @@
 REQUIRED_USE="tokudb? ( jemalloc ) static? ( !pam )"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE='20004_all_mariadb-filter-tokudb-flags-10.0.7.patch'
diff --git a/dev-db/mysql/mysql-5.6.28.ebuild b/dev-db/mysql/mysql-5.6.28.ebuild
index 3f54023..bc12816 100644
--- a/dev-db/mysql/mysql-5.6.28.ebuild
+++ b/dev-db/mysql/mysql-5.6.28.ebuild
@@ -15,7 +15,7 @@
 IUSE="$IUSE"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''
diff --git a/dev-db/postgresql/postgresql-9.3.10-r2.ebuild b/dev-db/postgresql/postgresql-9.3.10-r2.ebuild
index 58343b4..ae7b825 100644
--- a/dev-db/postgresql/postgresql-9.3.10-r2.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.10-r2.ebuild
@@ -9,7 +9,7 @@
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.4.5-r2.ebuild b/dev-db/postgresql/postgresql-9.4.5-r2.ebuild
index 587f841..2b4de94 100644
--- a/dev-db/postgresql/postgresql-9.4.5-r2.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.5-r2.ebuild
@@ -9,7 +9,7 @@
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-go/godep/Manifest b/dev-go/godep/Manifest
index 0ee7847..97e5c18 100644
--- a/dev-go/godep/Manifest
+++ b/dev-go/godep/Manifest
@@ -1,2 +1,3 @@
 DIST godep-50.tar.gz 70100 SHA256 e474e663e9d696445129201e3d3598a724de9a673ce3ad6652af75a93da2aeed SHA512 b3c114885d7de362c8a3fa3a65f609f37c8610eeb3d9807628f70d49b5b813770a5445c4048bd749df635d9526e5136abcbd2c1d4bd415fd97e86d6599b98438 WHIRLPOOL d4b4e0e2dc3f9ecfd2a1f25cdb56b156b601fc5393527695655769ccb29fa2a45a104b09f95a182df7587e61a5311c1966e5f73ed9bab5cfb891a46fddf35c08
 DIST godep-51.tar.gz 70357 SHA256 7829d6ed805df5ab3b35d74685e2d471869b66cf4e4e408dabf098d2bfaafebe SHA512 0d2500b19ec804c626b16407df3a925d7307b667a90475e0aad26b2b511e1d24e333bc03341aa62879d6538b48d5a12173341bbe1fcd6fbe1116909d21c4f3d5 WHIRLPOOL 5e0a7db6431a15b2c31e405748f2feb86bd169677bd8710dc1f1a35b19fa807719433d0201283e470bdec49dc3c44e4c11b585f623a27b1f965d10ff38110073
+DIST godep-52.tar.gz 70407 SHA256 37a526b6af329b05f81ec92b72488b2a4cdc8457aa9ac5643ca20c28844e277d SHA512 76f473a2eb26f480f0d3e61bdc3fffc6eebb968203ac89613519482bd29433a2ef7c25342cba0b6ad424c070b672e89d1731e1529741312ca8c9f5bfe30ca1cd WHIRLPOOL c6dac3af106d99549c22130f0b47fd108938405a135338e1c1c4d883015020f5abc085c7c5ad9d1615be8f866b2b35a2d06eb35db16cebc81ca4b1827ef423a1
diff --git a/dev-go/godep/godep-52.ebuild b/dev-go/godep/godep-52.ebuild
new file mode 100644
index 0000000..6f0bf64
--- /dev/null
+++ b/dev-go/godep/godep-52.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+EGO_PN=github.com/tools/godep
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT=v${PV}
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="dependency tool for go"
+HOMEPAGE="https://github.com/tools/godep"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+src_install() {
+	dobin godep
+dodoc src/${EGO_PN}/*.md
+}
diff --git a/dev-java/colt/colt-1.2.0-r2.ebuild b/dev-java/colt/colt-1.2.0-r2.ebuild
deleted file mode 100644
index 1aca6f8..0000000
--- a/dev-java/colt/colt-1.2.0-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="source doc"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="A set of Open Source Libraries for High Performance Scientific and Technical Computing in Java"
-SRC_URI="http://dsd.lbl.gov/~hoschek/colt-download/releases/${P}.tar.gz"
-HOMEPAGE="http://www-itg.lbl.gov/~hoschek/colt/"
-
-LICENSE="colt"
-IUSE=""
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.4
-	>=dev-java/concurrent-util-1.3.4:0"
-RDEPEND=">=virtual/jre-1.4
-	>=dev-java/concurrent-util-1.3.4:0"
-
-S="${WORKDIR}/${PN}"
-
-EANT_BUILD_TARGET="javac jar"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="concurrent-util"
-
-java_prepare() {
-	find "${S}" -iname '*.jar' -delete || die
-
-	epatch "${FILESDIR}/${P}-benchmark-no-deprecation.patch"
-}
-
-src_install() {
-	java-pkg_dojar lib/${PN}.jar
-
-	dohtml README.html || die
-	use doc && java-pkg_dojavadoc doc/api
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/colt/colt-1.2.0-r3.ebuild b/dev-java/colt/colt-1.2.0-r3.ebuild
index ca4b0ed..d9b814a 100644
--- a/dev-java/colt/colt-1.2.0-r3.ebuild
+++ b/dev-java/colt/colt-1.2.0-r3.ebuild
@@ -14,7 +14,7 @@
 LICENSE="colt"
 IUSE=""
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.7"
 RDEPEND=">=virtual/jre-1.7"
diff --git a/dev-java/fastutil/Manifest b/dev-java/fastutil/Manifest
index e3c8907..6752fc2 100644
--- a/dev-java/fastutil/Manifest
+++ b/dev-java/fastutil/Manifest
@@ -1,4 +1,2 @@
-DIST fastutil-4.3.1-src.tar.gz 203660 SHA256 90f07cf08c8926451041e52452c3ba486f3000bfbade1d2fa3531fab0d09db4e SHA512 afedd592a891a0ed7a06780f8f1e0bbcdd0f1da6aee8536628e8a61f6dfc0787a23d69e68e1543fcfa9bc410571114a44499f5b302e30796c19f5a5841354a81 WHIRLPOOL b98f8f0a26b78e546bf491ab4fde3ddff8f226f4cf92d6098dddbcc365f419f02cca40b250371b5244ec5713722bcce8830a559430fbe46d24747d8ef4085852
-DIST fastutil-4.4.2-src.tar.gz 213196 SHA256 dff9d53db666a3ad6d1cb88166b05a0d38333fbb3ecd79edcbe968d38da795e7 SHA512 cb438044ee63a89e4e655a41448924d5ac1f61f48839480fc5ba2c08b6317e3e4b0f66b2581ebff73bcb7d865123539ad09029670d7e5d46664f61fe593c503b WHIRLPOOL ea834078c5c189574fd3e79f8b1189c674b31f005404f22701c1209204c7840ff340b471c521d84bd0325f8bf735bac9eb590c927134e7194f36e32925d0ac4f
 DIST fastutil-5.1.3-src.tar.gz 238461 SHA256 fe95b3f66306003bdda1de018120150790205760065d7e31aa8c207c25c3a188 SHA512 67f7ac65afbfd9e5adc415ea65a3b2f334752008e994c7e1ecac334b06a98edad73da549245e39c79709df683f4384c1d0c76f7e8a8cdd428407d547ce0eea47 WHIRLPOOL 2533487909428345f35eebb845f33267f6cd81140206e721eeca1f3f7f94926dc2af9b03dcbdde35799a089ad174e5dd6a052251820558a907579e223ec3b01a
 DIST fastutil-6.5.4-src.tar.gz 376688 SHA256 bc2cc6abb168856c43b9c5f6b468b1cfba4657efd0623a7d7e7800a9e01d966e SHA512 3b75d423ce9e4bb883f1baa910ed59b9ad2fc1ddf52da970f7d40eef6e0044618ce6aeaaa9daf873a256a966cd5bf850004feec21a8e7abf05cc6ac7eb6dd3fb WHIRLPOOL 5ec84a84c9be5dbfb53d69a557b0b26c0658b06b9234da4ed1614afff8ceafbcf3fe38a6b775fdc91202ad0301e2aebb70566dcd8cbae81c3828b7f18be5146d
diff --git a/dev-java/fastutil/fastutil-4.3.1-r1.ebuild b/dev-java/fastutil/fastutil-4.3.1-r1.ebuild
deleted file mode 100644
index 3ef42cd..0000000
--- a/dev-java/fastutil/fastutil-4.3.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Provides faster type-specific maps, sets and lists with a small memory footprint"
-SRC_URI="http://fastutil.dsi.unimi.it/${P}-src.tar.gz"
-HOMEPAGE="http://fastutil.dsi.unimi.it"
-LICENSE="LGPL-2.1"
-SLOT="4.3"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=">=virtual/jre-1.4"
-
-src_compile() {
-	emake sources || die "failed to make sources"
-	# bug 162650 and #175578 and #183356
-	java-pkg_init-compiler_
-	[[ ${GENTOO_COMPILER} != "javac" ]] && export ANT_OPTS="-Xmx512m"
-	java-pkg-2_src_compile
-}
-
-src_install() {
-
-	java-pkg_newjar ${P}.jar
-
-	dodoc CHANGES README
-	use doc && java-pkg_dojavadoc docs
-	use source && java-pkg_dosrc java/it
-
-}
diff --git a/dev-java/fastutil/fastutil-4.4.2-r1.ebuild b/dev-java/fastutil/fastutil-4.4.2-r1.ebuild
deleted file mode 100644
index 383af34..0000000
--- a/dev-java/fastutil/fastutil-4.4.2-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Provides faster type-specific maps, sets and lists with a small memory footprint"
-SRC_URI="http://fastutil.dsi.unimi.it/${P}-src.tar.gz"
-HOMEPAGE="http://fastutil.dsi.unimi.it"
-LICENSE="LGPL-2.1"
-SLOT="4.4"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=">=virtual/jre-1.4"
-
-src_compile() {
-	make sources || die "failed to make sources"
-	# bug 162650 and #175578 and #183356
-	java-pkg_init-compiler_
-	[[ ${GENTOO_COMPILER} != "javac" ]] && export ANT_OPTS="-Xmx512m"
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	java-pkg_newjar ${P}.jar
-
-	dodoc CHANGES README || die
-
-	use doc && java-pkg_dojavadoc docs
-	use source && java-pkg_dosrc java/it
-}
diff --git a/dev-java/typesafe-config/Manifest b/dev-java/typesafe-config/Manifest
index 2e8f3ae..a824edf 100644
--- a/dev-java/typesafe-config/Manifest
+++ b/dev-java/typesafe-config/Manifest
@@ -1,2 +1,2 @@
+DIST typesafe-config-1.2.1.zip 287878 SHA256 b3d26a8959bc18b02f78d9ac94e691db7ca103020a700f4a1c9cbe45b254f44b SHA512 178f0df81f081b9355951debd3a5435c7d6aae25893f049917a25861015eba18a305d5370d914b89a7c46e55b5d9f3939ddd0656cfa9a4691bd16cf32c796502 WHIRLPOOL 591e2d61a477b681b842ef45166b1ecab6545d0002c78d3c13c57c0c6bb2a3ae5903cc0d095e2237aae3c284f7d71f2dbed7ca1889dc89a837a38cde06f5a039
 DIST typesafe-config-1.3.0.zip 363061 SHA256 b3af059bd13e597c5de466595f620cb686d21cfb7abd5bae1fec82d16be42999 SHA512 8b9821de442dc24b8b7be4c5ebc91d57214a32dceda8dc160cfaf801f70b34d2a2df6f8b2cbb744d18be3fbc887f1666f431b52882edcbde408d8adf3681fec4 WHIRLPOOL b2a61f17a269e1d8a533e6235ecdfd2968f452499e4adba61f17b667fe5aa2c07556587f9104d60e990fa268a3220b811f5860f6dd08c2ecd4cb5868833ac1e2
-DIST v1.3.0.zip 363061 SHA256 b3af059bd13e597c5de466595f620cb686d21cfb7abd5bae1fec82d16be42999 SHA512 8b9821de442dc24b8b7be4c5ebc91d57214a32dceda8dc160cfaf801f70b34d2a2df6f8b2cbb744d18be3fbc887f1666f431b52882edcbde408d8adf3681fec4 WHIRLPOOL b2a61f17a269e1d8a533e6235ecdfd2968f452499e4adba61f17b667fe5aa2c07556587f9104d60e990fa268a3220b811f5860f6dd08c2ecd4cb5868833ac1e2
diff --git a/dev-java/typesafe-config/typesafe-config-1.3.0-r1.ebuild b/dev-java/typesafe-config/typesafe-config-1.2.1.ebuild
similarity index 68%
rename from dev-java/typesafe-config/typesafe-config-1.3.0-r1.ebuild
rename to dev-java/typesafe-config/typesafe-config-1.2.1.ebuild
index dc19c36..dadedee 100644
--- a/dev-java/typesafe-config/typesafe-config-1.3.0-r1.ebuild
+++ b/dev-java/typesafe-config/typesafe-config-1.2.1.ebuild
@@ -8,22 +8,16 @@
 
 inherit java-pkg-2 java-pkg-simple
 
-DESCRIPTION="a library of arguably useful Java utilities"
+DESCRIPTION="A library of arguably useful Java utilities"
 HOMEPAGE="https://github.com/typesafehub/config"
-SRC_URI="https://github.com/typesafehub/config/archive/v${PV}.zip"
+SRC_URI="https://github.com/typesafehub/config/archive/v${PV}.zip -> ${P}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ppc64 x86"
 IUSE="doc source"
 
-CDEPEND=""
+RDEPEND=">=virtual/jre-1.6"
 
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/zip
-	>=virtual/jdk-1.6"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/zip"
diff --git a/dev-java/typesafe-config/typesafe-config-1.3.0-r2.ebuild b/dev-java/typesafe-config/typesafe-config-1.3.0-r2.ebuild
index 14e2073..436b08b 100644
--- a/dev-java/typesafe-config/typesafe-config-1.3.0-r2.ebuild
+++ b/dev-java/typesafe-config/typesafe-config-1.3.0-r2.ebuild
@@ -8,25 +8,16 @@
 
 inherit java-pkg-2 java-pkg-simple
 
-DESCRIPTION="a library of arguably useful Java utilities"
+DESCRIPTION="A library of arguably useful Java utilities"
 HOMEPAGE="https://github.com/typesafehub/config"
 SRC_URI="https://github.com/typesafehub/config/archive/v${PV}.zip -> ${P}.zip"
 
-# BEWARE when removing r1! There's a string of deps relying on ppc+ppc64 that
-# has to be sorted first.
-# See https://bugs.gentoo.org/show_bug.cgi?id=571316
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc source"
 
-CDEPEND=""
+RDEPEND=">=virtual/jre-1.8"
 
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/zip
-	>=virtual/jdk-1.8"
+DEPEND=">=virtual/jdk-1.8
+	app-arch/zip"
diff --git a/dev-lang/go-bootstrap/go-bootstrap-1.4.3.ebuild b/dev-lang/go-bootstrap/go-bootstrap-1.4.3.ebuild
index adf2490..6fcd5cd 100644
--- a/dev-lang/go-bootstrap/go-bootstrap-1.4.3.ebuild
+++ b/dev-lang/go-bootstrap/go-bootstrap-1.4.3.ebuild
@@ -10,7 +10,7 @@
 
 SRC_URI="https://storage.googleapis.com/golang/go${PV}.src.tar.gz"
 # Upstream only supports go on amd64, arm and x86 architectures.
-KEYWORDS="-* ~amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="-* amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris"
 
 DESCRIPTION="Version of go compiler used for bootstrapping"
 HOMEPAGE="http://www.golang.org"
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 8384477..671a66c 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,2 +1,3 @@
 DIST go1.4.2.src.tar.gz 10921896 SHA256 299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b SHA512 cda1a29d4418875dffaf3324004ddae8e1bbb573f7668e6e0c03d8b61284f4db7fca244c181f2859f8ccdd3db6391fb21e0d98a1a9fc15096c15883249d48a9c WHIRLPOOL d06c27f6ff3a6499a6c7cb3c5eccd53eb588896c4d837e1fe9855c22ee3caa5cc48fd68cbeceff105b7c47fafbbf0eb3dc28ee3af7196692c5bf18511c6760ef
 DIST go1.5.3.src.tar.gz 12057623 SHA256 754e06dab1c31ab168fc9db9e32596734015ea9e24bc44cae7f237f417ce4efe SHA512 b348832ea7cb095cf793960cf9f4da5e9f6ca8de7b5262bb819de97efea4835643e30a18efd4a82d01ea3854a1905af9e134271716c4b68c9d2a8f6e15f65ff0 WHIRLPOOL aec869ec6af62601f6b83283417eef739141f99be938d419ef4a553028141e05ded7777fdff2a2d1a3e35e4976e4ec96a301b4875c509a370848d0df5dc9e0c8
+DIST go1.6rc1.src.tar.gz 12597286 SHA256 2d1a6756f24227dcee955add4af7d194eb4a8c3656b2c4ce778994e21a533a83 SHA512 539ba9603d87bf09d37ab37a7256cb6860357ce976ac000814e733d5ae4f2d1150a4d75412b70dba0fae453aa6fc36c0cc03874d9adce7d23a168551611a47f4 WHIRLPOOL c7f272dfec8a2526bacc1cba165afb5a7c8e6df2540132ce0934795df0c0952752ee7cdee3201a9f13da1f15b13c5b67c0879ef9eedfd60d47be0f9525b37961
diff --git a/dev-lang/go/go-1.5.3.ebuild b/dev-lang/go/go-1.5.3.ebuild
index 87cd6ce..8d4b5b1 100644
--- a/dev-lang/go/go-1.5.3.ebuild
+++ b/dev-lang/go/go-1.5.3.ebuild
@@ -16,7 +16,7 @@
 	SRC_URI="https://storage.googleapis.com/golang/go${PV}.src.tar.gz"
 	# go-bootstrap-1.4 only supports go on amd64, arm and x86 architectures.
 	# Allowing other bootstrap options would enable arm64 and ppc64 builds.
-	KEYWORDS="-* ~amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="-* amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A concurrent garbage collected and typesafe programming language"
diff --git a/dev-lang/go/go-1.6_rc1.ebuild b/dev-lang/go/go-1.6_rc1.ebuild
new file mode 100644
index 0000000..b234182
--- /dev/null
+++ b/dev-lang/go/go-1.6_rc1.ebuild
@@ -0,0 +1,209 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit eutils toolchain-funcs
+
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="git://github.com/golang/go.git"
+	inherit git-r3
+else
+	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz"
+	# go-bootstrap-1.4 only supports go on amd64, arm and x86 architectures.
+	# Allowing other bootstrap options would enable arm64 and ppc64 builds.
+	KEYWORDS=""
+fi
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="http://www.golang.org"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE=""
+
+DEPEND=">=dev-lang/go-bootstrap-1.4.1"
+RDEPEND="!<dev-go/go-tools-0_pre20150902"
+
+# These test data objects have writable/executable stacks.
+QA_EXECSTACK="usr/lib/go/src/debug/elf/testdata/*.obj"
+
+REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# The go language uses *.a files which are _NOT_ libraries and should not be
+# stripped. The test data objects should also be left alone and unstripped.
+STRIP_MASK="/usr/lib/go/pkg/*.a
+	/usr/lib/go/src/debug/elf/testdata/*
+	/usr/lib/go/src/debug/dwarf/testdata/*
+	/usr/lib/go/src/runtime/race/*.syso"
+
+if [[ ${PV} != 9999 ]]; then
+	S="${WORKDIR}"/go
+fi
+
+go_arch()
+{
+	# By chance most portage arch names match Go
+	local portage_arch=$(tc-arch $@)
+	case "${portage_arch}" in
+		x86)	echo 386;;
+		x64-*)	echo amd64;;
+		*)		echo "${portage_arch}";;
+	esac
+}
+
+go_arm()
+{
+	case "${1:-${CHOST}}" in
+		armv5*)	echo 5;;
+		armv6*)	echo 6;;
+		armv7*)	echo 7;;
+		*)
+			die "unknown GOARM for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_os()
+{
+	case "${1:-${CHOST}}" in
+		*-linux*)	echo linux;;
+		*-darwin*)	echo darwin;;
+		*-freebsd*)	echo freebsd;;
+		*-netbsd*)	echo netbsd;;
+		*-openbsd*)	echo openbsd;;
+		*-solaris*)	echo solaris;;
+		*-cygwin*|*-interix*|*-winnt*)
+			echo windows
+			;;
+		*)
+			die "unknown GOOS for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_tuple()
+{
+	echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile()
+{
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+pkg_pretend()
+{
+	# make.bash does not understand cross-compiling a cross-compiler
+	if [[ $(go_tuple) != $(go_tuple ${CTARGET}) ]]; then
+		die "CHOST CTARGET pair unsupported: CHOST=${CHOST} CTARGET=${CTARGET}"
+	fi
+}
+
+src_compile()
+{
+	export GOROOT_BOOTSTRAP="${EPREFIX}"/usr/lib/go1.4
+	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+	export GOROOT="$(pwd)"
+	export GOBIN="${GOROOT}/bin"
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go_arch ${CBUILD})
+	export GOHOSTOS=$(go_os ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go_arch)
+	export GOOS=$(go_os)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	if [[ ${ARCH} == arm ]]; then
+		export GOARM=$(go_arm)
+	fi
+
+	cd src
+	./make.bash || die "build failed"
+}
+
+src_test()
+{
+	go_cross_compile && return 0
+
+	cd src
+	PATH="${GOBIN}:${PATH}" \
+		./run.bash -no-rebuild || die "tests failed"
+}
+
+src_install()
+{
+	local bin_path f x
+
+	dodir /usr/lib/go
+	insinto /usr/lib/go
+
+	# There is a known issue which requires the source tree to be installed [1].
+	# Once this is fixed, we can consider using the doc use flag to control
+	# installing the doc and src directories.
+	# [1] https://golang.org/issue/2775
+	doins -r bin doc lib pkg src
+	fperms -R +x /usr/lib/go/bin /usr/lib/go/pkg/tool
+
+	if go_cross_compile; then
+		bin_path="bin/$(go_tuple)"
+	else
+		bin_path=bin
+	fi
+	for x in ${bin_path}/*; do
+		f=${x##*/}
+		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+	done
+
+	dodir /usr/lib/go/misc
+	insinto /usr/lib/go/misc
+	doins -r misc/trace
+
+	dodoc AUTHORS CONTRIBUTORS PATENTS README.md
+}
+
+pkg_preinst()
+{
+	has_version '<dev-lang/go-1.4' &&
+		export had_support_files=true ||
+		export had_support_files=false
+}
+
+pkg_postinst()
+{
+	# If the go tool sees a package file timestamped older than a dependancy it
+	# will rebuild that file.  So, in order to stop go from rebuilding lots of
+	# packages for every build we need to fix the timestamps.  The compiler and
+	# linker are also checked - so we need to fix them too.
+	ebegin "fixing timestamps to avoid unnecessary rebuilds"
+	tref="usr/lib/go/pkg/*/runtime.a"
+	find "${EROOT}"usr/lib/go -type f \
+		-exec touch -r "${EROOT}"${tref} {} \;
+	eend $?
+
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} &&
+		${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "Release notes are located at http://golang.org/doc/go${PV}"
+	fi
+
+	if $had_support_files; then
+		ewarn
+		ewarn "All editor support, IDE support, shell completion"
+		ewarn "support, etc has been removed from the go package"
+		ewarn "upstream."
+		ewarn "For more information on which support is available, see"
+		ewarn "the following URL:"
+		ewarn "https://github.com/golang/go/wiki/IDEsAndTextEditorPlugins"
+	fi
+}
diff --git a/dev-lang/moarvm/Manifest b/dev-lang/moarvm/Manifest
index 27ffb97..52b7d68 100644
--- a/dev-lang/moarvm/Manifest
+++ b/dev-lang/moarvm/Manifest
@@ -7,3 +7,4 @@
 DIST MoarVM-2015.07.tar.gz 3225835 SHA256 310a4ea6dbaacaf1837606edf6c42170143f60c8e29eb94c7e6fea810b6af10b SHA512 304d6ce5c50a5091daa02dab0fe328875d392fee29aed397db530324c51b909529ede9f703f18f43bbc398c70ec85958ffed3a8bc06d77e29ec193561165b581 WHIRLPOOL 6036fb9cba88a12edc3c5332d706cd11e6604d418217f880f9b409e16b22fd4610bc6c8e606888d69ccee9dbd7836d9ebcc3006a8bf6cce766334192ff3e7f52
 DIST MoarVM-2015.11.tar.gz 3261494 SHA256 eca0efcd620c51909b6caea8e3c8085f0de1dbb629dc064bea3a916a9bead5cf SHA512 338f220a0462431425c3c999233470686d342899e56473f9beb3d8a509daf25866b5c4419e28a1f3a4902526690e80b581b8567d6327d49b4c4b9a81eb932569 WHIRLPOOL a03c22ef4fd15864c141df7867cf4089da8382fb457179bdafd95cb2625d69df3a252bf41caa0327ea20ec664aa5ab1553eadb8d59c5ebb0942a8758f143e372
 DIST MoarVM-2015.12.tar.gz 3273408 SHA256 4e4f106ec0802dfda5206fea811d260cc1111fe4cfa13b038af9077d8ad56826 SHA512 cd51dc2495a2f897ecff3ae46ff4334a840d52de6f3c492473bbd4d0b2fc5dffe4e671b008bd5baa623ba7017bf995900898f690b0b93a827559f43525e421f4 WHIRLPOOL f417c188d76a5e7f4d80141942fd6ab2571b3aa4a67923ee2cff48c9ebd0cfbc919037a456692143aa2c5a524c6f36198b5fb36f9b676db74dceb1fb263a0c17
+DIST MoarVM-2016.01.tar.gz 3314742 SHA256 d409b684c7c92b144b31cf7f0408f30ccbb033ce646f57d7fbaeb9683773e37b SHA512 019433a985c8245c231d533b8310fceda185a694681aaecb922602ad98897c636c40fbe1a36ba656af4c242b28315611f656454eb41f25e0f891b652210eb435 WHIRLPOOL f603e1f60667771e0200e731b37ff854346d00a0de484a9b3072f83e0ee624bc2b7d7e862c872d9062a4397adb5bfab31d835754966a7fe44490312c82a37e8e
diff --git a/dev-lang/moarvm/moarvm-2016.01.ebuild b/dev-lang/moarvm/moarvm-2016.01.ebuild
new file mode 100644
index 0000000..af54566
--- /dev/null
+++ b/dev-lang/moarvm/moarvm-2016.01.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib
+
+MY_PN="MoarVM"
+
+DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6"
+HOMEPAGE="http://moarvm.org"
+SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="dev-libs/libuv"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+S="${WORKDIR}/MoarVM-${PV}"
+
+src_configure() {
+	perl Configure.pl --prefix="${D}/usr"|| die
+}
+
+src_install() {
+	emake install
+}
diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
index ec3dad0..940ace5 100644
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@@ -7,3 +7,4 @@
 DIST nqp-2015.07.2.tar.gz 5001361 SHA256 45cde1880b314d98dd20062e93ef28f083dbf2239784e8f050456df8520a25c1 SHA512 b40ad51e37504b0c05e3d27c7a09543bb4735b3d8758a34805034600e362ae327434584f6824ef72587c37de5b51b476dbb05e8f0f248dc49ed64449f2ba1917 WHIRLPOOL 692f4ac9c669f7cf3b56e81b659f4b1d50296b4dccf9effa6f08aca9082f3b501fad140f7411e9ddbada15a5c458be21b699e850ed04574ed53699d2d28be084
 DIST nqp-2015.11.tar.gz 5113497 SHA256 f9a5e33e628d56b1210a049363198ed05b465024d4f259809f1b1617eb49b568 SHA512 94f464c055b308ee408240d3cbb7e30b71de99c14e97b5bbaa5fbbe4bc021f60b5567de0113628e2dfb89152eb6a00c8d0cfee92c3b54c5c5fd473c2f00e2cf7 WHIRLPOOL 57151fe290dc6674cb10b190349d8809cff90d10385500fda7772d2d78539d492b18be49d1bd903a96c6a9d1bc26a797f7cf3f956891b0af3820c70ce7307d7d
 DIST nqp-2015.12.tar.gz 5135635 SHA256 4d77681ec4e0fa0c91bf346ab2bb076981921d29e1fbb9964a2a025d7283bbb7 SHA512 97ef4a52b2b7b461f57cbc2c80f3d2b0056125960c77527f1c9ea2ab21f1882bbeb238e7a5b50c7cd88ac60f74a2b600b85ae9ba70db0209b90a91d68b49216d WHIRLPOOL 79257972580ba0737bb2be7eb2cae3203ae9feefa8e268d5f3ef688ba8cfd9b7aa8126e9431a1d4ef7274f9a93a4751741efd79314b300bca177dd3de5e37018
+DIST nqp-2016.01.tar.gz 5117110 SHA256 87875120af7167093643f2a35869d66a61f735220a9348627ba89cf294387c8b SHA512 e79668f7f5f3679fe3b93f63e1151da1eab109ef4acc6f8ae3da3d9e5c3da814440dd43279978b1a13f30647d7c52bda5575b02f366bd928965b06b47c6d6d91 WHIRLPOOL d2369417707332d8bc045f6f93da81e1301ec2599f197664d80e6edeefc1bc7a2147ad3b7e893eef0fb6b96adf2f68f5ab44b948801e266e68d99552253abeda
diff --git a/dev-lang/nqp/nqp-2016.01.ebuild b/dev-lang/nqp/nqp-2016.01.ebuild
new file mode 100644
index 0000000..9a64251
--- /dev/null
+++ b/dev-lang/nqp/nqp-2016.01.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# still not working
+RESTRICT="test"
+
+inherit eutils multilib versionator
+
+GITCRAP=b5ebdaa
+
+DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
+HOMEPAGE="http://rakudo.org/"
+SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="doc java +moar"
+REQUIRED_USE="|| ( java moar )"
+
+RDEPEND="
+	java? ( >=virtual/jre-1.7 )
+	moar? ( =dev-lang/moarvm-${PV} )
+	dev-libs/libffi"
+DEPEND="${RDEPEND}
+	java? ( >=virtual/jdk-1.7 )
+	dev-lang/perl"
+
+S=${WORKDIR}/perl6-nqp-${GITCRAP}
+
+src_configure() {
+	use java && myconf+="jvm,"
+	use moar && myconf+="moar,"
+	perl Configure.pl --backend=${myconf} --prefix=/usr || die
+	# dirty hack to make dyncall not fail
+	sed -i -e 's/-Werror=missing-prototypes//' Makefile || die
+	sed -i -e 's/-Werror=missing-declarations//' Makefile || die
+	sed -i -e 's/-Werror=strict-prototypes//' Makefile || die
+
+	# more dirty hack to allow building with newer gcc
+	sed -i -e 's/-Werror=implicit-function-declaration//' Makefile || die
+	sed -i -e 's/-Werror=nested-externs//' Makefile || die
+}
+
+src_compile() {
+	emake -j1 || die
+}
+
+src_test() {
+	emake -j1 test || die
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install || die
+
+	dodoc CREDITS README.pod || die
+
+	if use doc; then
+		dodoc -r docs/* || die
+	fi
+}
diff --git a/dev-lang/ocaml/ocaml-4.02.3.ebuild b/dev-lang/ocaml/ocaml-4.02.3.ebuild
index ba1d3ae..07dcbc9 100644
--- a/dev-lang/ocaml/ocaml-4.02.3.ebuild
+++ b/dev-lang/ocaml/ocaml-4.02.3.ebuild
@@ -17,7 +17,7 @@
 # Everytime ocaml is updated to a new version, everything ocaml must be rebuilt,
 # so here we go with the subslot.
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="emacs latex ncurses +ocamlopt X xemacs"
 
 RDEPEND="
diff --git a/dev-lang/rakudo/Manifest b/dev-lang/rakudo/Manifest
index c338461..6ced073 100644
--- a/dev-lang/rakudo/Manifest
+++ b/dev-lang/rakudo/Manifest
@@ -7,3 +7,4 @@
 DIST rakudo-2015.07.2.tar.gz 2539175 SHA256 1794f2d670af1174aee620587270c05fbc06ef3026ae144daac436101856c492 SHA512 2e487df689c40b45673fc14a66127f893a5b0db13c5747e030dbc4b293cec76114b88909598f2ac7d607e7fe6d8fa632ee0c7386a064da31e76feeec48406d5f WHIRLPOOL bfa2ae4c3f5e24f641eaf8c52d96e61c9cfc48d4ecd9fcacae5a19ed1f60d636d3241fddf2bcbf40df2f2b98add912992c8e955dd237b7583af38c17bbb6713c
 DIST rakudo-2015.11.tar.gz 2643309 SHA256 a27c8357d06ebfcd1337003c869686f5041aba563a3a8c57bc3c555334e43bc3 SHA512 e4d662709cf47b2b98398c5781973d1abd008f6f13b170fdba418bf36ff552e6c33caee26e2833539828c06ab7562f02cf5e54789f898e2e2d1d31db98d2e95e WHIRLPOOL 22fdaaf616dc62606ca320cb08231b2ae0740e4191f238f2fa26247b2fcd45ae061a2b4f1c616181ea68339a45054751fef0ebab825e98580ecede43c039805e
 DIST rakudo-2015.12.tar.gz 2669528 SHA256 f8a57a7b543416c8ea623644f3d74673c4e6c68f3b0161a6b963550ecb74781b SHA512 48e4c98bbff67a52f68a835cc87a19a0b17f2d67790f8162ffd9f167f080d09180d375b5ea9a8577d1de5036c78e604473a2140107d448aff3630c138fd16114 WHIRLPOOL 351ab7ff4b4a1ff00195f913d48f87ef620888cf709e68df5b169f24256d5042bd4a89ef5b3595d9be32ed27cae2e87da9cf3f2585eec0823420be5ee6d8a1a3
+DIST rakudo-2016.01.tar.gz 2687098 SHA256 ba9fe982905d78ed615749280bc803df5c8ff895c8d15e7960f8c2a91631ed43 SHA512 b84feb26363c7b75a89fac0ac255f87e5e349265386f7eaf99f761466d8acf8fb5d8eb951c4172278d17af407ff7ccefa73a9543fe9c182a0e78984946481bad WHIRLPOOL 02b0b9b270ec26a63e8ff63a3c40b2018461b3515754256caa20ed76eb974c6f59e44e28365297c2af2fd1bf848f2fd7f4c014c97d459b927b26f5f31add8b26
diff --git a/dev-lang/rakudo/rakudo-2016.01.ebuild b/dev-lang/rakudo/rakudo-2016.01.ebuild
new file mode 100644
index 0000000..7bad068
--- /dev/null
+++ b/dev-lang/rakudo/rakudo-2016.01.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="A compiler for the Perl 6 programming language"
+HOMEPAGE="http://rakudo.org"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz"
+fi
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# TODO: add USE="javascript" once that's usable in nqp
+IUSE="test"
+
+RDEPEND="=dev-lang/nqp-${PV}*:=[moar]"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5.10"
+
+#PATCHES=(${FILESDIR}/${PV})
+
+src_configure() {
+	perl Configure.pl --prefix=/usr --sysroot=/usr --backends=moar
+}
+
+src_test() {
+	export RAKUDO_PRECOMP_PREFIX=$(mktemp -d)
+	default
+}
diff --git a/dev-libs/libiconv/libiconv-1.14-r2.ebuild b/dev-libs/libiconv/libiconv-1.14-r2.ebuild
index ae98764..ad70ac7 100644
--- a/dev-libs/libiconv/libiconv-1.14-r2.ebuild
+++ b/dev-libs/libiconv/libiconv-1.14-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="static-libs"
 
 DEPEND="!sys-libs/glibc
diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest
index de29c6e..da7eacb 100644
--- a/dev-libs/libusb/Manifest
+++ b/dev-libs/libusb/Manifest
@@ -1,3 +1,4 @@
 DIST libusb-1.0.18.tar.bz2 502160 SHA256 c73f5cec45a5de94418da4e151b7232958571926984acfb9bce02b9424e83720 SHA512 bbc3d75cb91f4e6a024549c2bac38ee85aeda8529a4553fd36bc8e8a5c223cd89eb952eda71fcc0071d6c6c818a0631d4cca084fed69d4986eee5dcf9a87d662 WHIRLPOOL fcc663884fb6d03bcf5f08c30bfded1d05c5b9ac836a2b99335553476201f956fed327c4a51609e19f54182bf5db125a0f22b41496def0443b5b4152a9f60a45
 DIST libusb-1.0.19.tar.bz2 521496 SHA256 6c502c816002f90d4f76050a6429c3a7e0d84204222cbff2dce95dd773ba6840 SHA512 f42f0187bfec16ebabad64efef7a7651ee85dcf2af1b7cbe543b7de615f9c6432f7eea5fcc6b23335591dcad287c905eb9bd56199cc5d3b47435027ad678f2c1 WHIRLPOOL 95bc30575cc0e9306584453f6b7549902083ff95ff170f0fc2c89734841f7fb82cf9e25a6443ba6a0b04e1f111096deb1e4a6dc8aa13a68d13f02e02b5d274c6
+DIST libusb-1.0.20.tar.bz2 795247 SHA256 cb057190ba0a961768224e4dc6883104c6f945b2bf2ef90d7da39e7c1834f7ff SHA512 4230047dbc18db402f399a6b228f70da37ce4f9da9d57203e5c31cf0edec5ddd664865b4f16038a2ae72c26097e713b709b9e882a11b65a274e84993d617c765 WHIRLPOOL 2d270f77352e108cfeba5f33799a2480535402108efe28c030599f071872d4394ce58464930fd405b66c14879b18309ff189d42892b9ae15aebc2496639026a6
 DIST libusb-1.0.9.tar.bz2 421971 SHA256 e920eedc2d06b09606611c99ec7304413c6784cba6e33928e78243d323195f9b SHA512 5eba3e9df2c1db71d685becebebf5b1310ee87e442f97a2553a430fd11655a2d9ce50e4ec2ffd62fe322286b0d6bc9e142ce552effc2466ee50424deba035ee5 WHIRLPOOL 9886cb6660d4530fe199441a8b5b76cb8a00012d69a13a40276bf3b880561eeb31301c186828b6fd08b687e038fac640475ba280473053e252cf23f15ca38372
diff --git a/dev-libs/libusb/libusb-1.0.19.ebuild b/dev-libs/libusb/libusb-1.0.19-r1.ebuild
similarity index 92%
rename from dev-libs/libusb/libusb-1.0.19.ebuild
rename to dev-libs/libusb/libusb-1.0.19-r1.ebuild
index fd36b4f..b16d9a3 100644
--- a/dev-libs/libusb/libusb-1.0.19.ebuild
+++ b/dev-libs/libusb/libusb-1.0.19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc examples static-libs test udev"
 
-RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
+RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs?] )
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
diff --git a/dev-libs/libusb/libusb-1.0.19.ebuild b/dev-libs/libusb/libusb-1.0.20.ebuild
similarity index 76%
copy from dev-libs/libusb/libusb-1.0.19.ebuild
copy to dev-libs/libusb/libusb-1.0.20.ebuild
index fd36b4f..0723c73 100644
--- a/dev-libs/libusb/libusb-1.0.19.ebuild
+++ b/dev-libs/libusb/libusb-1.0.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -7,14 +7,14 @@
 
 DESCRIPTION="Userspace access to USB devices"
 HOMEPAGE="http://libusb.info/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc examples static-libs test udev"
 
-RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
+RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs?] )
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
@@ -33,7 +33,8 @@
 }
 
 multilib_src_compile() {
-	emake
+	# Bug 573802
+	emake -j1
 
 	if multilib_is_native_abi; then
 		use doc && emake -C doc docs
diff --git a/dev-libs/libusb/metadata.xml b/dev-libs/libusb/metadata.xml
index 66a6901..b0a7596 100644
--- a/dev-libs/libusb/metadata.xml
+++ b/dev-libs/libusb/metadata.xml
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>peter@stuge.se</email>
-		<name>Peter Stuge</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+	<maintainer type="person">
+		<email>peter@stuge.se</email>
+		<name>Peter Stuge</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libusb</remote-id>
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index 84490bf..0cf2c00 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1 +1,2 @@
 DIST nettle-3.1.1.tar.gz 1851876 SHA256 5fd4d25d64d8ddcb85d0d897572af73b05b4d163c6cc49438a5bfbb8ff293d4c SHA512 b0a52e1569ff11d871165a689fdc2a0b2f478bcc3122f39df9751b7b1c915d4240ec57d22e98034cf2b5130dddcf5dc57fe26278a2f41c15f669f65814768de1 WHIRLPOOL 8a429cd860ff717c225fbd576f6bcfc2c33809df5c346e3ced9fd75f89e0895f200ffbd0bec84bd74144e397d16d1f9ba56131c29a3d65cbc4189ef3dfd5fb99
+DIST nettle-3.2.tar.gz 1879604 SHA256 ea4283def236413edab5a4cf9cf32adf540c8df1b9b67641cfc2302fca849d97 SHA512 9f2c802e8b683d1c2fd8d16ab33b2a1efda33a1bf33196be39031a2d0677f2e78d67221a718997780e157aa72973da7d9d549429e706fcfcdff97ee3bbef615a WHIRLPOOL 0353f04760137eef292848b4d8060c40cf2959596aff6f39a1d1bd123e42bc0ecb6f01679f16797204eedb01123c09ae7745121241f6a32cc205bf1c8c6efc12
diff --git a/dev-libs/nettle/nettle-3.2.ebuild b/dev-libs/nettle/nettle-3.2.ebuild
new file mode 100644
index 0000000..7abf2b5
--- /dev/null
+++ b/dev-libs/nettle/nettle-3.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools eutils multilib-build multilib-minimal multilib toolchain-funcs
+
+DESCRIPTION="Low-level cryptographic library"
+HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-3 LGPL-2.1 )"
+SLOT="0/6" # subslot = libnettle soname version
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+IUSE="doc +gmp neon static-libs test cpu_flags_x86_aes"
+
+DEPEND="gmp? ( dev-libs/gmp:0[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r17
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/nettle/nettle-stdint.h
+	/usr/include/nettle/version.h
+)
+
+src_prepare() {
+	default
+
+	sed -e '/CFLAGS=/s: -ggdb3::' \
+		-e 's/solaris\*)/sunldsolaris*)/' \
+		-i configure.ac || die
+
+	# conditionally build tests and examples required by tests
+	use test || sed -i '/SUBDIRS/s/testsuite examples//' Makefile.in || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# --disable-openssl bug #427526
+	ECONF_SOURCE="${S}" econf \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--disable-openssl \
+		--disable-fat \
+		$(use_enable gmp public-key) \
+		$(use_enable static-libs static) \
+		$(tc-is-static-only && echo --disable-shared) \
+		$(use_enable doc documentation) \
+		$(use_enable neon arm-neon) \
+		$(use_enable cpu_flags_x86_aes x86-aesni)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	if use doc ; then
+		dohtml nettle.html
+		dodoc nettle.pdf
+	fi
+}
diff --git a/dev-libs/nss/nss-3.21-r2.ebuild b/dev-libs/nss/nss-3.21-r2.ebuild
index 078a017..5545d30 100644
--- a/dev-libs/nss/nss-3.21-r2.ebuild
+++ b/dev-libs/nss/nss-3.21-r2.ebuild
@@ -20,7 +20,7 @@
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cacert +nss-pem utils"
 CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/protobuf/metadata.xml b/dev-libs/protobuf/metadata.xml
index 27c7a05..5f0a96f 100644
--- a/dev-libs/protobuf/metadata.xml
+++ b/dev-libs/protobuf/metadata.xml
@@ -1,7 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
-	<upstream>
-		<remote-id type="github">google/protobuf</remote-id>
-	</upstream>
+<maintainer type='person'>
+	<email>vapier@gentoo.org</email>
+</maintainer>
+<upstream>
+	<remote-id type='github'>google/protobuf</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-ml/camlp4/camlp4-4.02.1_p3.ebuild b/dev-ml/camlp4/camlp4-4.02.1_p3.ebuild
index d2d0d9e..08515a3 100644
--- a/dev-ml/camlp4/camlp4-4.02.1_p3.ebuild
+++ b/dev-ml/camlp4/camlp4-4.02.1_p3.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
 DEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]"
diff --git a/dev-ml/camlp5/camlp5-6.14.ebuild b/dev-ml/camlp5/camlp5-6.14.ebuild
index 30e029a..1300c32 100644
--- a/dev-ml/camlp5/camlp5-6.14.ebuild
+++ b/dev-ml/camlp5/camlp5-6.14.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ppc x86 ~x86-fbsd"
 IUSE="doc +ocamlopt"
 
 DEPEND=">=dev-lang/ocaml-3.10:=[ocamlopt?]"
diff --git a/dev-ml/findlib/findlib-1.5.6.ebuild b/dev-ml/findlib/findlib-1.5.6.ebuild
index 0c7251e..470c741 100644
--- a/dev-ml/findlib/findlib-1.5.6.ebuild
+++ b/dev-ml/findlib/findlib-1.5.6.ebuild
@@ -14,7 +14,7 @@
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND=">=dev-lang/ocaml-4.02.1:=[ocamlopt?]
 	tk? ( dev-ml/labltk:= )"
diff --git a/dev-ml/labltk/labltk-8.06.0.ebuild b/dev-ml/labltk/labltk-8.06.0.ebuild
index 804638c..6459c79 100644
--- a/dev-ml/labltk/labltk-8.06.0.ebuild
+++ b/dev-ml/labltk/labltk-8.06.0.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt X"
 
 RDEPEND=">=dev-lang/tk-8.0.3
diff --git a/dev-perl/B-Keywords/B-Keywords-1.140.0.ebuild b/dev-perl/B-Keywords/B-Keywords-1.140.0.ebuild
index 8aa4eb2..d0d95e1 100644
--- a/dev-perl/B-Keywords/B-Keywords-1.140.0.ebuild
+++ b/dev-perl/B-Keywords/B-Keywords-1.140.0.ebuild
@@ -13,7 +13,7 @@
 # GPL-2 - no later clause
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild b/dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild
index a992f90..ff90b5f 100644
--- a/dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild
+++ b/dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="Extract data from Macintosh BinHex files"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc ~ppc64 ~x86"
+KEYWORDS="alpha amd64 hppa ppc ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Devel-Cycle/Devel-Cycle-1.120.0.ebuild b/dev-perl/Devel-Cycle/Devel-Cycle-1.120.0.ebuild
index cdadeab..cad5edd 100644
--- a/dev-perl/Devel-Cycle/Devel-Cycle-1.120.0.ebuild
+++ b/dev-perl/Devel-Cycle/Devel-Cycle-1.120.0.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="Find memory cycles in objects"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/ExtUtils-Config/ExtUtils-Config-0.7.0.ebuild b/dev-perl/ExtUtils-Config/ExtUtils-Config-0.7.0.ebuild
index c091a64..af25ac0 100644
--- a/dev-perl/ExtUtils-Config/ExtUtils-Config-0.7.0.ebuild
+++ b/dev-perl/ExtUtils-Config/ExtUtils-Config-0.7.0.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION='A wrapper for perl'\''s configuration'
 LICENSE=" || ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.22.0.ebuild b/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.22.0.ebuild
index 9511dea..d6031f0 100644
--- a/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.22.0.ebuild
+++ b/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.22.0.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION='Various portability utilities for module builders'
 LICENSE=" || ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.10.0.ebuild b/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.10.0.ebuild
index 018df75..516e210 100644
--- a/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.10.0.ebuild
+++ b/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.10.0.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION='Build.PL install path logic made easy'
 LICENSE=" || ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-perl/Filter/Filter-1.540.0.ebuild b/dev-perl/Filter/Filter-1.540.0.ebuild
index 2d50e35..c9bb02b 100644
--- a/dev-perl/Filter/Filter-1.540.0.ebuild
+++ b/dev-perl/Filter/Filter-1.540.0.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="Interface for creation of Perl Filters"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/dev-perl/Finance-Quote/Finance-Quote-1.370.0.ebuild b/dev-perl/Finance-Quote/Finance-Quote-1.370.0.ebuild
index 4afc230..78b560e 100644
--- a/dev-perl/Finance-Quote/Finance-Quote-1.370.0.ebuild
+++ b/dev-perl/Finance-Quote/Finance-Quote-1.370.0.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="alpha amd64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 # virtual/perl-Data-Dumper currently commented out in the code
diff --git a/dev-perl/Gentoo-PerlMod-Version/Gentoo-PerlMod-Version-0.8.0.ebuild b/dev-perl/Gentoo-PerlMod-Version/Gentoo-PerlMod-Version-0.8.0.ebuild
index ac04e62..5190a7a 100644
--- a/dev-perl/Gentoo-PerlMod-Version/Gentoo-PerlMod-Version-0.8.0.ebuild
+++ b/dev-perl/Gentoo-PerlMod-Version/Gentoo-PerlMod-Version-0.8.0.ebuild
@@ -10,7 +10,7 @@
 DESCRIPTION="Convert arbitrary Perl Modules' versions into normalised Gentoo versions"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Getopt-Mixed/Getopt-Mixed-1.120.0.ebuild b/dev-perl/Getopt-Mixed/Getopt-Mixed-1.120.0.ebuild
index 81673a0..de96d84 100644
--- a/dev-perl/Getopt-Mixed/Getopt-Mixed-1.120.0.ebuild
+++ b/dev-perl/Getopt-Mixed/Getopt-Mixed-1.120.0.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="Getopt::Mixed is used for parsing mixed options"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Graph/Graph-0.970.400.ebuild b/dev-perl/Graph/Graph-0.970.400.ebuild
index 3cc2608..55efbac 100644
--- a/dev-perl/Graph/Graph-0.970.400.ebuild
+++ b/dev-perl/Graph/Graph-0.970.400.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="Data structure and ops for directed graphs"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Hook-LexWrap/Hook-LexWrap-0.250.0.ebuild b/dev-perl/Hook-LexWrap/Hook-LexWrap-0.250.0.ebuild
index 9514819..35ac3db 100644
--- a/dev-perl/Hook-LexWrap/Hook-LexWrap-0.250.0.ebuild
+++ b/dev-perl/Hook-LexWrap/Hook-LexWrap-0.250.0.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="Lexically scoped subroutine wrappers"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild b/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild
index 3093b7d..eec2053 100644
--- a/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild
+++ b/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild
@@ -9,7 +9,7 @@
 
 DESCRIPTION='A tiny replacement for Module::Build'
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/MooseX-Types/MooseX-Types-0.460.0.ebuild b/dev-perl/MooseX-Types/MooseX-Types-0.460.0.ebuild
index 84d7978..bdc882a 100644
--- a/dev-perl/MooseX-Types/MooseX-Types-0.460.0.ebuild
+++ b/dev-perl/MooseX-Types/MooseX-Types-0.460.0.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="Organise your Moose types in libraries"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~hppa ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Mozilla-CA/Mozilla-CA-20150826.ebuild b/dev-perl/Mozilla-CA/Mozilla-CA-20150826.ebuild
index d966493..12a15d9 100644
--- a/dev-perl/Mozilla-CA/Mozilla-CA-20150826.ebuild
+++ b/dev-perl/Mozilla-CA/Mozilla-CA-20150826.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="alpha amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-perl/PPI/PPI-1.220.ebuild b/dev-perl/PPI/PPI-1.220.ebuild
index 061154a..8c337bc 100644
--- a/dev-perl/PPI/PPI-1.220.ebuild
+++ b/dev-perl/PPI/PPI-1.220.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="Parse, Analyze and Manipulate Perl (without perl)"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/PPIx-Regexp/PPIx-Regexp-0.33.0.ebuild b/dev-perl/PPIx-Regexp/PPIx-Regexp-0.33.0.ebuild
index 1eb1c1a..9740986 100644
--- a/dev-perl/PPIx-Regexp/PPIx-Regexp-0.33.0.ebuild
+++ b/dev-perl/PPIx-Regexp/PPIx-Regexp-0.33.0.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="Represent a regular expression of some sort"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86"
+KEYWORDS="alpha amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/PPIx-Utilities/PPIx-Utilities-1.1.0-r1.ebuild b/dev-perl/PPIx-Utilities/PPIx-Utilities-1.1.0-r1.ebuild
index 4b57953..20c8f4d 100644
--- a/dev-perl/PPIx-Utilities/PPIx-Utilities-1.1.0-r1.ebuild
+++ b/dev-perl/PPIx-Utilities/PPIx-Utilities-1.1.0-r1.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="Extensions to PPI"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-perl/PPI-1.208
diff --git a/dev-perl/PadWalker/PadWalker-2.100.0.ebuild b/dev-perl/PadWalker/PadWalker-2.100.0.ebuild
index 36aaf0a..9f7aa5e 100644
--- a/dev-perl/PadWalker/PadWalker-2.100.0.ebuild
+++ b/dev-perl/PadWalker/PadWalker-2.100.0.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="play with other peoples' lexical variables"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/Perl-Critic-Dynamic/Perl-Critic-Dynamic-0.50.0-r1.ebuild b/dev-perl/Perl-Critic-Dynamic/Perl-Critic-Dynamic-0.50.0-r1.ebuild
index 4558841..1521c68 100644
--- a/dev-perl/Perl-Critic-Dynamic/Perl-Critic-Dynamic-0.50.0-r1.ebuild
+++ b/dev-perl/Perl-Critic-Dynamic/Perl-Critic-Dynamic-0.50.0-r1.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="Base class for dynamic Policies"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="alpha amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-perl/Perl-Critic
diff --git a/dev-perl/Perl-Critic/Perl-Critic-1.118.0-r1.ebuild b/dev-perl/Perl-Critic/Perl-Critic-1.118.0-r1.ebuild
index feaa966..23d908b 100644
--- a/dev-perl/Perl-Critic/Perl-Critic-1.118.0-r1.ebuild
+++ b/dev-perl/Perl-Critic/Perl-Critic-1.118.0-r1.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="Critique Perl source code for best-practices"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-perl/Module-Pluggable-3.1
diff --git a/dev-perl/Pod-Spell/Pod-Spell-1.10.0-r1.ebuild b/dev-perl/Pod-Spell/Pod-Spell-1.10.0-r1.ebuild
index 0be7c34..1eaafa3 100644
--- a/dev-perl/Pod-Spell/Pod-Spell-1.10.0-r1.ebuild
+++ b/dev-perl/Pod-Spell/Pod-Spell-1.10.0-r1.ebuild
@@ -12,7 +12,7 @@
 SRC_URI+=" mirror://gentoo/podspell.1.gz https://dev.gentoo.org/~tove/files/podspell.1.gz"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="virtual/perl-Pod-Escapes
diff --git a/dev-perl/Readonly/Readonly-1.30.0-r1.ebuild b/dev-perl/Readonly/Readonly-1.30.0-r1.ebuild
index c94297d..c34df46 100644
--- a/dev-perl/Readonly/Readonly-1.30.0-r1.ebuild
+++ b/dev-perl/Readonly/Readonly-1.30.0-r1.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="Facility for creating read-only scalars, arrays, hashes"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/String-Format/String-Format-1.170.0-r1.ebuild b/dev-perl/String-Format/String-Format-1.170.0-r1.ebuild
index 796c27b..6754faf 100644
--- a/dev-perl/String-Format/String-Format-1.170.0-r1.ebuild
+++ b/dev-perl/String-Format/String-Format-1.170.0-r1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/Sub-Exporter-ForMethods/Sub-Exporter-ForMethods-0.100.52.ebuild b/dev-perl/Sub-Exporter-ForMethods/Sub-Exporter-ForMethods-0.100.52.ebuild
index 18a77bd..40b4792 100644
--- a/dev-perl/Sub-Exporter-ForMethods/Sub-Exporter-ForMethods-0.100.52.ebuild
+++ b/dev-perl/Sub-Exporter-ForMethods/Sub-Exporter-ForMethods-0.100.52.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="Helper routines for using Sub::Exporter to build methods"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~hppa ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.11.ebuild b/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.11.ebuild
index 835d3b1..ff5e166 100644
--- a/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.11.ebuild
+++ b/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.11.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="Only use Sub::Exporter if you need it"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Test-Differences/Test-Differences-0.630.0.ebuild b/dev-perl/Test-Differences/Test-Differences-0.630.0.ebuild
index 39b2f7e..825db82 100644
--- a/dev-perl/Test-Differences/Test-Differences-0.630.0.ebuild
+++ b/dev-perl/Test-Differences/Test-Differences-0.630.0.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="Test strings and data structures and show differences if not ok"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ppc ~ppc64 ~x86"
+KEYWORDS="alpha ~amd64 ~arm hppa ppc ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND="dev-perl/Text-Diff
diff --git a/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.40.0-r1.ebuild b/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.40.0-r1.ebuild
index 1cb9c5f..4ea65de 100644
--- a/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.40.0-r1.ebuild
+++ b/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.40.0-r1.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="Check for memory leaks and circular memory references"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND=">=dev-perl/Devel-Cycle-1.04
diff --git a/dev-perl/Test-Most/Test-Most-0.340.0.ebuild b/dev-perl/Test-Most/Test-Most-0.340.0.ebuild
index 3f03439..d859bd3 100644
--- a/dev-perl/Test-Most/Test-Most-0.340.0.ebuild
+++ b/dev-perl/Test-Most/Test-Most-0.340.0.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="Most commonly needed test functions and features"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 hppa ppc ~ppc64 ~x86"
+KEYWORDS="alpha ~amd64 hppa ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Test-Object/Test-Object-0.70.0-r1.ebuild b/dev-perl/Test-Object/Test-Object-0.70.0-r1.ebuild
index 2ad6067..994d99b 100644
--- a/dev-perl/Test-Object/Test-Object-0.70.0-r1.ebuild
+++ b/dev-perl/Test-Object/Test-Object-0.70.0-r1.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="Thoroughly testing objects via registered handlers"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="virtual/perl-File-Spec
diff --git a/dev-perl/Test-SubCalls/Test-SubCalls-1.90.0-r1.ebuild b/dev-perl/Test-SubCalls/Test-SubCalls-1.90.0-r1.ebuild
index e99fb6a..177dc3f 100644
--- a/dev-perl/Test-SubCalls/Test-SubCalls-1.90.0-r1.ebuild
+++ b/dev-perl/Test-SubCalls/Test-SubCalls-1.90.0-r1.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="Track the number of times subs are called"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 DEPEND=">=dev-perl/Hook-LexWrap-0.20
diff --git a/dev-perl/Text-Diff/Text-Diff-1.430.0.ebuild b/dev-perl/Text-Diff/Text-Diff-1.430.0.ebuild
index 0fbcd7e..b741e64 100644
--- a/dev-perl/Text-Diff/Text-Diff-1.430.0.ebuild
+++ b/dev-perl/Text-Diff/Text-Diff-1.430.0.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="Perform diffs on files and record sets"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha ~amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/glib-perl/glib-perl-1.314.0.ebuild b/dev-perl/glib-perl/glib-perl-1.314.0.ebuild
index dbdd2db..248ac1f 100644
--- a/dev-perl/glib-perl/glib-perl-1.314.0.ebuild
+++ b/dev-perl/glib-perl/glib-perl-1.314.0.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/gnome2-perl/gnome2-perl-1.45.0.ebuild b/dev-perl/gnome2-perl/gnome2-perl-1.45.0.ebuild
index 98b589f..c966b3f 100644
--- a/dev-perl/gnome2-perl/gnome2-perl-1.45.0.ebuild
+++ b/dev-perl/gnome2-perl/gnome2-perl-1.45.0.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+KEYWORDS="alpha ~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/dev-perl/gtk2-perl/gtk2-perl-1.249.500.ebuild b/dev-perl/gtk2-perl/gtk2-perl-1.249.500.ebuild
index 8e28c01..da3c30a 100644
--- a/dev-perl/gtk2-perl/gtk2-perl-1.249.500.ebuild
+++ b/dev-perl/gtk2-perl/gtk2-perl-1.249.500.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/namespace-autoclean/namespace-autoclean-0.280.0.ebuild b/dev-perl/namespace-autoclean/namespace-autoclean-0.280.0.ebuild
index 9d5c769..75285b0 100644
--- a/dev-perl/namespace-autoclean/namespace-autoclean-0.280.0.ebuild
+++ b/dev-perl/namespace-autoclean/namespace-autoclean-0.280.0.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="Keep imports out of your namespace"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/perltidy/perltidy-20130922.0.0.ebuild b/dev-perl/perltidy/perltidy-20130922.0.0.ebuild
index fc48db1..c00486b 100644
--- a/dev-perl/perltidy/perltidy-20130922.0.0.ebuild
+++ b/dev-perl/perltidy/perltidy-20130922.0.0.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-php/PEAR-DB_DataObject/Manifest b/dev-php/PEAR-DB_DataObject/Manifest
index a13eb30..5b5b89c 100644
--- a/dev-php/PEAR-DB_DataObject/Manifest
+++ b/dev-php/PEAR-DB_DataObject/Manifest
@@ -1 +1,2 @@
 DIST DB_DataObject-1.11.3.tgz 81873 SHA256 5fa1ce2d3d2543a5b9e8f825a2c9a409201978b0f6c45da1f9dadfe58ac47d2b SHA512 bf74b99b6d28e8c5074dd9058ad6624ed93cd4578164d71fcf2c70070a81f5bb5dfc46d11d5a1408ad5bac12ac6d36cd47dbe102b16ffbf9c091153e9e400d8f WHIRLPOOL 3189f3238afc0d7087ced6c1b1bd91ecf99b009f03e17e907d68404c7d5e06f6ebeda0d5b3ef7235802fd18062ae330ec974b5121de17078521cec2210a1e0c9
+DIST DB_DataObject-1.11.5.tgz 83878 SHA256 0157d3197c28b33d41c069b7f0ed8d2651fe2377e83a0a7b9f1b7a47a4f31b05 SHA512 bc8c5d0994fba78c6f8137682da87018e7660ceb39f5583aabf424509bf0ab263b8f32f6676821acaf69ed991778ad85f5f3fc156799c0811b2ec39546688bc6 WHIRLPOOL 64e1eea3a33e83d307a5059e7f770fb9e16b0c67ac4feb6962e0f7c2caf102a160645005581c9cf828f0013829fe133a2fe8dc66356039283a3b3908f3cc3472
diff --git a/dev-php/PEAR-DB_DataObject/PEAR-DB_DataObject-1.11.5.ebuild b/dev-php/PEAR-DB_DataObject/PEAR-DB_DataObject-1.11.5.ebuild
new file mode 100644
index 0000000..87d2dae
--- /dev/null
+++ b/dev-php/PEAR-DB_DataObject/PEAR-DB_DataObject-1.11.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit php-pear-r1
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DESCRIPTION="SQL builder and data modeling layer"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE="minimal"
+
+# The MDB2/DB dependencies are listed as "optional," but really, you
+# need one or the other. Prefer the newer MDB2 to the deprecated DB.
+DEPEND=""
+RDEPEND="|| ( dev-php/PEAR-MDB2 dev-php/PEAR-DB )
+	dev-php/PEAR-Date
+	!minimal? ( dev-php/PEAR-Validate )"
+
+src_prepare() {
+	# Don't install this batch file -- it winds up in ${EPREFIX}/usr/bin.
+	# Delete the line that mentions it from package.xml.
+	sed -e '/DB_DataObject_createTables\.bat/d' \
+		-i "${WORKDIR}/package.xml" \
+		|| die "failed to remove batch file from package.xml"
+
+	eapply_user
+}
diff --git a/dev-python/hypothesis/hypothesis-1.19.0.ebuild b/dev-python/hypothesis/hypothesis-1.19.0.ebuild
index 451c324..2e3b074 100644
--- a/dev-python/hypothesis/hypothesis-1.19.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-1.19.0.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/ipyparallel/Manifest b/dev-python/ipyparallel/Manifest
index 4f66c23..4d02d6d 100644
--- a/dev-python/ipyparallel/Manifest
+++ b/dev-python/ipyparallel/Manifest
@@ -1 +1,2 @@
 DIST ipyparallel-4.1.0.tar.gz 2271608 SHA256 c943f6b3bbabb9332336d15474969e2a7a73d5b583f9786f7b357c75e4b1709a SHA512 19fff1ea57d9fcaec6525ce6e0c72ab63ab1245e32e485174a0691d2b48d8d2512af4055b77df82c7b30a8c071e1b6c5900d37e992f82f1597492e220e83d36f WHIRLPOOL ead35bc2166af0b221e730550689b09b7bf04148abcd754039f1c511acaa182ba50b593372f3e8bc627ae40a6117f9209cac476c1905bdc780f53de10666ffe1
+DIST ipyparallel-5.0.0.tar.gz 2286751 SHA256 ffa7e2e29fdc4844b3c1721f46b42eee5a1abe5cbb851ccf79d0f4f89b9fe21a SHA512 ef04b717198246300ad1020eb7f9a65c40553a897653384bd839d5fb05409a276df41f933b0f023c0523fc6d8cebf6e2c6f8478c8be4fe4fdf386ad78b8f4418 WHIRLPOOL 677fd7fa2090b2b75c234c4802fab553105d2e3ce44ab4c390cadc56ba5ff3814005ab478906197d6a9f862e0d69901168d22cdc44c8063cf8e71fc8f8bdc449
diff --git a/dev-python/ipyparallel/ipyparallel-5.0.0.ebuild b/dev-python/ipyparallel/ipyparallel-5.0.0.ebuild
new file mode 100644
index 0000000..8bf04a1
--- /dev/null
+++ b/dev-python/ipyparallel/ipyparallel-5.0.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Interactive Parallel Computing with IPython"
+HOMEPAGE="http://ipython.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	!<dev-python/ipython-4.0.0[smp]
+	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+	"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	iptest ipyparallel.tests -- -vsx || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 6451464..af332b8 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,3 +1,4 @@
 DIST ipython-3.2.1.tar.gz 10884249 SHA256 c913adee7ae5b338055274c51a7d2b3cea468b5b316046fa520cd8a434b09177 SHA512 de7723e3b859d21a58a24456c76c8d8ec98c019f290f61269f46270e7647d2b49a98671138fecd75cb6f46384fde7e09618eb5c85c175e0e442c7fae7328d8fe WHIRLPOOL 9f020c167559259931dcb177d0c3a5211939632e5775c2627795ba390cf57bd62c378c15b7ee9b9ed2079180f8df8e062eb9673ed9cfc025a56f1da82c9428d1
 DIST ipython-4.0.1.tar.gz 6207566 SHA256 3bd3b78abc4f43b9ea7fa5353a2a9ba01af8ac4aec5d11e78fa5cbcec105432e SHA512 88419feca21c762a8553b4c11661e28b3305742fc89309abfd46b1213da210249b4781b754996835a2cc539569ae7cb816ed26bbaddbf15529eeb6479660265e WHIRLPOOL 58c17378fbcbac94e1585cce0cdd00996f7df20f5781a88e1e7d56b9fe2db81fe3282211dba31e8f54d2e50db869d2cce2670cfebc5c868455f481064e0089c6
 DIST ipython-4.0.3.tar.gz 6207899 SHA256 3a928f59e8ac8dd97858c28390867c87c09510f1f8bbe97e4e9c6b036eb84fc0 SHA512 1e2deb597348757e69aaeadd0632cf984056e5f7278ee5bbbd7b4233581323b07f55685b1891c23dc0977d9f30f7dc734dcf2216bc8876424cdb0f7a9294fecf WHIRLPOOL 1beb60e6daf3cea4609318e87a07307843eeb1002847f8c3c5fbe8e114ab29cb052c810884b410f1e8414437b91c5335048106756e2d88a82a7e440e3ff8fc17
+DIST ipython-4.1.1.tar.gz 4938684 SHA256 1cb340dfdf6ec306b9ded72071742c87fa5247929db7ab704e17defe1975e38f SHA512 ccb24a6d3de5f12a21225387e46ad1b1038910d51d8c0aeb1f4ad6d24751b300295548083f60f3eadec3f29c75370644638b30e6ce391d13f900454e8b3d60a5 WHIRLPOOL f041d10747d4919566a0119e25bfd9030d6213021ecd222bad9e456a7cb3505ee5d3ffc7fe0de5aa1080453565245c3e95cb774df0746f7d4a13b51067bc53b9
diff --git a/dev-python/ipython/ipython-4.1.1.ebuild b/dev-python/ipython/ipython-4.1.1.ebuild
new file mode 100644
index 0000000..3c9b5da
--- /dev/null
+++ b/dev-python/ipython/ipython-4.1.1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE='readline,sqlite,threads(+)'
+
+inherit distutils-r1 eutils virtualx
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="http://ipython.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples matplotlib mongodb notebook nbconvert qt4 +smp test wxwidgets"
+
+REQUIRED_USE="
+	test? ( doc matplotlib mongodb notebook nbconvert qt4 wxwidgets )
+	doc? ( mongodb )"
+
+CDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pickleshare[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/simplegeneric[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+	mongodb? ( <dev-python/pymongo-3[${PYTHON_USEDEP}] )
+	wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython:*[${PYTHON_USEDEP}]' python2_7) )"
+
+RDEPEND="${CDEPEND}
+	notebook? (
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+	)
+	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )
+	qt4? ( dev-python/qtconsole )"
+DEPEND="${CDEPEND}
+	>=dev-python/setuptools-18.5[${PYTHON_USEDEP}]
+	test? (
+		app-text/dvipng
+		dev-python/jinja[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+		x11-base/xorg-server[xvfb]
+	)
+	doc? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/fabric[${PYTHON_USEDEP}]' python2_7)
+		>=dev-python/jsonschema-2.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
+		dev-python/rpy[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+	)"
+
+PDEPEND="
+	smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/2.1.0-substitute-files.patch
+	)
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Remove out of date insource files
+	rm IPython/extensions/rmagic.py || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html_noapi
+}
+
+python_test() {
+	distutils_install_for_testing
+	# https://github.com/ipython/ipython/issues/8639
+	# Failure of some modules only in python3.4 
+	local fail
+	run_tests() {
+		pushd ${TEST_DIR} > /dev/null || die
+		"${PYTHON}" -m IPython.testing.iptestcontroller --all || fail=1
+		popd > /dev/null || die
+	}
+	VIRTUALX_COMMAND=run_tests virtualmake
+	[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Create ipythonX.Y symlinks.
+	# TODO:
+	# 1. do we want them for pypy? No.  pypy has no numpy
+	# 2. handle it in the eclass instead (use _python_ln_rel).
+	# With pypy not an option the dosym becomes unconditional
+	dosym ../lib/python-exec/${EPYTHON}/ipython \
+		/usr/bin/ipython${EPYTHON#python}
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "sympyprinting" dev-python/sympy
+	optfeature "cythonmagic" dev-python/cython
+	optfeature "%lprun magic command" dev-python/line_profiler
+	optfeature "%mprun magic command" dev-python/memory_profiler
+	if use nbconvert; then
+		if ! has_version app-text/pandoc ; then
+			einfo "Node.js will be used to convert notebooks to other formats"
+			einfo "like HTML. Support for that is still experimental. If you"
+			einfo "encounter any problems, please use app-text/pandoc instead."
+		fi
+	fi
+}
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-2.3.1-r1.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-2.3.1-r1.ebuild
index d0ea157..c56c57b 100644
--- a/dev-python/keystonemiddleware/keystonemiddleware-2.3.1-r1.ebuild
+++ b/dev-python/keystonemiddleware/keystonemiddleware-2.3.1-r1.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-2.3.1.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-2.3.1.ebuild
deleted file mode 100644
index cad25cd..0000000
--- a/dev-python/keystonemiddleware/keystonemiddleware-2.3.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-#PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-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}]"
-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/stevedore-1.5.0[${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-1.1.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/keystonemiddleware/keystonemiddleware-2.3.2-r1.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-2.3.2-r1.ebuild
index acea64e..ef75044 100644
--- a/dev-python/keystonemiddleware/keystonemiddleware-2.3.2-r1.ebuild
+++ b/dev-python/keystonemiddleware/keystonemiddleware-2.3.2-r1.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-2.3.2.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-2.3.2.ebuild
deleted file mode 100644
index 6a2c3c7..0000000
--- a/dev-python/keystonemiddleware/keystonemiddleware-2.3.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-#PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-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}]"
-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/oslo-messaging-2.6.0[${PYTHON_USEDEP}]
-		!~dev-python/oslo-messaging-2.6.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/stevedore-1.5.0[${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/oslo-utils-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.8.0[${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/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 338a2ac..143007c 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,2 +1,3 @@
 DIST libvirt-python-1.2.21.tar.gz 171250 SHA256 7ffb49fcb64ac06188fc626c853c99361e5965766ab020f8ea66f8fbcfc29684 SHA512 7e2481ffa26105ddde703bd6eafe74240b69990b2f2ce0042f20f7fceb1d326fb8a66bf26042bfe63a12cf3202d7c19b14b6d766dd42fb66af212393d7aaf332 WHIRLPOOL 18dd5bc0d565b6846c40960cf258d7fb3714054be15fe54507e2846c5a7c2cd81e9b209c8e70cbfd5319d5a06f00c2c5322995058637af87d1676276f8675b2e
 DIST libvirt-python-1.3.0.tar.gz 171195 SHA256 097d41bc52c300e50c5b04836e078bae5653fe222db92a9a10839f3e6b3afc7c SHA512 b207aa9aef63e7d1a8377b2f8a0fa8dc05893bd744672c2b41f4dafa2516cbddd2868f37b0caf72b125fccbbf56542fcf1b94b452c406757f30d8f02d6ee26b4 WHIRLPOOL 1bde1fd130e0760bfa8f62c2f85e4ded991fc0eadcaf10b38bbbcf754eaa7b3a0ccb72f304f65457115419e4d3d904d07172e33bd68d581a29e4fb8d0703b45a
+DIST libvirt-python-1.3.1.tar.gz 171221 SHA256 7143b922a9bd66a5e199b13316fa4266cbffc23db01c99bce37216a1eb9118f7 SHA512 f980d6aec1c83422d01c8ff02915357f4903f8c2a8ea9538da35e7313f6d491ebb4646e642097269a6be2996da879e7594c5e166cf2cc0bd96745eace7ce7567 WHIRLPOOL 3fe0ecba5f618eab1059c5e4ac4ef8789ed6684f36aee336f2e366198805560706c41d67ddceb328a0ad66867145a103aa15665b646b7bc5a5b058b02755ce11
diff --git a/dev-python/libvirt-python/libvirt-python-1.3.1.ebuild b/dev-python/libvirt-python/libvirt-python-1.3.1.ebuild
new file mode 100644
index 0000000..cc59d1b
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-1.3.1.ebuild
@@ -0,0 +1,44 @@
+# 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} )
+
+AUTOTOOLIZE=yes
+
+MY_P="${P/_rc/-rc}"
+
+inherit eutils distutils-r1
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://libvirt.org/libvirt-python.git"
+	SRC_URI=""
+	KEYWORDS=""
+	RDEPEND="app-emulation/libvirt:=[-python(-)]"
+else
+	SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	RDEPEND="app-emulation/libvirt:0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="http://www.libvirt.org"
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="test"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+# testsuite is currently not included in upstream tarball
+RESTRICT="test"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/mimeparse/Manifest b/dev-python/mimeparse/Manifest
index 451d25f..830b451 100644
--- a/dev-python/mimeparse/Manifest
+++ b/dev-python/mimeparse/Manifest
@@ -1,2 +1,2 @@
 DIST python-mimeparse-0.1.4.tar.gz 5228 SHA256 3c69a21e37e77f754e6fc09ebda70acd92c90d8a58f29a41cc0248351378ddc3 SHA512 c8eeb298773a0eb36512b1d9a46dfc85423c0dab10b85ed94284bf1bf8dba8c34aeccefd8b6a187434789d5a160ab5d4af81659dd1808ea02078cc2b168e10b3 WHIRLPOOL f83328743b16ae46263e05055d6400617b7858e11837ce892919e26a36348650122b78ee366125a1793b20fa71c641b3606bf834d2936f98dab65b89b740385b
-DIST python-mimeparse-1.5.tar.gz 5827 SHA256 9518ff1576d60e99f310116711beda6974f18caa3deb01c73d25bab409408878 SHA512 799b40c0128f22949869bc55f618b46f022bf937cd59be21343dab3d3d977cc24d84744dcbd23da4efb135e940a1373f064ec6e56e8bd4188fa54a3107d2718f WHIRLPOOL b9c9748c24ff931c2c3a2ae4da088818f9a7018be6450783c3ac0ff533e7292b23a5e94cff976b3209003a481240a5a4af65c7d6b81753b80e200b0fc5a0c03d
+DIST python-mimeparse-1.5.1.tar.gz 5822 SHA256 e4d0c49120f5d946106ed3a6fed0b353740c0c9700b57d7d024c65466e50a106 SHA512 bd25dd43ba98ac8e10e02d21ae040be76b0a2ae3904333c6bbf8d46e4f12bda84eb410059b22a345b6840af2c055802b31c3f76c46f133c1c11673a4f15f21f7 WHIRLPOOL a31cd0a78ba86a16d335ece4a226981dce813399e0695ce577d6fa8f327e6cf88c5723f69600f5852cde2d1a66ccb49aac1b8ada3854e1fe8f33a073a8ebb27c
diff --git a/dev-python/mimeparse/mimeparse-1.5.ebuild b/dev-python/mimeparse/mimeparse-1.5.1.ebuild
similarity index 100%
rename from dev-python/mimeparse/mimeparse-1.5.ebuild
rename to dev-python/mimeparse/mimeparse-1.5.1.ebuild
diff --git a/dev-python/networkx/networkx-1.10-r1.ebuild b/dev-python/networkx/networkx-1.10-r1.ebuild
index 9770aae..b6b73f9 100644
--- a/dev-python/networkx/networkx-1.10-r1.ebuild
+++ b/dev-python/networkx/networkx-1.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,6 +17,8 @@
 KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples test"
 
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
 COMMON_DEPEND="
 	dev-python/matplotlib[${PYTHON_USEDEP}]
 		sci-libs/scipy[${PYTHON_USEDEP}]"
@@ -42,6 +44,10 @@
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 	)"
 
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
 python_prepare_all() {
 	# Avoid d'loading of file objects.inv from 2 sites of python docs
 	sed -e "s/'sphinx.ext.intersphinx', //" -i doc/source/conf.py || die
diff --git a/dev-python/networkx/networkx-1.10.ebuild b/dev-python/networkx/networkx-1.10.ebuild
index 95ff6a2..23f681f 100644
--- a/dev-python/networkx/networkx-1.10.ebuild
+++ b/dev-python/networkx/networkx-1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,10 @@
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples test"
 
-COMMON_DEPEND="dev-python/matplotlib[${PYTHON_USEDEP}]
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+COMMON_DEPEND="
+	dev-python/matplotlib[${PYTHON_USEDEP}]
 		sci-libs/scipy[${PYTHON_USEDEP}]"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
@@ -41,6 +44,10 @@
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 	)"
 
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
 python_prepare_all() {
 	# Avoid d'loading of file objects.inv from 2 sites of python docs
 	sed -e "s/'sphinx.ext.intersphinx', //" -i doc/source/conf.py || die
diff --git a/dev-python/networkx/networkx-1.11.ebuild b/dev-python/networkx/networkx-1.11.ebuild
index 4508dcd..0c22174 100644
--- a/dev-python/networkx/networkx-1.11.ebuild
+++ b/dev-python/networkx/networkx-1.11.ebuild
@@ -17,6 +17,8 @@
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples test"
 
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
 COMMON_DEPEND="
 	dev-python/matplotlib[${PYTHON_USEDEP}]
 		sci-libs/scipy[${PYTHON_USEDEP}]"
@@ -42,6 +44,10 @@
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 	)"
 
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
 python_prepare_all() {
 	# Avoid d'loading of file objects.inv from 2 sites of python docs
 	sed -e "s/'sphinx.ext.intersphinx', //" -i doc/source/conf.py || die
diff --git a/dev-python/nose/Manifest b/dev-python/nose/Manifest
index 1afef6a..3f45f5a 100644
--- a/dev-python/nose/Manifest
+++ b/dev-python/nose/Manifest
@@ -1,3 +1 @@
-DIST nose-1.3.4.tar.gz 277488 SHA256 76bc63a4e2d5e5a0df77ca7d18f0f56e2c46cfb62b71103ba92a92c79fab1e03 SHA512 19499ab08018229ea5195cdac739d6c7c247c5aa5b2c91b801cbd99bad12584ed84c5cfaaa6fa8b4893a46324571a2f8a1988a1381f4ddd58390e597bd7bdc24 WHIRLPOOL 10c3938913e0bfcbb20a7822feadd751c2c1db76d97bf0a5ecbe83be81934a5a23aad4d37a77c68d6da5ac80bdb274f56e2ee3206fb97f96832271d479ca7302
-DIST nose-1.3.6.tar.gz 276273 SHA256 f61e0909a743eed37b1207e38a8e7b4a2fe0a82185e36f2be252ef1b3f901758 SHA512 d0cede08dc33a8ac0af0f18063e57f31b615f06e911edb5ca264575174d8f4adb4338448968c403811d9dcc60f38ade3164662d6c7b69b499f56f0984bb6283c WHIRLPOOL d7360c24aad388c736ce08578eb7ca529873a8603dc0b8e4c79d7756a6d5f6429561b3b8beffc2930301a48767ded06fb3127c27c07432cb25a0549556cb74fe
 DIST nose-1.3.7.tar.gz 280488 SHA256 f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98 SHA512 e65c914f621f8da06b9ab11a0ff2763d6e29b82ce2aaed56da0e3773dc899d9deb1f20015789d44c65a5dad7214520f5b659b3f8d7695fb207ad3f78e5cf1b62 WHIRLPOOL 68684b12e18d41b1f49ba3e832adf8a03b3b84ce530f0bde34f8c40c84f38046aac2777090472fefe87ba7abe3fdffa4cdcad74e3b717fcb9dfe932a0657b965
diff --git a/dev-python/nose/files/nose-0.11.0-disable_intersphinx.patch b/dev-python/nose/files/nose-0.11.0-disable_intersphinx.patch
deleted file mode 100644
index 5ce5a1d..0000000
--- a/dev-python/nose/files/nose-0.11.0-disable_intersphinx.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- doc/conf.py.orig	2009-05-07 03:12:35.000000000 +0200
-+++ doc/conf.py	2009-05-13 10:13:12.588540888 +0200
-@@ -31,7 +31,7 @@
- 
- # Add any Sphinx extension module names here, as strings. They can be extensions
- # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
--extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx',
-+extensions = ['sphinx.ext.autodoc',
-               'nose.sphinx.pluginopts', 'manbuilder']
- 
- # Add any paths that contain templates here, relative to this directory.
-@@ -231,4 +231,4 @@
- 
- 
- # Example configuration for intersphinx: refer to the Python standard library.
--intersphinx_mapping = {'http://docs.python.org/dev': None}
-+#intersphinx_mapping = {'http://docs.python.org/dev': None}
diff --git a/dev-python/nose/files/nose-1.2.1-skiptest.patch b/dev-python/nose/files/nose-1.2.1-skiptest.patch
deleted file mode 100644
index b8f7a57..0000000
--- a/dev-python/nose/files/nose-1.2.1-skiptest.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Tests are set to compulsory fail, cannot be set to expectedFailure
-diff -ur nose-1.2.1.orig/functional_tests/test_program.py nose-1.2.1/functional_tests/test_program.py
---- functional_tests/test_program.py	2011-12-14 22:01:38.000000000 +0800
-+++ functional_tests/test_program.py	2013-03-02 14:50:28.628004408 +0800
-@@ -1,5 +1,8 @@
--import os
--import unittest
-+import os, sys
-+if sys.version_info[:2] == (2, 7) or hasattr(sys, 'pypy_version_info'):
-+    import unittest
-+else:
-+    import unittest2 as unittest
- from cStringIO import StringIO
- from nose import SkipTest
- from nose.core import TestProgram
-@@ -91,6 +91,7 @@
-         assert not res.errors
-         assert not res.failures
- 
-+    @unittest.skip("tests set to exit with compulsory fail, error")
-     def test_run_support_twist(self):
-         """Collect and run tests in functional/support/twist
- 
diff --git a/dev-python/nose/files/nose-1.3.1-doctest.patch b/dev-python/nose/files/nose-1.3.1-doctest.patch
deleted file mode 100644
index 37d0dcc..0000000
--- a/dev-python/nose/files/nose-1.3.1-doctest.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://github.com/nose-devs/nose/commit/5bcedc9a0601b4f70e2cba6c14c3046fb326bfaa.diff
-diff --git a/unit_tests/test_config_defaults.rst b/unit_tests/test_config_defaults.rst
-index 944d370..034f58e 100644
---- a/unit_tests/test_config_defaults.rst
-+++ b/unit_tests/test_config_defaults.rst
-@@ -89,9 +89,9 @@ Invalid config files
- 
- (file-like object)
- 
--    >>> options, args = parse([], StringIO("spam"))
-+    >>> options, args = parse([], StringIO("spam")) # doctest: +ELLIPSIS
-     error: Error reading config file '<???>': File contains no section headers.
--    file: <???>, line: 1
-+    file: ...<???>..., line: 1
-     'spam'
- 
- (filename)
-@@ -99,7 +99,7 @@ Invalid config files
-     >>> options, args = parse([], os.path.join(support, "invalid.cfg"))
-     ... # doctest: +ELLIPSIS
-     error: Error reading config file '...invalid.cfg': File contains no section headers.
--    file: ...invalid.cfg, line: 1
-+    file: ...invalid.cfg..., line: 1
-     'spam\n'
- 
- (filenames, length == 1)
-@@ -107,7 +107,7 @@ Invalid config files
-     >>> options, args = parse([], [os.path.join(support, "invalid.cfg")])
-     ... # doctest: +ELLIPSIS
-     error: Error reading config file '...invalid.cfg': File contains no section headers.
--    file: ...invalid.cfg, line: 1
-+    file: ...invalid.cfg..., line: 1
-     'spam\n'
- 
- (filenames, length > 1)
-@@ -120,7 +120,7 @@ file is bad
-     ...                            os.path.join(support, "b.cfg")])
-     ... # doctest: +ELLIPSIS
-     error: Error reading config file '...invalid.cfg': File contains no section headers.
--    file: ...invalid.cfg, line: 1
-+    file: ...invalid.cfg..., line: 1
-     'spam\n'
- 
- 
-
diff --git a/dev-python/nose/files/nose-1.3.1-pypy-test.patch b/dev-python/nose/files/nose-1.3.1-pypy-test.patch
deleted file mode 100644
index 41ad468..0000000
--- a/dev-python/nose/files/nose-1.3.1-pypy-test.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://github.com/nose-devs/nose/commit/0181572a64195a8fa1c6c867ae6c61a79a9606ca.diff
-
-diff --git a/nose/util.py b/nose/util.py
-index dcb5fef..e612696 100644
---- a/nose/util.py
-+++ b/nose/util.py
-@@ -447,11 +447,10 @@ def try_run(obj, names):
-         if func is not None:
-             if type(obj) == types.ModuleType:
-                 # py.test compatibility
--                try:
--                    args, varargs, varkw, defaults = inspect.getargspec(func)
--                    if hasattr(func, '__call__') and ismethod(func.__call__):
--                        args.pop(0)
--                except TypeError:
-+                if isinstance(func, types.FunctionType):
-+                    args, varargs, varkw, defaults = \
-+                        inspect.getargspec(func)
-+                else:
-                     # Not a function. If it's callable, call it anyway
-                     if hasattr(func, '__call__'):
-                         func = func.__call__
-diff --git a/unit_tests/test_utils.py b/unit_tests/test_utils.py
-index 2bd837c..cd9ba6e 100644
---- a/unit_tests/test_utils.py
-+++ b/unit_tests/test_utils.py
-@@ -1,4 +1,5 @@
- import os
-+import sys
- import unittest
- import nose
- from nose import case
-@@ -168,7 +169,7 @@ def __call__(self):
-         class Bar_m:
-             def __call__(self, mod):
-                 pass
--        
-+
-         foo = imp.new_module('foo')
-         foo.bar = bar
-         foo.bar_m = bar_m
-
diff --git a/dev-python/nose/files/nose-1.3.1-python3.4.patch b/dev-python/nose/files/nose-1.3.1-python3.4.patch
deleted file mode 100644
index 2269f75..0000000
--- a/dev-python/nose/files/nose-1.3.1-python3.4.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 192694ed9f70447317bd54e427a17208bddf03be Mon Sep 17 00:00:00 2001
-From: John Szakmeister <john@szakmeister.net>
-Date: Sat, 15 Mar 2014 06:15:42 -0400
-Subject: [PATCH] Fix #783: try_run is broken with Python 3.4
-
-It turns out that we expected inspect.getargspec() to only work on
-functions (versus classes that are callable).  Python 3.4 has changed
-this behavior and now happily returns the arg spec.  Let's try to detect
-this situation by checking the __call__() method to if it's actually the
-method of a class.  If so, pop the 'self' argument off of args--similar
-to what's done in the exceptional case below.
----
- CHANGELOG    | 1 +
- nose/util.py | 4 +++-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/nose/util.py b/nose/util.py
-index 7995700..dcb5fef 100644
---- a/nose/util.py
-+++ b/nose/util.py
-@@ -8,7 +8,7 @@
- import sys
- import types
- import unittest
--from nose.pyversion import ClassType, TypeType, isgenerator
-+from nose.pyversion import ClassType, TypeType, isgenerator, ismethod
- 
- 
- log = logging.getLogger('nose')
-@@ -449,6 +449,8 @@ def try_run(obj, names):
-                 # py.test compatibility
-                 try:
-                     args, varargs, varkw, defaults = inspect.getargspec(func)
-+                    if hasattr(func, '__call__') and ismethod(func.__call__):
-+                        args.pop(0)
-                 except TypeError:
-                     # Not a function. If it's callable, call it anyway
-                     if hasattr(func, '__call__'):
--- 
-1.8.5.5
-
diff --git a/dev-python/nose/files/nose-1.3.1-version.patch b/dev-python/nose/files/nose-1.3.1-version.patch
deleted file mode 100644
index 8f6edb5..0000000
--- a/dev-python/nose/files/nose-1.3.1-version.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://github.com/nose-devs/nose/commit/43c35e49106916f51f676455888fe7a39d030113.diff
-diff --git a/nose/pyversion.py b/nose/pyversion.py
-index fba5ada..8b56614 100644
---- a/nose/pyversion.py
-+++ b/nose/pyversion.py
-@@ -89,7 +89,8 @@ def __init__(self, cls, func):
-         self.__dict__ = func.__dict__.copy()
-         self._func = func
-         self.__self__ = UnboundSelf(cls)
--        self.im_class = cls
-+        if sys.version_info < (3, 0):
-+            self.im_class = cls
- 
-     def address(self):
-         cls = self.__self__.cls
-
diff --git a/dev-python/nose/files/nose-1.3.7-python-3.5-backport.patch b/dev-python/nose/files/nose-1.3.7-python-3.5-backport.patch
new file mode 100644
index 0000000..8d2f2f0
--- /dev/null
+++ b/dev-python/nose/files/nose-1.3.7-python-3.5-backport.patch
@@ -0,0 +1,54 @@
+From 8e7ad3d50012688ca029d126cbc88251831fea88 Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev <mitya57@gmail.com>
+Date: Mon, 1 Feb 2016 00:05:30 +0300
+Subject: [PATCH 1/2] Set __qualname__ equal to __name__ on derived classes
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+To make output on Python ≥ 3.5 the same as on previous Python versions.
+
+This fixes #928.
+---
+ functional_tests/test_load_tests_from_test_case.py | 1 +
+ nose/util.py                                       | 1 +
+ unit_tests/test_xunit.py                           | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/functional_tests/test_load_tests_from_test_case.py b/functional_tests/test_load_tests_from_test_case.py
+index 42f8563..13d0c8a 100644
+--- a/functional_tests/test_load_tests_from_test_case.py
++++ b/functional_tests/test_load_tests_from_test_case.py
+@@ -29,6 +29,7 @@ def setUp(self):
+                 pass
+             def tearDown(self):
+                 pass
++        Derived.__qualname__ = Derived.__name__
+         # must use nose loader here because the default loader in 2.3
+         # won't load tests from base classes
+         l = loader.TestLoader()
+diff --git a/nose/util.py b/nose/util.py
+index bfe1658..80ab1d4 100644
+--- a/nose/util.py
++++ b/nose/util.py
+@@ -643,6 +643,7 @@ class C(cls):
+         pass
+     C.__module__ = module
+     C.__name__ = cls.__name__
++    C.__qualname__ = cls.__name__
+     return C
+ 
+ 
+diff --git a/unit_tests/test_xunit.py b/unit_tests/test_xunit.py
+index 944d285..261436b 100644
+--- a/unit_tests/test_xunit.py
++++ b/unit_tests/test_xunit.py
+@@ -16,6 +16,7 @@ def mktest():
+     class TC(unittest.TestCase):
+         def runTest(self):
+             pass
++    TC.__qualname__ = TC.__name__
+     test = TC()
+     return test
+ 
+
diff --git a/dev-python/nose/nose-1.3.4.ebuild b/dev-python/nose/nose-1.3.4.ebuild
deleted file mode 100644
index 6d77007..0000000
--- a/dev-python/nose/nose-1.3.4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring"
-HOMEPAGE="https://pypi.python.org/pypi/nose http://readthedocs.org/docs/nose/ https://bitbucket.org/jpellerin/nose"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples test"
-
-RDEPEND="dev-python/coverage[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )
-	test? ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7) )"
-
-python_prepare_all() {
-	# Tests need to be converted, and they don't respect BUILD_DIR.
-	use test && DISTUTILS_IN_SOURCE_BUILD=1
-
-	# Disable tests requiring network connection.
-	sed \
-		-e "s/test_resolve/_&/g" \
-		-e "s/test_raises_bad_return/_&/g" \
-		-e "s/test_raises_twisted_error/_&/g" \
-		-i unit_tests/test_twisted.py || die "sed failed"
-	# Disable versioning of nosetests script to avoid collision with
-	# versioning performed by the eclass.
-	sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" \
-		-i setup.py || die "sed2 failed"
-
-	# Prevent un-needed d'loading during doc build
-	sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	local add_targets=()
-
-	if use test; then
-		add_targets+=( egg_info )
-		python_is_python3 && add_targets+=( build_tests )
-	fi
-
-	distutils-r1_python_compile ${add_targets[@]}
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	"${PYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install --install-data "${EPREFIX}/usr/share"
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-
-	if use doc; then
-		dohtml -r -A txt doc/.build/html/.
-	fi
-}
diff --git a/dev-python/nose/nose-1.3.6.ebuild b/dev-python/nose/nose-1.3.6.ebuild
deleted file mode 100644
index fe1725e..0000000
--- a/dev-python/nose/nose-1.3.6.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring"
-HOMEPAGE="
-	https://pypi.python.org/pypi/nose
-	http://readthedocs.org/docs/nose/
-	https://bitbucket.org/jpellerin/nose"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples test"
-
-RDEPEND="
-	dev-python/coverage[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )
-	test? ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7) )"
-
-python_prepare_all() {
-	# Tests need to be converted, and they don't respect BUILD_DIR.
-	use test && DISTUTILS_IN_SOURCE_BUILD=1
-
-	# Disable tests requiring network connection.
-	sed \
-		-e "s/test_resolve/_&/g" \
-		-e "s/test_raises_bad_return/_&/g" \
-		-e "s/test_raises_twisted_error/_&/g" \
-		-i unit_tests/test_twisted.py || die "sed failed"
-	# Disable versioning of nosetests script to avoid collision with
-	# versioning performed by the eclass.
-	sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" \
-		-i setup.py || die "sed2 failed"
-
-	# Prevent un-needed d'loading during doc build
-	sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	local add_targets=()
-
-	if use test; then
-		add_targets+=( egg_info )
-		python_is_python3 && add_targets+=( build_tests )
-	fi
-
-	distutils-r1_python_compile ${add_targets[@]}
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	"${PYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install --install-data "${EPREFIX}/usr/share"
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-
-	if use doc; then
-		dohtml -r -A txt doc/.build/html/.
-	fi
-}
diff --git a/dev-python/nose/nose-1.3.7.ebuild b/dev-python/nose/nose-1.3.7-r1.ebuild
similarity index 88%
rename from dev-python/nose/nose-1.3.7.ebuild
rename to dev-python/nose/nose-1.3.7-r1.ebuild
index 26a7859..4ef52e3 100644
--- a/dev-python/nose/nose-1.3.7.ebuild
+++ b/dev-python/nose/nose-1.3.7-r1.ebuild
@@ -18,13 +18,11 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 
 REQUIRED_USE="
-	doc? (
-		|| ( $(python_gen_useflags 'python2*') )
-	)"
+	doc? ( || ( $(python_gen_useflags 'python2*') ) )"
 
 RDEPEND="
 	dev-python/coverage[${PYTHON_USEDEP}]
@@ -33,6 +31,8 @@
 	doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )
 	test? ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7) )"
 
+PATCHES=( "${FILESDIR}"/${P}-python-3.5-backport.patch )
+
 pkg_setup() {
 	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
 }
@@ -70,10 +70,7 @@
 }
 
 python_compile_all() {
-	if use doc; then
-		python_setup 'python2*'
-		emake -C doc html
-	fi
+	use doc && emake -C doc html
 }
 
 python_test() {
@@ -88,5 +85,4 @@
 	use examples && local EXAMPLES=( examples/. )
 	use doc && HTML_DOCS=( doc/.build/html/. )
 	distutils-r1_python_install_all
-
 }
diff --git a/dev-python/nose/nose-9999.ebuild b/dev-python/nose/nose-9999.ebuild
index fa4b126..67dd103 100644
--- a/dev-python/nose/nose-9999.ebuild
+++ b/dev-python/nose/nose-9999.ebuild
@@ -2,46 +2,46 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-#if LIVE
-EGIT_REPO_URI="git://github.com/nose-devs/${PN}.git
-	https://github.com/nose-devs/${PN}.git"
-inherit git-2
-#endif
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1 eutils
+
+inherit distutils-r1 git-r3
 
 DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring"
-HOMEPAGE="https://pypi.python.org/pypi/nose http://readthedocs.org/docs/nose/ https://github.com/nose-devs/nose"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="
+	https://pypi.python.org/pypi/nose
+	http://readthedocs.org/docs/nose/
+	https://github.com/nose-devs/nose"
+SRC_URI=""
+EGIT_REPO_URI="
+	git://github.com/nose-devs/${PN}.git
+	https://github.com/nose-devs/${PN}.git"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
 IUSE="doc examples test"
 
-RDEPEND="dev-python/coverage[${PYTHON_USEDEP}]
+REQUIRED_USE="
+	doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+RDEPEND="
+	dev-python/coverage[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	doc? ( >=dev-python/sphinx-0.6 )
-	test? ( dev-python/twisted-core )"
+	doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )
+	test? ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7) )"
 
-#if LIVE
-SRC_URI=
-KEYWORDS=
-#endif
-
-DOCS=( AUTHORS )
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
 
 python_prepare_all() {
 	# Tests need to be converted, and they don't respect BUILD_DIR.
 	use test && DISTUTILS_IN_SOURCE_BUILD=1
 
-	# Disable sphinx.ext.intersphinx, requires network
-	epatch "${FILESDIR}/${PN}-0.11.0-disable_intersphinx.patch"
 	# Disable tests requiring network connection.
 	sed \
 		-e "s/test_resolve/_&/g" \
@@ -53,6 +53,9 @@
 	sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" \
 		-i setup.py || die "sed2 failed"
 
+	# Prevent un-needed d'loading during doc build
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
+
 	distutils-r1_python_prepare_all
 }
 
@@ -61,7 +64,7 @@
 
 	if use test; then
 		add_targets+=( egg_info )
-		[[ ${EPYTHON} == python3* ]] && add_targets+=( build_tests )
+		python_is_python3 && add_targets+=( build_tests )
 	fi
 
 	distutils-r1_python_compile ${add_targets[@]}
@@ -72,7 +75,7 @@
 }
 
 python_test() {
-	"${PYTHON}" selftest.py || die "Tests fail with ${EPYTHON}"
+	"${PYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}"
 }
 
 python_install() {
@@ -80,10 +83,7 @@
 }
 
 python_install_all() {
-	local EXAMPLES=( examples/. )
+	use examples && local EXAMPLES=( examples/. )
+	use doc && HTML_DOCS=( doc/.build/html/. )
 	distutils-r1_python_install_all
-
-	if use doc; then
-		dohtml -r -A txt doc/.build/html/.
-	fi
 }
diff --git a/dev-python/numpy/numpy-1.10.4.ebuild b/dev-python/numpy/numpy-1.10.4.ebuild
index 310c4c6..28b5d19 100644
--- a/dev-python/numpy/numpy-1.10.4.ebuild
+++ b/dev-python/numpy/numpy-1.10.4.ebuild
@@ -25,7 +25,7 @@
 # It appears the docs haven't been upgraded, still @ 1.8.1
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack test"
 
 RDEPEND="
@@ -114,6 +114,7 @@
 #		-i numpy/tests/test_scripts.py || die
 
 	distutils-r1_python_prepare_all
+	epatch_user
 }
 
 python_compile() {
diff --git a/dev-python/pip/pip-8.0.2-r1.ebuild b/dev-python/pip/pip-8.0.2-r1.ebuild
index f594034..d377307 100644
--- a/dev-python/pip/pip-8.0.2-r1.ebuild
+++ b/dev-python/pip/pip-8.0.2-r1.ebuild
@@ -32,6 +32,7 @@
 	>=dev-python/pyparsing-2.0.7[${PYTHON_USEDEP}]
 	virtual/python-ipaddress[${PYTHON_USEDEP}]
 "
+# https://github.com/pypa/pip/issues/3057
 RDEPEND="${VENDOR_DEPEND}
 	>=dev-python/setuptools-19.2[${PYTHON_USEDEP}]
 	<dev-python/setuptools-19.4[${PYTHON_USEDEP}]
diff --git a/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild b/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild
index 545cd1d..d5eb94a 100644
--- a/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild
@@ -22,7 +22,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/pyrsistent/pyrsistent-0.11.11.ebuild b/dev-python/pyrsistent/pyrsistent-0.11.11.ebuild
index 57938f9..e84a53c 100644
--- a/dev-python/pyrsistent/pyrsistent-0.11.11.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.11.11.ebuild
@@ -32,6 +32,6 @@
 RESTRICT="test"
 
 python_test() {
-	export 	PYTHONPATH="${S}:${PYTHONPATH}"
+	export PYTHONPATH="${S}:${PYTHONPATH}"
 	py.test -v -v -x || die ${PYTHONPATH}
 }
diff --git a/dev-python/rpy/Manifest b/dev-python/rpy/Manifest
index 8f2eacd..b5e9402 100644
--- a/dev-python/rpy/Manifest
+++ b/dev-python/rpy/Manifest
@@ -5,3 +5,4 @@
 DIST rpy2-2.7.5.tar.gz 177407 SHA256 0d88f7fff21fbef523c8678ed8f850a36052edca4ce702c62f234fdcb52de441 SHA512 132618c42688302145f3df17b2153a40e57a9e3ada0b98c97091349794fcf79c03738dadcde5f3553bb915f6bec5a91812484e7886ce9d61033daab0ad5e62d8 WHIRLPOOL e8f8104add0b2e3ba1f5b0423c39e10c912252b9ba5f47b1fd572f3b3533a224fc689dc247a1c78c7ad2899983e5f494c5477c40f704fbbcb268d75d956275c7
 DIST rpy2-2.7.6.tar.gz 177562 SHA256 ea35a2f37fd36e8af069731bf1421fbb2d3f8550bcb55fde3bebf0bcb1b00a5a SHA512 03c1f62aa367049815504ecea8bb3ff82dee779167ab59eea148e8d631e50151d4ce1805327ddf3b06821a767aab162c613a32d73e814a832d79158b455aab9c WHIRLPOOL 2df3db91e8a8132dbf25703fbb60aa7f17eb63faa56101c5e1697e9a37a21b7545629382643ac5d9420a9953c4d41ef2dc196dd50547d4d1119ec08fb5e0262e
 DIST rpy2-2.7.7.tar.gz 178098 SHA256 bf17d49c83f856a9ca537a7746c5e5edced23c3a181b89b61cb959a5db90339f SHA512 66bb901150d256a2373aa52a4d05bd5cb93acf58e3f21cd55bf5d0f8f204953898b6dc5ebffa26e06b9ab76982a1cc31f0011b8520a059b071033f54e0b8836b WHIRLPOOL 1621345954c54b7250a93ec8fb1ca1ce110d6d9e4391ca023436eef1a70c69b4cdee0a8b01982706e4b6daba5f0fc74770b0ac4517642fb6c4d4ed148ef4eb97
+DIST rpy2-2.7.8.tar.gz 178334 SHA256 4f51bcdddea01a63e624f4b38de4f6b10a2466d82fd7e890791a07b06e51781d SHA512 adbc83c8003963219038b541e0b5d1736eb515fda77e277462e87cd1dfdc39b225bb73a659f62dc7fb1d7678a415047153fa4861328dc0ecf8ba450b3748150e WHIRLPOOL 4c1ffcbd88875223d80f1b078dbf1d8c59b85765b8b106a577d00f0d219560dbba6f5d2b7b66ac59434791781c0b1665c5bbee19f402fa4e1a0fdaa6b4db3852
diff --git a/dev-python/rpy/rpy-2.7.8.ebuild b/dev-python/rpy/rpy-2.7.8.ebuild
new file mode 100644
index 0000000..6c31dd1
--- /dev/null
+++ b/dev-python/rpy/rpy-2.7.8.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 flag-o-matic
+
+MYSLOT=2
+MY_PN=${PN}${MYSLOT}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python interface to the R Programming Language"
+HOMEPAGE="http://rpy.sourceforge.net/ https://pypi.python.org/pypi/rpy2"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-lang/R-3.1
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.13.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+
+# ggplot2 is an optional test dep but not in portage
+S="${WORKDIR}/${MY_P}"
+
+# Tarball absent of doc files in doc folder
+# https://bitbucket.org/rpy2/rpy2/issues/229
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	${PYTHON} -m 'rpy2.tests' || die
+}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index c8a8003..7622db7 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -11,3 +11,4 @@
 DIST setuptools-19.6.1.tar.gz 637780 SHA256 d7fd89a4bbd89ea51aaf18100b50411cc881866f3456f11a8732f1c957f3d7da SHA512 542c41aafdeca3e7658650dfb1c2f5209eb89ae17586cddf1a57316b987507c1263648c93d4177d8d1f775c0ce60c0849b9f4639e395b364ddfe4d92f019be0c WHIRLPOOL 597ed23c4fed9e61f3e8dadfe405fc0cb6be8ccc34c38b3933f69da08452ac53c2ce9e743555544209dd7e55a57fd327bcd7060eb6d0367f869288945dda1a96
 DIST setuptools-19.6.2.tar.gz 641373 SHA256 69261eefdb21057cfbe92ba8032b923d6363d6682967d42cf46388090d0f1a15 SHA512 c00ef832fd4d1514e440c36d90691e48aa179b14d24021dd7a0149dbb0ae8efb801327025a7e1911a29cef63eec7c5cbadfa78c832beb316b8a4391b4ff053fe WHIRLPOOL 3cbc2a1c29050a86a323a0271f4e17adda0df2f99620e54fdaf9038ca9f4e1bb0801fdd309be274c655aaf6fb7c6c77b4babb5cd721c09d9e6904235077b3736
 DIST setuptools-19.6.tar.gz 641502 SHA256 ecd48d753c1a8ecc6a2826b863a6defaafbfd4ceafc0c1d62e5362f5a86912e9 SHA512 79b9a0f595bda16f18997d9937c6bc2e21bb2bb23fcca4be29df2fb71649c5ba973428472e3c795f2a5d6fbcccf1d5f29096a0fb593a4c52fa87b1d003e474da WHIRLPOOL 391f3e20739c717cc42613e099b867ee01cd8a1f3623f31062dee23131c3b1bad2e34345348f76e44ff2b92652cf65931b3fd8b6a7663b9c135a7c03b6954405
+DIST setuptools-19.7.tar.gz 641634 SHA256 9e0783f3e6b736530a84980dce99fb0f01dafcd31b3f600cde2aa446f6f77cc0 SHA512 fe74b10eb1afef5d78cc5cd4d6dbd53ed16f975c693c138181dfb1661276255d214037eb036186d0cdc9dd31d636f9f1067d67bf591542e8ef933afca267ee4c WHIRLPOOL e1ee325d3de9a6b0dfd49fc68129271faeaccf5ffb77a750f553986fc47b75a5003c17a3f00d76be15eb3808d04e7060f5ccddb9ca9c804fbb68ad54c01453f4
diff --git a/dev-python/setuptools/setuptools-19.7.ebuild b/dev-python/setuptools/setuptools-19.7.ebuild
new file mode 100644
index 0000000..3004253
--- /dev/null
+++ b/dev-python/setuptools/setuptools-19.7.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://pypi.python.org/pypi/setuptools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/packaging-15.3-r1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND=">=dev-python/certifi-2015.11.20[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( README.txt docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+	rm -r ./pkg_resources/_vendor || die
+	# disable tests requiring a network connection
+	rm setuptools/tests/test_packageindex.py || die
+
+	# don't run integration tests
+	rm setuptools/tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/testtools/Manifest b/dev-python/testtools/Manifest
index fa1cddc..54b8c86 100644
--- a/dev-python/testtools/Manifest
+++ b/dev-python/testtools/Manifest
@@ -2,3 +2,4 @@
 DIST testtools-1.8.0.tar.gz 207976 SHA256 8afd6400fb4e75adb0b29bd09695ecb2024cd7befab4677a58c147701afadd97 SHA512 b5f0201222d1e8c60fb7c2793bcd38e1c96c6f9fae99e9f3e784d17230c9abbf7325053d501c07e752bad2da36b49e2c79a25d0c20cb9a2f426057f839a77b3a WHIRLPOOL 71d4082197a9c179862fc3c63eadc37d6ff776f0a62e5fb08c296a5bf7109dc5110a2104a1ed15ca97c523aa0afb9e7124805ec6a6ae18f7605d7641abd9c54a
 DIST testtools-1.8.1.tar.gz 209327 SHA256 155ed29086e48156519e15f7801b702c15ba34d8700d80ba606101f448a3839f SHA512 0bd765bd3cc82a38c980d251427f9f32d44c377aa753d2d83c36fb8cfaeb8a10cfc86a38899b89ff454fe11742ab5e309439980e12a8bbae19b3d9df799803d9 WHIRLPOOL 06f654e447b6ae42cffbff454886dc1016746bf218c90e89c4b9361af2dc709acdfdcd0100c1624dffc1f72dec5c8037dd4357aa373a6413abf945c0d27868e1
 DIST testtools-1.9.0.tar.gz 221760 SHA256 b46eec2ad3da6e83d53f2b0eca9a8debb687b4f71343a074f83a16bbdb3c0644 SHA512 d4d78fb3fd105789e1ee749c66f4612494557af963ba7c3bf5b3c322609bb2ce98c6027f714cbf71720fe248d72a459b554aa65374c6a0b56904b7dabb38a112 WHIRLPOOL 926e738afd86fe945765f9fa08fa40deed7e73db4f37eb2fca9fa30321e28cda9c99e86a1e583853fe1abf93919a71c808131d2cd0694cded3d7203a406fc8d9
+DIST testtools-2.0.0.tar.gz 224923 SHA256 8237ab211cdeced2ff69e7b51c66ed8b1fd2aa0b338b1749609f9567646fad57 SHA512 e27659bc1a21f20de7b8f3699198067e25024dfed68fc9553045a1356a8b46df494882b8946212e11c9cb5a1d4ce8882758839a4accf5bd01db4398ff9e0413d WHIRLPOOL db4daec29b6e1fbe4b9c6989af7f0c70dc70a0d39f84336a9885d1e977cbe0303bf5471342a1d74e0e6a7eb961945d6180153711229dc18e8fdbb9f92b4d6df8
diff --git a/dev-python/testtools/testtools-2.0.0.ebuild b/dev-python/testtools/testtools-2.0.0.ebuild
new file mode 100644
index 0000000..367c8a7
--- /dev/null
+++ b/dev-python/testtools/testtools-2.0.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Extensions to the Python standard library unit testing framework"
+HOMEPAGE="https://github.com/testing-cabal/testtools"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+CDEPEND="
+	dev-python/extras[${PYTHON_USEDEP}]
+	>=dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
+	dev-python/mimeparse[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
+	dev-python/pyrsistent[${PYTHON_USEDEP}]
+	>=dev-python/unittest2-1.0.0[${PYTHON_USEDEP}]
+	dev-python/traceback2[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/testscenarios[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	"${PYTHON}" -m testtools.run testtools.tests.test_suite || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/theano/Manifest b/dev-python/theano/Manifest
index 41b7d8a..eb5e9e1 100644
--- a/dev-python/theano/Manifest
+++ b/dev-python/theano/Manifest
@@ -1 +1,2 @@
 DIST Theano-0.6.0.tar.gz 1763756 SHA256 aaa75f9a9b7bf50f09ddcc01fb993cf47513179d0a7bee3d96bfeebd66e76083 SHA512 6333c673df809bed3af952e0759cce4878ed21684367c6eb20e422363c7c5696ea59239ff6a448c6a32771b1069d441b0e3d049f9708ae69d790412303b8ebbd WHIRLPOOL 946fcacb87b7745e72282f5f7e6b67db5fd0e365f55b2c97a8e9e506e30986d90da7c3789636892ca316da33f4f064f99d31fc3771678457dd609fd0c43d9010
+DIST Theano-0.7.0.tar.gz 1985387 SHA256 05b0f6d2467735abea13bdc5c2c1ce3c53f1b89f9ebc5a43abdf71f88cf818b3 SHA512 6e6bf9afdebf3c281d71f5ceda73792e0a52b403b18776a639665767ac73ac4920b5042e29d656d517b8f023e5f9cd5a27086e0456dc40c42abf6f3569da3f06 WHIRLPOOL b79906e39eb8f7cad26160148465b4719d1011e1a4626c98fdb55cd273ff289b0c01278d51fdc8271b71434be0fd036f8259a315b07639e9ad83d1e3bf313687
diff --git a/dev-python/theano/theano-0.6.0.ebuild b/dev-python/theano/theano-0.6.0.ebuild
index 1483766..09384e6 100644
--- a/dev-python/theano/theano-0.6.0.ebuild
+++ b/dev-python/theano/theano-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,15 +11,14 @@
 MYPN=Theano
 MYP=${MYPN}-$(replace_version_separator 3 '')
 
-DESCRIPTION="Python library to define and optimize multi-dimensional arrays mathematical expressions"
+DESCRIPTION="Define and optimize multi-dimensional arrays mathematical expressions"
 HOMEPAGE="https://github.com/Theano/Theano"
-LICENSE="BSD"
-
 SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 SLOT="0"
+LICENSE="BSD"
 IUSE="test"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="sci-libs/scipy[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
@@ -29,5 +28,5 @@
 S="${WORKDIR}/${MYP}"
 
 python_test() {
-	nosetests || die
+	nosetests --verbosity=3 || die
 }
diff --git a/dev-python/theano/theano-0.7.0.ebuild b/dev-python/theano/theano-0.7.0.ebuild
new file mode 100644
index 0000000..46e5945
--- /dev/null
+++ b/dev-python/theano/theano-0.7.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 versionator
+
+MYPN=Theano
+MYP=${MYPN}-$(replace_version_separator 3 '')
+
+DESCRIPTION="Define and optimize multi-dimensional arrays mathematical expressions"
+HOMEPAGE="https://github.com/Theano/Theano"
+SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+IUSE="test"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/numpy-1.6.2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-0.11[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MYP}"
+
+python_prepare_all() {
+	find -type f -name "*.py" -exec \
+	sed \
+		-e 's:theano.compat.six:six:g' \
+		-i '{}' + || die
+
+	rm ${PN}/compat/six.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests --verbosity=3 || die
+}
diff --git a/dev-qt/qtchooser/qtchooser-0_p20151008.ebuild b/dev-qt/qtchooser/qtchooser-0_p20151008.ebuild
index ba9dcdb..b05a883 100644
--- a/dev-qt/qtchooser/qtchooser-0_p20151008.ebuild
+++ b/dev-qt/qtchooser/qtchooser-0_p20151008.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="test"
 
 DEPEND="test? (
diff --git a/dev-ros/cv_bridge/Manifest b/dev-ros/cv_bridge/Manifest
index a7e292a..6b67d1d 100644
--- a/dev-ros/cv_bridge/Manifest
+++ b/dev-ros/cv_bridge/Manifest
@@ -1,3 +1,4 @@
 DIST vision_opencv-1.11.10.tar.gz 106660 SHA256 f9e120a780252b0234cbf3e65260ce3033dd25a81b32f27ccfdda41a3e765a3e SHA512 c8ba5991a50526a2341552f95dcaeb1b1ccf8ea7684f543e50ebcdd5ef0abdcd578364efcf25d4adad976c4382c67ee3d2550c107e569be2fbb675dcf4b8d51e WHIRLPOOL 2d2ba6916a73172035a772fe845b73cec19119370f4955d4c4bf36592d44f22b158d58b8bc67d3ec3fce395e54dcd7ef7eba1dcdefc51d8c85aa1e739b5877b9
+DIST vision_opencv-1.11.11.tar.gz 107062 SHA256 33413f7d805cf6f3edaabae6b264af1e09568085f84763a7b8e76b075962c449 SHA512 ab8d8065937c017ec42e9f0e8ec69934830f7b4de8a47b3d01d56ad4bc661e19f98ef52a8a10bfcd48d448b7187cf44f9cedb48e500e85da052ea1616b686e9e WHIRLPOOL 7c7878e1bb582f98b857d233c5462969e6b4f2488bcd096563e233f6310255c917a2e09ba73550b6d9ab46cd047d3cd3a58548457d1717a06cddf2609085c0c6
 DIST vision_opencv-1.11.8.tar.gz 80160 SHA256 0cf0934d4d9bd91e966afc2f25a4e54646016b6628f4fe58e81faee0c58c88c2 SHA512 55ca2554a3736bd5102bfef14562a6bc341d13eb098fbb7d8d050c90b5d397820791aed54a3697f5084a1b629d959c7abc24172a8efbdfc65490ebdbcb548c77 WHIRLPOOL 8b2b9f4968618258ebd6b2d6d0674ca9c24ed5e7d1adcc4cbbf769e13206017ea06fe5172277a19d67c73c88066270a2e259743ee1b63e4cec7ce8508405b8d3
 DIST vision_opencv-1.11.9.tar.gz 97544 SHA256 3ce781847f5f855083cfae94a8d89defbe4cc83e086b4c796653561aee08b826 SHA512 e1a40997d6a3cf821fb1d57f818b3bcb52d2d0372159eec7f756c7df52fbd2a3ec91ac960cd1a7454f13cd6fe0192f4c019e70fcd4b20d0f797f4845ce676211 WHIRLPOOL c0388e6a40a2b166231b960eff5a011ea2e96c23319209315a86744ac5628d75b9bcb3fd0abdebe941ff89b12852b8813b5e97b3ab7827a2320e0dc0fc64ab74
diff --git a/dev-ros/cv_bridge/cv_bridge-1.11.11.ebuild b/dev-ros/cv_bridge/cv_bridge-1.11.11.ebuild
new file mode 100644
index 0000000..608a617
--- /dev/null
+++ b/dev-ros/cv_bridge/cv_bridge-1.11.11.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Converts between ROS Image messages and OpenCV images"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosconsole
+	media-libs/opencv
+	dev-libs/boost:=[threads,python,${PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_geometry/Manifest b/dev-ros/image_geometry/Manifest
index a7e292a..6b67d1d 100644
--- a/dev-ros/image_geometry/Manifest
+++ b/dev-ros/image_geometry/Manifest
@@ -1,3 +1,4 @@
 DIST vision_opencv-1.11.10.tar.gz 106660 SHA256 f9e120a780252b0234cbf3e65260ce3033dd25a81b32f27ccfdda41a3e765a3e SHA512 c8ba5991a50526a2341552f95dcaeb1b1ccf8ea7684f543e50ebcdd5ef0abdcd578364efcf25d4adad976c4382c67ee3d2550c107e569be2fbb675dcf4b8d51e WHIRLPOOL 2d2ba6916a73172035a772fe845b73cec19119370f4955d4c4bf36592d44f22b158d58b8bc67d3ec3fce395e54dcd7ef7eba1dcdefc51d8c85aa1e739b5877b9
+DIST vision_opencv-1.11.11.tar.gz 107062 SHA256 33413f7d805cf6f3edaabae6b264af1e09568085f84763a7b8e76b075962c449 SHA512 ab8d8065937c017ec42e9f0e8ec69934830f7b4de8a47b3d01d56ad4bc661e19f98ef52a8a10bfcd48d448b7187cf44f9cedb48e500e85da052ea1616b686e9e WHIRLPOOL 7c7878e1bb582f98b857d233c5462969e6b4f2488bcd096563e233f6310255c917a2e09ba73550b6d9ab46cd047d3cd3a58548457d1717a06cddf2609085c0c6
 DIST vision_opencv-1.11.8.tar.gz 80160 SHA256 0cf0934d4d9bd91e966afc2f25a4e54646016b6628f4fe58e81faee0c58c88c2 SHA512 55ca2554a3736bd5102bfef14562a6bc341d13eb098fbb7d8d050c90b5d397820791aed54a3697f5084a1b629d959c7abc24172a8efbdfc65490ebdbcb548c77 WHIRLPOOL 8b2b9f4968618258ebd6b2d6d0674ca9c24ed5e7d1adcc4cbbf769e13206017ea06fe5172277a19d67c73c88066270a2e259743ee1b63e4cec7ce8508405b8d3
 DIST vision_opencv-1.11.9.tar.gz 97544 SHA256 3ce781847f5f855083cfae94a8d89defbe4cc83e086b4c796653561aee08b826 SHA512 e1a40997d6a3cf821fb1d57f818b3bcb52d2d0372159eec7f756c7df52fbd2a3ec91ac960cd1a7454f13cd6fe0192f4c019e70fcd4b20d0f797f4845ce676211 WHIRLPOOL c0388e6a40a2b166231b960eff5a011ea2e96c23319209315a86744ac5628d75b9bcb3fd0abdebe941ff89b12852b8813b5e97b3ab7827a2320e0dc0fc64ab74
diff --git a/dev-ros/image_geometry/image_geometry-1.11.11.ebuild b/dev-ros/image_geometry/image_geometry-1.11.11.ebuild
new file mode 100644
index 0000000..8206647
--- /dev/null
+++ b/dev-ros/image_geometry/image_geometry-1.11.11.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ and Python libraries for interpreting images geometrically"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	media-libs/opencv
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-cpp/gtest )"
diff --git a/dev-ros/moveit_msgs/Manifest b/dev-ros/moveit_msgs/Manifest
index df0dc43..2664871 100644
--- a/dev-ros/moveit_msgs/Manifest
+++ b/dev-ros/moveit_msgs/Manifest
@@ -1 +1,2 @@
 DIST moveit_msgs-0.6.1.tar.gz 16540 SHA256 833e005ecb7bf631fb6b8e6d245739e4bdb626522b75f531cadd730ff67295f1 SHA512 a949e6c71f823b77989241f040d405ca70b0bc560661de83bebadb439e0105f36fbf0fdb36b2365847012deac05a6b21633c0190f21b24ab04facc5d87184e14 WHIRLPOOL 4e668c0961668c2266fe713c312244a48d53c322c87a7713aa39163454aa2612a7b7f4492630f9f08d35e15ab98bb8a15710d9daebc8b9a8765128d44d163bff
+DIST moveit_msgs-0.7.0.tar.gz 16950 SHA256 89f0542707046fdebd7c81f672e6276df198d424fa9d1f44278c35c584850fb5 SHA512 8d532b8a8b141785c1c490862431a576ec6214c7ae3a5a86a9c538fd473a5eac66f88019d6fa659df1fd7b8299200e0e213c20582519ab69c8a5281d2161a183 WHIRLPOOL a400fd0326c884b4c2e151ab821bc67243d1d1b7c33ab1b505c6b3914bae8cf9ad96d010f56f906aa410b950c38b9c07718630b24385a4aa91d62e61e259fcbc
diff --git a/dev-ros/moveit_msgs/moveit_msgs-0.7.0.ebuild b/dev-ros/moveit_msgs/moveit_msgs-0.7.0.ebuild
new file mode 100644
index 0000000..1a0bf19
--- /dev/null
+++ b/dev-ros/moveit_msgs/moveit_msgs-0.7.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros-planning/moveit_msgs"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="
+	dev-ros/actionlib_msgs
+	dev-ros/sensor_msgs
+	dev-ros/geometry_msgs
+	dev-ros/trajectory_msgs
+	dev-ros/shape_msgs
+	dev-ros/std_msgs
+	dev-ros/octomap_msgs
+	dev-ros/object_recognition_msgs
+"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages, services and actions used by MoveIt"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/opencv_apps/Manifest b/dev-ros/opencv_apps/Manifest
index a7e292a..6b67d1d 100644
--- a/dev-ros/opencv_apps/Manifest
+++ b/dev-ros/opencv_apps/Manifest
@@ -1,3 +1,4 @@
 DIST vision_opencv-1.11.10.tar.gz 106660 SHA256 f9e120a780252b0234cbf3e65260ce3033dd25a81b32f27ccfdda41a3e765a3e SHA512 c8ba5991a50526a2341552f95dcaeb1b1ccf8ea7684f543e50ebcdd5ef0abdcd578364efcf25d4adad976c4382c67ee3d2550c107e569be2fbb675dcf4b8d51e WHIRLPOOL 2d2ba6916a73172035a772fe845b73cec19119370f4955d4c4bf36592d44f22b158d58b8bc67d3ec3fce395e54dcd7ef7eba1dcdefc51d8c85aa1e739b5877b9
+DIST vision_opencv-1.11.11.tar.gz 107062 SHA256 33413f7d805cf6f3edaabae6b264af1e09568085f84763a7b8e76b075962c449 SHA512 ab8d8065937c017ec42e9f0e8ec69934830f7b4de8a47b3d01d56ad4bc661e19f98ef52a8a10bfcd48d448b7187cf44f9cedb48e500e85da052ea1616b686e9e WHIRLPOOL 7c7878e1bb582f98b857d233c5462969e6b4f2488bcd096563e233f6310255c917a2e09ba73550b6d9ab46cd047d3cd3a58548457d1717a06cddf2609085c0c6
 DIST vision_opencv-1.11.8.tar.gz 80160 SHA256 0cf0934d4d9bd91e966afc2f25a4e54646016b6628f4fe58e81faee0c58c88c2 SHA512 55ca2554a3736bd5102bfef14562a6bc341d13eb098fbb7d8d050c90b5d397820791aed54a3697f5084a1b629d959c7abc24172a8efbdfc65490ebdbcb548c77 WHIRLPOOL 8b2b9f4968618258ebd6b2d6d0674ca9c24ed5e7d1adcc4cbbf769e13206017ea06fe5172277a19d67c73c88066270a2e259743ee1b63e4cec7ce8508405b8d3
 DIST vision_opencv-1.11.9.tar.gz 97544 SHA256 3ce781847f5f855083cfae94a8d89defbe4cc83e086b4c796653561aee08b826 SHA512 e1a40997d6a3cf821fb1d57f818b3bcb52d2d0372159eec7f756c7df52fbd2a3ec91ac960cd1a7454f13cd6fe0192f4c019e70fcd4b20d0f797f4845ce676211 WHIRLPOOL c0388e6a40a2b166231b960eff5a011ea2e96c23319209315a86744ac5628d75b9bcb3fd0abdebe941ff89b12852b8813b5e97b3ab7827a2320e0dc0fc64ab74
diff --git a/dev-ros/opencv_apps/opencv_apps-1.11.11.ebuild b/dev-ros/opencv_apps/opencv_apps-1.11.11.ebuild
new file mode 100644
index 0000000..6d271ab
--- /dev/null
+++ b/dev-ros/opencv_apps/opencv_apps-1.11.11.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+
+inherit ros-catkin
+
+DESCRIPTION="OpenCV applications for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cv_bridge
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/image_transport
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nodelet
+	dev-ros/roscpp
+	>=media-libs/opencv-3:0=[contrib]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/opencv_tests/Manifest b/dev-ros/opencv_tests/Manifest
index a7e292a..6b67d1d 100644
--- a/dev-ros/opencv_tests/Manifest
+++ b/dev-ros/opencv_tests/Manifest
@@ -1,3 +1,4 @@
 DIST vision_opencv-1.11.10.tar.gz 106660 SHA256 f9e120a780252b0234cbf3e65260ce3033dd25a81b32f27ccfdda41a3e765a3e SHA512 c8ba5991a50526a2341552f95dcaeb1b1ccf8ea7684f543e50ebcdd5ef0abdcd578364efcf25d4adad976c4382c67ee3d2550c107e569be2fbb675dcf4b8d51e WHIRLPOOL 2d2ba6916a73172035a772fe845b73cec19119370f4955d4c4bf36592d44f22b158d58b8bc67d3ec3fce395e54dcd7ef7eba1dcdefc51d8c85aa1e739b5877b9
+DIST vision_opencv-1.11.11.tar.gz 107062 SHA256 33413f7d805cf6f3edaabae6b264af1e09568085f84763a7b8e76b075962c449 SHA512 ab8d8065937c017ec42e9f0e8ec69934830f7b4de8a47b3d01d56ad4bc661e19f98ef52a8a10bfcd48d448b7187cf44f9cedb48e500e85da052ea1616b686e9e WHIRLPOOL 7c7878e1bb582f98b857d233c5462969e6b4f2488bcd096563e233f6310255c917a2e09ba73550b6d9ab46cd047d3cd3a58548457d1717a06cddf2609085c0c6
 DIST vision_opencv-1.11.8.tar.gz 80160 SHA256 0cf0934d4d9bd91e966afc2f25a4e54646016b6628f4fe58e81faee0c58c88c2 SHA512 55ca2554a3736bd5102bfef14562a6bc341d13eb098fbb7d8d050c90b5d397820791aed54a3697f5084a1b629d959c7abc24172a8efbdfc65490ebdbcb548c77 WHIRLPOOL 8b2b9f4968618258ebd6b2d6d0674ca9c24ed5e7d1adcc4cbbf769e13206017ea06fe5172277a19d67c73c88066270a2e259743ee1b63e4cec7ce8508405b8d3
 DIST vision_opencv-1.11.9.tar.gz 97544 SHA256 3ce781847f5f855083cfae94a8d89defbe4cc83e086b4c796653561aee08b826 SHA512 e1a40997d6a3cf821fb1d57f818b3bcb52d2d0372159eec7f756c7df52fbd2a3ec91ac960cd1a7454f13cd6fe0192f4c019e70fcd4b20d0f797f4845ce676211 WHIRLPOOL c0388e6a40a2b166231b960eff5a011ea2e96c23319209315a86744ac5628d75b9bcb3fd0abdebe941ff89b12852b8813b5e97b3ab7827a2320e0dc0fc64ab74
diff --git a/dev-ros/opencv_tests/opencv_tests-1.11.11.ebuild b/dev-ros/opencv_tests/opencv_tests-1.11.11.ebuild
new file mode 100644
index 0000000..770ea0b
--- /dev/null
+++ b/dev-ros/opencv_tests/opencv_tests-1.11.11.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
+KEYWORDS="~amd64 ~arm"
+# Be careful: It needs opencv with python support but opencv is python-single-r1
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tests for ROS OpenCV integration"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cv_bridge[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	media-libs/opencv[python,python_single_target_python2_7]
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	ros-catkin_src_install
+	insinto /usr/share/${PN}/launch
+	doins launch/*.launch
+	exeinto /usr/libexec/${PN}
+	doexe nodes/*
+}
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index e5fa61b..fb49484 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,3 +1,4 @@
 DIST capybara-1.1.4.gem 72192 SHA256 33073d7e4920a3e74c61ec46d1afe655eb0f3361187113c5e146df498e4611ed SHA512 102738031281d0fabd645fa6d941cf0a9ddd56f90d53d7cc1c8a7b03a37b6af8f4cddd178e6fc07d6751a539a5039cf20502eabdd49e8001793601bb312b47a3 WHIRLPOOL 81eff318acfdc0806c9f8d4e212068edd57694d44db1e29bbefaa7a4db162f3a2354374d6ab97ad7c2372ff9e6f6bb864ed483050facad5c298c2223a39c63cc
 DIST capybara-2.5.0.gem 240640 SHA256 755c32b0ba828b2671ca63605cce4e4c3b494b16e91bf4f99e445975488ebc61 SHA512 30431cc78c16a26f850ef1a1d60af4c9934ce89ffa3ed9c305af903640a66dc78e831614c22ed7725bf23d70e5de6b50b6c1d23cc3e33c815e73a2f1117dc13c WHIRLPOOL cb1dded65c7a789a46df0a86fbaf1f3104a4ece86133b8003c8c6ac18b8d6ed4d86f50310fe7d5a4d523393258c9bbf636c088d00f2a9d8f751390ed08d02bca
 DIST capybara-2.6.0.gem 220160 SHA256 a34de24ef02b2cd42367f580a8b005e3793fb0a6a53a71d7d8c267ec1a1472fc SHA512 d7b2006565bb3118f5c16d2bf50aa833f56bd862b00b3dc483d09e1f1474f5882b3121d69ae0699c90f950589b8d673f384e20b93f1eee663dbfd76801ce2993 WHIRLPOOL d9da6ec338df9d2eda4019df877f66d68329a8027f00331f5f2fab6f9ffd051c0ada0843dcf27d93843f818619367a220092dfea47708a4c2e1dfc8b51690c2a
+DIST capybara-2.6.2.gem 220160 SHA256 dc03b0065090b6f7a41fc242d15f06ea5bc97337620fa8fbd2a541ce8b3ac752 SHA512 a50de9bf3e09270a8ad4739326ecb938901e098caa7610cb5daa3df7d79753dcbe77beca60237d3a0536e0e6518af517dc6d96e9fea37d19ceb89a6f6905969d WHIRLPOOL 509b8963f5ea7808f4ebf1c24a34bcfa8b27374f900d63a2c07a44367e48e2208e30477f92e058d2b8724ce063c8f03b76046303a98d9325ce03d5405400b40f
diff --git a/dev-ruby/capybara/capybara-2.6.2.ebuild b/dev-ruby/capybara/capybara-2.6.2.ebuild
new file mode 100644
index 0000000..29d850a
--- /dev/null
+++ b/dev-ruby/capybara/capybara-2.6.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+# Rake tasks are not distributed in the gem.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit virtualx ruby-fakegem
+
+DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
+HOMEPAGE="https://github.com/jnicklas/capybara"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="2"
+IUSE="test"
+
+DEPEND="${DEPEND} test? ( www-client/firefox )"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec:3 dev-ruby/launchy >=dev-ruby/selenium-webdriver-2.0 )"
+
+ruby_add_rdepend "
+	dev-ruby/addressable
+	>=dev-ruby/mime-types-1.16:*
+	>=dev-ruby/nokogiri-1.3.3
+	>=dev-ruby/rack-1.0.0:*
+	>=dev-ruby/rack-test-0.5.4
+	>=dev-ruby/xpath-2.0.0:2"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' -e '/pry/d' spec/spec_helper.rb || die
+
+	# Avoid window-manager specific tests (sizes are specific for fluxbox)
+	sed -i -e '/#maximize/,/^  end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die
+}
+
+each_ruby_test() {
+	VIRTUALX_COMMAND=${RUBY}
+	virtualmake -Ilib -S rspec-3 spec || die "Tests failed."
+}
diff --git a/dev-ruby/diff-lcs/diff-lcs-1.2.5-r1.ebuild b/dev-ruby/diff-lcs/diff-lcs-1.2.5-r1.ebuild
index 93274db..2409788 100644
--- a/dev-ruby/diff-lcs/diff-lcs-1.2.5-r1.ebuild
+++ b/dev-ruby/diff-lcs/diff-lcs-1.2.5-r1.ebuild
@@ -17,5 +17,5 @@
 
 LICENSE="|| ( MIT Ruby GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
diff --git a/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.4.ebuild b/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.4.ebuild
index a35f0b2..2ffc319 100644
--- a/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.4.ebuild
+++ b/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.4.ebuild
@@ -18,7 +18,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/nokogiri/nokogiri-1.6.6.2.ebuild b/dev-ruby/nokogiri/nokogiri-1.6.6.2.ebuild
index f05e4fd..452bda4 100644
--- a/dev-ruby/nokogiri/nokogiri-1.6.6.2.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.6.6.2.ebuild
@@ -18,7 +18,7 @@
 LICENSE="MIT"
 SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/rack-cache/Manifest b/dev-ruby/rack-cache/Manifest
index c59d1f5..f90c509 100644
--- a/dev-ruby/rack-cache/Manifest
+++ b/dev-ruby/rack-cache/Manifest
@@ -1,2 +1,3 @@
 DIST rack-cache-1.3.0.tar.gz 258225 SHA256 356f849e285fa2cf00c1d6823aa2202d14add67815b07b70048242f7c61c6df8 SHA512 d7028456b7059b775a75f35ae2f7a4a00bfe908ebc7e7f57b2f659f9690ac40085d3dc89acd0b1e540cf309e218a276504650a50f092557b7ef871a66aa6bfbf WHIRLPOOL 8e456b7eff61913cd75c2f1a20c55ff6f1430ca28384b6d743c976df7677b3334e6c83628c1fc9fb7d11b268b71c5c8e653ad8b0c59430a691071c37a657e916
 DIST rack-cache-1.5.1.tar.gz 258817 SHA256 77afa21e3d2c97224795b740d4a67b23e2fbb15515b774b897993343265545f5 SHA512 e7d2804d2e4f48f8333ee9689251f760290eb15c692a55dd1bfdcfcbecc677afbf6db949c8ca9bc79e7248c58ca5f6f89bc13ab912c34f33e119befcdde902f8 WHIRLPOOL e3808050537411af5f210b7201da8f3b2b4d499a20e9a161ef29c88edba80348919629b23b929d9361982c4c328dcdae25eba3c616cbbab0ef626da6bfa0d590
+DIST rack-cache-1.6.0.tar.gz 259383 SHA256 6c365f1a80a21701dd86b24bf5aa832fb3c70bd0ab1ede594ddc4a15e2376291 SHA512 d15e0eb55213e4ba7c528417c7f460606f4ac24222a0aa913859b8801e8b608600818c230a7677ccec99b1040a62a7067c1911ac109ae14d58c4ff140e502070 WHIRLPOOL 05f37a92b8affd318092218c871b1b3b7b7fe6f55088eb617af783fb178b6552dc5c19461ed2104053832fb9d84bddd0b0f34d250127167044961c7d10c810cb
diff --git a/dev-ruby/rack-cache/rack-cache-1.6.0.ebuild b/dev-ruby/rack-cache/rack-cache-1.6.0.ebuild
new file mode 100644
index 0000000..120d56e
--- /dev/null
+++ b/dev-ruby/rack-cache/rack-cache-1.6.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+# no documentation is generable, it needs hanna, which is broken
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md doc/*"
+
+inherit versionator ruby-fakegem
+
+DESCRIPTION="Enable HTTP caching for Rack-based applications that produce freshness info"
+HOMEPAGE="https://github.com/rtomayko/rack-cache"
+SRC_URI="https://github.com/rtomayko/rack-cache/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.2"
+KEYWORDS="~amd64 ~arm ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rack:*"
+
+ruby_add_bdepend "test? (
+	dev-ruby/maxitest
+	>=dev-ruby/minitest-5.7.0:5
+	>=dev-ruby/mocha-0.13.0 )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' \
+		-e "2i require 'timeout'" \
+		test/test_helper.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -I.:lib:test -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/rake-compiler/rake-compiler-0.9.2-r1.ebuild b/dev-ruby/rake-compiler/rake-compiler-0.9.2-r1.ebuild
index e9d222b..e7570c8 100644
--- a/dev-ruby/rake-compiler/rake-compiler-0.9.2-r1.ebuild
+++ b/dev-ruby/rake-compiler/rake-compiler-0.9.2-r1.ebuild
@@ -19,7 +19,7 @@
 SRC_URI="https://github.com/luislavena/${PN}/tarball/v${PV} -> ${P}.tar.gz"
 RUBY_S="luislavena-${PN}-*"
 
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild b/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild
index 0582047..8f4139a 100644
--- a/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild
@@ -25,7 +25,7 @@
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-2.14.5-r1.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-2.14.5-r1.ebuild
index 4dc96b0..d3444e8 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-2.14.5-r1.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-2.14.5-r1.ebuild
@@ -20,7 +20,7 @@
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/diff-lcs-1.1.3"
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-2.14.6-r1.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-2.14.6-r1.ebuild
index d446deb..039059b 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-2.14.6-r1.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-2.14.6-r1.ebuild
@@ -18,7 +18,7 @@
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/rspec-rails/Manifest b/dev-ruby/rspec-rails/Manifest
index 85968ed..d07af39 100644
--- a/dev-ruby/rspec-rails/Manifest
+++ b/dev-ruby/rspec-rails/Manifest
@@ -4,3 +4,4 @@
 DIST rspec-rails-3.3.2.tar.gz 102934 SHA256 efdfadb375e0a64b6a306482ab705bdd9f147ff8c6b1acebb1981e50d5043b1c SHA512 59d8c516e3b7b5138c08d6cc2d68e21078dec0b340f9c0f709c9fa9cb7c318718454a8e11737a3ff1f2e940fc7d8db425b36bffda6966ad5f270923ffb9345bc WHIRLPOOL 6501d7b3467dcbec069472e6510a8c48a0a50b5f02ad6be5336b8c0bd2f841e72d865a3a8260bc4ef47744f6fd39eb4554c0c14d47153b2c1dce829d446b3672
 DIST rspec-rails-3.3.3.tar.gz 102963 SHA256 b0edc645a25c929deb39a7334894922cdf67cf7cb895bb728751d0d3a459fac9 SHA512 72c8a027d3ac7c8487c4dec23c91c7014456e6d8ed10f80f72e71c90e7bde0a3c005dd6b57985b1f3e32b32cb6d4610f651f8aa4b81156536a667a266e816603 WHIRLPOOL 78b00968fe75cd632b94bd4b2f244dc6ac50e708b9023baf882bba6ef76b827b681f55dd88be0220988c49d308b9bde4e3344456980db0d9a5654e39f65edd93
 DIST rspec-rails-3.4.0.tar.gz 113846 SHA256 8cbe0b54e1000e3b5f9810c22b8387f95d34c482eea00177c4895b6a5d38673e SHA512 d9bc98a2af31dba2149c678025b2e9ffc7120daec2a0326fd50f1dd3e47efd8cb636fda10728d637792a4a9bdeeed54650892af11aafa4ec4baaa7577329985e WHIRLPOOL b8e0934ba838acbab96123d6327e1910c86117b5f3b16206ec782d4e12c4cf2e59f2fce481a29d6cb3b80804407859523a9bbc38c6e58b8d35f2d7ef0e09fb2f
+DIST rspec-rails-3.4.2.tar.gz 114252 SHA256 ff54962e135baad173aa987ba08ea4d35b2479cc32beaa2d348e2dfb95bffc85 SHA512 922a666ac674d6e91083caf5b5526556add9ffc8783f3f5af8a7d60afb2353b99730e367d522b91bf487fcbe9282fbf51648487c9d0bed005882dc57d7fb57bc WHIRLPOOL 7004dec656c42d2c0ad1a930c4df04955acb0b936c75699f902cd42acb1e42fc9cab7340acf8da834b769d5740431d2ad6e83ea1b61d60939d7d523bb6462977
diff --git a/dev-ruby/rspec-rails/rspec-rails-3.4.2.ebuild b/dev-ruby/rspec-rails/rspec-rails-3.4.2.ebuild
new file mode 100644
index 0000000..610b7d8
--- /dev/null
+++ b/dev-ruby/rspec-rails/rspec-rails-3.4.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="RSpec's official Ruby on Rails plugin"
+HOMEPAGE="http://rspec.info/"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE=""
+
+SUBVERSION="$(get_version_component_range 1-2)"
+
+ruby_add_rdepend ">=dev-ruby/activesupport-3.0:* <dev-ruby/activesupport-4.3:*
+	>=dev-ruby/actionpack-3.0:* <dev-ruby/actionpack-4.3:*
+	>=dev-ruby/railties-3.0:* <dev-ruby/railties-4.3:*
+	=dev-ruby/rspec-${SUBVERSION}*"
+
+# Depend on the package being already installed for tests, because
+# requiring ammeter will load it, and we need a consistent set of rspec
+# and rspec-rails for that to work.
+ruby_add_bdepend "test? (
+	=dev-ruby/mocha-0.10*
+	>=dev-ruby/capybara-2.0.0
+	>=dev-ruby/ammeter-1.1.2
+	~dev-ruby/rspec-rails-${PV}
+)"
+
+all_ruby_prepare() {
+	# Remove .rspec options to avoid dependency on newer rspec when
+	# bootstrapping.
+	rm -f .rspec || die
+
+	# Avoid bundler-specific specs.
+	rm -f spec/sanity_check_spec.rb || die
+
+	# Avoid broken controller generator specs for now.
+	rm -fr spec/generators/rspec || die
+
+	# Avoid loading rspec/rails explicitly since ammeter/init will also
+	# do this and loading it twice causes an error
+	sed -i -e '/rspec\/rails/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/rspec/rspec-2.14.1-r1.ebuild b/dev-ruby/rspec/rspec-2.14.1-r1.ebuild
index 89aa78c..ace2361 100644
--- a/dev-ruby/rspec/rspec-2.14.1-r1.ebuild
+++ b/dev-ruby/rspec/rspec-2.14.1-r1.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/ruby_parser/Manifest b/dev-ruby/ruby_parser/Manifest
index a8c93e5..074f7c2 100644
--- a/dev-ruby/ruby_parser/Manifest
+++ b/dev-ruby/ruby_parser/Manifest
@@ -1,2 +1,3 @@
 DIST ruby_parser-3.6.6.gem 250880 SHA256 d3a3ff8e472f85d769e848caa94938e5c4a7b5d9df75384056431bade8bd2cf5 SHA512 c28fea8970c6449a59c1fed1cb2fec3cd167d45c622a7d7de85cf22f24238cd91e3fae4c20ff0de4bd0f4c3afdfd1979e16ee73f60104bcc39469d13650be02a WHIRLPOOL fdf8abbb6eb1e2c421704effd574b5d7baa21059267fad53b1a4f9e80f46c76afe65065e7b5753769c06159a6bd8c84453b9d8d3989f91492fefb15a7b5a6a64
 DIST ruby_parser-3.7.2.gem 311296 SHA256 7f639194041e51680b530480990c0ca3632507e3740a8ef4516592550e3037e6 SHA512 52c026ebdcc687059818d42bb0f4c8e960209deb19f86bd3204c6b0bd3e06ffa01e9d628587f88c866756a81914d5b3cb7df2947433eb39d214a4a144c168442 WHIRLPOOL 63b3189f5ac5153aee8ce7ff1c2ae2533199b59db016a1159e80ec31b23b87e08e97a6bff9112533216f2b07d28ab16e52f462921a0779d45d0cb1c79b1e613f
+DIST ruby_parser-3.7.3.gem 311296 SHA256 fdcbe21874bfe584ab329bccbc1fc0c2bde9d3c7d0b076b10de18e645117f1ae SHA512 eeb468111152a80fa047dfebbfb29ea94e4b76fc2c88e49f9094a0bdfd0c4d61bd2831a10a2556d4363e6a46093a8209a3599ce16b8f63b88a29b2d850556c16 WHIRLPOOL 5c6ab80d4a18f8b1533941436ef0ab812069159bac76fac087fbcff583d2f3126f118357a25f84027bf361e4471fdf909af8ce4165728afa2732ed1a91275f54
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.7.3.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.7.3.ebuild
new file mode 100644
index 0000000..7fa23ed
--- /dev/null
+++ b/dev-ruby/ruby_parser/ruby_parser-3.7.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_TASK_DOC="docs"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A ruby parser written in pure ruby"
+HOMEPAGE="https://github.com/seattlerb/ruby_parser"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/sexp_processor-4.6.1:4
+	!<dev-ruby/ruby_parser-2.3.1-r1"
+
+ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.9.1 )"
+ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 )"
+
+DEPEND+=" test? ( dev-util/unifdef )"
+
+all_ruby_prepare() {
+	# Remove reference to perforce method that is not in a released
+	# version of hoe-seattlerb.
+	#sed -i -e '/perforce/d' Rakefile || die
+	sed -i -e '/license/d' Rakefile || die
+	sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/shoulda/shoulda-2.11.3-r1.ebuild b/dev-ruby/shoulda/shoulda-2.11.3-r1.ebuild
deleted file mode 100644
index 6198d82..0000000
--- a/dev-ruby/shoulda/shoulda-2.11.3-r1.ebuild
+++ /dev/null
@@ -1,28 +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"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CONTRIBUTION_GUIDELINES.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Making tests easy on the fingers and eyes"
-HOMEPAGE="http://thoughtbot.com/projects/shoulda"
-SRC_URI="https://github.com/thoughtbot/${PN}/tarball/v${PV} -> ${P}.tar.gz"
-RUBY_S="thoughtbot-${PN}-*"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# tests seem to be quite broken :( They require working version of
-# various rails versions. There appear to be unit and matcher tests but
-# they can't be run on their own.
-RESTRICT=test
diff --git a/dev-ruby/shoulda/shoulda-3.5.0-r1.ebuild b/dev-ruby/shoulda/shoulda-3.5.0-r1.ebuild
deleted file mode 100644
index d169225..0000000
--- a/dev-ruby/shoulda/shoulda-3.5.0-r1.ebuild
+++ /dev/null
@@ -1,34 +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="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Making tests easy on the fingers and eyes"
-HOMEPAGE="http://thoughtbot.com/projects/shoulda"
-SRC_URI="https://github.com/thoughtbot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64"
-IUSE=""
-
-# This now more or less a meta-gem and it only contains features for
-# integration tests using Appraisals, which we don't currently package.
-RESTRICT=test
-
-ruby_add_rdepend ">=dev-ruby/shoulda-context-1.0.1
-	>=dev-ruby/shoulda-matchers-1.4.1"
-
-all_ruby_prepare() {
-	sed -e '/git ls-files/d' -i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/totoridipjp/metadata.xml b/dev-ruby/totoridipjp/metadata.xml
index 4b45643..ddf5da9 100644
--- a/dev-ruby/totoridipjp/metadata.xml
+++ b/dev-ruby/totoridipjp/metadata.xml
@@ -9,6 +9,6 @@
 		<name>Gentoo Ruby Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="rubygems">delayer-deferred</remote-id>
+		<remote-id type="rubygems">totoridipjp</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/totoridipjp/totoridipjp-0.1.0.ebuild b/dev-ruby/totoridipjp/totoridipjp-0.1.0.ebuild
index b7ef079..fad356c 100644
--- a/dev-ruby/totoridipjp/totoridipjp-0.1.0.ebuild
+++ b/dev-ruby/totoridipjp/totoridipjp-0.1.0.ebuild
@@ -1,14 +1,20 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
+RUBY_FAKEGEM_BINWRAP=""
+
 inherit ruby-fakegem
+
 DESCRIPTION="A ruby binding to use totori.dip.jp Web API"
 HOMEPAGE="https://rubygems.org/gems/totoridipjp"
 
@@ -16,7 +22,3 @@
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-
-all_ruby_prepare() {
-	rm -fvr bin/ || die
-}
diff --git a/dev-ruby/unf_ext/Manifest b/dev-ruby/unf_ext/Manifest
index 16ffa3c..82a7b8d 100644
--- a/dev-ruby/unf_ext/Manifest
+++ b/dev-ruby/unf_ext/Manifest
@@ -1,2 +1,2 @@
-DIST unf_ext-0.0.6.gem 395264 SHA256 afcdba30a57665a4540c5d43b2833c6a3677a3296428fa70fbd7b4c8feaceb1f SHA512 ae6df02589e0ce4189127836bdc18f7cc2f1c7f7fd2647f0b8d0a80f1175ad1f682a983195527e4f0b50b685de0aaf9377b7c5e955dc49d802176b2db63fc869 WHIRLPOOL 25d54eb777e00b4c96c87079159e05a94c5507d1f165fec6803337f9f4c7f0b8069d578702f5dc2ab0ae05c89b6cbab8b28aa29fbd6d18082c903a0af6cc06df
 DIST unf_ext-0.0.7.1.gem 392192 SHA256 ab58d1a808d38872817bea89fc3f055bfc250af48d9653425e35c7c18caec253 SHA512 06239dc5870ad0f345266b12ad6ed9508ab731dfd37b450d0e1eae1ef8e8301f8ad1ef7fffbbcf69b56b0af5aa257ea279dda3a252bdf397d11949e9885db3d4 WHIRLPOOL 4d5d8c6efb46bb46b65967101389b5b7414bfa507d591e29dfb9d8c354555b9b92a997f19b68e0d4aa58143bf836849f152dafc2936b13a11cac74d7063f3d16
+DIST unf_ext-0.0.7.2.gem 392192 SHA256 e8fa13d09880f8d06d30a86f929a38ba0af6abe61272927a49e6796aee1aa111 SHA512 99e1cada3cc51baf52010b7569f68eff168dfb4c691645c88625738513258191e586e5d99f5ba7f528ce677fdec77a08510f77d9bf2c9234c68ac239f270fbf6 WHIRLPOOL 2e932abce52f87709dbf5f25ba8a7a32bd55410ba10b620db4d23a41855faf0da3486674ea7e9fb11849f9621d0fdbab8739c0486278026ba9e8f27ae47f5332
diff --git a/dev-ruby/unf_ext/unf_ext-0.0.6-r1.ebuild b/dev-ruby/unf_ext/unf_ext-0.0.6-r1.ebuild
deleted file mode 100644
index a23a6cc..0000000
--- a/dev-ruby/unf_ext/unf_ext-0.0.6-r1.ebuild
+++ /dev/null
@@ -1,47 +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"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem multilib
-
-DESCRIPTION="Unicode Normalization Form support library for CRuby"
-HOMEPAGE="http://sourceforge.jp/projects/unf/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/test-unit-2.5.1-r1
-		dev-ruby/shoulda
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/,/end/ s:^:#:' Rakefile test/helper.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/unf_ext extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext/unf_ext CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" V=1
-	cp ext/unf_ext/*$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 test/test_*.rb
-}
diff --git a/dev-ruby/unf_ext/unf_ext-0.0.6-r2.ebuild b/dev-ruby/unf_ext/unf_ext-0.0.7.2.ebuild
similarity index 82%
rename from dev-ruby/unf_ext/unf_ext-0.0.6-r2.ebuild
rename to dev-ruby/unf_ext/unf_ext-0.0.7.2.ebuild
index 01ef53d..c4a1c03 100644
--- a/dev-ruby/unf_ext/unf_ext-0.0.6-r2.ebuild
+++ b/dev-ruby/unf_ext/unf_ext-0.0.7.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
@@ -20,7 +20,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_bdepend "
diff --git a/dev-ruby/zentest/zentest-4.11.0.ebuild b/dev-ruby/zentest/zentest-4.11.0.ebuild
index 4f2b1fd..cc27e26 100644
--- a/dev-ruby/zentest/zentest-4.11.0.ebuild
+++ b/dev-ruby/zentest/zentest-4.11.0.ebuild
@@ -17,7 +17,7 @@
 HOMEPAGE="https://github.com/seattlerb/zentest"
 LICENSE="Ruby"
 
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-tex/latexdiff/latexdiff-1.1.0.ebuild b/dev-tex/latexdiff/latexdiff-1.1.0.ebuild
index 6b44cef..fc73489 100644
--- a/dev-tex/latexdiff/latexdiff-1.1.0.ebuild
+++ b/dev-tex/latexdiff/latexdiff-1.1.0.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 IUSE=""
 
diff --git a/dev-tex/pgf/pgf-3.0.1.ebuild b/dev-tex/pgf/pgf-3.0.1.ebuild
index e061a38..bc3f5d1 100644
--- a/dev-tex/pgf/pgf-3.0.1.ebuild
+++ b/dev-tex/pgf/pgf-3.0.1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2 LPPL-1.3c FDL-1.2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source"
 
 RDEPEND="dev-texlive/texlive-latexrecommended
diff --git a/dev-util/android-tools/android-tools-5.1.1_p13.ebuild b/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
index 8558b9e..c124266 100644
--- a/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
+++ b/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -25,8 +25,8 @@
 IUSE=""
 
 RDEPEND="sys-libs/zlib:=
-	dev-libs/openssl:0="
-
+	dev-libs/openssl:0=
+	dev-libs/libpcre"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}
diff --git a/dev-util/pkgconf/pkgconf-0.9.12.ebuild b/dev-util/pkgconf/pkgconf-0.9.12.ebuild
index ebc4c7f..f4be434 100644
--- a/dev-util/pkgconf/pkgconf-0.9.12.ebuild
+++ b/dev-util/pkgconf/pkgconf-0.9.12.ebuild
@@ -10,7 +10,7 @@
 else
 	inherit eutils multilib-minimal
 	SRC_URI="http://rabbit.dereferenced.org/~nenolod/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
+	KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
diff --git a/dev-vcs/gitg/gitg-3.18.0.ebuild b/dev-vcs/gitg/gitg-3.18.0.ebuild
index b23a33b..e3fa887 100644
--- a/dev-vcs/gitg/gitg-3.18.0.ebuild
+++ b/dev-vcs/gitg/gitg-3.18.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_3,3_4} )
+PYTHON_COMPAT=( python{3_3,3_4,3_5} )
 
 inherit gnome2 python-r1 vala
 
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index a1081e6..0acabff 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -2,5 +2,5 @@
 DIST mercurial-3.3.3.tar.gz 4167447 SHA256 a445367f0dcbaf3a6279bfa743b364e729be0d1f0c852cb6d37f297916ffae13 SHA512 bea215b0bd9e8603ade019f01ae0600dd1d1ad77675b38b5e13d86c43dd2c58b6c86c252517f0fcab6444c171e9f53537e4e170739c991ac08a1111169fe545d WHIRLPOOL e5fd41c6d27d7fce8559a2d15b33e24cf702d9497326e2c1062fe2acd22e7ad16cd6981d3dadb5a7458f12dcd35cc98583f53bc3188d99a9638daddb7d95657b
 DIST mercurial-3.4.2.tar.gz 4296407 SHA256 dcc90e4a8476149ecc8af13c08202860b4c9c987a94c4f3c18b28294b6fd8ecd SHA512 f5ef7064a1ac4189fe4db91fec283cdead257b132674d0869f075b80ba5707e0163e28f18545a9d867336ebc6b1cbb8bcf794b6881b8f23f6c067e68c7ae584b WHIRLPOOL db7389c92680f6058efda6fa4cb7747ff3cd78bc361c43464a938c213b9ce46e8a040a57c68975f02342beb35522c27c3ab6250b2fc6e54777ddd20b0bda5443
 DIST mercurial-3.5.2.tar.gz 4415307 SHA256 23fdc038503911b21dc9e556118803f7b1d4150eb14933d2ea3d0ff0dc60ab5d SHA512 d0a4007763186ab72e7ef6e6f6fa84719fcdc2d16208bc99cc32f44cecdc0ccdf5719e18fbc8a5d0735f6441acc0d82bcac05d7c75fee15966c88ee75e7b6bdd WHIRLPOOL 10ec5dd3d1d2e3487f4a290bc0d32fe2237cc450b54774503e7e9e25b12e895c8065f1c2e27dcaa03deac82d1e10e58dd8ea18e9bacf4f24f58a52a3d5c0fea4
-DIST mercurial-3.6.2.tar.gz 4518349 SHA256 09c567049c3e30f791db0cf5937346c7ff3568deadf4eb1d4e2f7c80001cb3d6 SHA512 2ad780174a30c39a1482d597466523a133b8c62a3a0eb9ac3b183082e279fc624998a9ffa520abafe5f7afc7d9f4600f443ad4dfa1003bd7fdc6b713040091ed WHIRLPOOL cb3270be37b36ad5cfd5f1aac002006b5206daf22504af2143c359bab0d3db19fc7820a03ed819fa80c73610d485f5f85d405b4ad89d0744f79da049afd8866b
 DIST mercurial-3.6.3.tar.gz 4521749 SHA256 402731f27256beb9a575a6991ca3d7059976197c905337f4f5729fd940329fa8 SHA512 e5b39e5456a35e19f2ac02838946305023de957590c5aa2828f7c37e9b5f6f2e6376526d0845ebd1ca198860425d11e208b3c36e12e189e0b02871e9c91aad9a WHIRLPOOL 36f0f6caa43ce2c65c7c2bdfb3fa3935cec1e47c25fae6a6a3c7b00165d1aff9b71c73dd10faad2e2ba096d55cc633366170135d95452c162936fef93571dbf1
+DIST mercurial-3.7.1.tar.gz 4630846 SHA256 96d37d1f444a032295e190318b3166e9d05abb55916d2b3adb618a8f16c5cfed SHA512 32df161756d7c76abd792bfe5dc3d3f2ea39facdc9c9bd8d93193ecd6cc171f050a4e6dae18255614087ba6fa8f9d787aac41b137c233fa9c3f32217a9cad112 WHIRLPOOL 894a9bd7c61f6a6262ec46f8c80b1894348f765216159458795210fed504a4700e8b4b263e305f3c746d180ef27ab1de11fd4926a2969883d529a613dc93e17a
diff --git a/dev-vcs/mercurial/mercurial-3.6.2.ebuild b/dev-vcs/mercurial/mercurial-3.7.1.ebuild
similarity index 98%
rename from dev-vcs/mercurial/mercurial-3.6.2.ebuild
rename to dev-vcs/mercurial/mercurial-3.7.1.ebuild
index 1f57c1e..18f93f9 100644
--- a/dev-vcs/mercurial/mercurial-3.6.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-3.7.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
diff --git a/dev-vcs/rapidsvn/rapidsvn-0.12.1-r3.ebuild b/dev-vcs/rapidsvn/rapidsvn-0.12.1-r3.ebuild
index ccaeca2..fbd6ad2 100644
--- a/dev-vcs/rapidsvn/rapidsvn-0.12.1-r3.ebuild
+++ b/dev-vcs/rapidsvn/rapidsvn-0.12.1-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=6
+EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
 
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index 2ff8c7a..894a93c 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -2,5 +2,5 @@
 DIST tortoisehg-3.3.3.tar.gz 8230380 SHA256 a22ec794b0152b25b085447a253594dde27f71863149b9471ec70669687fb47f SHA512 ed15a2ce76647f6c2d9df2daebc62f983eec6a27ea15a808060d83968cfee2c22f643b2ed6fb48bf06dd5d7cb9f4178e756e539eec2ca43e74fe4c8cfc7da4cf WHIRLPOOL d069dbe4ca109aaf2ebf9dd73f2d87343c2c71a8d5a894a5b7278a5edc878aa7eda56f9d53dca8968d1e730eea94a9f814a5cd76fb4af522a506753a5342cb47
 DIST tortoisehg-3.4.2.tar.gz 8205349 SHA256 d22692166dc6ff61c9d12bfe5ceb77fbf87e7dd52222c956976e7987d84145a1 SHA512 f771536508f1c72c15b1fe7fbf5b3ef6dafbb14314db45776632231dd2d74b46b862476fe78505a08b2271c2ce6419926e6090a2e0a6451da60314ba154fe9f4 WHIRLPOOL cfe0db33da10b2fcafff3e831937488a276924420cfff8a50396e0109c3edef7fb182036d38b72ff8fbf6aafae714eb1b6c4caf109938361babf04eed3addce4
 DIST tortoisehg-3.5.2.tar.gz 7399407 SHA256 f5d36d8f19b508dd00a7ac720af3889defd40e99fcb60d907a0fefb9c867dd63 SHA512 43ab341b4b01b2b28a9ac4290c9902720a10094390d323ab0c4e0962276cd333def7bec818e59a8bbacac9390cb22fd310875eb58f7092573c1254c517ada310 WHIRLPOOL c49707205e06fe269be3c69330d78ca8194a54d709b9056bea502403b4e047a1da46f1cd73ca5d7b052aab6f0d4b3ae4aa93f0544b78f12a6a9ffd8459edfb37
-DIST tortoisehg-3.6.2.tar.gz 7748075 SHA256 3ed668010e7f850ed3932aab83f87f0d0cc8726969283b190e002e9a1d2a3cac SHA512 901962b7f09a4823401ef50407b0767c280089fd00ebbd9c06dd4e88c66fa3814364a82fb7726a53d53837948c623f09d3fdb3c6f432cc9107be3c1a8a826d5f WHIRLPOOL e378aa9a162538196ec127d30788b34aa76e2e786f06d3bb69b0b2e66c96a1c3c3f4a98e8e2f6b3d6a30887a76646473708710596aa77e7c2e6f7d292f55a787
 DIST tortoisehg-3.6.3.tar.gz 7748149 SHA256 99f4ed22082e8c9d7e52f6b0c94d0835cf40aa5a1624f07bb7839d7891ca843b SHA512 5b6fdf8b4233d6802aa0e501e9f9c22ee44391461c0552d73f65a6c26e041ac11efe0ad703558e1f589e421d8759ea0052c634960e51738cc2534d9a73030c1b WHIRLPOOL 9ab2d97658d8e82eb9d12a7be6349fff37e2b8642ff471ac2e30c9f65465f4d9dca86582968bf889e075574c300247583c60152220cd5024ad51f1109abd9431
+DIST tortoisehg-3.7.1.tar.gz 7770904 SHA256 6612dacc2a41f259382ce321fc3dff9630327508062b56744a3a87c9ed448ef9 SHA512 5d4302c6b5db6dc3feaf0fd045500c574bb9eb8de7d7c00b54c6122c80af6eed9fc173173ba23f86aaa06728ec115635caeea5c10d079976e2a6a1c8bab10e3a WHIRLPOOL 06cdbbf7e86170ccd74a7e8cce5527ac7a3e020c13146134dc771bf34667f8ff6623b7ccc674d7b4a14f214e033ed006c5e6d657098c55dc8b970cfe5e5517f4
diff --git a/dev-vcs/tortoisehg/tortoisehg-3.6.2.ebuild b/dev-vcs/tortoisehg/tortoisehg-3.7.1.ebuild
similarity index 93%
rename from dev-vcs/tortoisehg/tortoisehg-3.6.2.ebuild
rename to dev-vcs/tortoisehg/tortoisehg-3.7.1.ebuild
index a4a2d28..3b0a0c0 100644
--- a/dev-vcs/tortoisehg/tortoisehg-3.6.2.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-3.7.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 eutils
@@ -10,7 +10,7 @@
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
-	HG_DEPEND=">=dev-vcs/mercurial-3.5 <dev-vcs/mercurial-3.7"
+	HG_DEPEND=">=dev-vcs/mercurial-3.6 <dev-vcs/mercurial-3.8"
 else
 	inherit mercurial
 	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
diff --git a/eclass/bash-completion.eclass b/eclass/bash-completion.eclass
deleted file mode 100644
index 625ea24..0000000
--- a/eclass/bash-completion.eclass
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# @DEAD
-
-# DEPRECATED
-# This eclass has been superseded by bash-completion-r1 eclass.
-# Please modify your ebuilds to use that one instead.
-
-# @ECLASS: bash-completion.eclass
-# @MAINTAINER:
-# shell-tools@gentoo.org.
-# @AUTHOR:
-# Original author: Aaron Walker <ka0ttic@gentoo.org>
-# @BLURB: An Interface for installing contributed bash-completion scripts
-# @DESCRIPTION:
-# Simple eclass that provides an interface for installing
-# contributed (ie not included in bash-completion proper)
-# bash-completion scripts.
-#
-# Note: this eclass has been deprecated in favor of bash-completion-r1. Please
-# use that one instead.
-
-# @ECLASS-VARIABLE: BASHCOMPLETION_NAME
-# @DESCRIPTION:
-# Install the completion script with this name (see also dobashcompletion)
-
-# @ECLASS-VARIABLE: BASHCOMPFILES
-# @DESCRIPTION:
-# Space delimited list of files to install if dobashcompletion is called without
-# arguments.
-
-inherit eutils
-
-eqawarn "bash-completion.eclass is last rited and will be removed on 2015-11-24."
-eqawarn "Please update your ebuilds to use bash-completion-r1 instead."
-
-EXPORT_FUNCTIONS pkg_postinst
-
-IUSE="bash-completion"
-
-# Allow eclass to be inherited by eselect without a circular dependency
-if [[ ${CATEGORY}/${PN} != app-admin/eselect ]]; then
-	RDEPEND="bash-completion? ( app-admin/eselect )"
-fi
-PDEPEND="bash-completion? ( app-shells/bash-completion )"
-
-# @FUNCTION: dobashcompletion
-# @USAGE: [file] [new_file]
-# @DESCRIPTION:
-# The first argument is the location of the bash-completion script to install,
-# and is required if BASHCOMPFILES is not set. The second argument is the name
-# the script will be installed as. If BASHCOMPLETION_NAME is set, it overrides
-# the second argument. If no second argument is given and BASHCOMPLETION_NAME
-# is not set, it will default to ${PN}.
-dobashcompletion() {
-	local f
-
-	eqawarn "bash-completion.eclass has been deprecated."
-	eqawarn "Please update your ebuilds to use bash-completion-r1 instead."
-
-	if [[ -z ${1} && -z ${BASHCOMPFILES} ]]; then
-		die "Usage: dobashcompletion [file] [new file]"
-	fi
-
-	if use bash-completion; then
-		insinto /usr/share/bash-completion
-		if [[ -n ${1} ]]; then
-			[[ -z ${BASHCOMPLETION_NAME} ]] && BASHCOMPLETION_NAME="${2:-${PN}}"
-			newins "${1}" "${BASHCOMPLETION_NAME}" || die "Failed to install ${1}"
-		else
-			set -- ${BASHCOMPFILES}
-			for f in "$@"; do
-				if [[ -e ${f} ]]; then
-					doins "${f}" || die "Failed to install ${f}"
-				fi
-			done
-		fi
-	fi
-}
-
-# @FUNCTION: bash-completion_pkg_postinst
-# @DESCRIPTION:
-# The bash-completion pkg_postinst function, which is exported
-bash-completion_pkg_postinst() {
-	local f
-
-	if use bash-completion ; then
-		elog "The following bash-completion scripts have been installed:"
-		if [[ -n ${BASHCOMPLETION_NAME} ]]; then
-			elog "	${BASHCOMPLETION_NAME}"
-		else
-			set -- ${BASHCOMPFILES}
-			for f in "$@"; do
-				elog "	$(basename ${f})"
-			done
-		fi
-		elog
-		elog "To enable command-line completion on a per-user basis run:"
-		elog "	eselect bashcomp enable <script>"
-		elog
-		elog "To enable command-line completion system-wide run:"
-		elog "	eselect bashcomp enable --global <script>"
-	fi
-}
diff --git a/eclass/emul-linux-x86.eclass b/eclass/emul-linux-x86.eclass
deleted file mode 100644
index a93c600..0000000
--- a/eclass/emul-linux-x86.eclass
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# @DEAD
-
-#
-# Original Author: Mike Doty <kingtaco@gentoo.org>
-# Adapted from emul-libs.eclass
-# Purpose: Providing a template for the app-emulation/emul-linux-* packages
-#
-
-inherit eutils multilib
-
-case "${EAPI:-0}" in
-	3|4|5)
-		EXPORT_FUNCTIONS src_prepare src_install
-		;;
-	*) die "EAPI=${EAPI} is not supported" ;;
-esac
-
-eqawarn "emul-linux-x86.eclass is last rited and will be removed on 2015-11-24."
-eqawarn "Please remove your copies of emul-linux-x86 ebuilds as they are"
-eqawarn "no longer supported."
-
-DESCRIPTION="Provides precompiled 32bit libraries"
-#HOMEPAGE="https://amd64.gentoo.org/emul/content.xml"
-HOMEPAGE="https://dev.gentoo.org/~pacho/emul.html"
-SRC_URI="https://dev.gentoo.org/~pacho/emul/${P}.tar.xz"
-
-IUSE="+development"
-
-RESTRICT="strip"
-S=${WORKDIR}
-
-QA_PREBUILT="*"
-
-SLOT="0"
-
-DEPEND=">=sys-apps/findutils-4.2.26"
-RDEPEND=""
-
-emul-linux-x86_src_prepare() {
-	ALLOWED=${ALLOWED:-^${S}/etc/env.d}
-	use development && ALLOWED="${ALLOWED}|/usr/lib32/pkgconfig"
-	find "${S}" ! -type d ! '(' -name '*.so' -o -name '*.so.[0-9]*' -o -name '*.h' ')' | egrep -v "${ALLOWED}" | xargs -d $'\n' rm -f || die 'failed to remove everything but *.so*'
-}
-
-emul-linux-x86_src_install() {
-	for dir in etc/env.d etc/revdep-rebuild ; do
-		if [[ -d "${S}"/${dir} ]] ; then
-			for f in "${S}"/${dir}/* ; do
-				mv -f "$f"{,-emul}
-			done
-		fi
-	done
-
-	# remove void directories
-	find "${S}" -depth -type d -print0 | xargs -0 rmdir 2&>/dev/null
-
-	cp -pPR "${S}"/* "${ED}"/ || die "copying files failed!"
-
-	# Do not hardcode lib32, bug #429726
-	local x86_libdir=$(get_abi_LIBDIR x86)
-	if [[ ${x86_libdir} != "lib32" ]] ; then
-		ewarn "Moving lib32/ to ${x86_libdir}/; some libs might not work"
-		mv "${D}"/usr/lib32 "${D}"/usr/${x86_libdir} || die
-		if [[ -d ${D}/lib32 ]] ; then
-			mv "${D}"/lib32 "${D}"/${x86_libdir} || die
-		fi
-
-		pushd "${D}"/usr/${x86_libdir} >/dev/null
-
-		# Fix linker script paths.
-		local ldscripts
-		if ldscripts=( $(grep -ls '^GROUP.*/lib32/' *.so) ) ; then
-			sed -i \
-				-e "s:/lib32/:/${x86_libdir}/:" \
-				"${ldscripts[@]}" || die
-		fi
-
-		# Rewrite symlinks (if need be).
-		local sym tgt
-		while read sym ; do
-			tgt=$(readlink "${sym}")
-			ln -sf "${tgt/lib32/${x86_libdir}}" "${sym}" || die
-		done < <(find -xtype l)
-
-		popd >/dev/null
-	fi
-
-	# Since header wrapping is added as part of gx86-multilib support,
-	# all packages involved install their own copies of i686* headers
-	# when built with abi_x86_32.
-	if [[ -d "${D}"/usr/include ]] && use abi_x86_32; then
-		rm -r "${D}"/usr/include || die
-	fi
-	# The same goes for ${CHOST}- multilib tool prefixing.
-	if path_exists "${D}"/usr/bin/i686-pc-linux-gnu-* && use abi_x86_32; then
-		rm "${D}"/usr/bin/i686-pc-linux-gnu-* || die
-	fi
-}
diff --git a/eclass/php-pear-r1.eclass b/eclass/php-pear-r1.eclass
index 85eee28..237cf83 100644
--- a/eclass/php-pear-r1.eclass
+++ b/eclass/php-pear-r1.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,14 +19,17 @@
 
 EXPORT_FUNCTIONS pkg_setup src_install
 
-# Silence repoman warnings
 case "${EAPI:-0}" in
-        5)
-                PHP_DEPEND="dev-lang/php:*"
-                ;;
-        *)
-                PHP_DEPEND="dev-lang/php"
-                ;;
+	0|1|2|3|4)
+		PHP_DEPEND="dev-lang/php"
+		;;
+	5|6)
+		# Repoman will complain about the missing slot in newer EAPIs.
+		PHP_DEPEND="dev-lang/php:*"
+		;;
+	*)
+		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
+		;;
 esac
 
 DEPEND="${PHP_DEPEND}
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index ac9dfc8..b494e0d 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -190,13 +190,19 @@
 			configure || die "sed failed (QMAKE_CONF_COMPILER)"
 
 		# Respect toolchain and flags in config.tests
-		find config.tests/unix -name '*.test' -type f \
-			-execdir sed -i -e '/bin\/qmake/ s/-nocache //' '{}' + \
-			|| die "sed failed (config.tests)"
+		find config.tests/unix -name '*.test' -type f -execdir \
+			sed -i -e '/bin\/qmake/ s/-nocache //' '{}' + || die
 
 		# Don't add -O3 to CXXFLAGS (bug 549140)
 		sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
 			src/{corelib/corelib,gui/gui}.pro || die "sed failed (optimize_full)"
+
+		# Don't inject -msse/-mavx/... into CXXFLAGS when detecting
+		# compiler support for extended instruction sets (bug 552942)
+		if use x86 && [[ ${QT5_MINOR_VERSION} -ge 5 ]]; then
+			find config.tests/common -name '*.pro' -type f -execdir \
+				sed -i -e '/else:QMAKE_CXXFLAGS\s*+=/ d' '{}' + || die
+		fi
 	fi
 
 	if [[ ${EAPI} == 5 ]]; then
@@ -531,7 +537,7 @@
 		# obsolete flag, does nothing
 		#-qml-debug
 
-		# instruction set support
+		# extended instruction sets support
 		$(is-flagq -mno-sse2    && echo -no-sse2)
 		$(is-flagq -mno-sse3    && echo -no-sse3)
 		$(is-flagq -mno-ssse3   && echo -no-ssse3)
diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass
index ea7cf9f..dc6db5a 100644
--- a/eclass/wxwidgets.eclass
+++ b/eclass/wxwidgets.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -29,7 +29,7 @@
 #      DEPEND="wxwidgets? ( x11-libs/wxGTK:2.8[X?] )"
 #
 #      src_configure() {
-#          if use wxwidgets; then 
+#          if use wxwidgets; then
 #              WX_GTK_VER="2.8"
 #              if use X; then
 #                  need-wxwidgets unicode
@@ -58,20 +58,29 @@
 # Use the -DNDEBUG preprocessor flag to disable debugging features.
 # (Using need-wxwidgets will do this for you, see below.)
 
-inherit eutils flag-o-matic multilib
+if [[ -z ${_WXWIDGETS_ECLASS} ]]; then
+
+case ${EAPI} in
+	0|1|2|3|4|5)
+		inherit eutils flag-o-matic multilib
+		;;
+	*)
+		die "EAPI=${EAPI:-0} is not supported"
+		;;
+esac
 
 # We do this in global scope so ebuilds can get sane defaults just by
 # inheriting.
 if [[ -z ${WX_CONFIG} ]]; then
 	if [[ -n ${WX_GTK_VER} ]]; then
-		for wxtoolkit in mac gtk2 base; do
+		for _wxtoolkit in mac gtk2 base; do
 			# newer versions don't have a seperate debug profile
-			for wxdebug in xxx release- debug-; do
-				wxconf="${wxtoolkit}-unicode-${wxdebug/xxx/}${WX_GTK_VER}"
+			for _wxdebug in xxx release- debug-; do
+				_wxconf="${_wxtoolkit}-unicode-${_wxdebug/xxx/}${WX_GTK_VER}"
 
-				[[ -f ${EPREFIX}/usr/$(get_libdir)/wx/config/${wxconf} ]] || continue
+				[[ -f ${EPREFIX}/usr/$(get_libdir)/wx/config/${_wxconf} ]] || continue
 
-				WX_CONFIG="${EPREFIX}/usr/$(get_libdir)/wx/config/${wxconf}"
+				WX_CONFIG="${EPREFIX}/usr/$(get_libdir)/wx/config/${_wxconf}"
 				WX_ECLASS_CONFIG="${WX_CONFIG}"
 				break
 			done
@@ -80,6 +89,9 @@
 		[[ -n ${WX_CONFIG} ]] && export WX_CONFIG WX_ECLASS_CONFIG
 	fi
 fi
+unset _wxtoolkit
+unset _wxdebug
+unset _wxconf
 
 # @FUNCTION:    need-wxwidgets
 # @USAGE:       <profile>
@@ -106,7 +118,7 @@
 		echo
 		die
 	fi
-	
+
 	if [[ ${WX_GTK_VER} != 2.8 && ${WX_GTK_VER} != 2.9 && ${WX_GTK_VER} != 3.0 ]]; then
 		eerror "Invalid WX_GTK_VER: ${WX_GTK_VER} - must be set to a valid wxGTK SLOT."
 		echo
@@ -160,3 +172,6 @@
 	einfo "Using wxWidgets:            ${wxconf}"
 	echo
 }
+
+_WXWIDGETS_ECLASS=1
+fi
diff --git a/games-board/pychess/Manifest b/games-board/pychess/Manifest
index 209e82d..5910da1 100644
--- a/games-board/pychess/Manifest
+++ b/games-board/pychess/Manifest
@@ -1 +1,2 @@
 DIST pychess-0.10.1.tar.gz 1939605 SHA256 8a8ac9fc6a4605d189a9728f55183130b6a304cbf2dc5b2e923297303fe4ae8a SHA512 1000c840954b93bd3720fd3265b6cc0ac33df22373eb965d4ac03d16f7589af3b10bf2ebc28a2ff555b5e4101bffbfe96d52051e6c51a084229a3cc1691f1dd8 WHIRLPOOL 7554456eea487cefe3d8303aacdfa5748345b9682a8c557a2ed53090cc9a5beacc5b2e874db222b75fc03bcaf61dd9d7c3e2df23a13a4db820d4bd34c2f7b66e
+DIST pychess-0.12.2.tar.gz 4653011 SHA256 feecabcea35cce0d69100e0c995f0a88d83d1246be512f2348c13e40bff9916e SHA512 d20ff665f47b58dce92ee822c6495fb31b84f19b15e70644cb7caefda837597e075f62cd0aa6bdd36f342d3eaa66174f9fa950800ec77346ef1cccfa7e37c735 WHIRLPOOL 0bca1361412f316f6446579646f1d51d525228a4427137711efdca01c75ed3c769fd83d0c4e942db36daa3dbc22e74dd5410c8a33c06a96458d0755a6fca0131
diff --git a/games-board/pychess/pychess-0.12.2.ebuild b/games-board/pychess/pychess-0.12.2.ebuild
new file mode 100644
index 0000000..f77d61e
--- /dev/null
+++ b/games-board/pychess/pychess-0.12.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit fdo-mime gnome2-utils distutils-r1 games
+
+DESCRIPTION="A chess client for Gnome"
+HOMEPAGE="http://pychess.org/"
+SRC_URI="http://pychess.org/download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gstreamer"
+
+DEPEND="dev-python/librsvg-python
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	dev-python/pygtksourceview:2[${PYTHON_USEDEP}]
+	gstreamer? ( dev-python/gst-python:0.10[${PYTHON_USEDEP}] )
+	dev-python/gconf-python
+	x11-themes/gnome-icon-theme"
+RDEPEND=${DEPEND}
+
+python_install() {
+	distutils-r1_python_install --install-scripts="${GAMES_BINDIR}"
+
+	# bug 487706
+	sed -i \
+		-e "s/@PYTHON@/${EPYTHON}/" \
+		"${ED%/}/$(python_get_sitedir)"/${PN}/Players/engineNest.py || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc AUTHORS README.md
+	prepgamesdirs
+}
+
+src_prepare() {
+	distutils-r1_src_prepare
+}
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+src_install() {
+	distutils-r1_src_install
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_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/games-mud/gmudix/files/gmudix-1.0-format.patch b/games-mud/gmudix/files/gmudix-1.0-format.patch
new file mode 100644
index 0000000..77314c9
--- /dev/null
+++ b/games-mud/gmudix/files/gmudix-1.0-format.patch
@@ -0,0 +1,11 @@
+--- src/gui_user.c.old	2016-02-04 21:21:15.141455597 +0100
++++ src/gui_user.c	2016-02-04 21:21:31.016156493 +0100
+@@ -820,7 +820,7 @@
+ 
+     dialog = gtk_message_dialog_new(GTK_WINDOW(user->gui_user.g_window), 
+                 GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, 
+-                GTK_BUTTONS_CLOSE, msg);
++                GTK_BUTTONS_CLOSE, "%s", msg);
+                 
+     gtk_window_set_transient_for(GTK_WINDOW(user->gui_user.g_window), 
+                                  GTK_WINDOW(dialog));
diff --git a/games-mud/gmudix/gmudix-1.0.ebuild b/games-mud/gmudix/gmudix-1.0.ebuild
index 1490308..5896104 100644
--- a/games-mud/gmudix/gmudix-1.0.ebuild
+++ b/games-mud/gmudix/gmudix-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,7 +19,8 @@
 	virtual/pkgconfig"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-as-needed.patch
+	epatch "${FILESDIR}"/${P}-as-needed.patch \
+		"${FILESDIR}"/${P}-format.patch
 	mv configure.in configure.ac || die
 	rm -f missing || die
 	eautoreconf
diff --git a/games-puzzle/krystaldrop/Manifest b/games-puzzle/krystaldrop/Manifest
deleted file mode 100644
index 9f56978..0000000
--- a/games-puzzle/krystaldrop/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST krystaldrop-0.7.2-art.tgz 17079147 SHA256 7cd9dbd1ad12eb7e26e57e2a52b59e7137e20979d4fc8cb21a48faff983f6e27 SHA512 f9cf76007a0c280c450e0fc5a83f0ce01de787382fe12754f4d490a93579db380a3babc1670630fe16f48a1dd6e73c60391ed7c76ce3f7b2fde550ea20c9811a WHIRLPOOL 0eb7f4bb5523c6842523da02f05836b5b212d5e0f3887cc8406b88f285b7e702e0c5d98b63016d67fcd78b02c51bb4f604f2aa9d079372a9c3abc8b0c0bef7aa
-DIST krystaldrop-0.7.2-src.tgz 162856 SHA256 d0e42cf05f241e409649de6a48045c026c42417cdabd233c8fef8783096946e5 SHA512 680b311966ae5d766de0c2f173806e34f7d4b6ae8ca37ad90f1abf70256b2e3f909aca71cf1584d09ac0b53e084ebd668167da33431d2ec7d8e27406d48a39e6 WHIRLPOOL e69ab50d8cda6a740096aa8646dd10f592eeb30c430e37a89f548097331aa540b6d21bf53d6405f2ae87c99d4b1676faa033e8d5e78dbe466b82ba9bb9de536e
diff --git a/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-as-needed.patch b/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-as-needed.patch
deleted file mode 100644
index 54eba0e..0000000
--- a/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Sources/Makefile.old        2009-02-10 10:03:03.000000000 +0100
-+++ Sources/Makefile    2009-02-10 10:04:21.000000000 +0100
-@@ -186,7 +186,7 @@
- 	@$(MAKE) -s --no-print-directory -f Makefile.dep $@
- 
- kdrop: $(OBJ)
--	$(LINK) $(LCFLAGS) $(LIBS) -o $@ $(OBJ)
-+	$(LINK) $(LDFLAGS) $(LCFLAGS) -o $@ $(OBJ) $(LIBS)
- 
- $(OBJ): %.o: dep/%.d
- $(OBJ): %.o: %.cpp
diff --git a/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-cxxflags.patch b/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-cxxflags.patch
deleted file mode 100644
index 7fcb5aa..0000000
--- a/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-cxxflags.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- Sources/Makefile.old	2012-11-09 08:04:43.029680861 +0100
-+++ Sources/Makefile	2012-11-09 08:16:02.650491943 +0100
-@@ -35,10 +35,6 @@
- export
- VERSION=0_7_2
- 
--CC=g++
--LINK=g++
--MAKE=make
--
- SRC= KrystalDrop/main.cpp                              \
-      KrystalDrop/Names.cpp                             \
-      KrystalDrop/Controller/BackgroundController.cpp   \
-@@ -159,7 +155,7 @@
-   CCFLAGS:=$(CCFLAGS) -ggdb -DDEBUG -DDEBUG_SANITY_CHECK
- endif
- ifeq ($(DEBUG_MODE),no)
--  CCFLAGS:=$(CCFLAGS) -O2 -DNDEBUG
-+  CCFLAGS:=$(CCFLAGS) -DNDEBUG
- endif
- ifeq ($(DISPLAY_FPS),yes)
-   CCFLAGS:=$(CCFLAGS) -DDISPLAY_FPS
-@@ -186,11 +182,11 @@
- 	@$(MAKE) -s --no-print-directory -f Makefile.dep $@
- 
- kdrop: $(OBJ)
--	$(LINK) $(LDFLAGS) $(LCFLAGS) -o $@ $(OBJ) $(LIBS)
-+	$(CXX) $(LDFLAGS) $(LCFLAGS) -o $@ $(OBJ) $(LIBS)
- 
- $(OBJ): %.o: dep/%.d
- $(OBJ): %.o: %.cpp
--	$(CC) $(CCFLAGS) -o $@ -c $<
-+	$(CXX) $(CCFLAGS) $(CXXFLAGS) -o $@ -c $<
- 
- clean:
- 	find -name "*.o" -exec rm {} ";"
diff --git a/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-deps.patch b/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-deps.patch
deleted file mode 100644
index 07e60a0..0000000
--- a/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-deps.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: krystaldrop/Makefile.dep
-===================================================================
---- krystaldrop.orig/Makefile.dep
-+++ krystaldrop/Makefile.dep
-@@ -10,7 +10,6 @@ default:
- $(DEP): dep/%.d: %.cpp
- 	@test -d dep/$(dir $*) || mkdir -p dep/$(dir $*)
- 	@$(SHELL) -ec '$(CC) $(CCFLAGS) $(DCFLAGS) $< \
--	| sed '\''s/$(subst .,\.,$(notdir $*))\.o[ :]*/$(subst /,\/,$*).o \
--	dep\/$(subst /,\/,$*).d : /g'\'' > $@; \
-+	| sed '\''s/$(subst .,\.,$(notdir $*))\.o[ :]*/$(subst /,\/,$*).o dep\/$(subst /,\/,$*).d : /g'\'' > $@; \
- 	[ -s $@ ] || rm -f $@'
- 
-Index: krystaldrop/Sources/Makefile.dep
-===================================================================
---- krystaldrop.orig/Sources/Makefile.dep
-+++ krystaldrop/Sources/Makefile.dep
-@@ -10,7 +10,6 @@ default:
- $(DEP): dep/%.d: %.cpp
- 	@test -d dep/$(dir $*) || mkdir -p dep/$(dir $*)
- 	@$(SHELL) -ec '$(CC) $(CCFLAGS) $(DCFLAGS) $< \
--	| sed '\''s/$(subst .,\.,$(notdir $*))\.o[ :]*/$(subst /,\/,$*).o \
--	dep\/$(subst /,\/,$*).d : /g'\'' > $@; \
-+	| sed '\''s/$(subst .,\.,$(notdir $*))\.o[ :]*/$(subst /,\/,$*).o dep\/$(subst /,\/,$*).d : /g'\'' > $@; \
- 	[ -s $@ ] || rm -f $@'
- 
diff --git a/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-gcc41.patch b/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-gcc41.patch
deleted file mode 100644
index c962a21..0000000
--- a/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-gcc41.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Index: krystaldrop/Sources/KDpp/Tools/FilePath.h
-===================================================================
---- krystaldrop.orig/Sources/KDpp/Tools/FilePath.h
-+++ krystaldrop/Sources/KDpp/Tools/FilePath.h
-@@ -75,7 +75,7 @@ public:
- 	/**
- 		Adds a directory before the filePath....
- 	*/
--	void KD_FilePath::PrefixDirectory(const string &path);
-+	void PrefixDirectory(const string &path);
- 
- 
- 	/**
-Index: krystaldrop/Sources/KDpp/Video/Color.h
-===================================================================
---- krystaldrop.orig/Sources/KDpp/Video/Color.h
-+++ krystaldrop/Sources/KDpp/Video/Color.h
-@@ -38,7 +38,7 @@ public:
- 	KD_Color operator*( float lambda );
- 
- 	// Multiply by another color
--	KD_Color KD_Color::operator*( const KD_Color &other );
-+	KD_Color operator*( const KD_Color &other );
- 
- 	// Sets all the components between 0 and 1
- 	void normalize();
-Index: krystaldrop/Sources/KrystalDrop/Game/AnimRow.h
-===================================================================
---- krystaldrop.orig/Sources/KrystalDrop/Game/AnimRow.h
-+++ krystaldrop/Sources/KrystalDrop/Game/AnimRow.h
-@@ -22,7 +22,7 @@ class KD_AnimatedRow: public KD_Row
-    void UpdateBlocks (unsigned multiplier); /* multiplier is used to catch up when a lag has occured */
-   
-   public:
--   KD_AnimatedRow::KD_AnimatedRow (short Height_In_Gems, short x_Offset, 
-+   KD_AnimatedRow (short Height_In_Gems, short x_Offset, 
-                                    KD_Hand* Hand, KD_Parameters* Param, KD_Memo* Memo);
-   ~KD_AnimatedRow();
-   
-Index: krystaldrop/Sources/KrystalDrop/Game/Table.h
-===================================================================
---- krystaldrop.orig/Sources/KrystalDrop/Game/Table.h
-+++ krystaldrop/Sources/KrystalDrop/Game/Table.h
-@@ -329,7 +329,7 @@ public:
- 	/**
- 		Sets the sprites for the border of the field.
- 	*/
--	void KD_Table::setAllBorders(KD_Sprite *spr[KD_NB_SPRITE_FOR_BORDER]);
-+	void setAllBorders(KD_Sprite *spr[KD_NB_SPRITE_FOR_BORDER]);
- 	void setHorizontalBar(KD_Sprite *spr);
- 	void setVerticalBar(KD_Sprite *spr);
- 	void setUpperLeftBar(KD_Sprite *spr);
-Index: krystaldrop/Sources/Makefile
-===================================================================
---- krystaldrop.orig/Sources/Makefile
-+++ krystaldrop/Sources/Makefile
-@@ -35,7 +35,7 @@ ACC_ZLIB_SUPPORT=yes
- export
- VERSION=0_7_2
- 
--CC=g++ -Werror
-+CC=g++
- LINK=g++
- MAKE=make
- 
-Index: krystaldrop/Sources/Makefile.lib
-===================================================================
---- krystaldrop.orig/Sources/Makefile.lib
-+++ krystaldrop/Sources/Makefile.lib
-@@ -30,7 +30,7 @@ STATIC_LIBRARY=no
- export
- VERSION=0_7
- 
--CC=g++ -Werror
-+CC=g++
- LINK=g++
- MAKE=make
- 
diff --git a/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-gcc43.patch b/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-gcc43.patch
deleted file mode 100644
index a4130ac..0000000
--- a/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-gcc43.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- krystaldrop/Sources/KDpp/Resources/ArchiveReader.h.old	2008-07-30 22:05:18.000000000 -0500
-+++ krystaldrop/Sources/KDpp/Resources/ArchiveReader.h	2008-07-30 22:27:20.000000000 -0500
-@@ -2,7 +2,26 @@
- #define ArchiveReader_H
- 
- #include <map>
--#include <string>
-+#include <cstring>
-+#include <locale>
-+
-+/* 
-+ * structs needed for std::transform() 
-+ * See: http://gcc.gnu.org/onlinedocs/libstdc++/22_locale/howto.html#7 
-+ */ 
-+struct ToUpper { 
-+	ToUpper(std::locale const& l) : loc(l) {;} 
-+	char operator() (char c) const  { return std::toupper(c,loc); } 
-+private: 
-+	std::locale const& loc; 
-+}; 
-+	 
-+struct ToLower { 
-+	ToLower(std::locale const& l) : loc(l) {;} 
-+	char operator() (char c) const  { return std::tolower(c,loc); } 
-+private: 
-+	std::locale const& loc; 
-+}; 
- 
- /** \c KD_ArchiveReader is a generic abstract class which reads a specific kind of archive
-     (`.zip' for instance)
---- krystaldrop/Sources/KDpp/Resources/ArchiveManager.cpp.old	2008-07-30 20:53:19.000000000 -0500
-+++ krystaldrop/Sources/KDpp/Resources/ArchiveManager.cpp	2008-07-30 22:35:54.000000000 -0500
-@@ -1,10 +1,11 @@
--#include <assert.h>
-+#include <cassert>
-+#include <algorithm>
- 
- #include "ArchiveManager.h"
- #include "../Tools/Logfile.h"
- 
- #ifndef _WIN32
--#include <ctype.h>
-+#include <cctype>
- #endif
- 
- std::map<std::string,KD_ArchiveReader*> KD_ArchiveManager::opened_archives;
-@@ -25,7 +26,6 @@
-   opened_archives.clear();
- }
- 
--
- void KD_ArchiveManager::RegisterArchiveFormat (std::string suffix, T_ArchiveReaderFactory reader_factory)
- {
-   NormalizeSuffix (suffix);
-@@ -36,9 +36,10 @@
- 
- 
- void KD_ArchiveManager::NormalizeSuffix (std::string& suffix)
--{
-+{  
-+  ToLower __tolower(std::locale::classic());
-   // stores the suffix lower-case
--  transform (suffix.begin(), suffix.end(), suffix.begin(), tolower);
-+  transform (suffix.begin(), suffix.end(), suffix.begin(), __tolower);
- 
-    // add the dot character `.' if it is missing
-   if (suffix[0]!= '.') suffix= '.'+ suffix;
---- krystaldrop/Sources/KDpp/Tools/FilePath.cpp.old	2008-07-30 20:55:13.000000000 -0500
-+++ krystaldrop/Sources/KDpp/Tools/FilePath.cpp	2008-07-30 22:37:05.000000000 -0500
-@@ -1,12 +1,12 @@
- #include "FilePath.h"
- 
--#include <stdio.h>
-+#include <cstdio>
-+#include <algorithm>
- 
- #ifndef _WIN32
--#include <ctype.h>
-+#include <cctype>
- #endif
- 
--
- KD_FilePath::KD_FilePath() : fileName("") , filePath(""), archiveName(""), archiveSuffix("")
- {
- }
-@@ -165,8 +165,9 @@
- 	// (*not* the first one found scanning from left to right)
- 
- 	// the search is case-insensitive -> lower-casificator in action
-+	ToLower __tolower(std::locale::classic());
- 	string copy_directory = directory;
--	transform (copy_directory.begin(), copy_directory.end(), copy_directory.begin(), tolower);
-+	transform (copy_directory.begin(), copy_directory.end(), copy_directory.begin(), __tolower);
- 
- 	map<string,T_ArchiveReaderFactory>::iterator suffix_iter=
- 		KD_ArchiveManager::known_suffixes.begin();
-@@ -271,6 +272,7 @@
- 
- string KD_FilePath::GetFileExtension() const
- {
-+	ToLower __tolower(std::locale::classic());
- 	size_t pos = fileName.rfind('.');
- 	if (pos == fileName.npos)
- 		return "";
-@@ -280,7 +282,7 @@
- 	for (unsigned int i=0; i<ext.size(); i++)
- 		ext[i] = tolower(ext[i]);
- */
--	transform (ext.begin(), ext.end(), ext.begin(), tolower);
-+	transform (ext.begin(), ext.end(), ext.begin(), __tolower);
- 	return ext;
- }
- 
diff --git a/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-glibc2.10.patch b/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-glibc2.10.patch
deleted file mode 100644
index 2e9ab8b..0000000
--- a/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-glibc2.10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Sources/KrystalDrop/Tools/direct.cpp
-+++ Sources/KrystalDrop/Tools/direct.cpp
-@@ -77,7 +77,7 @@
-   assert (f);
-   assert (*f!= 0);
- 
--  p= strrchr (f, ACC_FNSPLITCHAR);
-+  p= strrchr ((char *)f, ACC_FNSPLITCHAR);
-   if (p!= NULL)
-   { if (*p== 0)      return NULL; // this line should be useless, according to strrchr manpage
-     if (*(p+ 1)== 0) return NULL;
diff --git a/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-icu.patch b/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-icu.patch
deleted file mode 100644
index 09bcaf6..0000000
--- a/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-icu.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- Sources/KDpp/Tools/XMLConfig.h.old	2011-05-05 11:42:04.117278725 +0200
-+++ Sources/KDpp/Tools/XMLConfig.h	2011-05-05 11:42:28.395026400 +0200
-@@ -3,11 +3,9 @@
- 
- #include "defines.h"
- 
--extern "C" {
- #include <libxml/xmlmemory.h>
- #include <libxml/parser.h>
- //#include <libxml/parser.h>
--}
- 
- #include "FilePath.h"
- 
diff --git a/games-puzzle/krystaldrop/files/krystaldrop-assert.patch b/games-puzzle/krystaldrop/files/krystaldrop-assert.patch
deleted file mode 100644
index 5aff17e..0000000
--- a/games-puzzle/krystaldrop/files/krystaldrop-assert.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -rNu krystaldrop.orig/Sources/KDpp/Resources/ArchiveManager.cpp krystaldrop/Sources/KDpp/Resources/ArchiveManager.cpp
---- krystaldrop.orig/Sources/KDpp/Resources/ArchiveManager.cpp	2003-08-26 15:14:19.000000000 -0400
-+++ krystaldrop/Sources/KDpp/Resources/ArchiveManager.cpp	2004-02-26 20:13:42.000000000 -0500
-@@ -1,3 +1,5 @@
-+#include <assert.h>
-+
- #include "ArchiveManager.h"
- #include "../Tools/Logfile.h"
- 
diff --git a/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild b/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild
deleted file mode 100644
index 9e173dd..0000000
--- a/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils games
-
-DESCRIPTION="Free clone of an excellent NeoGeo puzzle game, Magical Drop"
-HOMEPAGE="http://krystaldrop.sourceforge.net/"
-SRC_URI="mirror://sourceforge/krystaldrop/art_${PV}.tgz -> ${P}-art.tgz
-	mirror://sourceforge/krystaldrop/src_${PV}.tgz -> ${P}-src.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="virtual/opengl
-	media-libs/libsdl
-	media-libs/sdl-image
-	media-libs/sdl-mixer
-	media-libs/sdl-ttf
-	dev-libs/libxml2"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	mv ../art .
-	epatch \
-		"${FILESDIR}"/krystaldrop-assert.patch \
-		"${FILESDIR}"/${P}-gcc41.patch \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-as-needed.patch \
-		"${FILESDIR}"/${P}-deps.patch \
-		"${FILESDIR}"/${P}-icu.patch \
-		"${FILESDIR}"/${P}-glibc2.10.patch \
-		"${FILESDIR}"/${P}-cxxflags.patch
-
-	sed -i \
-		-e "/^EXEDIR:=/ s|$|/bin|" \
-		-e "/^INSTALL_PREFIX:=/ s|$|${D}|" Makefile \
-		|| die "sed Makefile failed"
-
-	# fix the high score location
-	sed -i \
-		-e "s:BINDIR:\"${GAMES_STATEDIR}/${PN}\":" \
-		Sources/KrystalDrop/Controller/HighScoresController.cpp \
-		|| die "sed HighScoresController.cpp failed"
-}
-
-src_install() {
-	default
-	dodir "${GAMES_STATEDIR}/${PN}"
-	mv "${D}${GAMES_DATADIR}/${PN}/art/survival.sco" \
-		"${D}${GAMES_STATEDIR}/${PN}/" || die "mv failed"
-	fperms 664 "${GAMES_STATEDIR}/${PN}/survival.sco"
-	doman doc/kdrop.6
-	newicon art/drop.png ${PN}.png
-	make_desktop_entry kdrop "KrystalDrop" ${PN}
-
-	prepgamesdirs
-}
diff --git a/games-puzzle/krystaldrop/metadata.xml b/games-puzzle/krystaldrop/metadata.xml
deleted file mode 100644
index 3e69330..0000000
--- a/games-puzzle/krystaldrop/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">krystaldrop</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-strategy/triplea/Manifest b/games-strategy/triplea/Manifest
index 48d8991..a6432e5 100644
--- a/games-strategy/triplea/Manifest
+++ b/games-strategy/triplea/Manifest
@@ -1 +1,2 @@
 DIST triplea_1_8_0_5_source_code_only.zip 377607369 SHA256 7d43d8936650ee5ce8b215c7bb6c5ac611f3a232559c0cbb48dba910f63643f5 SHA512 76275121e71b727d05c47612c3a27431beb3e610f1953c8aea4cef878bac4f0a4309794c805462b75fff71d875bc92395108f196f1e04544bb4ef0b8e298904c WHIRLPOOL be06d9c6c4af75ca3ab221b69c13e8e3139569f7108cb4c5de510397a888da7e21822dd1a2e1b5ee63ce5e2e36153d3651088d036089e6f1e08beb5a473f015c
+DIST triplea_1_8_0_9_source_code_only.zip 378475905 SHA256 5f1d0811b96338e1d7200269e24f99cdfe801198922da2a951d14d3ab31c5187 SHA512 d117bb85d0136d85c76f091cf3b2a398ad1f8755df2cea02867be36d91c6cc98e0fc713a72a93dc74ec91c7b44959afdad5b136591a25a0080f4eabf3c8bff0d WHIRLPOOL 7d3bfc1eb344d77efb1cb20bb8dc33f89c93546e4c64bc04f128ad255ac5db31f0c2e0f7c47d85fb9e8bb200490046fd128e883c82d320e5c01a1712cb9b86f4
diff --git a/games-strategy/triplea/triplea-1.8.0.9.ebuild b/games-strategy/triplea/triplea-1.8.0.9.ebuild
new file mode 100644
index 0000000..7cd819e
--- /dev/null
+++ b/games-strategy/triplea/triplea-1.8.0.9.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils java-pkg-2 java-ant-2 versionator games
+
+MY_PV=$(replace_all_version_separators _)
+DESCRIPTION="An open source clone of the popular Axis and Allies boardgame"
+HOMEPAGE="http://triplea.sourceforge.net/"
+SRC_URI="mirror://sourceforge/triplea/${PN}_${MY_PV}_source_code_only.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="test" # Needs X11 maybe use virtualx.eclass
+
+RDEPEND="dev-java/commons-httpclient:3
+	dev-java/commons-logging
+	dev-java/junit:4"
+DEPEND="${RDEPEND}
+	>=virtual/jdk-1.6
+	app-arch/unzip"
+RDEPEND="${RDEPEND}
+	>=virtual/jre-1.6"
+
+S=${WORKDIR}/${PN}_${MY_PV}
+
+pkg_setup() {
+	games_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+src_prepare() {
+	sed -i \
+		-e '/userHome.*triplea/s:"triplea":".triplea":g' \
+		src/games/strategy/engine/framework/GameRunner2.java || die
+
+	rm -r old/ lib/derby*.jar || die
+	# dev-java/commons-logging is lagging behind in portage...
+	# java-pkg_jar-from apple-java-extensions-bin AppleJavaExtensions.jar \
+	# 	lib/AppleJavaExtensions.jar
+	java-pkg_jar-from commons-httpclient-3 commons-httpclient.jar \
+		lib/commons-httpclient-3.1.jar
+	java-pkg_jar-from commons-logging commons-logging.jar \
+		lib/commons-logging-1.1.3.jar
+	# dev-java/commons-codec is lagging behind in portage...
+	# java-pkg_jar-from commons-codec commons-codec.jar \
+		# lib/commons-codec-1.3.jar
+	# installs the test files
+	java-pkg_jar-from --into lib junit
+
+	# lots of other jars from some other java packages...
+	# either missing from portage or none stable is ages.
+	#java-pkg_ensure-no-bundled-jars
+}
+
+src_compile() {
+	eant || die
+	echo "triplea.saveGamesInHomeDir=true" > data/triplea.properties
+	# The only target creating this is zip which does unjar etc
+	cd classes || die
+	jar cf ../bin/triplea.jar * || die
+	rm -r * || die
+}
+
+src_test() {
+	ANT_TASKS="ant-junit" eant test
+}
+
+src_install() {
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r assets bin data dice_servers maps
+
+	java-pkg_regjar "${D}/${GAMES_DATADIR}"/${PN}/bin/*.jar
+	java-pkg_dolauncher ${PN} -into "${GAMES_PREFIX}" \
+		--java_args "-Xmx256m" --main \
+		games.strategy.engine.framework.GameRunner
+	java-pkg_dolauncher ${PN}-server -into "${GAMES_PREFIX}" \
+		--java_args "-server -Xmx64m -Dtriplea.lobby.port=3303 -Dtriplea.lobby.console=true" \
+		--main games.strategy.engine.lobby.server.LobbyServer
+
+	newicon icons/triplea_icon.png ${PN}.png
+	newicon icons/triplea_icon.png ${PN}-server.png
+	make_desktop_entry ${PN} TripleA
+	make_desktop_entry ${PN}-server TripleA-server
+
+	dodoc changelog.txt TripleA_RuleBook.pdf
+	dohtml -r doc/* readme.html
+	prepgamesdirs
+}
diff --git a/mail-client/mutt/mutt-1.5.24-r2.ebuild b/mail-client/mutt/mutt-1.5.24-r2.ebuild
index 153dc59..e8e93a1 100644
--- a/mail-client/mutt/mutt-1.5.24-r2.ebuild
+++ b/mail-client/mutt/mutt-1.5.24-r2.ebuild
@@ -18,7 +18,7 @@
 IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 CDEPEND="
 	app-misc/mime-types
 	nls? ( virtual/libintl )
diff --git a/mail-filter/dovecot-antispam/dovecot-antispam-2.0_pre20130429.ebuild b/mail-filter/dovecot-antispam/dovecot-antispam-2.0_pre20130429.ebuild
index fca9408..1038b37 100644
--- a/mail-filter/dovecot-antispam/dovecot-antispam-2.0_pre20130429.ebuild
+++ b/mail-filter/dovecot-antispam/dovecot-antispam-2.0_pre20130429.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,12 +14,17 @@
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 
-DEPEND=">=net-mail/dovecot-2.1.16"
-RDEPEND="${DEPEND}"
+RDEPEND=">=net-mail/dovecot-2.1.16"
+DEPEND="${RDEPEND}
+	app-text/txt2man"
 
 DOCS=( README )
 
 src_prepare() {
+	# use system txt2man
+	rm doc/txt2man || die
+	sed -i 's#./txt2man#txt2man#' doc/Makefile || die
+
 	AT_M4DIR="m4" eautoreconf
 }
 
diff --git a/mail-mta/exim/exim-4.86-r2.ebuild b/mail-mta/exim/exim-4.86-r2.ebuild
index 02f4639..8d54cba 100644
--- a/mail-mta/exim/exim-4.86-r2.ebuild
+++ b/mail-mta/exim/exim-4.86-r2.ebuild
@@ -87,6 +87,7 @@
 	epatch "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
 	epatch "${FILESDIR}"/exim-4.86-radius-type-fix.patch
 	epatch "${FILESDIR}"/exim-4.86-radius-include.patch
+	epatch "${FILESDIR}"/exim-4.86-TMPDIR.patch # 63420
 
 	if use maildir ; then
 		epatch "${FILESDIR}"/exim-4.20-maildir.patch
diff --git a/mail-mta/exim/exim-4.87_rc3.ebuild b/mail-mta/exim/exim-4.87_rc3.ebuild
index 7c370de..356e2ff 100644
--- a/mail-mta/exim/exim-4.87_rc3.ebuild
+++ b/mail-mta/exim/exim-4.87_rc3.ebuild
@@ -85,6 +85,7 @@
 	epatch "${FILESDIR}"/exim-4.82-makefile-freebsd.patch # 235785
 	epatch "${FILESDIR}"/exim-4.87-as-needed-ldflags.patch # 352265, 391279
 	epatch "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
+	epatch "${FILESDIR}"/exim-4.86-TMPDIR.patch # 63420
 
 	if use maildir ; then
 		epatch "${FILESDIR}"/exim-4.20-maildir.patch
diff --git a/mail-mta/exim/files/exim-4.86-TMPDIR.patch b/mail-mta/exim/files/exim-4.86-TMPDIR.patch
new file mode 100644
index 0000000..7fb0a79
--- /dev/null
+++ b/mail-mta/exim/files/exim-4.86-TMPDIR.patch
@@ -0,0 +1,71 @@
+From c36cf51b85cfc86e46226c846914c8d915f9f3c0 Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+Date: Tue, 2 Feb 2016 20:56:15 +0300
+Subject: [PATCH] Rename build-time option TMPDIR to EXIM_TMPDIR
+
+---
+ src/EDITME              |  2 +-
+ src/config.h.defaults   |  2 +-
+ src/exim.c              | 12 ++++++------
+ 3 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/EDITME b/src/EDITME
+index 30a296e..6afe0c7 100644
+--- a/src/EDITME
++++ b/src/EDITME
+@@ -1123,7 +1123,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases
+ # it replaces the value with what is defined here. Commenting this setting
+ # suppresses the check altogether.
+ 
+-TMPDIR="/tmp"
++EXIM_TMPDIR="/tmp"
+ 
+ 
+ #------------------------------------------------------------------------------
+diff --git a/src/config.h.defaults b/src/config.h.defaults
+index 14de083..c1cf1a9 100644
+--- a/src/config.h.defaults
++++ b/src/config.h.defaults
+@@ -150,7 +150,7 @@ it's a default value. */
+ 
+ #define TCP_WRAPPERS_DAEMON_NAME "exim"
+ #define TIMEZONE_DEFAULT
+-#define TMPDIR
++#define EXIM_TMPDIR
+ 
+ #define TRANSPORT_APPENDFILE
+ #define TRANSPORT_AUTOREPLY
+diff --git a/src/exim.c b/src/exim.c
+index ebc71dd..c134bf5 100644
+--- a/src/exim.c
++++ b/src/exim.c
+@@ -3899,20 +3899,20 @@ if (log_oneline)
+ temporary files are created; Exim doesn't use these (apart from when delivering
+ to MBX mailboxes), but called libraries such as DBM libraries may require them.
+ If TMPDIR is found in the environment, reset it to the value defined in the
+-TMPDIR macro, if this macro is defined. */
++EXIM_TMPDIR macro, if this macro is defined. */
+ 
+-#ifdef TMPDIR
++#ifdef EXIM_TMPDIR
+   {
+   uschar **p;
+   for (p = USS environ; *p != NULL; p++)
+     {
+     if (Ustrncmp(*p, "TMPDIR=", 7) == 0 &&
+-        Ustrcmp(*p+7, TMPDIR) != 0)
++        Ustrcmp(*p+7, EXIM_TMPDIR) != 0)
+       {
+-      uschar *newp = malloc(Ustrlen(TMPDIR) + 8);
+-      sprintf(CS newp, "TMPDIR=%s", TMPDIR);
++      uschar *newp = malloc(Ustrlen(EXIM_TMPDIR) + 8);
++      sprintf(CS newp, "TMPDIR=%s", EXIM_TMPDIR);
+       *p = newp;
+-      DEBUG(D_any) debug_printf("reset TMPDIR=%s in environment\n", TMPDIR);
++      DEBUG(D_any) debug_printf("reset TMPDIR=%s in environment\n", EXIM_TMPDIR);
+       }
+     }
+   }
+-- 
+2.4.10
+
diff --git a/media-libs/imlib2/imlib2-1.4.7.ebuild b/media-libs/imlib2/imlib2-1.4.7.ebuild
index 4c5ad61..622f618 100644
--- a/media-libs/imlib2/imlib2-1.4.7.ebuild
+++ b/media-libs/imlib2/imlib2-1.4.7.ebuild
@@ -16,7 +16,7 @@
 DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
 HOMEPAGE="https://www.enlightenment.org/"
 
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE="bzip2 gif jpeg cpu_flags_x86_mmx mp3 png static-libs tiff X zlib"
 
diff --git a/media-libs/libepoxy/libepoxy-1.3.1.ebuild b/media-libs/libepoxy/libepoxy-1.3.1.ebuild
index 401e85d..3cae16c 100644
--- a/media-libs/libepoxy/libepoxy-1.3.1.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.3.1.ebuild
@@ -12,7 +12,7 @@
 	GIT_ECLASS="git-r3"
 fi
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 PYTHON_REQ_USE='xml(+)'
 inherit autotools-multilib ${GIT_ECLASS} python-any-r1
 
diff --git a/media-libs/libepoxy/libepoxy-9999.ebuild b/media-libs/libepoxy/libepoxy-9999.ebuild
index 0dfcf8c..98ef5b0 100644
--- a/media-libs/libepoxy/libepoxy-9999.ebuild
+++ b/media-libs/libepoxy/libepoxy-9999.ebuild
@@ -12,7 +12,7 @@
 	GIT_ECLASS="git-r3"
 fi
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 PYTHON_REQ_USE='xml(+)'
 inherit autotools-multilib ${GIT_ECLASS} python-any-r1
 
diff --git a/media-libs/phat/files/phat-0.4.1-underlinking.patch b/media-libs/phat/files/phat-0.4.1-underlinking.patch
new file mode 100644
index 0000000..d841cd0
--- /dev/null
+++ b/media-libs/phat/files/phat-0.4.1-underlinking.patch
@@ -0,0 +1,27 @@
+- Remove hardcoded CFLAGS and -Werror flags
+- Fix underlinking caused by missing x11 dependency:
+* ../phat/.libs/libphat.so: error: undefined reference to 'XWarpPointer'
+
+--- phat-0.4.1/configure.ac
++++ phat-0.4.1/configure.ac
+@@ -17,7 +17,6 @@
+     [if test x$enable_debug = xyes; then with_debug=yes ; fi])
+ 
+ if test x$with_debug = xno; then
+-    CFLAGS="-O3"
+     AC_DEFINE(DEBUG, 0, [[whether to display debugging output or not]])
+ else
+     AC_DEFINE(DEBUG, 1, [[whether to display debugging output or not]])
+@@ -46,10 +45,10 @@
+ GTK_DOC_CHECK(1.0)
+ 
+ # misc checks
+-PKG_CHECK_MODULES(MISC, libgnomecanvas-2.0)
++PKG_CHECK_MODULES(MISC, libgnomecanvas-2.0 x11)
+ 
+ # set compilation flags
+-CFLAGS="$CFLAGS $GTK_CFLAGS $MISC_CFLAGS -Wall -Werror"
++CFLAGS="$CFLAGS $GTK_CFLAGS $MISC_CFLAGS -Wall"
+ LIBS="$LIBS $GTK_LIBS $MISC_LIBS"
+ 
+ # print build summary
diff --git a/media-libs/phat/phat-0.4.1-r1.ebuild b/media-libs/phat/phat-0.4.1-r1.ebuild
new file mode 100644
index 0000000..cabb3f3
--- /dev/null
+++ b/media-libs/phat/phat-0.4.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools eutils
+
+DESCRIPTION="PHAT is a collection of GTK+ widgets geared toward pro-audio apps"
+HOMEPAGE="https://sourceforge.net/projects/phat.berlios/"
+SRC_URI="mirror://sourceforge/phat.berlios/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="debug"
+
+RDEPEND="x11-libs/gtk+:2
+	x11-libs/libX11
+	gnome-base/libgnomecanvas"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/gtk-doc"
+
+PATCHES=(
+	"${FILESDIR}/${P}-underlinking.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/media-libs/rubberband/rubberband-1.8.1-r1.ebuild b/media-libs/rubberband/rubberband-1.8.1-r1.ebuild
index 9308923..1ad0356 100644
--- a/media-libs/rubberband/rubberband-1.8.1-r1.ebuild
+++ b/media-libs/rubberband/rubberband-1.8.1-r1.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="static-libs"
 
 RDEPEND="media-libs/vamp-plugin-sdk[${MULTILIB_USEDEP}]
diff --git a/media-libs/x265/x265-1.8-r3.ebuild b/media-libs/x265/x265-1.8-r3.ebuild
index 01d3a7c..63563ad 100644
--- a/media-libs/x265/x265-1.8-r3.ebuild
+++ b/media-libs/x265/x265-1.8-r3.ebuild
@@ -13,7 +13,7 @@
 	SRC_URI="
 		https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz
 		http://ftp.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm hppa ~ppc ppc64 x86"
+	KEYWORDS="amd64 arm hppa ~ppc ppc64 x86"
 fi
 
 DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
diff --git a/media-radio/cwdaemon/cwdaemon-0.10.2.ebuild b/media-radio/cwdaemon/cwdaemon-0.10.2.ebuild
index 26633ed..66c3329 100644
--- a/media-radio/cwdaemon/cwdaemon-0.10.2.ebuild
+++ b/media-radio/cwdaemon/cwdaemon-0.10.2.ebuild
@@ -12,7 +12,7 @@
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~x86"
+KEYWORDS="alpha amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND=">=media-radio/unixcw-3.3.1"
diff --git a/media-radio/unixcw/unixcw-3.5.0.ebuild b/media-radio/unixcw/unixcw-3.5.0.ebuild
index 1450f10..633619b 100644
--- a/media-radio/unixcw/unixcw-3.5.0.ebuild
+++ b/media-radio/unixcw/unixcw-3.5.0.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~x86"
+KEYWORDS="alpha amd64 ~ppc ~x86"
 IUSE="alsa ncurses pulseaudio suid qt5"
 
 RDEPEND="ncurses? ( sys-libs/ncurses:= )
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index 1609e31..9fd1a30 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -1,5 +1,3 @@
-DIST ncmpcpp-0.6.7.tar.bz2 429687 SHA256 08807dc515b4e093154a6e91cdd17ba64ebedcfcd7aa34d0d6eb4d4cc28a217b SHA512 2161a9799c218fe506aa7645338c6e5b32bc6fcb8ee5bcdc76484a068242ae39fd884ece845e1c2f895305d2e6867a3074c266548322f80766c1b8dfeb5d39bb WHIRLPOOL 9f1e4cda03fcb36c79c34a921e8bd272d1875b96a497c2af0a68f2928e82d0ecce208cd08c89a79643106c284757b85eb0f57bcd241f213c3f5d1bdbad087247
-DIST ncmpcpp-0.6.8.tar.bz2 431213 SHA256 ee81f3fdb2a4b670b5e2617f6489f154e69a552e68fc550b1e20ad85f526e692 SHA512 e474bd4122212c34d7043adf7b68aeaaa2e9b5a999840b7e8632d251bdab17f5314fca03bdf2b8eee5de2572d3e5c602d87a1f89889ab7c747321e4272f63ebc WHIRLPOOL 98b7f67246943970018a94c4225540d48ffad7208b77c805bd05d0469423c329daf55480b9caf66538136f5fa198b7fdb65659d90a4f9bae956c0cdee0a6c684
 DIST ncmpcpp-0.7.1.tar.bz2 442512 SHA256 73b76ca9a7b08b220c49251195b9a929768759bd03cf6956b74a2f218b2e2fdf SHA512 0b01e13b9cb0964d5e7ae32b88b6fc4d65ff11a7f9f45c57dd2260ce5e188005b6d728b9c23ce54559920ca03ff80fbf90b94846ac3ff387804bf413e43f9c56 WHIRLPOOL c8d3ae147022313a333a9901a15e4b0ea0d3553b7c35943542a742dde551f756131222166007a4c02f1434264c7160ee1fb00100371df35f49b4977d07df4bc0
 DIST ncmpcpp-0.7.2.tar.bz2 442457 SHA256 6392f5eb98c4f130639e198200ef3db0b873b9594b65fe807ee73293ceb4093b SHA512 6ecc02694ecc6ff10e3a6d89d0b227385b1ab36c30afce57a8a8b74725063154736c78141d3fdaafb3a008e80855bc206dbf7e4aefc8486e01f300354967f1f8 WHIRLPOOL 8fbe3e3dd8ef43dfad466ccc2657455837ef4c95ae8164fbe0e60fcb5a4c239bf654c1392b5a3fec7bc8e64dbea3aba7e9dfde9e9d28999fdb95294d49a0429c
 DIST ncmpcpp-0.7.3.tar.bz2 442209 SHA256 2c8b29435ca4fd845400cee7c9fd50a731bee215e92fd7e98a7446c84136b212 SHA512 6314b97f36014ade92b3a73640bf529625d75d20a68fb9b2999de579095e37c46e1951b22b0a849bd8e23998e72cfa77f717cff914b7e20dccc0a918cb739732 WHIRLPOOL f50986be48ee8032295da6b9b806e03762f574f889ebcb2b9e54aeb0ab8fbf372cb2d79152e37c870e4a39f27030087146bc14ba5d03ea20bbe87dd52e35eaf0
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.6.7.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.6.7.ebuild
deleted file mode 100644
index e0caa2b..0000000
--- a/media-sound/ncmpcpp/ncmpcpp-0.6.7.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
-HOMEPAGE="http://ncmpcpp.rybczak.net/"
-SRC_URI="http://ncmpcpp.rybczak.net/stable/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86"
-IUSE="clock curl outputs taglib unicode visualizer"
-
-RDEPEND="
-	>=media-libs/libmpdclient-2.1
-	curl? ( net-misc/curl )
-	dev-libs/boost:=[nls,threads]
-	sys-libs/ncurses[unicode?]
-	sys-libs/readline:*
-	taglib? ( media-libs/taglib )
-	visualizer? ( sci-libs/fftw:3.0 )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die
-	sed -i -e 's|COPYING||g' Makefile{.am,.in} || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable clock) \
-		$(use_enable outputs) \
-		$(use_enable unicode) \
-		$(use_enable visualizer) \
-		$(use_with curl) \
-		$(use_with taglib) \
-		$(use_with visualizer fftw) \
-		--docdir=/usr/share/doc/${PF}
-}
-
-src_install() {
-	default
-
-	dodoc doc/{bindings,config}
-}
-
-pkg_postinst() {
-	echo
-	elog "Example configuration files have been installed at"
-	elog "${ROOT}usr/share/doc/${PF}"
-	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
-	elog "as user configuration files."
-	echo
-	if use visualizer; then
-	elog "If you want to use the visualizer, you need mpd with fifo enabled."
-	echo
-	fi
-}
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.6.8.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.6.8.ebuild
deleted file mode 100644
index db22df8..0000000
--- a/media-sound/ncmpcpp/ncmpcpp-0.6.8.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
-HOMEPAGE="http://ncmpcpp.rybczak.net/"
-SRC_URI="http://ncmpcpp.rybczak.net/stable/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="clock curl outputs taglib unicode visualizer"
-
-RDEPEND="
-	>=media-libs/libmpdclient-2.1
-	curl? ( net-misc/curl )
-	dev-libs/boost:=[nls,threads]
-	sys-libs/ncurses:=[unicode?]
-	sys-libs/readline:*
-	taglib? ( media-libs/taglib )
-	visualizer? ( sci-libs/fftw:3.0 )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die
-	sed -i -e 's|COPYING||g' Makefile{.am,.in} || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable clock) \
-		$(use_enable outputs) \
-		$(use_enable unicode) \
-		$(use_enable visualizer) \
-		$(use_with curl) \
-		$(use_with taglib) \
-		$(use_with visualizer fftw) \
-		--docdir=/usr/share/doc/${PF}
-}
-
-src_install() {
-	default
-
-	dodoc doc/{bindings,config}
-}
-
-pkg_postinst() {
-	echo
-	elog "Example configuration files have been installed at"
-	elog "${ROOT}usr/share/doc/${PF}"
-	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
-	elog "as user configuration files."
-	echo
-	if use visualizer; then
-	elog "If you want to use the visualizer, you need mpd with fifo enabled."
-	echo
-	fi
-}
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.7.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.7.ebuild
index 7a0d40c..1fa060d 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.7.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.7.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86"
 IUSE="clock curl outputs taglib unicode visualizer"
 
 RDEPEND="
diff --git a/media-sound/podget/metadata.xml b/media-sound/podget/metadata.xml
index 81671d5..38b7138 100644
--- a/media-sound/podget/metadata.xml
+++ b/media-sound/podget/metadata.xml
@@ -14,6 +14,6 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">podget</remote-id>
+		<remote-id type="github">dvehrs/podget</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/podget/podget-0.7.9.ebuild b/media-sound/podget/podget-0.7.9.ebuild
index 46bfe4f..f9f26af 100644
--- a/media-sound/podget/podget-0.7.9.ebuild
+++ b/media-sound/podget/podget-0.7.9.ebuild
@@ -5,8 +5,8 @@
 EAPI=6
 
 DESCRIPTION="A simple podcast aggregator"
-HOMEPAGE="http://podget.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://podget.sourceforge.net/ https://github.com/dvehrs/podget"
+SRC_URI="https://github.com/dvehrs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -22,7 +22,7 @@
 
 src_compile() {
 	# There is a Makefile that we don't want to use.
-	:
+	:;
 }
 
 src_install() {
diff --git a/media-sound/specimen/files/specimen-0.5.2_rc3-underlinking.patch b/media-sound/specimen/files/specimen-0.5.2_rc3-underlinking.patch
index 6267d7a..db0df85 100644
--- a/media-sound/specimen/files/specimen-0.5.2_rc3-underlinking.patch
+++ b/media-sound/specimen/files/specimen-0.5.2_rc3-underlinking.patch
@@ -1,5 +1,11 @@
---- configure.ac
-+++ configure.ac
+* Remove hardcoded CFLAGS
+* Fix underlinking issues
+  - missing -lm linkage (sin)
+  - missing -pthread linkage
+    -> https://bugs.gentoo.org/show_bug.cgi?id=561562
+
+--- specimen-0.5.2-rc3/configure.ac
++++ specimen-0.5.2-rc3/configure.ac
 @@ -1,10 +1,10 @@
  # -*- autoconf -*-
  # Process this file with autoconf to produce a configure script.
@@ -22,7 +28,7 @@
 -if test x$with_debug = xno; then
 -    CFLAGS="-O3"
 -else
-+if test x$with_debug != xno; then
++if test x$with_debug = xyes; then
      AC_DEFINE(DEBUG, 1, [[whether to display debugging output or not]])
  fi
  
@@ -45,21 +51,18 @@
  config_error="no"
  
  # gtk			   
-
---- src/Makefile.am
-+++ src/Makefile.am
-@@ -11,7 +11,7 @@
- specimen_SOURCES += lashdriver.c lashdriver.h                                                                                                                           
- endif
+@@ -122,7 +121,8 @@
+   fi
+ fi
  
--INCLUDES = \
-+AM_CPPFLAGS = \
- 	@ALSA_CFLAGS@ \
- 	@JACK_CFLAGS@ \
- 	@LIBSAMPLERATE_CFLAGS@ \
-
---- src/gui/Makefile.am
-+++ src/gui/Makefile.am
+-CC="$PTHREAD_CC"
++CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++LIBS="$LIBS $PTHREAD_CFLAGS"
+ 
+ # print build summary
+ AC_CONFIG_COMMANDS_POST([
+--- specimen-0.5.2-rc3/src/gui/Makefile.am
++++ specimen-0.5.2-rc3/src/gui/Makefile.am
 @@ -12,14 +12,14 @@
  paramselector.c paramselector.h patchlist.c patchlist.h midisection.c	\
  midisection.h channelsection.c channelsection.h
@@ -77,3 +80,14 @@
  endif
  
  libgui_a_CFLAGS = $(CFLAGS) -I.. -DINSTALLDIR=\"$(datadir)\"
+--- specimen-0.5.2-rc3/src/Makefile.am
++++ specimen-0.5.2-rc3/src/Makefile.am
+@@ -11,7 +11,7 @@
+ specimen_SOURCES += lashdriver.c lashdriver.h                                                                                                                           
+ endif
+ 
+-INCLUDES = \
++AM_CPPFLAGS = \
+ 	@ALSA_CFLAGS@ \
+ 	@JACK_CFLAGS@ \
+ 	@LIBSAMPLERATE_CFLAGS@ \
diff --git a/media-sound/specimen/specimen-0.5.2_rc3-r2.ebuild b/media-sound/specimen/specimen-0.5.2_rc3-r2.ebuild
new file mode 100644
index 0000000..d344339
--- /dev/null
+++ b/media-sound/specimen/specimen-0.5.2_rc3-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools versionator
+
+MY_PV="$(replace_version_separator 3 -)"
+
+DESCRIPTION="A Midi Controllable Audio Sampler"
+HOMEPAGE="http://zhevny.com/specimen"
+SRC_URI="http://zhevny.com/${PN}/files/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="lash"
+
+RDEPEND=">=media-sound/jack-audio-connection-kit-0.109.2
+	>=media-libs/alsa-lib-0.9
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	>=media-libs/phat-0.4
+	dev-libs/libxml2:2
+	x11-libs/gtk+:2
+	gnome-base/libgnomecanvas
+	lash? ( media-sound/lash )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-jackmidi.patch"
+	"${FILESDIR}/${P}-underlinking.patch"
+)
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable lash)
+}
+
+src_install() {
+	default
+	doicon pixmaps/${PN}.png
+	make_desktop_entry ${PN} Specimen ${PN}
+}
diff --git a/media-video/ffmpeg/ffmpeg-2.8.5.ebuild b/media-video/ffmpeg/ffmpeg-2.8.5.ebuild
index 3c58d8a..c21dbe3 100644
--- a/media-video/ffmpeg/ffmpeg-2.8.5.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.8.5.ebuild
@@ -55,7 +55,7 @@
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/ffmpeg2theora/Manifest b/media-video/ffmpeg2theora/Manifest
index ef0a9fd..292a695 100644
--- a/media-video/ffmpeg2theora/Manifest
+++ b/media-video/ffmpeg2theora/Manifest
@@ -1 +1,2 @@
 DIST ffmpeg2theora-0.29.tar.bz2 90143 SHA256 214110e2a5afdd8ff8e0be18152e893dbff5dabc1ae1d1124e64d9f93eae946d SHA512 5e5cf1dbc6807a15b3a3e8526955ef341357b6a3106a6449a54b5dc09c652a9df34b5e93c9cbf05e1efad87542364cb8335e173a59a184aa2ff38ec4b536a725 WHIRLPOOL d093a0b0a5d90f6b9a3d959ff662e5e8c9f8ca36d51122f0c293d2189493bdf6daa710fa94be0fdca0d63166c3102dba82da1e533e1876e62f3ed4ec47b65bea
+DIST ffmpeg2theora-0.30.tar.bz2 91269 SHA256 4f6464b444acab5d778e0a3359d836e0867a3dcec4ad8f1cdcf87cb711ccc6df SHA512 2c77d2c5e705751928e2bfd86c4fe4c2b7df2ca2ce70f3dfeb0014a3269eef067587eaa045c11b0db86c69176d8f01a43b3ad75544d181c016a89aa50b6518c1 WHIRLPOOL d048027e57903252fcb0c7358fc13b2242c6a6429b3d6adbebe1ad07e00fb0a922d6b0fcf193300a88ecd9539dffeb66e0516c0acb311b203a16bf5d9ea099bc
diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.30.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.30.ebuild
new file mode 100644
index 0000000..b8f81d0
--- /dev/null
+++ b/media-video/ffmpeg2theora/ffmpeg2theora-0.30.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs scons-utils
+
+DESCRIPTION="A simple converter to create Ogg Theora files"
+HOMEPAGE="http://www.v2v.cc/~j/ffmpeg2theora/"
+SRC_URI="http://www.v2v.cc/~j/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="kate libav"
+
+RDEPEND="
+	!libav? ( media-video/ffmpeg:0= )
+	libav? ( media-libs/libpostproc:0=
+		media-video/libav:0= )
+	>=media-libs/libvorbis-1.1
+	>=media-libs/libogg-1.1
+	>=media-libs/libtheora-1.1[encode]
+	kate? ( >=media-libs/libkate-0.3.7 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.29-swr.patch \
+		"${FILESDIR}"/${PN}-0.29-underlinking.patch
+}
+
+src_configure() {
+	myesconsargs=(
+		APPEND_CCFLAGS="${CFLAGS}"
+		APPEND_LINKFLAGS="${LDFLAGS}"
+		prefix=/usr
+		mandir=PREFIX/share/man
+		libkate=$(usex kate 1 0)
+		)
+}
+
+src_compile() {
+	escons
+}
+
+src_install() {
+	escons destdir="${D}" install
+	dodoc AUTHORS ChangeLog README subtitles.txt TODO
+}
diff --git a/media-video/mpv/mpv-0.14.0-r1.ebuild b/media-video/mpv/mpv-0.14.0-r1.ebuild
index f8910de..df48b7c 100644
--- a/media-video/mpv/mpv-0.14.0-r1.ebuild
+++ b/media-video/mpv/mpv-0.14.0-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 PYTHON_REQ_USE='threads(+)'
 
 WAF_PV='1.8.12'
diff --git a/media-video/mpv/mpv-0.15.0-r1.ebuild b/media-video/mpv/mpv-0.15.0-r1.ebuild
index 3bf7631..5de9fb6 100644
--- a/media-video/mpv/mpv-0.15.0-r1.ebuild
+++ b/media-video/mpv/mpv-0.15.0-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 PYTHON_REQ_USE='threads(+)'
 
 WAF_PV='1.8.12'
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 93c6e4f..3c00f85 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 PYTHON_REQ_USE='threads(+)'
 
 WAF_PV='1.8.12'
diff --git a/net-analyzer/cacti/cacti-0.8.8f-r1.ebuild b/net-analyzer/cacti/cacti-0.8.8f-r1.ebuild
index 7e1d6ef..4565b3f 100644
--- a/net-analyzer/cacti/cacti-0.8.8f-r1.ebuild
+++ b/net-analyzer/cacti/cacti-0.8.8f-r1.ebuild
@@ -14,7 +14,7 @@
 SRC_URI="http://www.cacti.net/downloads/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="snmp doc"
 
 need_httpd
diff --git a/net-analyzer/greenbone-security-assistant/Manifest b/net-analyzer/greenbone-security-assistant/Manifest
index 60bd670..cc88ae7 100644
--- a/net-analyzer/greenbone-security-assistant/Manifest
+++ b/net-analyzer/greenbone-security-assistant/Manifest
@@ -1 +1,2 @@
 DIST greenbone-security-assistant-6.0.8.tar.gz 1475498 SHA256 1dc23cc24dcd7adc84aaed218e0d9651e032b930ab897c571bf16eb0b155b1ff SHA512 4126e05fc9c7c3272200a070d849fb21c680f49390d5305dc433aa16bf4365525a2c6047575fc11ca53668f87ce5d2a1aef5e63e782cea9d403129ab86aafa8d WHIRLPOOL 91f38c495d99a1c54132e276c321f536abe2ca9a08d9caba716457d2ffb7b63025bb687ff1e6640912d41aed7b39875f1e5a4d2acba4ab7d48248cdf373414fc
+DIST greenbone-security-assistant-6.0.9.tar.gz 1476238 SHA256 bc3dead8e3c24ad906466c208aad1c48262dc912a941b255427f72b0932595e2 SHA512 4afb50f044b6853181c3c3e6466e7329915356bbcccecf98b89d9dc39a193392f45850f9073ac055ec826753af78e8a6368e7f9ac52734a3b5e254d124180d68 WHIRLPOOL d53d8b7e9cfccf5309d300e7ae806cca7586a1056644d582c4da1afa3cc04a6cb87426aa89005c5ef536b764868a5d0febb67d90042e1cc800ae892fcaeb2cca
diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.9.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.9.ebuild
new file mode 100644
index 0000000..77cbf92
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.9.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils systemd
+
+MY_PN=gsad
+
+DL_ID=2287
+
+DESCRIPTION="Greenbone Security Assistant for openvas"
+HOMEPAGE="http://www.openvas.org/"
+SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2+ BSD MIT"
+KEYWORDS=" ~amd64 ~arm ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/libgcrypt:0
+	dev-libs/libxslt
+	>=net-analyzer/openvas-libraries-8.0.3
+	net-libs/libmicrohttpd[messages]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.3-run.patch
+	)
+
+S="${WORKDIR}"/${P}
+
+src_prepare() {
+	sed \
+		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
+		-i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLOCALSTATEDIR="${EPREFIX}/var"
+		-DSYSCONFDIR="${EPREFIX}/etc"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
+
+	insinto /etc/openvas
+	doins "${FILESDIR}"/${MY_PN}-daemon.conf
+	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${MY_PN}
+
+	insinto /etc/logrotate.d
+	doins "${FILESDIR}"/${MY_PN}.logrotate
+
+	systemd_newtmpfilesd "${FILESDIR}"/${MY_PN}.tmpfiles.d ${MY_PN}.conf
+	systemd_dounit "${FILESDIR}"/${MY_PN}.service
+}
diff --git a/net-analyzer/nmap/nmap-7.01.ebuild b/net-analyzer/nmap/nmap-7.01.ebuild
index ecda7d6..f4f4ffc 100644
--- a/net-analyzer/nmap/nmap-7.01.ebuild
+++ b/net-analyzer/nmap/nmap-7.01.ebuild
@@ -19,7 +19,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 4952015..4cd50a2 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -1 +1,2 @@
 DIST pdns-3.4.7.tar.bz2 1345379 SHA256 e17eca86c5e702b54b62b1edebc4741d8e0db748050a7214c778302039f28c4b SHA512 d9dd8e7d37ae6d46783d9608beba2905838d1af8c597906bfe1134e2b787cfc529514f412eebb8838df5ceb1a7366c10057fd1d93b73924d0f6d2cec6ba72e13 WHIRLPOOL 7897ff06e1f43cada00aa25ef38e987377fe7a14a3634d5aa0484630d00d3e2269fe4caf36960c75dd825d47657ddf37692efa5a49eaf280b0832a301f27fd24
+DIST pdns-3.4.8.tar.bz2 1345728 SHA256 4f818fd09bff89625b4317cc7c05445f6e7bd9ea8d21e7eefeaaca07b8b0cd9f SHA512 8d0f7bbbe21559ecf0d9f323a2f4226b2c2d5542261e0ad44e6ac17f13bbe087b52efe1b74ca756cf9b92f6cb333829c42b55c245543fa3dea4a4f62be8cdf6e WHIRLPOOL fd6899fc5c6b1dea56f13cc8f643b09ef776fd7672b42f195337cf9573396b0024fb791b1abba24ea9329875f98dde16e8be3a71607e144699a561268392f663
diff --git a/net-dns/pdns/metadata.xml b/net-dns/pdns/metadata.xml
index 7fef8ca..f0d31b9 100644
--- a/net-dns/pdns/metadata.xml
+++ b/net-dns/pdns/metadata.xml
@@ -17,7 +17,6 @@
 	<flag name="mydns">Making it possible to use a MyDNS MySQL database with PowerDNS (not recommended for new deployments).</flag>
 	<flag name="opendbx">Use a database supported by <pkg>dev-db/opendbx</pkg> as backend.</flag>
 	<flag name="remote">Use a generic socket or pipe as a backend (via JSON RPC requests).</flag>
-	<flag name="remote-http">Enable remote connections to HTTP as backends (via RESTful JSON requests).</flag>
 	<flag name="tinydns">Use a TinyDNS CDB database as backend.</flag>
 	<flag name="tools">Build optional tools (dnsscan, dnsscope, etc..).</flag>
 </use>
diff --git a/net-dns/pdns/pdns-3.4.8.ebuild b/net-dns/pdns/pdns-3.4.8.ebuild
new file mode 100644
index 0000000..77d6d55
--- /dev/null
+++ b/net-dns/pdns/pdns-3.4.8.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib systemd user toolchain-funcs versionator
+
+DESCRIPTION="The PowerDNS Daemon"
+HOMEPAGE="http://www.powerdns.com/"
+SRC_URI="http://downloads.powerdns.com/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# other possible flags:
+# db2: we lack the dep
+# oracle: dito (need Oracle Client Libraries)
+# xdb: (almost) dead, surely not supported
+
+IUSE="botan cryptopp debug doc geoip ldap lua mydns mysql opendbx postgres remote sqlite static tools tinydns test"
+
+REQUIRED_USE="mydns? ( mysql )"
+
+RDEPEND="!static? (
+		net-libs/polarssl
+		>=dev-libs/boost-1.34:=
+		botan? ( =dev-libs/botan-1.10* )
+		cryptopp? ( dev-libs/crypto++ )
+		lua? ( dev-lang/lua:= )
+		mysql? ( virtual/mysql )
+		postgres? ( dev-db/postgresql:= )
+		ldap? ( >=net-nds/openldap-2.0.27-r4 )
+		sqlite? ( dev-db/sqlite:3 )
+		opendbx? ( dev-db/opendbx )
+		geoip? ( >=dev-cpp/yaml-cpp-0.5.1 dev-libs/geoip )
+		tinydns? ( >=dev-db/tinycdb-0.77 )
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	static? (
+		>=net-libs/polarssl-1.3.0[static-libs(+)]
+		>=dev-libs/boost-1.34[static-libs(+)]
+		botan? ( =dev-libs/botan-1.10*[static-libs(+)] )
+		cryptopp? ( dev-libs/crypto++[static-libs(+)] )
+		lua? ( dev-lang/lua:=[static-libs(+)] )
+		mysql? ( virtual/mysql[static-libs(+)] )
+		postgres? ( dev-db/postgresql[static-libs(+)] )
+		ldap? ( >=net-nds/openldap-2.0.27-r4[static-libs(+)] )
+		sqlite? ( dev-db/sqlite:3[static-libs(+)] )
+		opendbx? ( dev-db/opendbx[static-libs(+)] )
+		geoip? ( >=dev-cpp/yaml-cpp-0.5.1 dev-libs/geoip[static-libs(+)] )
+		tinydns? ( >=dev-db/tinycdb-0.77 )
+	)
+	doc? ( app-doc/doxygen )"
+
+src_configure() {
+	local dynmodules="pipe geo bind" # the default backends, always enabled
+	local modules=""
+
+	#use db2 && dynmodules+=" db2"
+	use ldap && dynmodules+=" ldap"
+	use lua && dynmodules+=" lua"
+	use mydns && dynmodules+=" mydns"
+	use mysql && dynmodules+=" gmysql"
+	use opendbx && dynmodules+=" opendbx"
+	#use oracle && dynmodules+=" goracle oracle"
+	use postgres && dynmodules+=" gpgsql"
+	use remote && dynmodules+=" remote"
+	use sqlite && dynmodules+=" gsqlite3"
+	use tinydns && dynmodules+=" tinydns"
+	use geoip && dynmodules+=" geoip"
+	#use xdb && dynmodules+=" xdb"
+
+	if use static ; then
+		modules="${dynmodules}"
+		dynmodules=""
+	fi
+
+	use botan && myconf+=" --enable-botan1.10"
+	use cryptopp && myconf+=" --enable-cryptopp"
+	use debug && myconf+=" --enable-verbose-logging"
+
+	CRYPTOPP_CFLAGS=" " \
+	CRYPTOPP_LIBS="-lcrypto++" \
+	econf \
+		--with-system-polarssl \
+		--disable-static \
+		--sysconfdir=/etc/powerdns \
+		--libdir=/usr/$(get_libdir)/powerdns \
+		--with-modules="${modules}" \
+		--with-dynmodules="${dynmodules}" \
+		--with-pgsql-includes=/usr/include \
+		--with-pgsql-lib=/usr/$(get_libdir) \
+		--with-mysql-lib=/usr/$(get_libdir) \
+		$(use_enable test unit-tests) \
+		$(use_with lua) \
+		$(use_enable static static-binaries) \
+		$(use_enable tools) \
+		${myconf}
+}
+
+src_compile() {
+	default
+	use doc && emake -C codedocs codedocs
+}
+
+src_install () {
+	default
+
+	mv "${D}"/etc/powerdns/pdns.conf{-dist,}
+
+	fperms 0700 /etc/powerdns
+	fperms 0600 /etc/powerdns/pdns.conf
+
+	# set defaults: setuid=pdns, setgid=pdns
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \
+		"${D}"/etc/powerdns/pdns.conf
+
+	doinitd "${FILESDIR}"/pdns
+	systemd_newunit contrib/systemd-pdns.service pdns.service
+
+	keepdir /var/empty
+
+	use doc && dohtml -r codedocs/html/.
+
+	# Install development headers
+	insinto /usr/include/pdns
+	doins pdns/*.hh
+	insinto /usr/include/pdns/backends/gsql
+	doins pdns/backends/gsql/*.hh
+
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/dnsdomain2.schema
+	fi
+
+	prune_libtool_files --all
+}
+
+pkg_preinst() {
+	enewgroup pdns
+	enewuser pdns -1 -1 /var/empty pdns
+}
+
+pkg_postinst() {
+	elog "PowerDNS provides multiple instances support. You can create more instances"
+	elog "by symlinking the pdns init script to another name."
+	elog
+	elog "The name must be in the format pdns.<suffix> and PowerDNS will use the"
+	elog "/etc/powerdns/pdns-<suffix>.conf configuration file instead of the default."
+
+	if use ldap ; then
+		ewarn "The official LDAP backend module is only compile-tested by upstream."
+		ewarn "Try net-dns/pdns-ldap-backend if you have problems with it."
+	fi
+
+	local fix_perms=0
+
+	for rv in ${REPLACING_VERSIONS} ; do
+		version_compare ${rv} 3.2
+		[[ $? -eq 1 ]] && fix_perms=1
+	done
+
+	if [[ $fix_perms -eq 1 ]] ; then
+		ewarn "To fix a security bug (bug #458018) had the following"
+		ewarn "files/directories the world-readable bit removed (if set):"
+		ewarn "  ${EPREFIX}/etc/pdns"
+		ewarn "  ${EPREFIX}/etc/pdns/pdns.conf"
+		ewarn "Check if this is correct for your setup"
+		ewarn "This is a one-time change and will not happen on subsequent updates."
+		chmod o-rwx "${EPREFIX}"/etc/pdns/{,pdns.conf}
+	fi
+
+}
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 62e78ea..ca4bfd2 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -2,27 +2,34 @@
 DIST shorewall-4.6.13.1.tar.bz2 498949 SHA256 fc2c390fecbc0c78d5cd648596abc1edb1d338d748b4a0605695c3141e24d35e SHA512 1b8e0a008660a8b66bcc77bb92f110fbdc04a0925d6f19bb01a6e798baa907f5ca4f6f60851c861963ab49b1a0b2ae652d4d1234fcf18ab56325ebcc66fbefb1 WHIRLPOOL 6c2a63a5c547d429c3d9c5d05683d8c4a2bdc662f58b7b8e7ae197053a13c06ad1c0ae9fcd0face2601d05a7becfaf0948e0765ff22e5dbeace0176e77e4bad6
 DIST shorewall-4.6.13.tar.bz2 500076 SHA256 fc4530d891da22d9efaa4339f10ebde27133bef9fe8c6e93abc701991f8b30ba SHA512 5018d34a15784870c521614a725baa05ea8df5e11e11d0177d01fc3012ed006f25b6a2afaf20cbae7b1c189ea841cc5ad2764067af0513f8378b316645524b48 WHIRLPOOL a6fef96deed7f7ad7bdc0273de88c15f77b901ec27905af474399b3b86fd8b6cdfe92556ae2314feaa73cd525960b56d986ce426225f7779e9235ccdc9f7248c
 DIST shorewall-5.0.2.1.tar.bz2 478874 SHA256 10136cf586b620abdad1f3c716f03d1160cfa65c8461fba42d858fa1ab8d5856 SHA512 54589366a7743b9e8035a13b83a77e80a319531e07c803fd88ea31d2023445b9a63b99e0ad030997f43cb49050dfc4b0c94af2ec6c6631249fc1a2354d5565c1 WHIRLPOOL 559f916008b04c6779b50185e123274c8a20994c3ade58789ee840c5d9e13c7dba3e0885b3babd7a187aeb19a25b4ea8a6e151270fed3f363ce4d14d0fe749fc
+DIST shorewall-5.0.4.tar.bz2 482227 SHA256 34a4ab3e4ded052cb563a280f07f350616db913ded124bfceb39adb325f1ce0a SHA512 7912d46e794b4facf29d290370a5cbad83a568873d8aca1b6efe7856c1420a7da882957d16bd4d376d9e7c69accb5263bfa0dd73af06f3c85eab41a0e244c362 WHIRLPOOL eb7351b01c9a3c709179eb6e21d6bb54935a11c066fb31588a1b90c9a089eac7e2d8387006f436c2a68c1618847f5ea69c65e8233240a8d3c8352e0a4d685dc9
 DIST shorewall-core-4.6.10.1.tar.bz2 58247 SHA256 5af804f39f4480685e995080dc8913d4af61af70d5a478dd00bbf0593851b44d SHA512 1028e0bf950aecbc77c6c263ab8351fb8ff90b6077a0d6bf7c0d882559f5d8644ce0f2c6aec6dd3614d90a319277763460909e345e1e004cf8ea1f548e369284 WHIRLPOOL 0a0834eb355e05679b5809a18dd0749c6c06ac3130a9ab375587c7e6134042c01762775ac136f0396c051f4ac4b2f379141d111760929a42da6f00656a96e120
 DIST shorewall-core-4.6.13.1.tar.bz2 61749 SHA256 d06a4c1050578013c6e37468f0a803fd129f1ac95b6ea5ab8af80f3eb0739539 SHA512 8db64a150101368ad50075f7ed97e2ceecf0d974ae1d0d61f6bc8dd967ff8f222265c543dfbe8f1217d90b21d93398669cc3d6e06a2b2c706c25347b27f13868 WHIRLPOOL 493f9a739388d3ecfe5fc9d04414c272d09a6eade8f236e21ec773b7df423844d2b9b427a297c9fa842ef22e7c491427d74e83dbc0aa267b16c20c1aff8525ed
 DIST shorewall-core-4.6.13.tar.bz2 61679 SHA256 e31dd55c8df37ee2168c5aa9843f9c2727f6a31a98634445e0c10990360665a4 SHA512 2c769f2f77ee51357f92daa1fe3f794fd3e3b537f0686a004809767340ad7bdd922be2580760cdbb834e8c80f53e9d5329ef86ee741520870c242452b1e44f30 WHIRLPOOL 90668efd2db2f09bf40934206b3124666b96157f085dfabc17ff2c2d65ebb8f348db6727516fced866d16eb4d44aa0ea9d6d91ed907593785788c6cdb50f10dc
 DIST shorewall-core-5.0.2.1.tar.bz2 47922 SHA256 8be30270e527c7697c365c437bff07e6a41ccdcf28b7163b2866750158e5845d SHA512 bf614cc73bc321c46b0825deb198943ce3a37a6e1b5dc5f2b9be17799409de9909219dec327c493a8382111cc9b7e7319c15effd84b238bee85ed9b6f0281100 WHIRLPOOL 5e415c8fb17edb96978cd3f8811fdd0953de556efe3cb6e5b1e9abe98535f905119eb968dadb65b3a525801c49af1fdbabc3b3e7eb06364c420323be6eeecb51
+DIST shorewall-core-5.0.4.tar.bz2 50604 SHA256 ea80b9e1854033c723a5321fc920b35aa0ebb0dea3721a47cee616aa3b92ed9f SHA512 1db3b7a44bf2f99d1a9c6775c798285bbc9a4bec5a340a10fd762600c01486f90d305297247cceb451616e852d9deb89163a43082e06f9eadad75cdd5d480a21 WHIRLPOOL bb4cea303c7ea1190ec3788f9e7cab4f0febf88ab5047c18adbe9e88476c5ebe569bd3ead6105131a61ac6c31bdab6d3192383e1709847e637220f223a8875b9
 DIST shorewall-docs-html-4.6.10.1.tar.bz2 4185752 SHA256 eeaec18b7f8663f0b836b76d140d3fad7871075de90f18ccc7b9fbda1538a787 SHA512 1bf1b3f5745d54af3af5f9bb6417c661e2bde8028d699aed4c4fcbe7cf301b8eadfed7be5e9bfdd677659c362d1e757eee13cd1b497a0c6837c179883c33e3a8 WHIRLPOOL 937fc4f76174f615de86eaa08690ebbe42f658154320d3e9972cbb0bcaa461e11fdaf5390f517f5d2f905aa5996ecb7399ca07d1767f647a49d33b1220e8d547
 DIST shorewall-docs-html-4.6.13.1.tar.bz2 4280904 SHA256 ded94cd41022855bbb20e3a5a579f82515fea8eb3d6b7ea110e491a5cc654804 SHA512 0f6090a428ead0c5ccfca020776a93c6c69de7043b947c129ca9fba8289919448af4b5c6a2a65dc9317df2979688f86873dc0ff6a04ba6e9a14b26f183872f33 WHIRLPOOL 4cf65fd2e4afcf40d7e7fdaab43002551f7af4bba6a12466d7dab87d5df5cbcf5ed80d3238ec6cf77e59f7587056adc4450db4765a2ef47e9bcf2641cf38407a
 DIST shorewall-docs-html-4.6.13.tar.bz2 4280790 SHA256 2fdc3d5aa2d998831b66ed2ebf257a581924ef9b5ef1a5a2d18511aeb6f46d3d SHA512 40b3db8e8ca022ee47f928fac512f28dff7da597d19dbf9d19f5d706764d01aa09ff348df37be40a8551a7e6fae9a8b1be7e1321de7f581af4e7217ad6e3bc64 WHIRLPOOL e639126f0b16ad332bf115ccd773e7b32b1b9a0c7bda78cf072096a466d4e78d2a404f2ec923cd1acc152481a01cd90affa9af25496ee136555cc55ed1156a31
 DIST shorewall-docs-html-5.0.2.1.tar.bz2 4272585 SHA256 a9c55c513fd086dc90d686f9a0444311453670487f10d3ed44505b952c72fcf2 SHA512 dc310f694b4cde8b27e3df99f75081019f752a3c7faa693093b1d5ec786392d2c2202f76b7372f894fd6e72fad5f7816db3b9a88a3a3409edcf4368d9e6b36d0 WHIRLPOOL 2f26c930a3aa56571cbfb02ba8f61b29103af91d46b014b21ed4b7da64f891c89df17fc725ba87b5809ad50d2d3ee2f8a55e6e983a612e6320d689afd6c287c6
+DIST shorewall-docs-html-5.0.4.tar.bz2 4263406 SHA256 501d76f53d6e638aaa14ab60718fa173ef0c3a7756e325326288c353d2845707 SHA512 7e35191fbd5a1b7f0172880fa03ce95f4ac13da3a481c4c2cace83380bcacd23809c56ea12876e55c6d2371a4c88ba44d6a8a600c83481156294ff1a2a48c0e4 WHIRLPOOL 347666e97898ea19af93aef3fb2852b1453791038fa534bb5cad8e96acff75460cb5527389b726f7e09d4721a7b171ca9d2171ac5704f8fa50e172d7ac403929
 DIST shorewall-init-4.6.10.1.tar.bz2 37674 SHA256 c3948dbe48230358eb4d5a370a44b247f4a6e6f28b1c4853be23d9abda79f6ba SHA512 71507a9c27f9a8286f82567f731714fe5a6f5b21f1f3f27f3a3ba9171301361948bef9824a9a45445d65f74039c4dca3ffc83e74a6ffd33783d1528ad581578e WHIRLPOOL 23c886b1015c6430d819d3010b8cdc587d88054f55b8092238438310562affdaead265a40a74dd888d1c939367afafa0ebecfe8946ceb202bab126ca2232cd97
 DIST shorewall-init-4.6.13.1.tar.bz2 40718 SHA256 35684f1955eed65d897f5c51a74b9bf431a839cdeabc9ca7b37109d7b47a9d95 SHA512 f6b5d6e59eb3e4f4408b68bee69dacd3e5b00b3d0628b4b0f6408342bd05b279efc3962c0b294e37b8e6c719442232e73e348f048534916f97e3f40fb3a598d5 WHIRLPOOL 05c774194b33e1ffecec42e756851d3a9bd6764a13b280f63737dca53efe4223cea081b42e4f1a205062baaa3fac62a92b490b1402a6cd0ada637f98bea1b690
 DIST shorewall-init-4.6.13.tar.bz2 40574 SHA256 a1ebf757ccf5b455220daf80af71d23dd6290d9bcd9440da2058bdf6fcfcd768 SHA512 63092ad30f4528e96ca8a12e0e76ef702446a9b61c880455f13ab9ce86c953a3cc3c3f05a04fff9df1a93cad8d01ffd2b846281a7f46a3d9000e5cd3c908051e WHIRLPOOL cf78de19cdcf6c0de23a3259509a95382aaac554a827cca4a031ce4c1ef3b57e7ccaa65c40daadea53dc4433ad819416cafb215aff7088b8eecfeecb1ab7983b
 DIST shorewall-init-5.0.2.1.tar.bz2 27055 SHA256 2ce13881f7442b9e43bb1417bed9236931bb46ce8c74dd87af5d18be41b05311 SHA512 d8debb25e36d7829dcdb08698a889ccee680126da40f5606bba6a04b344cfd28660450cb3fd2037f6ec4d75058d8a243da82fb4c3b25184b609a5aa454739eca WHIRLPOOL 5d17a58c157993af37f75b64e53b693c8f62854bfebb8774520bd435a6c65e24e06c22398181941b352e218945055d8e3927f2cfbcb32e09d8c30f3f8e45fc29
+DIST shorewall-init-5.0.4.tar.bz2 29902 SHA256 97c99c9e68f2546139f26f1f713e1a3377754e53bf2ba0d8f431469aed47ee9c SHA512 67a66ba6db64a320192f5affa38fb779c1f7d7b915523fe82e4dc8a79bb6590b8da62979f9108ba3f56beef05c1cddb5bb2ffea21317e516c2d8a380a5117567 WHIRLPOOL b4f7875ed0f52d8667135dc7204b1a570dec351a7d3fb42a37618af3d54b808355b4479bfb3421d29d4ab808aeae37cd3f1d12b66046f96ec80f776e796d86c7
 DIST shorewall-lite-4.6.10.1.tar.bz2 53535 SHA256 9944da74b9496fe29afe6ebab8f4a37cfb24a6a701282231dd6916831e064c38 SHA512 79347ae6c62e8f039efb2a21b10fd33d08831b6595b64fb4806cc5fd812216d295b73c859db775c0c19cd7c8bdfe67f21042db0d0b47ba47ab6b430d1d522659 WHIRLPOOL 593b8872ea0ff95c5847c51c9c3c312329017cbd7e96efcd39bf1a41a32ef3e99a29deb797a4260422d1bfd86ef4ca72b25024b7d2f5e4e17464df1f3f25571a
 DIST shorewall-lite-4.6.13.1.tar.bz2 56534 SHA256 639213a42c424def670a8b54ce13f0fe007aa9ff97e2beb8cb1cd98deb3fba2f SHA512 0fd3ac13e09dc4975d8a186a536b02420e00374376e3d8b903d6a69cb542de88a303bbe5d3e44831ef8d3ef3fd9ba0a34f19c89803d3ff4b622a366338cf7453 WHIRLPOOL 640541b5bb1c92d3fcb23ec970094200257af5b55a4a71be47a854be781d3e29d8354ea03d79b28fc654f3cab49c1e6de16ee01b3a02a61f0299a0a9bb4b5255
 DIST shorewall-lite-4.6.13.tar.bz2 56490 SHA256 b73707abeb7d9911cae12c8280c014ed4189bd181e8e45f341d9b786b2f22b82 SHA512 c19aaaec6f31efd1afc2cc8e00d341b6135bb5a3b019a3f4a050ec43e4c1f5e4f8d68b00ec29a41201bd8e37a39c4b37348ddef575a1771cc6e6f80024db027c WHIRLPOOL eef127d2c8b76e2846490c916ddfd95692f13f362fd8a522f4b14fe47aec3c91a18a96935db46f5f6bdeb148ce9b1287c99bb4cb4e8292d74812c3ac677a9b41
 DIST shorewall-lite-5.0.2.1.tar.bz2 44159 SHA256 0b7074d098c44156aac4234c02c36ec97d8ac2fd8042ec1f5e5c390612e3620b SHA512 0d2f93622d9dc000c2e58c73a20b13ecf97e139d542f99db3690f75974bab579c8379bd56eb7ffbb58cabcefbedf685d50ed7748c39c15ef7b3636ddbdcece3c WHIRLPOOL 4fb32d7c66411e9b45decbb1fddae00ccad83ba226f8fab806a7e2c6f54f7fa9f2d94bcba3133cdc8bfe0fe240213e016b8b94cd9f00eb46cf2735ac111ce100
+DIST shorewall-lite-5.0.4.tar.bz2 46454 SHA256 23ac0c1b5f8f1650e6a03a70022b3de0c705fb4257c56d0f84d823b0a10f659d SHA512 8f29c4318de4464eaaaab81096e6290abb0c5d148b043dda70f2f38b21823338e093766dd6fcf0d8924a8a7cd3dd84b5c253fdae421982bc2f9ada13a38db7ba WHIRLPOOL 271b9605e97b1f2c5891cae9c30b4b56b8e07e69f1effbc277d784d781cb35f33f1f3c8e2bcbae0e7ae0e6fe092937573cdbf7c9adea498212007b4db7a5ee95
 DIST shorewall6-4.6.10.1.tar.bz2 231553 SHA256 1a2e303e9361fccf393ebfe512cf8d770b522f6b65a0a125a5e4aa0b28dd6e0c SHA512 acb678bd84e68d72f5dafd00d03feedefc8b954f7df9a4e6d57c70647ad2b046f7145c7b5de729d8bf1258a036587a687ee41170add2a50a411675be61de7d3d WHIRLPOOL a3451ff58bc32f4d720f5b8c6db226ac924cf0179084f351b7b35773f011c1b0b5feff2e9544a7b198995d297637e210b80adfb483db198e186b24a1954d2cc1
 DIST shorewall6-4.6.13.1.tar.bz2 235114 SHA256 561887394a04532e06ebdf153aa60c6eaf176349f59a7a30e2c1d31aa48ba4eb SHA512 0700255da06c48577227439b3b358f4693a4e1e4c311f39079686c16b573e5bc4efd251160f69c1e6fc3daa8a503b2ede8fe44d51c93a9abd89431fd85081d72 WHIRLPOOL 9bcdf5b7a0c0a79143b3d451f7b362d41290ad641ab92b92abcfdda0fe15903ff2a225fc3571abe7c9c12e4b6ac34d054adf46372d94acfe997579a931a2979b
 DIST shorewall6-4.6.13.tar.bz2 235132 SHA256 dceb2de20460cd2015297925529fc95feb7bfc156465ef907dead663213a5994 SHA512 91184afc3b42b2b9d9ae679f9061964d79fd8320ff95eb8ab040dd2e2b144a2b546ba458c19a432992924b51c560cd04bff5750634b41f367f40314f8e3399a4 WHIRLPOOL d9a87edccc3d59146d3bcb97264b2a8c1c540b79885e76309ec8cfb9c73f0ce0332f9abc92574c5eb4812a000bede85ca28f5b144ceeb39af52f28cb9571a2a6
 DIST shorewall6-5.0.2.1.tar.bz2 221777 SHA256 ab8489662511990c5430e795803a01249e26e036f84c1079f08c45f52ef501fd SHA512 f79e890b1d6af42c9f3ae236d63fc731d963fc6a0f121a5f3f5a820f8f578b82cc92d450b0385ac0c9446049701500f83bf64b28e00b604d6b89a39529c46519 WHIRLPOOL ea4b1c72515069f4a636c9aa139734dc8c46a1583a4feb8ed6992a36d2e5607c870613b5ad8f4d2ab92629e292150b586986a6e791f3755ee7e48588c2da184f
+DIST shorewall6-5.0.4.tar.bz2 221062 SHA256 86b939f5a27e464d2d4928b66ba145c30c299bc90fd19802817d8a013cfc1fff SHA512 cc38b44fd4af38981d2a7acff11be4f481683f5d6227ed072a2147650ff20fbafdf2bdca63f66b330c11cabf521484f6d860ad1dc426f1d952d94643ff3d63dc WHIRLPOOL 2e0abbcd7e308f2523907be285c77a257a37aa70b81af0d356de53cd6e330305ca66be6972ab53954d0b02ada9fc6b5176b928db8f4a9ee588410c81dce55792
 DIST shorewall6-lite-4.6.10.1.tar.bz2 52669 SHA256 ce19583541f5eb39acad33099af087d030374d467eb64aa4415ac9b18e65c5a8 SHA512 a33ab4b2397864329f35e6352606b13d04fb8ada17777c98d75bc685411bcf9453bf452d3a0b6699c537081483347c542bdfa547d71ca4c0c41967ccd755fd2e WHIRLPOOL ff3ef6e3ad68f69f47e71553061e845ed125735c1c6986180835397c8148386349a0317debf592917ec5ed0734c3af461c5161d9a061c6b8a6ff5c81d52743f0
 DIST shorewall6-lite-4.6.13.1.tar.bz2 55723 SHA256 33a95315f4b976a4fe003f084c3f4363761a076c758c05c6a211a884fe6a63c5 SHA512 6c240fc31bf07e8c52aae3285cf22e7b2fefe846898bea02514157cffbedb930a7cf6a12a4ef473b1713ef8c524b7a48b916f0ffff37477c4ac94afb72397e11 WHIRLPOOL c9b99295ee498e9be3ae7d2a947153828653c931fba90527ecb05254c1fccb1981f800894b31786bcfab50cffdc2dd7e91964e70e43ab67a2d3d0954303b35a3
 DIST shorewall6-lite-4.6.13.tar.bz2 55646 SHA256 9da8d4e29d867ba96aaaa9c0854e385e26b107aa0e5babbc5b1ffd36327cb413 SHA512 e826778478532f32155514e47aad35e2bace38933f5c4ccded67d058acba0766ef6687cc8bcdef6ba4ee1e629af7b5e8d11a77c5a8bb67d4fdc0b0167dadb731 WHIRLPOOL 9a6bba924e24f400d46afb0e13760ee4ed2e690c35e4364f652e4c252f9930d5710eed30e51ff5f312bff6bd56130321c49d0a8ea893c789122bd412c6c79993
 DIST shorewall6-lite-5.0.2.1.tar.bz2 43345 SHA256 ebf19ef0ce409213b9c395911391f5f4e42c6542f6414cd849e66d6d19bd2751 SHA512 87fb50306c3e9d89cdf03bddb9b780929932ccbe5a346295f0bcdda8d3eeac6abd56387aad08aebc208228b5eee4378c29872d34b2d7ab11e8334ba5d7ec5165 WHIRLPOOL 9fbc60a75504be96b3bde80fc8c397d91af29c6c6d465bc14497586acbc8bd03a667f4680c847879dc59be2db9f15d5bed2fc22700d50a4d25eedc28d867c41a
+DIST shorewall6-lite-5.0.4.tar.bz2 45573 SHA256 ea578f90bdb5b797c5604a4490ce90437bb4fbc1384f99ef131b2a6415ce6cfe SHA512 eb85ba4cc7992acb0667c735593cceb958ffa06fedd101a6c987078cbfb8509a7b979c92147dfbc4be58a00a2042a20d88873ba6048038ba5c6c8695487c3a85 WHIRLPOOL b040e1850f30103642d83a93467bb21d31a22a1e2c3759677720f0efc613d43759a278536f6304968fba208121f91a151df1b64f9dec6aaae3859f04a2da8215
diff --git a/net-firewall/shorewall/shorewall-4.6.10.1.ebuild b/net-firewall/shorewall/shorewall-4.6.10.1.ebuild
index 192104a..13c2055 100644
--- a/net-firewall/shorewall/shorewall-4.6.10.1.ebuild
+++ b/net-firewall/shorewall/shorewall-4.6.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,8 +6,7 @@
 
 inherit eutils linux-info prefix systemd versionator
 
-DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall, is'
-DESCRIPTION+=' a high-level tool for configuring Netfilter'
+DESCRIPTION='A high-level tool for configuring Netfilter'
 HOMEPAGE="http://www.shorewall.net/"
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-firewall/shorewall/shorewall-4.6.13.1.ebuild b/net-firewall/shorewall/shorewall-4.6.13.1.ebuild
index fd85c68..f9f66e7 100644
--- a/net-firewall/shorewall/shorewall-4.6.13.1.ebuild
+++ b/net-firewall/shorewall/shorewall-4.6.13.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,8 +6,7 @@
 
 inherit eutils linux-info prefix systemd versionator
 
-DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall, is'
-DESCRIPTION+=' a high-level tool for configuring Netfilter'
+DESCRIPTION='A high-level tool for configuring Netfilter'
 HOMEPAGE="http://www.shorewall.net/"
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-firewall/shorewall/shorewall-4.6.13.ebuild b/net-firewall/shorewall/shorewall-4.6.13.ebuild
index fd85c68..f9f66e7 100644
--- a/net-firewall/shorewall/shorewall-4.6.13.ebuild
+++ b/net-firewall/shorewall/shorewall-4.6.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,8 +6,7 @@
 
 inherit eutils linux-info prefix systemd versionator
 
-DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall, is'
-DESCRIPTION+=' a high-level tool for configuring Netfilter'
+DESCRIPTION='A high-level tool for configuring Netfilter'
 HOMEPAGE="http://www.shorewall.net/"
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-firewall/shorewall/shorewall-5.0.2.1.ebuild b/net-firewall/shorewall/shorewall-5.0.2.1.ebuild
index df64299..0d750af 100644
--- a/net-firewall/shorewall/shorewall-5.0.2.1.ebuild
+++ b/net-firewall/shorewall/shorewall-5.0.2.1.ebuild
@@ -67,7 +67,7 @@
 	unset _tmp_last_index
 	unset _tmp_suffix
 else
-	KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 SRC_URI="
diff --git a/net-firewall/shorewall/shorewall-5.0.4.ebuild b/net-firewall/shorewall/shorewall-5.0.4.ebuild
new file mode 100644
index 0000000..59dff46
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.0.4.ebuild
@@ -0,0 +1,446 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc +init +ipv4 ipv6 lite4 lite6"
+
+MY_PV=${PV/_rc/-RC}
+MY_PV=${MY_PV/_beta/-Beta}
+MY_P=${PN}-${MY_PV}
+
+MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
+
+# shorewall
+MY_PN_IPV4=Shorewall
+MY_P_IPV4=${MY_PN_IPV4/#S/s}-${MY_PV}
+
+# shorewall6
+MY_PN_IPV6=Shorewall6
+MY_P_IPV6=${MY_PN_IPV6/#S/s}-${MY_PV}
+
+# shorewall-lite
+MY_PN_LITE4=Shorewall-lite
+MY_P_LITE4=${MY_PN_LITE4/#S/s}-${MY_PV}
+
+# shorewall6-lite
+MY_PN_LITE6=Shorewall6-lite
+MY_P_LITE6=${MY_PN_LITE6/#S/s}-${MY_PV}
+
+# shorewall-init
+MY_PN_INIT=Shorewall-init
+MY_P_INIT=${MY_PN_INIT/#S/s}-${MY_PV}
+
+# shorewall-core
+MY_PN_CORE=Shorewall-core
+MY_P_CORE=${MY_PN_CORE/#S/s}-${MY_PV}
+
+# shorewall-docs-html
+MY_PN_DOCS=Shorewall-docs-html
+MY_P_DOCS=${MY_PN_DOCS/#S/s}-${MY_PV}
+
+# Upstream URL schema:
+# Beta:    $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-Beta2/shorewall-4.6.4-Beta2.tar.bz2
+# RC:      $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-RC1/shorewall-4.6.4-RC1.tar.bz2
+# Release: $MIRROR/pub/shorewall/4.6/shorewall-4.6.3/shorewall-4.6.3.3.tar.bz2
+
+MY_URL_PREFIX=
+MY_URL_SUFFIX=
+if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
+	MY_URL_PREFIX='development/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/${MY_P_DOCS}.tar.bz2 )
+"
+
+# - Shorewall6 requires Shorewall
+# - Installing Shorewall-init or just the documentation doesn't make any sense,
+#   that's why we force the user to select at least one "real" Shorewall product
+#
+# See http://shorewall.net/download.htm#Which
+REQUIRED_USE="
+	ipv6? ( ipv4 )
+	|| ( ipv4 lite4 lite6 )
+"
+
+# No build dependencies! Just plain shell scripts...
+DEPEND=""
+
+RDEPEND="
+	>=net-firewall/iptables-1.4.20
+	>=sys-apps/iproute2-3.8.0[-minimal]
+	>=sys-devel/bc-1.06.95
+	ipv4? (
+		>=dev-lang/perl-5.16
+		virtual/perl-Digest-SHA
+	)
+	ipv6? (
+		>=dev-perl/Socket6-0.230.0
+		>=net-firewall/iptables-1.4.20[ipv6]
+		>=sys-apps/iproute2-3.8.0[ipv6]
+	)
+	lite6? (
+		>=net-firewall/iptables-1.4.20[ipv6]
+		>=sys-apps/iproute2-3.8.0[ipv6]
+	)
+	init? ( >=sys-apps/coreutils-8.20 )
+	!net-firewall/shorewall-core
+	!net-firewall/shorewall6
+	!net-firewall/shorewall-lite
+	!net-firewall/shorewall6-lite
+	!net-firewall/shorewall-init
+	!<sys-apps/systemd-214
+"
+
+S=${WORKDIR}
+
+pkg_pretend() {
+	local CONFIG_CHECK="~NF_CONNTRACK"
+
+	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
+	local WARNING_CONNTRACK+=" to run any shorewall-based firewall on the local system."
+
+	if use ipv4 || use lite4; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4"
+
+		local WARNING_CONNTRACK_IPV4="Without NF_CONNTRACK_IPV4 support, you will"
+		local WARNING_CONNTRACK_IPV4+=" be unable to run any shorewall-based IPv4 firewall on the local system."
+	fi
+
+	if use ipv6 || use lite6; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV6"
+
+		local WARNING_CONNTRACK_IPV6="Without NF_CONNTRACK_IPV6 support, you will"
+		local WARNING_CONNTRACK_IPV6+=" be unable to run any shorewall-based IPv6 firewall on the local system."
+	fi
+
+	check_extra_config
+}
+
+pkg_setup() {
+	if [ -n "${DIGEST}" ]; then
+		einfo "Unsetting environment variable \"DIGEST\" to prevent conflicts with package's \"install.sh\" script ..."
+		unset DIGEST
+	fi
+}
+
+src_prepare() {
+	# We are moving each unpacked source from MY_P_* to MY_PN_*.
+	# This allows us to use patches from upstream and keeps epatch_user working
+
+	einfo "Preparing shorewallrc ..."
+	cp "${FILESDIR}"/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# shorewall-core
+	mv "${S}"/${MY_P_CORE} "${S}"/${MY_PN_CORE} || die "Failed to move '${S}/${MY_P_CORE}' to '${S}/${MY_PN_CORE}'"
+	ebegin "Applying Gentoo-specific changes to ${MY_P_CORE} ..."
+	ln -s ../shorewallrc.gentoo ${MY_PN_CORE}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+	eend 0
+
+	# shorewall
+	if use ipv4; then
+		mv "${S}"/${MY_P_IPV4} "${S}"/${MY_PN_IPV4} || die "Failed to move '${S}/${MY_P_IPV4}' to '${S}/${MY_PN_IPV4}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV4}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_IPV4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall.confd "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd failed"
+		cp "${FILESDIR}"/shorewall.initd "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd failed"
+		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
+		eend 0
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		mv "${S}"/${MY_P_IPV6} "${S}"/${MY_PN_IPV6} || die "Failed to move '${S}/${MY_P_IPV6}' to '${S}/${MY_PN_IPV6}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV6}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_IPV6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall6.confd "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall6.confd failed"
+		cp "${FILESDIR}"/shorewall6.initd "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall6.initd failed"
+		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
+		eend 0
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		mv "${S}"/${MY_P_LITE4} "${S}"/${MY_PN_LITE4} || die "Failed to move '${S}/${MY_P_LITE4}' to '${S}/${MY_PN_LITE4}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE4}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_LITE4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall-lite.confd "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd failed"
+		cp "${FILESDIR}"/shorewall-lite.initd "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd failed"
+		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
+		eend 0
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		mv "${S}"/${MY_P_LITE6} "${S}"/${MY_PN_LITE6} || die "Failed to move '${S}/${MY_P_LITE6}' to '${S}/${MY_PN_LITE6}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE6}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_LITE6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall6-lite.confd "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall6-lite.confd failed"
+		cp "${FILESDIR}"/shorewall6-lite.initd "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall6-lite.initd failed"
+		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
+		eend 0
+	fi
+
+	# shorewall-init
+	if use init; then
+		mv "${S}"/${MY_P_INIT} "${S}"/${MY_PN_INIT} || die "Failed to move '${S}/${MY_P_INIT}' to '${S}/${MY_PN_INIT}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_INIT}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_INIT}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall-init.confd "${S}"/${MY_PN_INIT}/default.gentoo || die "Copying shorewall-init.confd failed"
+		cp "${FILESDIR}"/shorewall-init.initd "${S}"/${MY_PN_INIT}/init.gentoo.sh || die "Copying shorewall-init.initd failed"
+		cp "${FILESDIR}"/shorewall-init.systemd "${S}"/${MY_PN_INIT}/gentoo.service || die "Copying shorewall-init.systemd failed"
+		cp "${FILESDIR}"/shorewall-init.readme "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt || die "Copying shorewall-init.systemd failed"
+		eend 0
+
+		eprefixify "${S}"/${MY_PN_INIT}/init.gentoo.sh
+
+		cd "${S}"/${MY_PN_INIT}
+		epatch "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
+		cd "${S}"
+	fi
+
+	# shorewall-docs-html
+	if use doc; then
+		mv "${S}"/${MY_P_DOCS} "${S}"/${MY_PN_DOCS} || die "Failed to move '${S}/${MY_P_DOCS}' to '${S}/${MY_PN_DOCS}'"
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	# shorewall-core
+	einfo "Installing ${MY_P_CORE} ..."
+	DESTDIR="${D%/}" ${MY_PN_CORE}/install.sh shorewallrc.gentoo || die "${MY_PN_CORE}/install.sh failed"
+	dodoc "${S}"/${MY_PN_CORE}/changelog.txt "${S}"/${MY_PN_CORE}/releasenotes.txt
+
+	# shorewall
+	if use ipv4; then
+		einfo "Installing ${MY_P_IPV4} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${MY_PN_INIT}/install.sh shorewallrc.gentoo || die "${MY_PN_INIT}/install.sh failed"
+		dodoc "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt
+
+		if [ -f "${D}etc/logrotate.d/shorewall-init" ]; then
+			# On Gentoo, shorewall-init will not create shorewall-ifupdown.log,
+			# so we don't need a logrotate configuration file for shorewall-init
+			einfo "Removing unused \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [ -d "${D}etc/NetworkManager" ]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [ -f "${D}usr/share/shorewall-init/ifupdown" ]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}usr/share/shorewall-init/ifupdown\" failed"
+		fi
+	fi
+
+	if use doc; then
+		einfo "Installing ${MY_P_DOCS} ..."
+		dohtml -r "${S}"/${MY_PN_DOCS}
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		# Show first steps for shorewall/shorewall6
+		local _PRODUCTS=""
+		if use ipv4; then
+			_PRODUCTS="shorewall"
+
+			if use ipv6; then
+				_PRODUCTS="${_PRODUCTS}/shorewall6"
+			fi
+		fi
+
+		if [[ -n "${_PRODUCTS}" ]]; then
+			elog "Before you can use ${_PRODUCTS}, you need to edit its configuration in:"
+			elog ""
+			elog "  /etc/shorewall/shorewall.conf"
+
+			if use ipv6; then
+				elog "  /etc/shorewall6/shorewall6.conf"
+			fi
+
+			elog ""
+			elog "To activate your shorewall-based firewall on system start, please add ${_PRODUCTS} to your default runlevel:"
+			elog ""
+			elog "  # rc-update add shorewall default"
+
+			if use ipv6; then
+				elog "  # rc-update add shorewall6 default"
+			fi
+		fi
+
+		# Show first steps for shorewall-lite/shorewall6-lite
+		_PRODUCTS=""
+		if use lite4; then
+			_PRODUCTS="shorewall-lite"
+		fi
+
+		if use lite6; then
+			if [[ -z "${_PRODUCTS}" ]]; then
+				_PRODUCTS="shorewall6-lite"
+			else
+				_PRODUCTS="${_PRODUCTS}/shorewall6-lite"
+			fi
+		fi
+
+		if [[ -n "${_PRODUCTS}" ]]; then
+			if use ipv4; then
+				elog ""
+			fi
+
+			elog "Before you can use ${_PRODUCTS}, you need to provide a configuration, which you can"
+			elog "create using ${CATEGORY}/shorewall (with \"ipv4\" and or \"ipv6\" USE flag)."
+			elog ""
+			elog "To read more about ${_PRODUCTS}, please visit"
+			elog "  http://shorewall.net/CompiledPrograms.html"
+			elog ""
+			elog "To activate your shorewall-lite-based firewall on system start, please add ${PRODUCTS} to your default runlevel:"
+			elog ""
+
+			if use lite4; then
+				elog "  # rc-update add shorewall-lite default"
+			fi
+
+			if use lite6; then
+				elog "  # rc-update add shorewall6-lite default"
+			fi
+		fi
+
+		if use init; then
+			elog ""
+			elog "To secure your system on boot, please add shorewall-init to your boot runlevel:"
+			elog ""
+			elog "  # rc-update add shorewall-init boot"
+			elog ""
+			elog "and review \$PRODUCTS in"
+			elog ""
+			elog "  /etc/conf.d/shorewall-init"
+		fi
+
+	fi
+
+	if [[ -n "${REPLACING_VERSIONS}" && ${REPLACING_VERSIONS} < ${MY_MAJOR_RELEASE_NUMBER} ]]; then
+		# This is an upgrade
+
+		elog "You are upgrading from a previous major version. It is highly recommended that you read"
+		elog ""
+		elog "  - /usr/share/doc/shorewall*/releasenotes.tx*"
+		elog "  - http://shorewall.net/upgrade_issues.htm#idp8704902640"
+
+		if use ipv4; then
+			elog ""
+			elog "You can auto-migrate your configuration using"
+			elog ""
+			elog "  # shorewall update -A"
+
+			if use ipv6; then
+				elog "  # shorewall6 update -A"
+			fi
+
+			elog ""
+			elog "But if you are not familiar with the \"shorewall[6] update\" command,"
+			elog "please read the shorewall[6] man page first."
+		fi
+	fi
+
+	if ! use init; then
+		elog ""
+		elog "Consider emerging ${CATEGORY}/${PN} with USE flag \"init\" to secure your system on boot"
+		elog "before your shorewall-based firewall is ready to start."
+		elog ""
+		elog "To read more about shorewall-init, please visit"
+		elog "  http://www.shorewall.net/Shorewall-init.html"
+	fi
+
+	if ! has_version "net-firewall/conntrack-tools"; then
+		elog ""
+		elog "Your Shorewall firewall can utilize \"conntrack\" from the \"net-firewall/conntrack-tools\""
+		elog "package. if you want to use this feature, you need to install \"net-firewall/conntrack-tools\"!"
+	fi
+
+	if ! has_version "dev-perl/Devel-NYTProf"; then
+		elog ""
+		elog "If you want to profile your Shorewall firewall you need to install \"dev-perl/Devel-NYTProf\"!"
+	fi
+}
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 7d70b7a..e318a0a 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -2,6 +2,7 @@
 DIST samba-3.5.22.tar.gz 35385144 SHA256 b4c98f77f5634478da109063334acd9b6ad7bcb38151a5b1cac6dc5feb6679dc SHA512 0e1b4816d921ca82f0426a254cf103066634cc54e28d707a62da951118413f7f5ca5f87d60688cab802a58b0af87f797fbbe12f4e1284d5d7f545a98aba97616 WHIRLPOOL 6e59655dd7a537f0c7c889c43ddf5afb8060706e1ec79b3835698181c5c7478059f91c93eefbde50b03e0154a686eda35eabf807bb7ae01dd2b9b39648a009ae
 DIST samba-3.6.25.tar.gz 34121828 SHA256 8f2c8a7f2bd89b0dfd228ed917815852f7c625b2bc0936304ac3ed63aaf83751 SHA512 25a5c56dae4517e82e196b59fa301b661ec75db57effbb0ede35fb23b018f78cdea6513e8760966caf58abc43335fcebda77fe5bf5bb9d4b27fd3ca6e5a3b626 WHIRLPOOL 68c4a335b3912bf3c6baecae337b1131127515191052366ca9a04ec6d919f2fb69c912aefb087e2578134f3a9bde7b496ea880f2197a8dbf8221058dd1e8444d
 DIST samba-4.2.7.tar.gz 20741971 SHA256 f586ab3166ce4c663360f15b1de24ef083816a5471856e3ad49bc26b35f0104a SHA512 74314083c04689696f0423bc990947bfafad679edcac97e6c137e99c17de1e262a4d8450b57de733a70c86c746300c7c5a1365b56c0e353ce79b05e0baf8eb9a WHIRLPOOL 84e7d2f3a60701ee929198caf86371c9e1694be6def47a4f0f12d4d221b995209505c23564c304fbdd95ab5ae528f941946bd361ec6e388f7ba4db08792ff3ba
+DIST samba-4.2.8.tar.gz 20745527 SHA256 d2c0ca97ab415ede829d15ddad411d76e4f7b6a82e280bf7fbc9910c30fa4593 SHA512 cdee04ebc2303c1cadf2c0a45530909b6c97838e611378498faaaa6fcade8850746253d51ae71fd872c741f54ec2d3a9d452651291355e20001ca443fae9054a WHIRLPOOL 84b3f78b41da98eaa463f9b1c467e3c82268d31ac3d3e48d75b0a4dc04f479d12f2387c045281b0caa3a841c351587d0eabec403163ff479d8c700f0b638e5f4
 DIST samba-4.3.4.tar.gz 20434434 SHA256 5d0eb52e842832af922f7d57716eacff23192906ec3bdf6727e18ca24f1419d9 SHA512 021351534a70cd351934d7f8bfc3c4e9ed9ea3f11f778f6f9d076b3368103f7f478ff1745cb257de0bf2ee38ae76ecba58e01a4db6cbcacbd8a4876e8e1b30f2 WHIRLPOOL 328721951ed932c5813d6157ca2933e22adb793d5cd6667577e40151bcdae8dcddf5ca4e053cd6494e0f82f5801ae480716520c625dd9c337557abc168e00dec
 DIST samba-disable-python-patches-4.2.7.tar.xz 6296 SHA256 06a1b9aeb91b622d3c2a02a86edfc26e26f10303699c8b2badbd21ce68b10ec0 SHA512 ff746c2969b254d9ccad1440699fccd5958222eea8284a8e068b96df377d6cea8551ec3c6be7103cebf227b0b9038a5b06d3b06d9b247e181403e9fe1ad7eedf WHIRLPOOL 8ea9f34c5f011624b43c0f3f27601574c27e00c5a728d9af5b1cece090da362d51f93ef6cecd37f1204bbd4e608ed58027f52ef5c3d700a1cfdbbb0e5355c3b8
 DIST samba-disable-python-patches-4.3.3.tar.xz 6016 SHA256 00debe6c5cc57b87150ded67db8dc54e5ec487f6ed610c96e8fa393743c47f66 SHA512 775abcee86690605e156f4c560f25d762f5cc2e72177a55003ad5124ed643322f2c84514342ed0eadad2c8e1ea97006bc6ce7d504ca8a29c27a201666ce4bdf6 WHIRLPOOL 86c40669e706f6c3b955e6fb892931532e241dd92cae2e7b5986e78f6b5fe50c42c019b97650942de81c8c4989568bcb93e49a7bcb2f9fd300d189da5fa08fe4
diff --git a/net-fs/samba/samba-4.2.7.ebuild b/net-fs/samba/samba-4.2.7.ebuild
deleted file mode 100644
index f80127c..0000000
--- a/net-fs/samba/samba-4.2.7.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-
-inherit python-single-r1 waf-utils multilib linux-info systemd eutils
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-KEYWORDS="~amd64 ~hppa ~x86"
-[[ ${PV} = *_rc* ]] && KEYWORDS="~hppa"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="http://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads aio avahi client cluster cups dmapi fam gnutls iprint
-ldap pam quota selinux syslog +system-mitkrb5 systemd test winbind"
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="${PYTHON_DEPS}
-	dev-libs/iniparser:0
-	dev-libs/popt
-	sys-libs/readline:=
-	virtual/libiconv
-	dev-python/subunit[${PYTHON_USEDEP}]
-	>=net-libs/socket_wrapper-1.1.2
-	sys-apps/attr
-	sys-libs/libcap
-	>=sys-libs/ldb-1.1.24
-	sys-libs/ncurses:0=
-	>=sys-libs/nss_wrapper-1.0.2
-	>=sys-libs/ntdb-1.0[python,${PYTHON_USEDEP}]
-	>=sys-libs/talloc-2.1.2[python,${PYTHON_USEDEP}]
-	>=sys-libs/tdb-1.3.6[python,${PYTHON_USEDEP}]
-	>=sys-libs/tevent-0.9.25
-	>=sys-libs/uid_wrapper-1.0.1
-	sys-libs/zlib
-	acl? ( virtual/acl )
-	addns? ( net-dns/bind-tools[gssapi] )
-	aio? ( dev-libs/libaio )
-	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
-	cups? ( net-print/cups )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gnutls? ( dev-libs/libgcrypt:0
-		>=net-libs/gnutls-1.4.0 )
-	ldap? ( net-nds/openldap )
-	system-mitkrb5? ( app-crypt/mit-krb5 )
-	!system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl] )
-	systemd? ( sys-apps/systemd:0= )
-	pam? ( virtual/pam )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	client? ( net-fs/cifs-utils[ads?] )
-	selinux? ( sec-policy/selinux-samba )
-"
-
-REQUIRED_USE="addc? ( gnutls !system-mitkrb5 )
-	ads? ( acl gnutls ldap )
-	${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch"
-	"${FILESDIR}/${PN}-4.2.7-pam.patch"
-)
-
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	if use aio ; then
-		if ! linux_config_exists || ! linux_chkconfig_present AIO; then
-				ewarn "You must enable AIO support in your kernel config, "
-				ewarn "to be able to support asynchronous I/O. "
-				ewarn "You can find it at"
-				ewarn
-				ewarn "General Support"
-				ewarn " Enable AIO support "
-				ewarn
-				ewarn "and recompile your kernel..."
-		fi
-	fi
-}
-
-src_prepare() {
-	epatch ${PATCHES[@]}
-	# Allow user patches
-	epatch_user
-}
-
-src_configure() {
-	local myconf=()
-	myconf=(
-		--enable-fhs
-		--sysconfdir=/etc
-		--localstatedir=/var
-		--with-modulesdir=/usr/$(get_libdir)/samba
-		--with-piddir=/var/run/${PN}
-		--bundled-libraries=NONE
-		--builtin-libraries=NONE
-		--disable-rpath
-		--disable-rpath-install
-		--nopyc
-		--nopyo
-		$(use_with acl acl-support)
-		$(usex addc '' '--without-ad-dc')
-		$(use_with addns dnsupdate)
-		$(use_with ads)
-		$(usex ads '--with-shared-modules=idmap_ad' '')
-		$(use_with aio aio-support)
-		$(usex cluster '--with-ctdb-dir=/usr' '')
-		$(use_enable avahi)
-		$(use_with cluster cluster-support)
-		$(use_enable cups)
-		$(use_with dmapi)
-		$(use_with fam)
-		$(use_enable gnutls)
-		$(use_enable iprint)
-		$(use_with ldap)
-		$(use_with pam)
-		$(use_with pam pam_smbpass)
-		$(usex pam "--with-pammodulesdir=/$(get_libdir)/security" '')
-		$(use_with quota quotas)
-		$(use_with syslog)
-		$(use_with systemd)
-		$(usex system-mitkrb5 '--with-system-mitkrb5' '')
-		$(use_with winbind)
-		$(usex test '--enable-selftest' '')
-	)
-
-	CPPFLAGS="-I${SYSROOT}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-src_install() {
-	waf-utils_src_install
-
-	# install ldap schema for server (bug #491002)
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		doins examples/LDAP/samba.schema
-	fi
-
-	# Make all .so files executable
-	find "${D}" -type f -name "*.so" -exec chmod +x {} +
-
-	# install example config file
-	insinto /etc/samba
-	doins examples/smb.conf.default
-
-	# Install init script and conf.d file
-	newinitd "${CONFDIR}/samba4.initd-r1" samba
-	newconfd "${CONFDIR}/samba4.confd" samba
-
-	systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-	systemd_dounit "${FILESDIR}"/nmbd.service
-	systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-	systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-	systemd_dounit "${FILESDIR}"/winbindd.service
-	systemd_dounit "${FILESDIR}"/samba.service
-}
-
-src_test() {
-	"${WAF_BINARY}" test || die "test failed"
-}
-
-pkg_postinst() {
-	ewarn "Be aware the this release contains the best of all of Samba's"
-	ewarn "technology parts, both a file server (that you can reasonably expect"
-	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-	ewarn "controller work previously known as 'samba4'."
-
-	elog "For further information and migration steps make sure to read "
-	elog "http://samba.org/samba/history/${P}.html "
-	elog "http://samba.org/samba/history/${PN}-4.2.0.html and"
-	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.2.8.ebuild b/net-fs/samba/samba-4.2.8.ebuild
new file mode 100644
index 0000000..4c0a2ff
--- /dev/null
+++ b/net-fs/samba/samba-4.2.8.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+),xml(+)'
+
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_PATH="stable"
+[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
+
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
+	https://dev.gentoo.org/~axs/distfiles/samba-disable-python-patches-4.2.7.tar.xz"
+KEYWORDS="~amd64 ~hppa ~x86"
+[[ ${PV} = *_rc* ]] && KEYWORDS="~hppa"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="http://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads aio avahi client cluster cups dmapi fam gnutls iprint
+ldap pam quota selinux syslog +system-mitkrb5 systemd test winbind"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+CDEPEND="${PYTHON_DEPS}
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/iniparser:0
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	sys-libs/readline:=
+	virtual/libiconv
+	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=net-libs/socket_wrapper-1.1.2[${MULTILIB_USEDEP}]
+	sys-apps/attr[${MULTILIB_USEDEP}]
+	sys-libs/libcap
+	>=sys-libs/ldb-1.1.24[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+	>=sys-libs/nss_wrapper-1.0.2[${MULTILIB_USEDEP}]
+	>=sys-libs/ntdb-1.0[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.1.2[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.6[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.25[${MULTILIB_USEDEP}]
+	>=sys-libs/uid_wrapper-1.0.1[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/pam
+	acl? ( virtual/acl )
+	addns? ( net-dns/bind-tools[gssapi] )
+	aio? ( dev-libs/libaio )
+	cluster? ( !dev-db/ctdb )
+	cups? ( net-print/cups )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gnutls? ( dev-libs/libgcrypt:0
+		>=net-libs/gnutls-1.4.0 )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
+	!system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	client? ( net-fs/cifs-utils[ads?] )
+	selinux? ( sec-policy/selinux-samba )
+"
+
+REQUIRED_USE="addc? ( gnutls !system-mitkrb5 )
+	ads? ( acl gnutls ldap )
+	${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch"
+	"${FILESDIR}/${PN}-4.2.7-pam.patch"
+)
+
+CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use aio ; then
+		if ! linux_config_exists || ! linux_chkconfig_present AIO; then
+			ewarn "You must enable AIO support in your kernel config, "
+			ewarn "to be able to support asynchronous I/O. "
+			ewarn "You can find it at"
+			ewarn
+			ewarn "General Support"
+			ewarn " Enable AIO support "
+			ewarn
+			ewarn "and recompile your kernel..."
+		fi
+	fi
+	if use cluster ; then
+		SHAREDMODS="${SHAREDMODS}idmap_rid,idmap_tdb2,idmap_ad"
+	fi
+}
+
+src_prepare() {
+	epatch ${PATCHES[@]}
+
+	# install the patches from tarball(s)
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/patches"
+
+	# Allow user patches
+	epatch_user
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=()
+	myconf=(
+		--enable-fhs
+		--sysconfdir=/etc
+		--localstatedir=/var
+		--with-modulesdir=/usr/$(get_libdir)/samba
+		--with-piddir=/var/run/${PN}
+		--bundled-libraries=NONE
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+	)
+	if multilib_is_native_abi ; then
+		myconf+=(
+			$(use_with acl acl-support)
+			$(usex addc '' '--without-ad-dc')
+			$(use_with addns dnsupdate)
+			$(use_with ads)
+			$(usex ads '--with-shared-modules=idmap_ad' '')
+			$(use_with aio aio-support)
+			$(use_enable avahi)
+			$(use_with cluster cluster-support)
+			$(use_enable cups)
+			$(use_with dmapi)
+			$(use_with fam)
+			$(use_enable gnutls)
+			$(use_enable iprint)
+			$(use_with ldap)
+			$(use_with pam)
+			$(use_with pam pam_smbpass)
+			$(usex pam "--with-pammodulesdir=/$(get_libdir)/security" '')
+			$(use_with quota quotas)
+			$(use_with syslog)
+			$(use_with systemd)
+			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
+			$(use_with winbind)
+			$(usex test '--enable-selftest' '')
+			--with-shared-modules=${SHAREDMODS}
+		)
+	else
+		myconf+=(
+			--without-acl-support
+			--without-ad-dc
+			--without-dnsupdate
+			--without-ads
+			--without-aio-support
+			--disable-avahi
+			--without-cluster-support
+			--disable-cups
+			--without-dmapi
+			--without-fam
+			--disable-gnutls
+			--disable-iprint
+			$(use_with ldap)
+			--without-pam
+			--without-pam_smbpass
+			--without-quotas
+			--without-syslog
+			--without-systemd
+			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
+			--without-winbind
+			--disable-python
+		)
+	fi
+
+	CPPFLAGS="-I${SYSROOT}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${D}" -type f -name "*.so" -exec chmod +x {} +
+
+	if multilib_is_native_abi; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+		systemd_dounit "${FILESDIR}"/nmbd.service
+		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+		systemd_dounit "${FILESDIR}"/winbindd.service
+		systemd_dounit "${FILESDIR}"/samba.service
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Be aware the this release contains the best of all of Samba's"
+	ewarn "technology parts, both a file server (that you can reasonably expect"
+	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+	ewarn "controller work previously known as 'samba4'."
+
+	elog "For further information and migration steps make sure to read "
+	elog "http://samba.org/samba/history/${P}.html "
+	elog "http://samba.org/samba/history/${PN}-4.2.0.html and"
+	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-ftp/lftp/lftp-4.6.5.ebuild b/net-ftp/lftp/lftp-4.6.5.ebuild
index 9743ffe..914a388 100644
--- a/net-ftp/lftp/lftp-4.6.5.ebuild
+++ b/net-ftp/lftp/lftp-4.6.5.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="convert-mozilla-cookies +gnutls idn ipv6 nls openssl socks5 +ssl verify-file"
 LFTP_LINGUAS=( cs de es fr it ja ko pl pt_BR ru uk zh_CN zh_HK zh_TW )
diff --git a/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild b/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild
index 8feed88..8a72535 100644
--- a/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 inherit eutils flag-o-matic multilib user
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 
 DESCRIPTION="Courier authentication library"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 340cac0..f0f319a 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -2,7 +2,9 @@
 DIST gnutls-3.3.18.tar.xz 6275948 SHA256 7a87e7f486d1ada10007356917a412cde6c6114dac018e3569e3aa09e9f29395 SHA512 e7c972458ad0af401121c705ebe86aafa46c02743d963b1b67ca09192c746a9193c73d28501b6c046435259b40ac0f8d201860cd6cf6240a7783b6c01b64286c WHIRLPOOL ce2134515d234d6dbceebefd5602bc7f0d96faff839055fd401149c6969a245f5284d7e29ae2eca810fa6039d7184477b9fda2ae0faa379262434927320ebde3
 DIST gnutls-3.3.19.tar.xz 6280376 SHA256 888d8779b48f21959b33d4d9ad0b546e5ec3dea20abf0d9bb03869d56b1f44cf SHA512 d204ba16d5806d8a19df1825ceee49583b0d34ea212fe40e8d81a28f8843e18b211af5b8455fc0c84c0643fc23b12bd6434e6174170382d8e732e32f0d1f2fa2 WHIRLPOOL 7b68978de61edef731268a9ed7405735e589e1f6180a05e5f7b5466f1fde898da42ab9116242f2b210571c60c7f7ea1a4136323fd2dd305ebe442ec066092ee4
 DIST gnutls-3.3.20.tar.xz 6281012 SHA256 4c903e5cde7a8f15318af9a7a6c9b7fc8348594b0a1e9ac767636ef2187399ea SHA512 83059242a01a700abbca7f400712127ac3664e56e839929d1fe8571c2296b63f3c18f3fed04b5445973f4658b6b70ede85fadcc129a848a2fbbdac83437b97d1 WHIRLPOOL 32c7145a14e953ee348d8ae649236bb70fe7afd61f200fed067192d7851d4501d9d70e19a615f71de026852e2a3c8b9acde1dc8c3a0ac445d9f32da5784b2351
+DIST gnutls-3.3.21.tar.xz 6284464 SHA256 885ccb46e52f5a9f5aed3edf8aae4d67aa85e41b72471bed93e84fe3f7df3e5e SHA512 5161b036b3c55fec920e859b6e19aca8e7b667e53fa33666a2a28a16a6ff71b78da051798a36f09413f69c4d88ac5e48da9b2135751e78e9a7bed8d7a8c9cd19 WHIRLPOOL 104a129f8147386707e1a6ad690e1f6c27e2c8f09b05e16fc4ff191dfe6d6452213d3151645885b33daf45bbbd3c9d0ee521e5ea50dba752bcb1cc7616e01fc4
 DIST gnutls-3.4.5.tar.xz 6552036 SHA256 af88b8e0460728d034ff3f454f7851a09b7f0959a93531b6f8d35658ef0f7aae SHA512 16dfdaecbcc0b02ea762def35724a3433063136429d0eb67d9e009ced14a6ddddfa567f41e03a4fda9c4f68e3625bac41e8966882257099413c9500e33171a2f WHIRLPOOL 9274ae5660ac3f6da839f6a7fe3df4042155259170b069b8b54772d77b18564cc5f5337acc475d0936afe855fe9e046a1fb167bbd6842063c9c0335d218f4393
 DIST gnutls-3.4.6.tar.xz 6591628 SHA256 feb559ed7fffa24d5aa40527054fae5cb7f7b66e9f2bebc2383a781dfa4d20ec SHA512 c81da5bba3b28ab17ef762d8c6a6607745f1fa7177e0fdaacd374ac0ee64c14cd804e048aeb965383fafaa677ba2ed256c709a117f8a95012f8494c650d29c81 WHIRLPOOL c1c6a3a7ad3d046058d2fbc0d380d453e35567eed7f602184b577dea215ee8018f82a76684646513926473f4a504348390912ab3cd7ce5f3c1c5e11cf869f09b
 DIST gnutls-3.4.7.tar.xz 6613096 SHA256 c1be9e4b30295d7b5f96fa332c6a908e6fa2254377b67811301fca92eb882e5a SHA512 fdfca4c37292ee07d2d1e398380afe79a20f56040a7c84deb7a5b5221f3bcb4080471b9644c7f2bacb42247c3cc62e32a511f1e2ec6e31c15d9b08b20e8050b6 WHIRLPOOL b56e54c13c33fd74076caf29062cb0c6b38afecfe044a6d7db9b3eef3379a133fb327527ddf07c333783266f00b970aec33b2bb2a21e8b35ceaee0d934456aee
 DIST gnutls-3.4.8.tar.xz 6631528 SHA256 e07c05dea525c6bf0dd8017fc5b89d886954f04fedf457ecd1ce488ac3b86ab7 SHA512 b3b445ecbd8eae312183eee4f5087a33011236061fe1fe1f0db20239c4e281f5cacd818d62a992ef3011eb9fdc8459d0ed6faca6ea55012b152b5ac5907648bc WHIRLPOOL 97fc97a9f15b51ca91a06cc745397447a7f6b1d986f44f227d0e1aa970f48ca269c8527ff7320f072f555fcd7a1b34dfe115123e96bf45884c2e5357e02c9021
+DIST gnutls-3.4.9.tar.xz 6627640 SHA256 48594fadba33d450f796ec69526cf2bce6ff9bc3dc90fbd7bf38dc3601f57c3f SHA512 3ec5349f1418bf9f8ac492e93d2e8967c2011f9aaea262e0acb40db124ec19c269a9de49b1c9c994e9039929cd03d75f77a40580a1d7eb4b3db0e1d2b9d40f86 WHIRLPOOL 9b440e33a20e76c5fa9d9252136c5667562681d6e28e0c182d3befdf49abb753b9aab2193774334b5570aec0b58961193f27f2395898ba6664cb2749dd8c344e
diff --git a/net-libs/gnutls/gnutls-3.3.21.ebuild b/net-libs/gnutls/gnutls-3.3.21.ebuild
new file mode 100644
index 0000000..41ffb01
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.3.21.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools libtool eutils multilib-minimal versionator
+
+DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
+HOMEPAGE="http://www.gnutls.org/"
+SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
+
+# LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library.
+# soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled.
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
+IUSE="+cxx +crywrap dane doc examples guile nls +openssl pkcs11 static-libs test zlib ${IUSE_LINGUAS// / linguas_}"
+# heartbeat support is not disabled until re-licensing happens fullyf
+
+# NOTICE: sys-devel/autogen is required at runtime as we
+# use system libopts
+RDEPEND=">=dev-libs/libtasn1-4.3[${MULTILIB_USEDEP}]
+	>=dev-libs/nettle-2.7:=[gmp,${MULTILIB_USEDEP}]
+	>=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
+	sys-devel/autogen
+	crywrap? ( net-dns/libidn )
+	dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
+	guile? ( >=dev-scheme/guile-1.8:*[networking] )
+	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+	pkcs11? ( >=app-crypt/p11-kit-0.20.7[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.11.6
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	doc? (
+		sys-apps/texinfo
+		dev-util/gtk-doc
+	)
+	nls? ( sys-devel/gettext )
+	test? ( app-misc/datefudge )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.3.19-build-allow-installing-man-1-even-with-disable-doc.patch"
+)
+
+pkg_setup() {
+	# bug#520818
+	export TZ=UTC
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
+		doc/Makefile.am || die
+
+	# force regeneration of autogen-ed files
+	local file
+	for file in $(grep -l AutoGen-ed src/*.c) ; do
+		rm src/$(basename ${file} .c).{c,h} || die
+	done
+
+	# force regeneration of makeinfo files
+	# have no idea why on some system these files are not
+	# accepted as-is, see bug#520818
+	for file in $(grep -l "produced by makeinfo" doc/*.info) ; do
+		rm "${file}" || die
+	done
+
+	eautoreconf
+
+	# Use sane .so versioning on FreeBSD.
+	elibtoolize
+
+	# bug 497472
+	use cxx || epunt_cxx
+}
+
+multilib_src_configure() {
+	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
+
+	# TPM needs to be tested before being enabled
+	# hardware-accell is disabled on OSX because the asm files force
+	#   GNU-stack (as doesn't support that) and when that's removed ld
+	#   complains about duplicate symbols
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-valgrind-tests \
+		--without-included-libtasn1 \
+		--enable-heartbeat-support \
+		$(use_enable cxx) \
+		$(use_enable dane libdane) \
+		$(multilib_native_enable manpages) \
+		$(multilib_native_use_enable doc) \
+		$(multilib_native_use_enable doc gtk-doc) \
+		$(multilib_native_use_enable guile) \
+		$(multilib_native_use_enable crywrap) \
+		$(use_enable nls) \
+		$(use_enable openssl openssl-compatibility) \
+		$(use_enable static-libs static) \
+		$(use_with pkcs11 p11-kit) \
+		$(use_with zlib) \
+		--without-tpm \
+		--with-unbound-root-key-file=/etc/dnssec/root-anchors.txt \
+		$([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/doc/reference/html doc/reference/html || die
+	fi
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+
+		# symlink certtool for use in other ABIs
+		if use test; then
+			ln -s "${BUILD_DIR}"/src "${T}"/native-tools || die
+		fi
+	else
+		emake -C gl
+		emake -C lib
+		emake -C extra
+		use dane && emake -C libdane
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		# parallel testing often fails
+		emake -j1 check
+	else
+		# use native ABI tools
+		ln -s "${T}"/native-tools/{certtool,gnutls-{serv,cli}} \
+			"${BUILD_DIR}"/src/ || die
+
+		emake -C gl -j1 check
+		emake -C tests -j1 check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install
+	else
+		emake -C lib DESTDIR="${D}" install
+		emake -C extra DESTDIR="${D}" install
+		use dane && emake -C libdane DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+
+	dodoc doc/certtool.cfg
+
+	if use doc; then
+		dohtml doc/gnutls.html
+	else
+		rm -fr "${ED}/usr/share/doc/${PF}/html"
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+}
diff --git a/net-libs/gnutls/gnutls-3.4.9.ebuild b/net-libs/gnutls/gnutls-3.4.9.ebuild
new file mode 100644
index 0000000..ed0dc89
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.4.9.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools libtool eutils multilib-minimal versionator
+
+DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
+HOMEPAGE="http://www.gnutls.org/"
+SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
+
+# LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library.
+# soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled.
+LICENSE="GPL-3 LGPL-3"
+SLOT="0/30" # libgnutls.so number
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
+IUSE="+cxx +crywrap dane doc examples guile nls +openssl pkcs11 static-libs test +tools zlib ${IUSE_LINGUAS// / linguas_}"
+# heartbeat support is not disabled until re-licensing happens fullyf
+
+# NOTICE: sys-devel/autogen is required at runtime as we
+# use system libopts
+RDEPEND=">=dev-libs/libtasn1-4.3[${MULTILIB_USEDEP}]
+	>=dev-libs/nettle-3.1:=[gmp,${MULTILIB_USEDEP}]
+	>=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
+	tools? ( sys-devel/autogen )
+	crywrap? ( net-dns/libidn )
+	dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
+	guile? ( >=dev-scheme/guile-1.8:*[networking] )
+	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+	pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.11.6
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	doc? (
+		sys-apps/texinfo
+		dev-util/gtk-doc
+	)
+	nls? ( sys-devel/gettext )
+	test? ( app-misc/datefudge )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.4.7-build-allow-installing-man-1-even-with-disable-doc.patch"
+)
+
+pkg_setup() {
+	# bug#520818
+	export TZ=UTC
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
+		doc/Makefile.am || die
+
+	# force regeneration of autogen-ed files
+	local file
+	for file in $(grep -l AutoGen-ed src/*.c) ; do
+		rm src/$(basename ${file} .c).{c,h} || die
+	done
+
+	# force regeneration of makeinfo files
+	# have no idea why on some system these files are not
+	# accepted as-is, see bug#520818
+	for file in $(grep -l "produced by makeinfo" doc/*.info) ; do
+		rm "${file}" || die
+	done
+
+	eautoreconf
+
+	# Use sane .so versioning on FreeBSD.
+	elibtoolize
+
+	# bug 497472
+	use cxx || epunt_cxx
+}
+
+multilib_src_configure() {
+	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
+
+	# TPM needs to be tested before being enabled
+	# hardware-accell is disabled on OSX because the asm files force
+	#   GNU-stack (as doesn't support that) and when that's removed ld
+	#   complains about duplicate symbols
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-valgrind-tests \
+		--without-included-libtasn1 \
+		--enable-heartbeat-support \
+		$(use_enable cxx) \
+		$(use_enable dane libdane) \
+		$(multilib_native_enable manpages) \
+		$(multilib_native_use_enable tools) \
+		$(multilib_native_use_enable doc) \
+		$(multilib_native_use_enable doc gtk-doc) \
+		$(multilib_native_use_enable guile) \
+		$(multilib_native_use_enable crywrap) \
+		$(multilib_native_use_enable test tests) \
+		$(use_enable nls) \
+		$(use_enable openssl openssl-compatibility) \
+		$(use_enable static-libs static) \
+		$(use_with pkcs11 p11-kit) \
+		$(use_with zlib) \
+		--without-tpm \
+		--with-unbound-root-key-file=/etc/dnssec/root-anchors.txt \
+		$([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+
+	dodoc doc/certtool.cfg
+
+	if use doc; then
+		dohtml doc/gnutls.html
+	else
+		rm -fr "${ED}/usr/share/doc/${PF}/html"
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+}
diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild
index d010cc0..a64a283 100644
--- a/net-libs/libbtbb/libbtbb-9999.ebuild
+++ b/net-libs/libbtbb/libbtbb-9999.ebuild
@@ -26,7 +26,7 @@
 IUSE="+pcap static-libs +wireshark-plugins"
 
 RDEPEND="
-	pcap? ( net-libs/libpcap )
+	pcap? ( net-libs/libpcap[static-libs?] )
 	wireshark-plugins? (
 		>=net-analyzer/wireshark-1.8.3-r1:=
 	)
@@ -70,11 +70,11 @@
 	CMAKE_USE_DIR="${S}"
 	BUILD_DIR="${S}"_build
 	local mycmakeargs=(
-		-DDISABLE_PYTHON=true
+		-DENABLE_PYTHON=false
 		-DPACKAGE_MANAGER=true
 		$(cmake-utils_use pcap PCAPDUMP)
 		$(cmake-utils_use pcap USE_PCAP)
-		$(cmake-utils_use static-libs BUILD_STATIC)
+		$(cmake-utils_use static-libs BUILD_STATIC_LIB)
 	)
 	cmake-utils_src_configure
 
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index c69b64b..b806676 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,3 +1,2 @@
-DIST nghttp2-1.0.5.tar.gz 1356748 SHA256 64e066816606178188bfaf0aa7298e1f44cef943dd9ae936497dab38b3b2569e SHA512 f8b7a79e6174ff501d93333b25954822098d936720a8f4de8a15c83f16c009006aefd05e24977c219661fd63b9fead70eaf5703211bfd9e2bba6a61facbba9c4 WHIRLPOOL 608b1a4494e2aff0c941545c1f49c3c585846d27f5e509ff16c9217309689c47fd7f8fc398b23c83d8aa0ba3f9c2c52af039cd875e47f38630acc50e7c17f717
-DIST nghttp2-1.5.0.tar.gz 1980230 SHA256 ccde0e43cadcef2b81dad4d2ae05559290a2c174e4d2e3e882bd74679895be5c SHA512 6f5c67269277a0fbbe55c2dd18b49abcbc14614495100f715d7b0c61c1947b56cbc20f1f8dd51de5e921363c582c1d867c366b53869a73ad408c072c424a0f63 WHIRLPOOL 74d40e3d77d80d7fb5f7d24559e65dc8d60e60de0f772034beee0fcd6d7e7fab427fb16b69eab85daecbbfb861f77a49e70697338b021982d72d5caf2723b10b
 DIST nghttp2-1.6.0.tar.gz 1983953 SHA256 c88012e87b80c055ddd2412efd7e96b9e8cfe0652c4b21083f2cb89b2f0d3a26 SHA512 32d5227a5ff037d50d93d43b1fdb0be51d9cca1e09dcc85320b8e09f82fdc658397ca58ca400595f138ca7b77f389d945e3562ab4074afd05e1c74eca4de2744 WHIRLPOOL 31102e596a9e93ca993cd9b8b04da6f51acb247803de16958501bdb6fe06e5bbc951430d2c2be1bd7fd1d9216d087d711de83bad6bb93eb70f4e4b8b0f864efb
+DIST nghttp2-1.7.0.tar.gz 2001726 SHA256 f0be9560baa30fc56bcce0151d88126d71b91815bb47076a8dd9ad2b9023ff49 SHA512 556a81ef9bad8a75a23b13532e6066af4412d79fa8dbde508ea893780bc9b19e0525674dc1cfb04b25cc48d62ae704737d6c4b1aa2b442a2be514b72490f6c1b WHIRLPOOL 138bb50c85ef7838be919989c032157ecedbfe1d5bf28633d5ee0c3d6f18dc7fa7525e185d476d146788466b58db0a2104054a1a28cb5152a8c4e9652fcb22ba
diff --git a/net-libs/nghttp2/files/nghttp2-1.0.2-third-party.patch b/net-libs/nghttp2/files/nghttp2-1.0.2-third-party.patch
deleted file mode 100644
index 9e5323b..0000000
--- a/net-libs/nghttp2/files/nghttp2-1.0.2-third-party.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 19309823aa5e4e9a65436bbc32430c9092e5d233 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Wed, 17 Jun 2015 13:29:37 -0400
-Subject: [PATCH] enable third-party for asio_lib too
-
-Since this library uses the third-party subdir, make sure we auto-enable
-it when that lib is turned on.
----
- configure.ac | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index be51a24..8e81741 100644
---- a/configure
-+++ b/configure
-@@ -464,11 +464,12 @@ fi
- 
- AM_CONDITIONAL([ENABLE_EXAMPLES], [ test "x${enable_examples}" = "xyes" ])
- 
--# third-party only be built if either enable_examples or enable_app is
--# yes
-+# third-party only be built when needed
- 
- enable_third_party=no
--if test "x${enable_examples}" = "xyes" || test "x${enable_app}" = "xyes"; then
-+if test "x${enable_examples}" = "xyes" ||
-+   test "x${enable_app}" = "xyes" ||
-+   test "x${enable_asio_lib}" = "xyes"; then
-   enable_third_party=yes
- fi
- 
--- 
-2.4.1
-
diff --git a/net-libs/nghttp2/nghttp2-1.0.5.ebuild b/net-libs/nghttp2/nghttp2-1.0.5.ebuild
deleted file mode 100644
index 3bacabf..0000000
--- a/net-libs/nghttp2/nghttp2-1.0.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# TODO: Add python support.
-
-EAPI="5"
-
-inherit multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/tatsuhiro-t/nghttp2.git"
-	inherit git-2
-else
-	SRC_URI="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-fi
-
-DESCRIPTION="HTTP/2 C Library"
-HOMEPAGE="https://nghttp2.org/"
-
-LICENSE="MIT"
-SLOT="0/1.14" # <C++>.<C> SONAMEs
-IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml"
-
-RDEPEND="
-	cxx? ( dev-libs/boost:=[${MULTILIB_USEDEP},threads] )
-	hpack-tools? ( >=dev-libs/jansson-2.5 )
-	jemalloc? ( dev-libs/jemalloc )
-	utils? (
-		>=dev-libs/libev-4.15
-		>=dev-libs/openssl-1.0.2[-bindist]
-		>=sys-libs/zlib-1.2.3
-	)
-	xml? ( >=dev-libs/libxml2-2.7.7:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-examples \
-		--disable-failmalloc \
-		--disable-werror \
-		--without-cython \
-		--disable-python-bindings \
-		--without-spdylay \
-		$(use_enable cxx asio-lib) \
-		$(use_enable debug) \
-		$(multilib_native_use_enable hpack-tools) \
-		$(use_enable static-libs static) \
-		$(use_enable threads) \
-		$(multilib_native_use_enable utils app) \
-		$(multilib_native_use_with jemalloc) \
-		$(multilib_native_use_with xml libxml2)
-}
-
-multilib_src_install_all() {
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/net-libs/nghttp2/nghttp2-1.6.0.ebuild b/net-libs/nghttp2/nghttp2-1.6.0.ebuild
index 118731f..f65b7c1 100644
--- a/net-libs/nghttp2/nghttp2-1.6.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.6.0.ebuild
@@ -13,7 +13,7 @@
 	inherit git-2
 else
 	SRC_URI="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/nghttp2/nghttp2-1.5.0.ebuild b/net-libs/nghttp2/nghttp2-1.7.0.ebuild
similarity index 100%
rename from net-libs/nghttp2/nghttp2-1.5.0.ebuild
rename to net-libs/nghttp2/nghttp2-1.7.0.ebuild
diff --git a/net-misc/ntp/ntp-4.2.8_p6.ebuild b/net-misc/ntp/ntp-4.2.8_p6.ebuild
index 4e8f009..f47d8fe 100644
--- a/net-misc/ntp/ntp-4.2.8_p6.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p6.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="HPND BSD ISC"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint"
 IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
 
 CDEPEND="readline? ( >=sys-libs/readline-4.1:0= )
diff --git a/net-misc/socat/socat-1.7.3.1.ebuild b/net-misc/socat/socat-1.7.3.1.ebuild
index 6277416..00b6ebc 100644
--- a/net-misc/socat/socat-1.7.3.1.ebuild
+++ b/net-misc/socat/socat-1.7.3.1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="ssl readline ipv6 tcpd"
 
 DEPEND="
diff --git a/net-misc/x2goserver/files/x2goserver.init b/net-misc/x2goserver/files/x2goserver.init
index a6b7a66..118c8e0 100644
--- a/net-misc/x2goserver/files/x2goserver.init
+++ b/net-misc/x2goserver/files/x2goserver.init
@@ -1,10 +1,10 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 DAEMON=/usr/sbin/x2gocleansessions
-PIDFILE=/var/run/x2goserver.pid
+PIDFILE=/run/x2goserver.pid
 
 start() {
 	ebegin "Starting ${SVCNAME}"
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.19-r1.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.19-r1.ebuild
new file mode 100644
index 0000000..ecbadc0
--- /dev/null
+++ b/net-misc/x2goserver/x2goserver-4.0.1.19-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit multilib systemd toolchain-funcs user
+
+DESCRIPTION="The X2Go server"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+fuse postgres +sqlite"
+
+REQUIRED_USE="|| ( postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-perl/Capture-Tiny
+	dev-perl/Config-Simple
+	dev-perl/File-BaseDir
+	dev-perl/File-ReadBackwards
+	dev-perl/File-Which
+	media-fonts/font-cursor-misc
+	media-fonts/font-misc-misc[nls]
+	>=net-misc/nx-3.5.0.25
+	net-misc/openssh
+	>=sys-apps/iproute2-4.3.0
+	x11-apps/xauth
+	x11-apps/xhost
+	x11-apps/xwininfo
+	fuse? ( sys-fs/sshfs-fuse )
+	postgres? ( dev-perl/DBD-Pg )
+	sqlite? ( dev-perl/DBD-SQLite )"
+
+pkg_setup() {
+	# Force the group creation, #479650
+	enewgroup x2gouser
+	enewgroup x2goprint
+	enewuser x2gouser -1 -1 /var/lib/x2go x2gouser
+	enewuser x2goprint -1 -1 /var/spool/x2goprint x2goprint
+}
+
+src_prepare() {
+	# Do not install Xresources symlink (#521126)
+	sed -e '\#$(INSTALL_SYMLINK) /etc/X11/Xresources# s/^/#/' -i x2goserver-xsession/Makefile || die "Xresources symlink sed failed"
+	# Multilib clean
+	sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die "multilib sed failed"
+	# Skip man2html build
+	sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile */Makefile || die "man2html sed failed"
+	# Use nxagent directly
+	sed -i -e "/NX_TEMP=/s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die "sed failed"
+
+	eapply_user
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" PREFIX=/usr
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+
+	fowners root:x2goprint /usr/bin/x2goprint
+	fperms 2755 /usr/bin/x2goprint
+	fperms 0750 /etc/sudoers.d
+	fperms 0440 /etc/sudoers.d/x2goserver
+	dosym /usr/share/applications /etc/x2go/applications
+
+	newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
+	systemd_dounit "${FILESDIR}"/x2gocleansessions.service
+}
+
+pkg_postinst() {
+	if use sqlite ; then
+		elog "To use sqlite and create the initial database, run:"
+		elog " # x2godbadmin --createdb"
+	fi
+	if use postgres ; then
+		elog "To use a PostgreSQL databse, more information is availabe here:"
+		elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql"
+	fi
+
+	elog "For password authentication, you need to enable PasswordAuthentication"
+	elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)"
+	elog "An init script was installed for x2gocleansessions"
+}
diff --git a/net-nds/phpldapadmin/phpldapadmin-1.2.3-r1.ebuild b/net-nds/phpldapadmin/phpldapadmin-1.2.3-r1.ebuild
index 84052a1..cde91ce 100644
--- a/net-nds/phpldapadmin/phpldapadmin-1.2.3-r1.ebuild
+++ b/net-nds/phpldapadmin/phpldapadmin-1.2.3-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-inherit webapp
+inherit eutils webapp
 
 DESCRIPTION="phpLDAPadmin is a web-based tool for managing all aspects of your LDAP server"
 HOMEPAGE="http://phpldapadmin.sourceforge.net"
diff --git a/net-nds/phpldapadmin/phpldapadmin-1.2.3.ebuild b/net-nds/phpldapadmin/phpldapadmin-1.2.3.ebuild
index 0095131..c6c16b2 100644
--- a/net-nds/phpldapadmin/phpldapadmin-1.2.3.ebuild
+++ b/net-nds/phpldapadmin/phpldapadmin-1.2.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-inherit webapp
+inherit eutils webapp
 
 DESCRIPTION="phpLDAPadmin is a web-based tool for managing all aspects of your LDAP server"
 HOMEPAGE="http://phpldapadmin.sourceforge.net"
diff --git a/net-proxy/privoxy/privoxy-3.0.24.ebuild b/net-proxy/privoxy/privoxy-3.0.24.ebuild
index 69f17a1..c6d6f09 100644
--- a/net-proxy/privoxy/privoxy-3.0.24.ebuild
+++ b/net-proxy/privoxy/privoxy-3.0.24.ebuild
@@ -18,7 +18,7 @@
 +image-blocking ipv6 lfs png-images selinux +stats +threads toggle
 whitelists +zlib"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 LICENSE="GPL-2"
 
 DEPEND="dev-libs/libpcre
diff --git a/net-proxy/squid/squid-3.5.12.ebuild b/net-proxy/squid/squid-3.5.12.ebuild
index 859a0a1..13a543a 100644
--- a/net-proxy/squid/squid-3.5.12.ebuild
+++ b/net-proxy/squid/squid-3.5.12.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
 	ecap esi ssl-crtd \
 	mysql postgres sqlite \
diff --git a/net-wireless/ubertooth/Manifest b/net-wireless/ubertooth/Manifest
index 40da1f6..7fccdf3 100644
--- a/net-wireless/ubertooth/Manifest
+++ b/net-wireless/ubertooth/Manifest
@@ -1,3 +1 @@
-DIST ubertooth-2015-09-R2.tar.xz 1706712 SHA256 f2088c8c0e754df47dd8dbf604d5822bf5894b91e4505276c6f9e26b6a23b56d SHA512 240f6d682fe0addc05bb8ccf7eec931534449adfa9c1369b484aeac73d9bcaf75c211aeede21c6c219e363773ce3d63e4aa0ee6b662acc83409587bd7ac7e4da WHIRLPOOL 9fba78d1740efd342f3892ffc3cf914d1919ef1c7d282786a64afb72d6ed306dec3600363e3f85f2f70d9ccfba6b62f826a72942cb7c9316d151dd2718f79b09
 DIST ubertooth-2015-10-R1.tar.xz 1716840 SHA256 bc37e7978d137a64d918d7c8f1e7ca9cff093f9921d805e9809b12e5ab12ae35 SHA512 ad7229c9509db4b4230ec28d1c16200f0780dd7ce55224528ced6d8969f342a79b7317b69e7b9e49d03e93f973203801f4f703dd80dc115400366b0984c965b1 WHIRLPOOL 5f46bdc8746481d68fd5c8e3ce04aadbcc1bc704c95b1b5a3d389376704a2a3e702faf819c749f98cb737578e9ccfa3ac01887081bceeceed2e4804493b2c2a8
-DIST ubertooth_one_rx_only.dfu 32060 SHA256 fefc034ff19fa8b4b307d77c875bfeaa639e2aa0ecf8b8337e6424618480b1b5 SHA512 daeaeae90cb2aa591db2787466cbdc7365ce4e74ce5f7af4f61c9c1a22af93e846ea9230acca64f88a85a959d0db447b19da4dc4d213601db8dd1ad3d9978fa7 WHIRLPOOL 3069bf540c87d317e4f612b25ef4af10c3a9197ec9ead69082021442e0cc70d4b381488ba4bd509f75535a43f8f7b5fcebae313b96623513de846edb51cf63a0
diff --git a/net-wireless/ubertooth/ubertooth-2015.09.2.ebuild b/net-wireless/ubertooth/ubertooth-2015.09.2.ebuild
deleted file mode 100644
index efbfbb0..0000000
--- a/net-wireless/ubertooth/ubertooth-2015.09.2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-
-inherit multilib distutils-r1 cmake-utils udev
-
-HOMEPAGE="http://ubertooth.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+bluez +specan +pcap +ubertooth1-firmware +udev"
-REQUIRED_USE="	specan? ( ${PYTHON_REQUIRED_USE} )"
-DEPEND="bluez? ( net-wireless/bluez:= )
-	>=net-libs/libbtbb-${PV}:=
-	pcap? ( net-libs/libbtbb[pcap] )
-	specan? ( ${PYTHON_DEPS} )
-	virtual/libusb:1="
-RDEPEND="${DEPEND}
-	specan? ( >=dev-qt/qtgui-4.7.2:4
-		>=dev-python/pyside-1.0.2[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.3[${PYTHON_USEDEP}] )
-	udev? ( virtual/udev )"
-
-MY_PV=${PV/\./-}
-MY_PV=${MY_PV/./-R}
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/greatscottgadgets/ubertooth.git"
-	inherit git-r3
-	KEYWORDS=""
-	S="${WORKDIR}/${P}/host"
-else
-	S="${WORKDIR}/${PN}-${MY_PV}/host"
-	SRC_URI="https://github.com/greatscottgadgets/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz
-		https://github.com/greatscottgadgets/${PN}/releases/download/${MY_PV}/${PN}_one_rx_only.dfu"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-DESCRIPTION="An open source wireless development platform suitable for Bluetooth experimentation"
-
-#readd firmware building, but do it right
-#USE="-fortran -mudflap -nls -openmp -multilib" crossdev --without-headers --genv 'EXTRA_ECONF="--with-mode=thumb --with-cpu=cortex-m3 --with-float=soft"' -s4 -t arm-cortexm3-eabi
-
-src_prepare() {
-	cmake-utils_src_prepare
-	if use specan; then
-		pushd python/specan_ui || die
-		distutils-r1_src_prepare
-		popd
-	fi
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_enable bluez USE_BLUEZ)
-		$(cmake-utils_use pcap USE_PCAP)
-		$(cmake-utils_use_enable udev INSTALL_UDEV_RULES)
-		-DDISABLE_PYTHON=true
-	)
-	if use udev; then
-		mycmakeargs+=(
-			-DUDEV_RULES_GROUP=usb
-			-DUDEV_RULES_PATH="$(get_udevdir)/rules.d"
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use specan; then
-		pushd python/specan_ui || die
-		distutils-r1_src_compile
-		popd
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /usr/share/${PN}
-	pushd "${WORKDIR}/${PN}-${MY_PV}" || die
-	if [[ ${PV} == "9999" ]] ; then
-		ewarn "Firmware isn't available for git releases, we assume you are already"
-		ewarn "on the latest and/or can build your own."
-	else
-	        use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rxtx.dfu ${PN}-one-${PV}-bluetooth_rxtx.dfu
-	        use ubertooth1-firmware && newins "${DISTDIR}"/${PN}_one_rx_only.dfu ${PN}-one-${PV}-bluetooth_rx_only.dfu
-	fi
-	popd
-
-	if use specan; then
-		pushd python/specan_ui || die
-		distutils-r1_src_install
-		popd
-	fi
-
-	elog "Everyone can read from the ubertooth, but to talk to it"
-	elog "your user needs to be in the usb group."
-}
diff --git a/net-wireless/ubertooth/ubertooth-2015.10.1.ebuild b/net-wireless/ubertooth/ubertooth-2015.10.1.ebuild
index c35791d..a6a6949 100644
--- a/net-wireless/ubertooth/ubertooth-2015.10.1.ebuild
+++ b/net-wireless/ubertooth/ubertooth-2015.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -38,7 +38,7 @@
 	SRC_URI="https://github.com/greatscottgadgets/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
-DESCRIPTION="An open source wireless development platform suitable for Bluetooth experimentation"
+DESCRIPTION="open source wireless development platform suitable for Bluetooth experimentation"
 
 #readd firmware building, but do it right
 #USE="-fortran -mudflap -nls -openmp -multilib" crossdev --without-headers --genv 'EXTRA_ECONF="--with-mode=thumb --with-cpu=cortex-m3 --with-float=soft"' -s4 -t arm-cortexm3-eabi
diff --git a/net-wireless/ubertooth/ubertooth-9999.ebuild b/net-wireless/ubertooth/ubertooth-9999.ebuild
index c35791d..fe19eff 100644
--- a/net-wireless/ubertooth/ubertooth-9999.ebuild
+++ b/net-wireless/ubertooth/ubertooth-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,12 +13,13 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+bluez +specan +pcap +ubertooth1-firmware +udev"
-REQUIRED_USE="	specan? ( ${PYTHON_REQUIRED_USE} )"
+IUSE="+bluez +specan static-libs +pcap +ubertooth1-firmware +udev"
+REQUIRED_USE="specan? ( ${PYTHON_REQUIRED_USE} )"
 DEPEND="bluez? ( net-wireless/bluez:= )
-	>=net-libs/libbtbb-${PV}:=
+	>=net-libs/libbtbb-${PV}:=[static-libs?]
 	pcap? ( net-libs/libbtbb[pcap] )
 	specan? ( ${PYTHON_DEPS} )
+	static-libs? ( dev-libs/libusb[static-libs] )
 	virtual/libusb:1="
 RDEPEND="${DEPEND}
 	specan? ( >=dev-qt/qtgui-4.7.2:4
@@ -38,7 +39,7 @@
 	SRC_URI="https://github.com/greatscottgadgets/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
-DESCRIPTION="An open source wireless development platform suitable for Bluetooth experimentation"
+DESCRIPTION="open source wireless development platform suitable for Bluetooth experimentation"
 
 #readd firmware building, but do it right
 #USE="-fortran -mudflap -nls -openmp -multilib" crossdev --without-headers --genv 'EXTRA_ECONF="--with-mode=thumb --with-cpu=cortex-m3 --with-float=soft"' -s4 -t arm-cortexm3-eabi
@@ -56,8 +57,9 @@
 	mycmakeargs=(
 		$(cmake-utils_use_enable bluez USE_BLUEZ)
 		$(cmake-utils_use pcap USE_PCAP)
+		$(cmake-utils_use static-libs BUILD_STATIC_LIB)
 		$(cmake-utils_use_enable udev INSTALL_UDEV_RULES)
-		-DDISABLE_PYTHON=true
+		-DENABLE_PYTHON=false
 	)
 	if use udev; then
 		mycmakeargs+=(
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index af5c6ff..fdeefa4 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Tobias Klausmann <klausman@gentoo.org> 04 Feb 2016
+# sys-cluster/ceph is not broken per se, but a maintenance burden.
+net-analyzer/rrdtool rados
+
 # James Le Cuirot <chewi@gentoo.org) (30 Jan 2016)
 # scrollview requires Java, which is unsupported on Alpha.
 app-text/tesseract scrollview
diff --git a/profiles/package.mask b/profiles/package.mask
index 2e12463..e35da75 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,6 +30,17 @@
 
 #--- END OF EXAMPLES ---
 
+# James Le Cuirot <chewi@gentoo.org> (03 Feb 2016)
+# Built into Java since 1.5. Ancient and doesn't build with
+# Java 8. Removal in 30 days. See bug #544038.
+dev-java/concurrent-util
+
+# James Le Cuirot <chewi@gentoo.org> (03 Feb 2016)
+# Old, unused, broken on Java 7 and up. These are still alive upstream
+# but bumping is likely non-trivial. Removal in 30 days.
+dev-java/dsiutils
+dev-java/sux4j
+
 # Bernard Cafarelli <voyageur@gentoo.org> (27 Jan 2016)
 # New llvm version, masked for testing
 =sys-devel/llvm-3.8.0*
@@ -589,11 +600,6 @@
 # Needs a bump and substantial ebuild rewrite
 =sci-mathematics/reduce-20110414-r1
 
-# Michael Sterrett <mr_bones_@gentoo.org> (04 Jan 2016)
-# Upstream stopped development in 2004 and doesn't work on modern systems.
-# Masked for removal on 20160203
-games-puzzle/krystaldrop
-
 # Pacho Ramos <pacho@gentoo.org> (03 Jan 2016)
 # Fails to build, bug #368873. Removal in a month
 x11-misc/xoo
diff --git a/profiles/targets/systemd/package.use.mask b/profiles/targets/systemd/package.use.mask
index d5850dc..9795831 100644
--- a/profiles/targets/systemd/package.use.mask
+++ b/profiles/targets/systemd/package.use.mask
@@ -1,7 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Rick Farina <zerochaos@gentoo.org> (03 Feb 2016)
+# dev-libs/libusb[static-libs] requires libudev[static-libs] which is masked below
+dev-libs/libusb static-libs
+
 # Pacho Ramos <pacho@gentoo.org> (29 May 2014)
 # upower support is not needed on setups running systemd, also
 # relies on old upower (#508920)
diff --git a/ros-meta/vision_opencv/Manifest b/ros-meta/vision_opencv/Manifest
index a7e292a..6b67d1d 100644
--- a/ros-meta/vision_opencv/Manifest
+++ b/ros-meta/vision_opencv/Manifest
@@ -1,3 +1,4 @@
 DIST vision_opencv-1.11.10.tar.gz 106660 SHA256 f9e120a780252b0234cbf3e65260ce3033dd25a81b32f27ccfdda41a3e765a3e SHA512 c8ba5991a50526a2341552f95dcaeb1b1ccf8ea7684f543e50ebcdd5ef0abdcd578364efcf25d4adad976c4382c67ee3d2550c107e569be2fbb675dcf4b8d51e WHIRLPOOL 2d2ba6916a73172035a772fe845b73cec19119370f4955d4c4bf36592d44f22b158d58b8bc67d3ec3fce395e54dcd7ef7eba1dcdefc51d8c85aa1e739b5877b9
+DIST vision_opencv-1.11.11.tar.gz 107062 SHA256 33413f7d805cf6f3edaabae6b264af1e09568085f84763a7b8e76b075962c449 SHA512 ab8d8065937c017ec42e9f0e8ec69934830f7b4de8a47b3d01d56ad4bc661e19f98ef52a8a10bfcd48d448b7187cf44f9cedb48e500e85da052ea1616b686e9e WHIRLPOOL 7c7878e1bb582f98b857d233c5462969e6b4f2488bcd096563e233f6310255c917a2e09ba73550b6d9ab46cd047d3cd3a58548457d1717a06cddf2609085c0c6
 DIST vision_opencv-1.11.8.tar.gz 80160 SHA256 0cf0934d4d9bd91e966afc2f25a4e54646016b6628f4fe58e81faee0c58c88c2 SHA512 55ca2554a3736bd5102bfef14562a6bc341d13eb098fbb7d8d050c90b5d397820791aed54a3697f5084a1b629d959c7abc24172a8efbdfc65490ebdbcb548c77 WHIRLPOOL 8b2b9f4968618258ebd6b2d6d0674ca9c24ed5e7d1adcc4cbbf769e13206017ea06fe5172277a19d67c73c88066270a2e259743ee1b63e4cec7ce8508405b8d3
 DIST vision_opencv-1.11.9.tar.gz 97544 SHA256 3ce781847f5f855083cfae94a8d89defbe4cc83e086b4c796653561aee08b826 SHA512 e1a40997d6a3cf821fb1d57f818b3bcb52d2d0372159eec7f756c7df52fbd2a3ec91ac960cd1a7454f13cd6fe0192f4c019e70fcd4b20d0f797f4845ce676211 WHIRLPOOL c0388e6a40a2b166231b960eff5a011ea2e96c23319209315a86744ac5628d75b9bcb3fd0abdebe941ff89b12852b8813b5e97b3ab7827a2320e0dc0fc64ab74
diff --git a/ros-meta/vision_opencv/vision_opencv-1.11.11.ebuild b/ros-meta/vision_opencv/vision_opencv-1.11.11.ebuild
new file mode 100644
index 0000000..a4e2366
--- /dev/null
+++ b/ros-meta/vision_opencv/vision_opencv-1.11.11.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Converts between ROS Image messages and OpenCV images"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cv_bridge
+	dev-ros/image_geometry
+	dev-ros/opencv_tests
+	dev-ros/opencv_apps
+"
+DEPEND="${RDEPEND}"
diff --git a/sys-apps/i2c-tools/metadata.xml b/sys-apps/i2c-tools/metadata.xml
index b9c0b0c..65aa159 100644
--- a/sys-apps/i2c-tools/metadata.xml
+++ b/sys-apps/i2c-tools/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type='person'>
 	<email>vapier@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/sys-apps/iproute2/iproute2-4.3.0.ebuild b/sys-apps/iproute2/iproute2-4.3.0.ebuild
index 4a64883..6bb13f4 100644
--- a/sys-apps/iproute2/iproute2-4.3.0.ebuild
+++ b/sys-apps/iproute2/iproute2-4.3.0.ebuild
@@ -11,7 +11,7 @@
 	inherit git-2
 else
 	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/man-db/man-db-2.7.5.ebuild b/sys-apps/man-db/man-db-2.7.5.ebuild
index 6ab4997..7349971 100644
--- a/sys-apps/man-db/man-db-2.7.5.ebuild
+++ b/sys-apps/man-db/man-db-2.7.5.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ~ppc ppc64 s390 sh ~sparc ~x86 ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ~ppc ppc64 s390 sh ~sparc ~x86 ~arm-linux ~x86-linux"
 IUSE="berkdb +gdbm +manpager nls selinux static-libs zlib"
 
 CDEPEND=">=dev-libs/libpipeline-1.4.0
diff --git a/sys-apps/s6-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest
new file mode 100644
index 0000000..e879374
--- /dev/null
+++ b/sys-apps/s6-linux-utils/Manifest
@@ -0,0 +1 @@
+DIST s6-linux-utils-2.0.2.3.tar.gz 40050 SHA256 f959ffb9bb79865018becc6664d29faef22cb747a43db252879e11886b1b8cc3 SHA512 10d919c67036dbd57ed8d0e2ba46e1957c621414cae2326c2c696a27b46496d928aa768465236585ed8be279a2866cc9a519f9feb51b9757f999e9b8b80faf2d WHIRLPOOL 7c5515d65fc2f5db1a0b14abedfd2ea462e621a6a16200da162487b0a57d1adce6f5ecc034524b1e8f066e531413f5a9c528187dee38b1980d3826a3a970d6c8
diff --git a/sys-apps/s6-linux-utils/metadata.xml b/sys-apps/s6-linux-utils/metadata.xml
new file mode 100644
index 0000000..114fff1
--- /dev/null
+++ b/sys-apps/s6-linux-utils/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>aranea@aixah.de</email>
+		<name>Luis Ressel</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.0.2.3.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.0.2.3.ebuild
new file mode 100644
index 0000000..084367a
--- /dev/null
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.0.2.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit multilib
+
+DESCRIPTION="Set of tiny linux utilities"
+HOMEPAGE="http://www.skarnet.org/software/s6-linux-utils/"
+SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static"
+
+DEPEND="
+	static? ( >=dev-libs/skalibs-2.3.8.0[static-libs] )
+	!static? ( >=dev-libs/skalibs-2.3.8.0 )
+	"
+RDEPEND="
+	!static? ( >=dev-libs/skalibs-2.3.8.0 )
+	"
+
+HTML_DOCS="doc/."
+
+src_prepare()
+{
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s~tryldflag LDFLAGS_AUTO -Wl,--hash-style=both~:~" "${S}/configure" || die
+
+	eapply_user
+}
+
+src_configure()
+{
+	econf \
+		$(use_enable !static shared) \
+		$(use_enable static allstatic) \
+		$(use_enable static) \
+		--bindir=/bin \
+		--sbindir=/sbin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--datadir=/etc \
+		--sysdepdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs
+}
diff --git a/sys-apps/s6-portable-utils/Manifest b/sys-apps/s6-portable-utils/Manifest
new file mode 100644
index 0000000..03cd0a8
--- /dev/null
+++ b/sys-apps/s6-portable-utils/Manifest
@@ -0,0 +1 @@
+DIST s6-portable-utils-2.0.5.3.tar.gz 46300 SHA256 27be01b3d66df617ea7dbc21b55d253d5b9142463099f6944f90ef33587a2e09 SHA512 19e71457dc0ca8c1d161da36fb32902f2b8c60759745651806c9eebd19f3ec4d3d87d2d45fb226711eb16f6ae407671c363fc2a7df7d5746ecf3a4197012a122 WHIRLPOOL 1760eadf1eded5981aeb5b43df3a3c012a0b300ffed4ffdb22b51907e07962f65270763dff24937acbe7414d70f273497d8b91672360606827a002e968d2fa58
diff --git a/sys-apps/s6-portable-utils/metadata.xml b/sys-apps/s6-portable-utils/metadata.xml
new file mode 100644
index 0000000..114fff1
--- /dev/null
+++ b/sys-apps/s6-portable-utils/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>aranea@aixah.de</email>
+		<name>Luis Ressel</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.0.5.3.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.0.5.3.ebuild
new file mode 100644
index 0000000..ea6cddf
--- /dev/null
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.0.5.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit multilib
+
+DESCRIPTION="Set of tiny portable unix utilities"
+HOMEPAGE="http://www.skarnet.org/software/s6-portable-utils/"
+SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static"
+
+DEPEND="
+	static? ( >=dev-libs/skalibs-2.3.8.0[static-libs] )
+	!static? ( >=dev-libs/skalibs-2.3.8.0 )
+	"
+RDEPEND="
+	!static? ( >=dev-libs/skalibs-2.3.8.0 )
+	"
+
+HTML_DOCS="doc/."
+
+src_prepare()
+{
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s~tryldflag LDFLAGS_AUTO -Wl,--hash-style=both~:~" "${S}/configure" || die
+
+	eapply_user
+}
+
+src_configure()
+{
+	econf \
+		$(use_enable !static shared) \
+		$(use_enable static allstatic) \
+		$(use_enable static) \
+		--bindir=/bin \
+		--sbindir=/sbin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--datadir=/etc \
+		--sysdepdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs
+}
diff --git a/sys-apps/sysvinit/files/inittab-2.88 b/sys-apps/sysvinit/files/inittab-2.88
index 5328d30..ffb1ce3 100644
--- a/sys-apps/sysvinit/files/inittab-2.88
+++ b/sys-apps/sysvinit/files/inittab-2.88
@@ -8,6 +8,7 @@
 # Modified by:  Martin Schlemmer, <azarah@gentoo.org>
 # Modified by:  Mike Frysinger, <vapier@gentoo.org>
 # Modified by:  Robin H. Johnson, <robbat2@gentoo.org>
+# Modified by:  William Hubbs, <williamh@gentoo.org>
 #
 # $Id$
 
@@ -36,7 +37,7 @@
 su1:S:wait:/sbin/sulogin
 
 # TERMINALS
-x1:12345:respawn:/sbin/agetty 38400 console linux
+#x1:12345:respawn:/sbin/agetty 38400 console linux
 c1:12345:respawn:/sbin/agetty 38400 tty1 linux
 c2:2345:respawn:/sbin/agetty 38400 tty2 linux
 c3:2345:respawn:/sbin/agetty 38400 tty3 linux
diff --git a/sys-apps/sysvinit/sysvinit-2.88-r4.ebuild b/sys-apps/sysvinit/sysvinit-2.88-r4.ebuild
deleted file mode 100644
index 011e317..0000000
--- a/sys-apps/sysvinit/sysvinit-2.88-r4.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="/sbin/init - parent of all processes"
-HOMEPAGE="http://savannah.nongnu.org/projects/sysvinit"
-SRC_URI="mirror://nongnu/${PN}/${P}dsf.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="selinux ibm static kernel_FreeBSD"
-
-RDEPEND="
-	selinux? (
-		>=sys-libs/libselinux-1.28
-		sec-policy/selinux-shutdown
-	)
-	!>=sys-apps/util-linux-2.23"
-DEPEND="${RDEPEND}
-	virtual/os-headers"
-
-S=${WORKDIR}/${P}dsf
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.86-kexec.patch #80220
-	epatch "${FILESDIR}"/${PN}-2.86-shutdown-single.patch #158615
-	epatch "${FILESDIR}"/${P}-makefile.patch #319197
-	epatch "${FILESDIR}"/${P}-selinux.patch #326697
-	sed -i '/^CPPFLAGS =$/d' src/Makefile || die
-
-	# mountpoint/sulogin/utmpdump have moved to util-linux
-	sed -i -r \
-		-e '/^(USR)?S?BIN/s:\<(mountpoint|sulogin|utmpdump)\>::g' \
-		-e '/^MAN[18]/s:\<(mountpoint|sulogin|utmpdump)[.][18]\>::g' \
-		src/Makefile || die
-
-	# Mung inittab for specific architectures
-	cd "${WORKDIR}"
-	cp "${FILESDIR}"/inittab-2.87 inittab || die "cp inittab"
-	local insert=()
-	use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' )
-	use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' )
-	use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' )
-	use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' )
-	use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' )
-	if use ibm ; then
-		insert+=(
-			'#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0'
-			'#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0'
-		)
-	fi
-	(use arm || use mips || use sh || use sparc) && sed -i '/ttyS0/s:#::' inittab
-	if use kernel_FreeBSD ; then
-		sed -i \
-			-e 's/linux/cons25/g' \
-			-e 's/ttyS0/cuaa0/g' \
-			-e 's/ttyS1/cuaa1/g' \
-			inittab #121786
-	fi
-	if use x86 || use amd64 ; then
-		sed -i \
-			-e '/ttyS[01]/s:9600:115200:' \
-			inittab
-	fi
-	if [[ ${#insert[@]} -gt 0 ]] ; then
-		printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab
-	fi
-}
-
-src_compile() {
-	local myconf
-
-	tc-export CC
-	append-lfs-flags
-	export DISTRO= #381311
-	use static && append-ldflags -static
-	use selinux && myconf=WITH_SELINUX=yes
-	emake -C src ${myconf} || die
-}
-
-src_install() {
-	emake -C src install ROOT="${D}"
-	dodoc README doc/*
-
-	insinto /etc
-	doins "${WORKDIR}"/inittab
-
-	doinitd "${FILESDIR}"/{reboot,shutdown}.sh
-}
-
-pkg_postinst() {
-	# Reload init to fix unmounting problems of / on next reboot.
-	# This is really needed, as without the new version of init cause init
-	# not to quit properly on reboot, and causes a fsck of / on next reboot.
-	if [[ ${ROOT} == / ]] ; then
-		# Do not return an error if this fails
-		/sbin/telinit U &>/dev/null
-	fi
-}
diff --git a/sys-apps/sysvinit/sysvinit-2.88-r5.ebuild b/sys-apps/sysvinit/sysvinit-2.88-r5.ebuild
deleted file mode 100644
index a885d32..0000000
--- a/sys-apps/sysvinit/sysvinit-2.88-r5.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="/sbin/init - parent of all processes"
-HOMEPAGE="http://savannah.nongnu.org/projects/sysvinit"
-SRC_URI="mirror://nongnu/${PN}/${P}dsf.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="selinux ibm static kernel_FreeBSD"
-
-RDEPEND="
-	selinux? (
-		>=sys-libs/libselinux-1.28
-		sec-policy/selinux-shutdown
-	)"
-DEPEND="${RDEPEND}
-	virtual/os-headers"
-
-S=${WORKDIR}/${P}dsf
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.86-kexec.patch #80220
-	epatch "${FILESDIR}"/${PN}-2.86-shutdown-single.patch #158615
-	epatch "${FILESDIR}"/${P}-makefile.patch #319197
-	epatch "${FILESDIR}"/${P}-selinux.patch #326697
-	epatch "${FILESDIR}"/${P}-shutdown-h.patch #449354
-	sed -i '/^CPPFLAGS =$/d' src/Makefile || die
-
-	# mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux
-	sed -i -r \
-		-e '/^(USR)?S?BIN/s:\<(mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \
-		-e '/^MAN[18]/s:\<(mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \
-		src/Makefile || die
-
-	# Mung inittab for specific architectures
-	cd "${WORKDIR}"
-	cp "${FILESDIR}"/inittab-2.87 inittab || die "cp inittab"
-	local insert=()
-	use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' )
-	use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' )
-	use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' )
-	use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' )
-	use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' )
-	if use ibm ; then
-		insert+=(
-			'#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0'
-			'#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0'
-		)
-	fi
-	(use arm || use mips || use sh || use sparc) && sed -i '/ttyS0/s:#::' inittab
-	if use kernel_FreeBSD ; then
-		sed -i \
-			-e 's/linux/cons25/g' \
-			-e 's/ttyS0/cuaa0/g' \
-			-e 's/ttyS1/cuaa1/g' \
-			inittab #121786
-	fi
-	if use x86 || use amd64 ; then
-		sed -i \
-			-e '/ttyS[01]/s:9600:115200:' \
-			inittab
-	fi
-	if [[ ${#insert[@]} -gt 0 ]] ; then
-		printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab
-	fi
-}
-
-src_compile() {
-	local myconf
-
-	tc-export CC
-	append-lfs-flags
-	export DISTRO= #381311
-	use static && append-ldflags -static
-	use selinux && myconf=WITH_SELINUX=yes
-	emake -C src ${myconf} || die
-}
-
-src_install() {
-	emake -C src install ROOT="${D}"
-	dodoc README doc/*
-
-	insinto /etc
-	doins "${WORKDIR}"/inittab
-
-	doinitd "${FILESDIR}"/{reboot,shutdown}.sh
-}
-
-pkg_postinst() {
-	# Reload init to fix unmounting problems of / on next reboot.
-	# This is really needed, as without the new version of init cause init
-	# not to quit properly on reboot, and causes a fsck of / on next reboot.
-	if [[ ${ROOT} == / ]] ; then
-		# Do not return an error if this fails
-		/sbin/telinit U &>/dev/null
-	fi
-
-	elog "The mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to sys-apps/util-linux."
-}
diff --git a/sys-apps/sysvinit/sysvinit-2.88-r6.ebuild b/sys-apps/sysvinit/sysvinit-2.88-r6.ebuild
deleted file mode 100644
index 8f02b55..0000000
--- a/sys-apps/sysvinit/sysvinit-2.88-r6.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="/sbin/init - parent of all processes"
-HOMEPAGE="http://savannah.nongnu.org/projects/sysvinit"
-SRC_URI="mirror://nongnu/${PN}/${P}dsf.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="selinux ibm static kernel_FreeBSD"
-
-RDEPEND="
-	selinux? (
-		>=sys-libs/libselinux-1.28
-		sec-policy/selinux-shutdown
-	)"
-DEPEND="${RDEPEND}
-	virtual/os-headers"
-
-S=${WORKDIR}/${P}dsf
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.86-kexec.patch #80220
-	epatch "${FILESDIR}"/${PN}-2.86-shutdown-single.patch #158615
-	epatch "${FILESDIR}"/${P}-makefile.patch #319197
-	epatch "${FILESDIR}"/${P}-selinux.patch #326697
-	epatch "${FILESDIR}"/${P}-shutdown-h.patch #449354
-	sed -i '/^CPPFLAGS =$/d' src/Makefile || die
-
-	# mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux
-	sed -i -r \
-		-e '/^(USR)?S?BIN/s:\<(mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \
-		-e '/^MAN[18]/s:\<(mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \
-		src/Makefile || die
-
-	# pidof has moved to >=procps-3.3.9
-	sed -i -r \
-		-e '/\/bin\/pidof/d' \
-		-e '/^MAN8/s:\<pidof.8\>::g' \
-		src/Makefile || die
-
-	# Mung inittab for specific architectures
-	cd "${WORKDIR}"
-	cp "${FILESDIR}"/inittab-2.87 inittab || die "cp inittab"
-	local insert=()
-	use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' )
-	use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' )
-	use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' )
-	use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' )
-	use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' )
-	if use ibm ; then
-		insert+=(
-			'#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0'
-			'#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0'
-		)
-	fi
-	(use arm || use mips || use sh || use sparc) && sed -i '/ttyS0/s:#::' inittab
-	if use kernel_FreeBSD ; then
-		sed -i \
-			-e 's/linux/cons25/g' \
-			-e 's/ttyS0/cuaa0/g' \
-			-e 's/ttyS1/cuaa1/g' \
-			inittab #121786
-	fi
-	if use x86 || use amd64 ; then
-		sed -i \
-			-e '/ttyS[01]/s:9600:115200:' \
-			inittab
-	fi
-	if [[ ${#insert[@]} -gt 0 ]] ; then
-		printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab
-	fi
-}
-
-src_compile() {
-	local myconf
-
-	tc-export CC
-	append-lfs-flags
-	export DISTRO= #381311
-	use static && append-ldflags -static
-	use selinux && myconf=WITH_SELINUX=yes
-	emake -C src ${myconf} || die
-}
-
-src_install() {
-	emake -C src install ROOT="${D}"
-	dodoc README doc/*
-
-	insinto /etc
-	doins "${WORKDIR}"/inittab
-
-	doinitd "${FILESDIR}"/{reboot,shutdown}.sh
-}
-
-pkg_postinst() {
-	# Reload init to fix unmounting problems of / on next reboot.
-	# This is really needed, as without the new version of init cause init
-	# not to quit properly on reboot, and causes a fsck of / on next reboot.
-	if [[ ${ROOT} == / ]] ; then
-		# Do not return an error if this fails
-		/sbin/telinit U &>/dev/null
-	fi
-
-	elog "The mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to sys-apps/util-linux."
-	elog "The pidof tool has been moved to sys-process/procps."
-}
diff --git a/sys-apps/sysvinit/sysvinit-2.88-r8.ebuild b/sys-apps/sysvinit/sysvinit-2.88-r9.ebuild
similarity index 89%
rename from sys-apps/sysvinit/sysvinit-2.88-r8.ebuild
rename to sys-apps/sysvinit/sysvinit-2.88-r9.ebuild
index acc8a8d..a6b30a3 100644
--- a/sys-apps/sysvinit/sysvinit-2.88-r8.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.88-r9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=5
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -27,12 +27,16 @@
 
 S=${WORKDIR}/${P}dsf
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.86-kexec.patch" #80220
+	"${FILESDIR}/${PN}-2.86-shutdown-single.patch" #158615
+	"${FILESDIR}/${P}-makefile.patch" #319197
+	"${FILESDIR}/${P}-selinux.patch" #326697
+	"${FILESDIR}/${P}-shutdown-h.patch" #449354
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.86-kexec.patch #80220
-	epatch "${FILESDIR}"/${PN}-2.86-shutdown-single.patch #158615
-	epatch "${FILESDIR}"/${P}-makefile.patch #319197
-	epatch "${FILESDIR}"/${P}-selinux.patch #326697
-	epatch "${FILESDIR}"/${P}-shutdown-h.patch #449354
+	epatch "${PATCHES[@]}"
 	sed -i '/^CPPFLAGS =$/d' src/Makefile || die
 
 	# last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux
@@ -99,7 +103,7 @@
 	doins "${WORKDIR}"/inittab
 
 	# dead symlink
-	rm -f "${D}"/usr/bin/lastb
+	rm "${D}"/usr/bin/lastb || die
 }
 
 pkg_postinst() {
diff --git a/sys-apps/toybox/Manifest b/sys-apps/toybox/Manifest
index e4c65a7..2f289d9 100644
--- a/sys-apps/toybox/Manifest
+++ b/sys-apps/toybox/Manifest
@@ -1,8 +1,3 @@
-DIST toybox-0.4.7.tar.bz2 464545 SHA256 56392d602c21a3c9e05f94a64e194ff6467cb8e98ee10c4735e9d659a42c66d1 SHA512 77fa2eb7775d2f9fda5053048f902b91597ca5f1898f1819dc4308b7f6d10b96a09979d4f9853345598d30cce5c773f441454c97472920fffe3abf1cb4234741 WHIRLPOOL 270b25188291d06fb490268aa9e3efa26fe6cb6ca2fd2d3fef43f40c3ecbc6bd69a6303f487ce29e2078c6fc24e71c09de5c8e1e4743bb597f7d02b6f62460f9
-DIST toybox-0.4.8.tar.bz2 492065 SHA256 44fedc94ad4666daecddb6df9082709d68c9ff5950c625215158875c87561be7 SHA512 4b82d0c85e7137c65e4d89dee247852e80e6d6917e5ed55a13a513cfa08a63bc815a1dd2eb685faecdd15ddd5c61dcc01578f49fadbf23db65a78a26acb1441e WHIRLPOOL b8386bd379322b30ad428bab2bb4a03bacb58e505021f19e97808e341e19f0b18146f36bf2c1caeb10f4db59743832f65d41a8fe703683bdbdf2f78125b20ded
-DIST toybox-0.4.9.tar.bz2 526704 SHA256 e6dc9052826a3bdae1923e3301c9e3542e890af5ed66534052943f8412255bff SHA512 e1788ecc5eaf8a92b05c6469c3aca2465eba6ca782df9479beb438e8f18a7dbc53c8533b47e95a792f1f803fde9f542ad216a214853a490c5a53a235b63e0a2c WHIRLPOOL 92422d0ab0493aabc2129ca2c397d0ff65a07f9d3aedf440622bdc02d5bdd30f0a713f0cf23bb5e10d30d5de46dfc5cdaaa561794b78afb31b5544383e072e4b
-DIST toybox-0.5.0.tar.bz2 564512 SHA256 2718b42154be041435df48d5b5140f4e307767c36b1017e0c8d0da7f75b327a7 SHA512 a5ca0d3ab70c63b6d4310c2a3b79ebb2e267aceaee7251682b5e7606d7c848e8213e8d905c2349dda511ccd0a5f7253b9b16150f74fe71f95efa49101d497843 WHIRLPOOL afebeabb471aad89e5c2cbccea660a09cf93e09817f106bbbf5941ba194e7dbd033011a3ad8e7a7a7f1329f22ffcf60ba6732f9bc0023cbf15f33fd7003e553d
-DIST toybox-0.5.1.tar.bz2 588987 SHA256 83baa69a26e03a920ea7e91fbeb9016178990450d4144d1a244275b44346a12c SHA512 4abab27ef1d3ecedc1b419ea7421c032bdb9bd375a808e8400eda6c409665b41f35bef959087b863bb661d54962fb8ce78ed1d74285040837611dfdb7c715d03 WHIRLPOOL 8b098073ca7a604205e6c1857fedacab1c42785281cd05fe76bb654a54fea77beb588d7f9bd575be9c2c12fe03ae6598ba2f31b683f1bafdf249d26b8b953df8
-DIST toybox-0.5.2.tar.gz 685909 SHA256 dec7f6433ee0e130f224fc63760b347ad0572280c4de32f1aaefbee813a79a00 SHA512 76b20c70a1568b03c32e5670f8fbc517b4d528c21e74fc44ce1241cb494ad329f8e3412bf6501521ad2c19d07f89046fba2c37f8a07f4aba1e0ebe1346d9c83d WHIRLPOOL 168b2039c02fd8381a8c5c4353ed1d365a4ed941477b5b1acb21f6330d4f8e0785c69511edd187de790d0d6b65a9d34218a01ca25747558a0890f5f4c7f6f44b
 DIST toybox-0.6.0.tar.gz 710572 SHA256 d0b9788f61b9f9cbc685eabc0bd89b6925201ecb15a0cb4fbbd5fbf658b99991 SHA512 ddbd2252cd64a3508b9cd9d8a0a574805583b5b9c3861c153d25e8a394115c28b5a58d02a5aa7d7f58b9b9f3effcd33ac3f55788e0f3c4ad4265233f49c6f3ff WHIRLPOOL 0a83bc9895fd0c43ac541afdbfb6caaa294639646c82e70090fd40b77cf5943009188bb8f1b12b1af82d9bb94dd345892b36a5f7849d7154d34efa0b1f1a5f17
 DIST toybox-0.6.1.tar.gz 736371 SHA256 122ceb30c6ca0e8b8e914a427b1aaa89715c53a3df500afc56524ce88426838c SHA512 256afdcb0303b8f7a0bfa411cd0300d45460229dac3bf86fa147bb9d7806dc1224d0b1e28e58472932d8468407491559c6369cb29e78f67691560825dc25a68a WHIRLPOOL 0a5194965d3b4f4521193a51523d59cd52f23999c95cf167234853004cb0c3503aa4df96e65ab1d524741ff8e1d47def8af072f7eb8e8d55caec9c24b5525039
+DIST toybox-0.7.0.tar.gz 759570 SHA256 65428816f88ad3fe92b67df86dc05427c8078fe03843b8b9715fdfa6d29c0f97 SHA512 805d576712897f32b1f4e75b000a19a284622c040c0410ffc53e11c8ab7e3234e48cf5079a36622f03e6386acc9cbfc9ab94ba9e3e25e524ac0fa430a7d7947b WHIRLPOOL 5a4f4f35a5846891c46070dd9e520a675142d8b9ea9f33b02ff228c6a3198198a5e999b84464f985cde2bff396c4e5d2e4856b530408e5826b2e24e73d7cabba
diff --git a/sys-apps/toybox/toybox-0.4.7.ebuild b/sys-apps/toybox/toybox-0.4.7.ebuild
deleted file mode 100644
index 3115de2..0000000
--- a/sys-apps/toybox/toybox-0.4.7.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
-
-inherit eutils
-
-# makefile is stupid
-RESTRICT="test"
-
-DESCRIPTION="Common linux commands in a multicall binary"
-HOMEPAGE="http://landley.net/code/toybox/"
-SRC_URI="http://landley.net/code/toybox/downloads/${P}.tar.bz2"
-
-# The source code does not explicitly say that it's BSD, but the author has repeatedly said it
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	emake || die
-}
-
-src_test() {
-	emake test || die
-}
-
-src_install() {
-	mkdir -p "${D}/usr/bin"
-	cp toybox "${D}/usr/bin" || die
-}
diff --git a/sys-apps/toybox/toybox-0.4.8.ebuild b/sys-apps/toybox/toybox-0.4.8.ebuild
deleted file mode 100644
index 5f2e9aa..0000000
--- a/sys-apps/toybox/toybox-0.4.8.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
-
-inherit eutils
-
-# makefile is stupid
-RESTRICT="test"
-
-DESCRIPTION="Common linux commands in a multicall binary"
-HOMEPAGE="http://landley.net/code/toybox/"
-SRC_URI="http://landley.net/code/toybox/downloads/${P}.tar.bz2"
-
-# The source code does not explicitly say that it's BSD, but the author has repeatedly said it
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-src_configure() {
-	make defconfig
-}
-
-src_compile() {
-	emake
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	mkdir -p "${D}/usr/bin"
-	cp toybox "${D}/usr/bin" || die
-}
diff --git a/sys-apps/toybox/toybox-0.4.9-r1.ebuild b/sys-apps/toybox/toybox-0.4.9-r1.ebuild
deleted file mode 100644
index 14e1632..0000000
--- a/sys-apps/toybox/toybox-0.4.9-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils savedconfig toolchain-funcs
-
-# makefile is stupid
-RESTRICT="test"
-
-DESCRIPTION="Common linux commands in a multicall binary"
-HOMEPAGE="http://landley.net/code/toybox/"
-SRC_URI="http://landley.net/code/toybox/downloads/${P}.tar.bz2"
-
-# The source code does not explicitly say that it's BSD, but the author has repeatedly said it
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-src_prepare() {
-	sed -i -e 's/LOCALE/LC_ALL/' scripts/make.sh || die
-	restore_config .config
-	export CC="$(tc-getCC)"
-	export HOSTCC="$(tc-getCC)"
-}
-
-src_configure() {
-	if [ -f .config ]; then
-		yes "" | emake -j1 oldconfig > /dev/null
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-		emake defconfig > /dev/null
-	fi
-}
-
-src_compile() {
-	emake toybox_unstripped V=1
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	save_config .config
-	newbin toybox_unstripped toybox
-}
diff --git a/sys-apps/toybox/toybox-0.4.9.ebuild b/sys-apps/toybox/toybox-0.4.9.ebuild
deleted file mode 100644
index 133b749..0000000
--- a/sys-apps/toybox/toybox-0.4.9.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
-
-inherit eutils
-
-# makefile is stupid
-RESTRICT="test"
-
-DESCRIPTION="Common linux commands in a multicall binary"
-HOMEPAGE="http://landley.net/code/toybox/"
-SRC_URI="http://landley.net/code/toybox/downloads/${P}.tar.bz2"
-
-# The source code does not explicitly say that it's BSD, but the author has repeatedly said it
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-src_configure() {
-	make defconfig
-}
-
-src_compile() {
-	emake toybox_unstripped
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	mkdir -p "${D}/usr/bin"
-	cp toybox "${D}/usr/bin" || die
-}
diff --git a/sys-apps/toybox/toybox-0.5.0.ebuild b/sys-apps/toybox/toybox-0.5.0.ebuild
deleted file mode 100644
index 0d306d4..0000000
--- a/sys-apps/toybox/toybox-0.5.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multiprocessing savedconfig toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gfto/toybox.git"
-else
-	SRC_URI="http://landley.net/code/toybox/downloads/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-# makefile is stupid
-RESTRICT="test"
-
-DESCRIPTION="Common linux commands in a multicall binary"
-HOMEPAGE="http://landley.net/code/toybox/"
-
-# The source code does not explicitly say that it's BSD, but the author has repeatedly said it
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-src_prepare() {
-	epatch_user
-	restore_config .config
-}
-
-src_configure() {
-	if [ -f .config ]; then
-		yes "" | emake -j1 oldconfig > /dev/null
-		return 0
-	else
-		einfo "Could not locate user configfile, so we will save a default one"
-		emake defconfig > /dev/null
-	fi
-}
-
-src_compile() {
-	tc-export CC STRIP
-	export HOSTCC=$(tc-getBUILD_CC)
-	unset CROSS_COMPILE
-	export CPUS=$(makeopts_jobs)
-	emake V=1
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	save_config .config
-	newbin toybox_unstripped toybox
-}
diff --git a/sys-apps/toybox/toybox-0.5.1.ebuild b/sys-apps/toybox/toybox-0.5.1.ebuild
deleted file mode 100644
index 0d306d4..0000000
--- a/sys-apps/toybox/toybox-0.5.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multiprocessing savedconfig toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gfto/toybox.git"
-else
-	SRC_URI="http://landley.net/code/toybox/downloads/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-# makefile is stupid
-RESTRICT="test"
-
-DESCRIPTION="Common linux commands in a multicall binary"
-HOMEPAGE="http://landley.net/code/toybox/"
-
-# The source code does not explicitly say that it's BSD, but the author has repeatedly said it
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-src_prepare() {
-	epatch_user
-	restore_config .config
-}
-
-src_configure() {
-	if [ -f .config ]; then
-		yes "" | emake -j1 oldconfig > /dev/null
-		return 0
-	else
-		einfo "Could not locate user configfile, so we will save a default one"
-		emake defconfig > /dev/null
-	fi
-}
-
-src_compile() {
-	tc-export CC STRIP
-	export HOSTCC=$(tc-getBUILD_CC)
-	unset CROSS_COMPILE
-	export CPUS=$(makeopts_jobs)
-	emake V=1
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	save_config .config
-	newbin toybox_unstripped toybox
-}
diff --git a/sys-apps/toybox/toybox-0.5.2.ebuild b/sys-apps/toybox/toybox-0.7.0.ebuild
similarity index 100%
rename from sys-apps/toybox/toybox-0.5.2.ebuild
rename to sys-apps/toybox/toybox-0.7.0.ebuild
diff --git a/sys-auth/keystone/keystone-8.0.1-r1.ebuild b/sys-auth/keystone/keystone-8.0.1-r1.ebuild
index 24a477c..0036886 100644
--- a/sys-auth/keystone/keystone-8.0.1-r1.ebuild
+++ b/sys-auth/keystone/keystone-8.0.1-r1.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+sqlite memcached mongo mysql postgres ldap test"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/sys-auth/keystone/keystone-8.0.1.ebuild b/sys-auth/keystone/keystone-8.0.1.ebuild
deleted file mode 100644
index 673cc49..0000000
--- a/sys-auth/keystone/keystone-8.0.1.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 user
-
-DESCRIPTION="The Openstack authentication, authorization, and service catalog"
-HOMEPAGE="https://launchpad.net/keystone"
-SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+sqlite memcached mongo mysql postgres ldap test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		${RDEPEND}
-		>=dev-python/bashate-0.2[${PYTHON_USEDEP}]
-		<=dev-python/bashate-0.3.2[${PYTHON_USEDEP}]
-		memcached? (
-			>=dev-python/python-memcached-1.48[${PYTHON_USEDEP}]
-			<=dev-python/python-memcached-1.57[${PYTHON_USEDEP}]
-		)
-		mongo? (
-			>=dev-python/pymongo-2.6.3[${PYTHON_USEDEP}]
-			<dev-python/pymongo-3.2[${PYTHON_USEDEP}]
-		)
-		ldap? (
-			>=dev-python/python-ldap-2.4[$(python_gen_usedep 'python2_7')]
-			<=dev-python/python-ldap-2.4.20[$(python_gen_usedep 'python2_7')]
-			~dev-python/ldappool-1.0[$(python_gen_usedep 'python2_7')]
-		)
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		<=dev-python/coverage-4.0.3[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		<=dev-python/fixtures-1.4.0-r9999[${PYTHON_USEDEP}]
-		>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-		<=dev-python/lxml-3.5.0-r9999[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		<=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		<=dev-python/oslotest-2.0.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/webtest-2.0[${PYTHON_USEDEP}]
-		<=dev-python/webtest-2.0.20[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		<=dev-python/subunit-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		<=dev-python/testrepository-0.0.20[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		<=dev-python/testtools-1.8.1[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		<=dev-python/oslo-sphinx-4.1.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
-		<=dev-python/tempest-lib-0.11.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-		!~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
-		<=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
-		>=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
-	<=dev-python/webob-1.5.1[${PYTHON_USEDEP}]
-	~dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	<=dev-python/greenlet-0.4.9[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	<=dev-python/pastedeploy-1.5.2[${PYTHON_USEDEP}]
-	<=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-	<=dev-python/routes-2.2[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
-	<=dev-python/cryptography-1.1.2-r9999[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	<=dev-python/six-1.10.0-r9999[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		dev-python/mysql-python
-		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		dev-python/psycopg:2
-		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-	<=dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-	<=dev-python/stevedore-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.6[${PYTHON_USEDEP}]
-	<=dev-python/passlib-1.6.5[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
-	<=dev-python/python-keystoneclient-2.0.0-r9999[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/keystonemiddleware-2.4.0[${PYTHON_USEDEP}]
-	<=dev-python/keystonemiddleware-4.0.0-r9999[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-concurrency-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-config-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-context-1.0.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/oslo-messaging-2.6.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-2.6.1[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-2.7.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-2.8.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-2.8.1[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-2.9.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-3.1.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-messaging-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
-	<=dev-python/oslo-db-4.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-i18n-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-log-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-middleware-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-policy-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-serialization-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-service-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-utils-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oauthlib-0.6.0[${PYTHON_USEDEP}]
-	<=dev-python/oauthlib-1.0.3[${PYTHON_USEDEP}]
-	>=dev-python/pysaml2-2.4.0[${PYTHON_USEDEP}]
-	<=dev-python/pysaml2-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.5.4[${PYTHON_USEDEP}]
-	<=dev-python/dogpile-cache-0.5.7[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	~dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
-	<=dev-python/pycadf-2.0.1[${PYTHON_USEDEP}]
-	~dev-python/msgpack-0.4.6[${PYTHON_USEDEP}]"
-
-PATCHES=(
-)
-
-pkg_setup() {
-	enewgroup keystone
-	enewuser keystone -1 -1 /var/lib/keystone keystone
-}
-
-python_prepare_all() {
-	# it's in git, but not in the tarball.....
-	sed -i '/^hacking/d' test-requirements.txt || die
-	mkdir -p ${PN}/tests/tmp/ || die
-	cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die
-	distutils-r1_python_prepare_all
-}
-
-# Ignore (naughty) test_.py files & 1 test that connect to the network
-#-I 'test_keystoneclient*' \
-python_test() {
-	nosetests -I 'test_keystoneclient*' \
-		-e test_static_translated_string_is_Message \
-		-e test_get_token_id_error_handling \
-		-e test_provider_token_expiration_validation \
-		-e test_import --process-restartworker --process-timeout=60 || die "testsuite failed under python2.7"
-}
-
-python_install() {
-	distutils-r1_python_install
-	newconfd "${FILESDIR}/keystone.confd" keystone
-	newinitd "${FILESDIR}/keystone.initd" keystone
-
-	diropts -m 0750
-	keepdir /etc/keystone /var/log/keystone
-	insinto /etc/keystone
-	insopts -m0640 -okeystone -gkeystone
-	doins etc/keystone.conf.sample etc/logging.conf.sample
-	doins etc/default_catalog.templates etc/policy.json
-	doins etc/policy.v3cloudsample.json etc/keystone-paste.ini
-	insinto /etc/keystone/httpd
-	doins httpd/keystone.py httpd/wsgi-keystone.conf
-
-	fowners keystone:keystone /etc/keystone /var/log/keystone
-}
-
-pkg_postinst() {
-	elog "You might want to run:"
-	elog "emerge --config =${CATEGORY}/${PF}"
-	elog "if this is a new install."
-	elog "If you have not already configured your openssl installation"
-	elog "please do it by modifying /etc/ssl/openssl.cnf"
-	elog "BEFORE issuing the configuration command."
-	elog "Otherwise default values will be used."
-}
-
-pkg_config() {
-	if [ ! -d "${ROOT}"/etc/keystone/ssl ] ; then
-		einfo "Press ENTER to configure the keystone PKI, or Control-C to abort now..."
-		read
-		"${ROOT}"/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone
-	else
-		einfo "keystone PKI certificates directory already present, skipping configuration"
-	fi
-}
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index 5fca220..f53ae8f 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -8,3 +8,4 @@
 DIST fio-2.2.4.tar.bz2 467312 SHA256 9e1c77216457d9e21e418a55fa28bc1f98c283723fe9dcccff6138e3fb25285b SHA512 91fa0d8f9dd8d950dd26ef5c778414acddd9d6deeb84caeecdfef08df7e00c7972566a76bd242b0d5aea33a7c588aa05cf2fdcd79ef5a475277a2139d1f111a1 WHIRLPOOL 4588601d5f44c1836f97cc223bf08cce3f29f5ea3421880c00a16dcd9e3cffd741bbdd2029518712f8808548469d7f44f1b0348189643419bfd2104eab980536
 DIST fio-2.2.9.tar.bz2 492404 SHA256 c881d9cf15500bd4436970d0467c356c5c021417131587931ba78845e965bf56 SHA512 e0cd26bb8a760ef5e40ddb73246671c1988f0c0886bd24fa510fcab93fe64d8853f120355f55fa109168c7fae0b081f63278f2233644f5ed20da4e4c3cb3f3fc WHIRLPOOL 4f5ada7f1140c7229fc3173fa0582a4ae7401121768d8dec828dcd42c1c22ec828e9c000c482b155ead4fd75ee15c4d7678fc7c6d18c8fbb9c749e83f87a4881
 DIST fio-2.5.tar.bz2 509978 SHA256 30f85cd6596125bd2f76b379f15a4edee1149bb0347a9c10a2dda15d7591a543 SHA512 44fc4bc342b611f9ed89685d73592389dd9e63970a9bbcc1b332aa8434a3e4a52b0c16d27b6a6dd96fcf3a9831a68af5249251895a6dbd9f7190ad0b8935eb40 WHIRLPOOL dced416aae899987ff80c6f37999a064d8a45c8ea809d7a3f3a2eea5dd3b6ae5633125326373a5da3b37429dc940f0c97fa9694e976a61819709db3b6ab7ac3e
+DIST fio-2.6.tar.bz2 509685 SHA256 b4b846fca614f724b8315348cb23e2d4a1046e63f10e79b4b310acf29c4d1ac0 SHA512 9831c3de2110c509f6c99ffe0fc8256aea2b9b337e6b2799108c89d1b5e472a85e6df9cb090549db80429658717aa75f2ab10d41359386e1dde861c600645b39 WHIRLPOOL c5138eb2def4c67ee0d5cca46db6aa663e2a1e0eead05aab5938ced20dd68bc214f217724d3bd1c4a1030b4ffee2c07ee37910b57c6f11b2ed6a0ff67d3b30cc
diff --git a/sys-block/fio/files/fio-2.2.10-libmtd.patch b/sys-block/fio/files/fio-2.2.10-libmtd.patch
new file mode 100644
index 0000000..7e0a0c0
--- /dev/null
+++ b/sys-block/fio/files/fio-2.2.10-libmtd.patch
@@ -0,0 +1,12 @@
+diff -Nuar --exclude config.log fio-2.2.10/lib/libmtd.h fio-2.2.10.new/lib/libmtd.h
+--- fio-2.2.10/lib/libmtd.h	2016-01-26 18:02:07.000000000 -0800
++++ fio-2.2.10.new/lib/libmtd.h	2016-02-03 08:10:19.104693006 -0800
+@@ -29,6 +29,8 @@
+ extern "C" {
+ #endif
+ 
++#include <stdint.h>
++
+ /* Maximum MTD device name length */
+ #define MTD_NAME_MAX 127
+ /* Maximum MTD device type string length */
diff --git a/sys-block/fio/files/fio-2.2.13-libmtd.patch b/sys-block/fio/files/fio-2.2.13-libmtd.patch
new file mode 100644
index 0000000..7ab9a96
--- /dev/null
+++ b/sys-block/fio/files/fio-2.2.13-libmtd.patch
@@ -0,0 +1,12 @@
+diff -Nuar --exclude config.log fio-2.2.13/oslib/libmtd.h fio-2.2.13.new/oslib/libmtd.h
+--- fio-2.2.13/oslib/libmtd.h	2016-01-26 18:02:07.000000000 -0800
++++ fio-2.2.13.new/oslib/libmtd.h	2016-02-03 08:10:19.104693006 -0800
+@@ -29,6 +29,8 @@
+ extern "C" {
+ #endif
+ 
++#include <stdint.h>
++
+ /* Maximum MTD device name length */
+ #define MTD_NAME_MAX 127
+ /* Maximum MTD device type string length */
diff --git a/sys-block/fio/fio-2.2.10.ebuild b/sys-block/fio/fio-2.2.10.ebuild
index 1d6b7d4..27c39cd 100644
--- a/sys-block/fio/fio-2.2.10.ebuild
+++ b/sys-block/fio/fio-2.2.10.ebuild
@@ -38,6 +38,7 @@
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	epatch "${FILESDIR}"/fio-2.2.10-libmtd.patch
 	sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
 	epatch_user
 
diff --git a/sys-block/fio/fio-2.2.13.ebuild b/sys-block/fio/fio-2.2.13.ebuild
index 1d6b7d4..f7a5277 100644
--- a/sys-block/fio/fio-2.2.13.ebuild
+++ b/sys-block/fio/fio-2.2.13.ebuild
@@ -38,6 +38,7 @@
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	epatch "${FILESDIR}"/fio-2.2.13-libmtd.patch
 	sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
 	epatch_user
 
diff --git a/sys-block/fio/fio-2.5.ebuild b/sys-block/fio/fio-2.5.ebuild
index 1d6b7d4..f7a5277 100644
--- a/sys-block/fio/fio-2.5.ebuild
+++ b/sys-block/fio/fio-2.5.ebuild
@@ -38,6 +38,7 @@
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	epatch "${FILESDIR}"/fio-2.2.13-libmtd.patch
 	sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
 	epatch_user
 
diff --git a/sys-block/fio/fio-2.6.ebuild b/sys-block/fio/fio-2.6.ebuild
new file mode 100644
index 0000000..f7a5277
--- /dev/null
+++ b/sys-block/fio/fio-2.6.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+inherit eutils python-r1 toolchain-funcs
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Jens Axboe's Flexible IO tester"
+HOMEPAGE="http://brick.kernel.dk/snaps/"
+SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="aio glusterfs gnuplot gtk numa rbd rdma static zlib"
+
+# GTK+:2 does not offer static libaries
+# numactl always includes static libraries
+DEPEND="aio? ( static? ( dev-libs/libaio[static-libs(+)] ) !static? ( dev-libs/libaio ) )
+	glusterfs? ( static? ( sys-cluster/glusterfs[static-libs(+)] ) !static? ( sys-cluster/glusterfs ) )
+	gtk? (
+		static? ( dev-libs/glib:2[static-libs(+)] ) !static? ( dev-libs/glib:2 )
+		x11-libs/gtk+:2
+	)
+	numa? ( sys-process/numactl )
+	rbd? ( static? ( sys-cluster/ceph[static-libs(+)] ) !static? ( sys-cluster/ceph ) )
+	zlib? ( static? ( sys-libs/zlib[static-libs(+)] ) !static? ( sys-libs/zlib ) )"
+RDEPEND="${DEPEND}
+	gnuplot? (
+		sci-visualization/gnuplot
+		${PYTHON_DEPS}
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/fio-2.2.13-libmtd.patch
+	sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
+	epatch_user
+
+	# Many checks don't have configure flags.
+	sed -i \
+		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
+		-e '/if compile_prog "" "-lz" "zlib" *; *then/  '"s::if $(usex zlib true false) ; then:" \
+		-e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
+		configure || die
+}
+
+src_configure() {
+	chmod g-w "${T}"
+	# not a real configure script
+	set -- \
+	./configure \
+		--disable-optimizations \
+		--extra-cflags="${CFLAGS} ${CPPFLAGS}" \
+		--cc="$(tc-getCC)" \
+		$(usex glusterfs '' '--disable-gfapi') \
+		$(usex gtk '--enable-gfio' '') \
+		$(usex numa '' '--disable-numa') \
+		$(usex rbd '' '--disable-rbd') \
+		$(usex static '--build-static' '')
+	echo "$@"
+	"$@" || die 'configure failed'
+}
+
+src_compile() {
+	emake V=1 OPTFLAGS=
+}
+
+src_install() {
+	emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
+
+	if use gnuplot ; then
+		python_replicate_script "${ED}/usr/bin/fio2gnuplot"
+	else
+		rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die
+		rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die
+		rm "${ED}"/usr/share/fio/*.gpm || die
+		rmdir "${ED}"/usr/share/fio/ 2>/dev/null
+	fi
+
+	# This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
+	rm "${ED}"/usr/bin/genfio || die
+
+	dodoc README REPORTING-BUGS HOWTO
+	docinto examples
+	dodoc examples/*
+}
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index 8ed88c0..d0a26f6 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -1,3 +1,3 @@
 DIST os-prober_1.65.tar.xz 24712 SHA256 c4a7661a52edae722f7e6bacb3f107cf7086cbe768275fadf5398d04360bfc84 SHA512 64dd9042a26dc859d9186bb48545d85b1a369d00a93b5045c420eac0c4b672ab32cb6028eada5f1cc21c8ab9386c35b8eedb79bc7975faf7b0a7b2841b284f53 WHIRLPOOL 397a92312b018fa08b2e838bc6b85fa4d55502dfb8e8725c79f4a0ae397e3bd258a7bb302f74b2293cd85f4ddabf4cba75ff2b4b57fa9904094c3a50e1ace36e
-DIST os-prober_1.68.tar.xz 25336 SHA256 ad0b98c3e59239bff94e8f03bb618c21043c5314a7d00726d53f84add8478804 SHA512 b545cb42eb6e46da051aa7b63ec2cb29549aa197d0e0c361fa5d4a92ae3774c665003b4c1cd4294c9d26a63a71cd50cce75fed3be9d770adffeb0bd0b8cfc79e WHIRLPOOL a337446d1e6691d50b749fe3843452389845dbb5de5e06227baebd90b2535aa3111f7373f7c26335feef5637dc84ae5c1f0faa8bcaf97dfa4393129129e8cbf2
 DIST os-prober_1.70.tar.xz 25468 SHA256 f95a8998e106578edf105c42c84809c71e413a01370be9bd0b6d238d5b63bf1d SHA512 d060a7fd4e128693b1bb79cff014b4583f56fd0ed4fdd1afd9670623538c03c4e458697c85c753ef4746b1acc5f91e31ef1f0d83fcb696e35ae8355f16edd9a4 WHIRLPOOL 9414e27187223aa6cddf910bcf77f2b677bf1bef0b358b287a59dbbd2acb9a35060163d18c26808a97da061b8d3e77713e283de2d32e23188400fde975c607a7
+DIST os-prober_1.71.tar.xz 25540 SHA256 5d6141e02b58e82194422b97d683d61c7ff78175d89c2f055f5d2e7a363bdd20 SHA512 adb7b8cf54c6169510c7ce2bf40e4b659c97eecfb7c1dd149269520ef13cdc2b6587f221fcfcb95c18caf9dba8144bbba561abb158e986ab02f4e0d338317d04 WHIRLPOOL cb3d8596c1e753fc2d687b30c6bd386d160114524b7b4f2d39dfe208191b231962311103a3106a7ccad8fa05bee132a5faa72265c44c33e22cb3d6090dd1cb04
diff --git a/sys-boot/os-prober/os-prober-1.68.ebuild b/sys-boot/os-prober/os-prober-1.71.ebuild
similarity index 96%
rename from sys-boot/os-prober/os-prober-1.68.ebuild
rename to sys-boot/os-prober/os-prober-1.71.ebuild
index 1f28f43..83b93c9 100644
--- a/sys-boot/os-prober/os-prober-1.68.ebuild
+++ b/sys-boot/os-prober/os-prober-1.71.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,8 +16,6 @@
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-S=${WORKDIR}/${PN}
-
 src_prepare() {
 	# use default GNU rules
 	rm Makefile || die 'rm Makefile failed'
diff --git a/sys-devel/llvm/llvm-3.4.2.ebuild b/sys-devel/llvm/llvm-3.4.2.ebuild
index 5268c28..c2ef13a 100644
--- a/sys-devel/llvm/llvm-3.4.2.ebuild
+++ b/sys-devel/llvm/llvm-3.4.2.ebuild
@@ -445,6 +445,34 @@
 		fi
 	fi
 
+	# apply CHOST and PV to clang executables
+	# they're statically linked so we don't have to worry about the lib
+	if use clang; then
+		local clang_tools=( clang clang++ )
+		local i
+
+		# append ${PV} and symlink back
+		# TODO: use alternatives.eclass? does that make any sense?
+		# maybe with USE=-clang on :0 and USE=clang on older
+		for i in "${clang_tools[@]}"; do
+			mv "${ED%/}/usr/bin/${i}"{,-${PV}} || die
+			dosym "${i}"-${PV} /usr/bin/${i}
+		done
+
+		# now prepend ${CHOST} and let the multilib-build.eclass symlink it
+		if ! multilib_is_native_abi; then
+			# non-native? let's replace it with a simple wrapper
+			for i in "${clang_tools[@]}"; do
+				rm "${ED%/}/usr/bin/${i}-${PV}" || die
+				cat > "${T}"/wrapper.tmp <<-_EOF_
+					#!${EPREFIX}/bin/sh
+					exec "${i}-${PV}" $(get_abi_CFLAGS) "\${@}"
+				_EOF_
+				newbin "${T}"/wrapper.tmp "${i}-${PV}"
+			done
+		fi
+	fi
+
 	# Fix install_names on Darwin.  The build system is too complicated
 	# to just fix this, so we correct it post-install
 	local lib= f= odylib= ndylib= libpv=${PV}
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index f535f3c..dab2972 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -4,12 +4,10 @@
 DIST deblob-check-4.3 688368 SHA256 9dff222415c2ead1edba2f6755926d6786225814d87dc3624605f99a4b760a5a SHA512 2029b4765a4f83b71370dc4439526daff57be32f8692a329d500df82019a5381849ca979c0ae3761c2efcc04590c031560f0e25de50e71f476618df529a1445a WHIRLPOOL 6dbdcfe6653e751ff00ad91f45c803bdb196fdb9c895ddffaec18a111a19720d50a77485ff8ce228287217ad2e98b6f9e9c65a3c6476f195cbf9e3b7969be34a
 DIST genpatches-4.1-11.base.tar.xz 233284 SHA256 4189cfd2c7d1a1d7f28c8a596ad36741ce087c7c4cfbe0d5d20a0ee889328d18 SHA512 e5944edf832070d6072ab8efc242165afcfb689874687196c96389c6176ca9772e72e82836aba40ad05840536acae6efd6e72890efd692d903018d47489a90f8 WHIRLPOOL 13cb400b330443025f77dee6c710ca9886991a7032fa3ff925d53ed4fc03d07ece5647dca65de1a149073362db1d7a0b374a21d980eafcae09a4b01584c64cb6
 DIST genpatches-4.3-4.base.tar.xz 75572 SHA256 c0c073f12a4f1c0adf9d3865fe5d16dc43ea0e5c95c0867868e16e57f2fd6235 SHA512 a16b75f8fcd868d6f9bc2b91318eb8b8ec4db2b622d244e750d4176c4e8225808751c543c54d768fbd88785da656e9f60d8ef8bc22672b5cb1038573c0c366e1 WHIRLPOOL 04c723b71f440035f57684088a47e83430f1c5b057951e037f128f3681f16669eca16f2f1b8d4b7be4a617420131277d1fe415503a679b83a081e06635df46e3
-DIST genpatches-4.3-5.base.tar.xz 76536 SHA256 ef0d2bf2101d848ef6ef97ebb680dfb546aec91efdc17acb45bd234e4e7d2fe4 SHA512 635008532fc56f68e5867143367ecd7f3e277dda796d2c311e61459b6b1e454f0822664bfae02f59cce691246ba9a7d0f6ed6a5817230e512632c80b71ab6b7b WHIRLPOOL b467abff1276bb5884fcdeaed9d15ef7dd0a31f37e44b77c98214758bf406b21a5143b516a1c15056146af426122ec255736a33a643ad3bf10afd6d052070ccf
 DIST genpatches-4.3-7.base.tar.xz 137724 SHA256 f45b2b6bd27dd6ba0ce82f4b143078cdb99f729d344773ef31f42fff339f295d SHA512 3a910f0c0a41b1658190b005ca6cbfd82ddea72a65f09e26b4173371f5ff1f65a1712cd35633d0692f74fd8ff0d0fdb4163113ccca8c1de197d1ee52356fbad5 WHIRLPOOL 67611446db6eb94c59842874762797cd2986399e7304eb3adcdfd9a72b104a10dbdde7a22de87381f416ebe07ab312b80dc1a8946077a003bf5646db65aaedd9
 DIST hardened-patches-4.1.7-2.extras.tar.bz2 1419438 SHA256 c8c0fc29c39eafbcea107b8237087fd0e185297e2df9ffeaafc6b3a4736b7a45 SHA512 dac324e265174777d8b9c2369f57e52833b4228b3291e41952a9791ce41b9abf378e1d9a0521566c3a0e42de15a16afa5fe379985b7fee78b1b2b3b815d7cdd4 WHIRLPOOL 7638001f1b95e4af1d051b13648f486aa0eca524157e1a46dd2023fbd86313e0a5e8043653d7388b7286d42cc6e7c0f07cde2de3d5aee6cc058d12538a0980c1
 DIST hardened-patches-4.3.3-5.extras.tar.bz2 1649484 SHA256 2a62a5eb4b98f4fbeb43511a0573d58226277d3112401abec37355d85e01ae23 SHA512 09b7272af44fb1e29cba857f7c3305d97f8997881f228a2f2eb56dda909ae5402a69336c6fccdf3920f8788a7922f10b0977517f5918d44702e1a9b668c708c7 WHIRLPOOL efc152c7680b84b682f9f6857b8c6b2b66b6d505f76b311a8e3289a606f46d4944d90478ff93e3656f41c367fdbcd65dcf3043842354b26b669b462ce49f3471
 DIST hardened-patches-4.3.3-8.extras.tar.bz2 1669500 SHA256 55abfccb978e838266de327e020d47bb8f7bcf7ff6d6a89c993f18518ab6ffaa SHA512 bccae396966a3a00eac4763312e7c4a05f3cbc68f42675819ad90e3f43337713a7ee132ba5fe6874fffa55da9b8640e2d349793904736b9f62b178bdc5474ad9 WHIRLPOOL 76eceb3d204e3ed588fd40d773aa38f4450c0a3727aad75b231ed2795548ef3ef316fc3aeb174eabd79641fa43c4c2c56d184f6dd23f47980256e468c3cc6d2b
-DIST hardened-patches-4.3.4-3.extras.tar.bz2 1688931 SHA256 7ccce5bc5b9130ae63b865e04582b4fb6ccfecc8ef737317168f40aaad84a0d9 SHA512 702f936d945254def757cc116bfeb42dc3d84493d18749c4e3865a3d10caaffa486b4d9256a56f946eba7894f662989572df9b80fb78c56785997a9a19d68122 WHIRLPOOL cfbe5a2bf97b45937599e6261c3a7f45e3178216b3dcc802ef003f14fb1c3eeb05d057810968916e0e979395043096eaaa0ab1d85191ebad10c19da5eca10bc2
-DIST hardened-patches-4.3.5-1.extras.tar.bz2 1668674 SHA256 52a102901e32e7caac4cc8e3368878a81a7542364d5408185c1820f5faff752f SHA512 d4690e6d5f41558270c4195e0b5b3f325cfa7391d5d8b28b3cebbe3f5eb2bba92aea54cfc4ea6325b29ee13c05fc11e43e0e400eb173db9a7f821dd794277fc7 WHIRLPOOL 0430a886dc53b7d99e5dd532e1d3c394025ad4bf434d631b06370eb6cc24edb1e2cb25ece77cb204aaab53ffcbc9d653715cb1057c93555555ad667f680c6866
+DIST hardened-patches-4.3.5-2.extras.tar.bz2 1688809 SHA256 4859f8f42d14f79920613ccb195f2b4d65e1ba84cffccb338fe4c5cecb6d56ca SHA512 63128c8279077226292212de45b581d3de0cc9e866ae4907ba70e8cc9928324a4aada0429b1b102dcb72dccd75c26b2a5aa3880a6210e97c9871e7d6c32754cd WHIRLPOOL ee7f762935fbf211fded180921a80b4d9b2efd02be084df5636103c5a0bf8cf2ced5f59a9be3488cc4519969ae6d18783d7a704d5ea6a7140e7c83ae9a942203
 DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8
 DIST linux-4.3.tar.xz 86920812 SHA256 4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae SHA512 d25812043850530fdcfdb48523523ee980747f3c2c1266149330844dae2cba0d056d4ddd9c0f129f570f5d1f6df5c20385aec5f6a2e0755edc1e2f5f93e2c6bc WHIRLPOOL e3f131443acc14d4f67bbd3f4e1c57af3d822c41c85a112564d54667a591c8619dce42327fd8166d30a2d7adfaf433c2e2134d4995c91c08f65ac0cc2190f935
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.3.4-r2.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.3.4-r2.ebuild
deleted file mode 100644
index 67b9aab..0000000
--- a/sys-kernel/hardened-sources/hardened-sources-4.3.4-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="5"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-3"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="
-	1500_XATTR_USER_PREFIX.patch
-	1520_keyring-refleak-in-join-session-CVE-2016-0728.patch
-	2900_dev-root-proc-mount-fix.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-3.1*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.3.5.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.3.5-r1.ebuild
similarity index 96%
rename from sys-kernel/hardened-sources/hardened-sources-4.3.5.ebuild
rename to sys-kernel/hardened-sources/hardened-sources-4.3.5-r1.ebuild
index 35a53db..f59b31a 100644
--- a/sys-kernel/hardened-sources/hardened-sources-4.3.5.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-4.3.5-r1.ebuild
@@ -12,7 +12,7 @@
 inherit kernel-2
 detect_version
 
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-2"
 HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
 SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
 
diff --git a/sys-kernel/linux-firmware/linux-firmware-20151207.ebuild b/sys-kernel/linux-firmware/linux-firmware-20151207.ebuild
index 72758de..eb915c5 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20151207.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20151207.ebuild
@@ -9,10 +9,10 @@
 	inherit git-2
 	SRC_URI=""
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
 DESCRIPTION="Linux firmware files"
diff --git a/sys-kernel/linux-headers/linux-headers-4.3.ebuild b/sys-kernel/linux-headers/linux-headers-4.3.ebuild
index 57aff9d..5e46814 100644
--- a/sys-kernel/linux-headers/linux-headers-4.3.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.3.ebuild
@@ -13,7 +13,7 @@
 SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 
 DEPEND="app-arch/xz-utils
 	dev-lang/perl"
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index e302ecc..c3a410a 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1 +1 @@
-DIST google-chrome-unstable_50.0.2633.3-1_amd64.deb 48277408 SHA256 d4894a58a742920b7532cc3fcb846b298309a866c4ed4bae6d2605825d1dc776 SHA512 bccb4fcb73536db0791756528f8b834a112809a6a6127065b3e0bf43e79a4bf64a4c29a84120477c01774af7d67fba887c8118a49313fadf3688a01042f1bb44 WHIRLPOOL 5d589237e92302f50b657eab9f56634fe2d49f4dc8b9b2c44e9b897cdebc3c7515e02b035e5345f66feb35f277f3e02a566db4613c68ef6428a44041a219d4ee
+DIST google-chrome-unstable_50.0.2638.0-1_amd64.deb 48485834 SHA256 013a1fd1ab35db0b9e27965cf838e80a642ceb87f95fd1c75144071bc969b941 SHA512 688883ee5b4459b6c532c7dab630fbd6781a0604de23ae293ba9fbc1656c2bbcbf20a9dabafd6f66117ad2d516232a69a7e986e0d7eb0c24d52f08388f979bd4 WHIRLPOOL 943e52d51f6c6856f2d531b6fa6e0aa25a0ed67d5f95ffefa48d96417bcb2ed386a1d63e27ad3e6aa6fef2176a3456398dce8614113d2e077f3e86296f941db2
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-50.0.2633.3_p1.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-50.0.2638.0_p1.ebuild
similarity index 100%
rename from www-client/google-chrome-unstable/google-chrome-unstable-50.0.2633.3_p1.ebuild
rename to www-client/google-chrome-unstable/google-chrome-unstable-50.0.2638.0_p1.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 3848517..8ba186a 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,2 +1,2 @@
-DIST google-chrome-stable_48.0.2564.97-1_amd64.de